From f25eeb5c615efbdd66df9c4dc551dc48dac0090b Mon Sep 17 00:00:00 2001 From: Ethan Niser Date: Mon, 18 Sep 2023 00:02:47 -0500 Subject: [PATCH] prettier --- package.json | 4 +- packages/beth-stack/cli/index.js | 150 +++++++++--------- packages/beth-stack/src/cache/persist.ts | 12 +- packages/beth-stack/src/cache/render.ts | 2 +- .../src/cache/tests/persist-cache.test.tsx | 8 +- .../src/cache/tests/swr-behavior.test.tsx | 16 +- packages/beth-stack/src/cli/index.ts | 2 +- packages/beth-stack/src/elysia/index.ts | 2 +- packages/beth-stack/src/examples/example.tsx | 6 +- packages/beth-stack/src/jsx/index.ts | 18 +-- packages/beth-stack/src/jsx/render.ts | 8 +- packages/beth-stack/src/jsx/suspense.tsx | 4 +- .../beth-stack/src/jsx/tests/render.test.tsx | 4 +- packages/beth-stack/src/jsx/utils.ts | 2 +- prettier.config.cjs => prettier.config.mjs | 2 +- reset.d.ts | 2 +- .../beth-stack/tsconfig.json => tsconfig.json | 0 www/package.json | 2 +- 18 files changed, 121 insertions(+), 123 deletions(-) rename prettier.config.cjs => prettier.config.mjs (92%) rename packages/beth-stack/tsconfig.json => tsconfig.json (100%) diff --git a/package.json b/package.json index f7244d2..e0f89ca 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,7 @@ "dotenv": "latest", "prettier": "^2.8.8", "turbo": "^1.10.1", - "typescript": "^5.1.6" - }, - "devDependencies": { + "typescript": "^5.1.6", "@total-typescript/ts-reset": "^0.5.1" } } diff --git a/packages/beth-stack/cli/index.js b/packages/beth-stack/cli/index.js index b996bf8..3faae2e 100755 --- a/packages/beth-stack/cli/index.js +++ b/packages/beth-stack/cli/index.js @@ -950,7 +950,7 @@ var f0 = H0((y6) => { : z.parameters.length > H.parameters.length ? C.False : !z.parameters.every( - (X0, u0) => W(z0(H.parameters[u0], X0)) === C.True, + (X0, u0) => W(z0(H.parameters[u0], X0)) === C.True ) ? C.False : W(z0(z.returns, H.returns)); @@ -976,7 +976,7 @@ var f0 = H0((y6) => { : z.parameters.length > H.parameters.length ? C.False : !z.parameters.every( - (X0, u0) => W(z0(H.parameters[u0], X0)) === C.True, + (X0, u0) => W(z0(H.parameters[u0], X0)) === C.True ) ? C.False : W(z0(z.returns, H.returns)); @@ -1466,11 +1466,11 @@ var f0 = H0((y6) => { function W(J) { const q = Object.getOwnPropertyNames(J).reduce( (D, B) => ({ ...D, [B]: X(J[B]) }), - {}, + {} ), F = Object.getOwnPropertySymbols(J).reduce( (D, B) => ({ ...D, [B]: X(J[B]) }), - {}, + {} ); return { ...q, ...F }; } @@ -1616,13 +1616,13 @@ var f0 = H0((y6) => { function W(J, q) { return y6.Type.Intersect( J.allOf.map((F) => Z(F, q)), - { ...J }, + { ...J } ); } function Y(J, q) { return y6.Type.Union( J.anyOf.map((F) => Z(F, q)), - { ...J }, + { ...J } ); } function X(J, q) { @@ -1658,7 +1658,7 @@ var f0 = H0((y6) => { ...K.reduce( (I, w) => w.map((U) => (K.every((P) => P.includes(U)) ? I.add(U) : I))[0], - new Set(), + new Set() ), ]; } @@ -1709,7 +1709,7 @@ var f0 = H0((y6) => { const X = g1.ParseExact(Y.pattern); if (!f1.Check(X)) throw new Y8( - "Cannot resolve keys from infinite template expression", + "Cannot resolve keys from infinite template expression" ); return [...T1.Generate(X)]; })() @@ -1839,7 +1839,7 @@ var f0 = H0((y6) => { function U(O, S) { if (!Y(O, S)) throw new K$( - "TemplateLiteralParser: Index must point to open parens", + "TemplateLiteralParser: Index must point to open parens" ); let R = 0; for (let _ = S; _ < O.length; _++) { @@ -1848,7 +1848,7 @@ var f0 = H0((y6) => { if (R === 0) return [S, _]; } throw new K$( - "TemplateLiteralParser: Unclosed group parens in expression", + "TemplateLiteralParser: Unclosed group parens in expression" ); } function P(O, S) { @@ -2109,7 +2109,7 @@ var f0 = H0((y6) => { .map((Z) => V.IsString(Z) ? { [y6.Kind]: "Literal", type: "string", const: Z } - : { [y6.Kind]: "Literal", type: "number", const: Z }, + : { [y6.Kind]: "Literal", type: "number", const: Z } ); return this.Create({ ...W, [y6.Kind]: "Union", anyOf: X }); } @@ -2159,7 +2159,7 @@ var f0 = H0((y6) => { : A.TTuple($) && A.TNumber(W) ? (() => { const Z = (V.IsUndefined($.items) ? [] : $.items).map((Q) => - u.Type(Q), + u.Type(Q) ); return this.Union(Z, Y); })() @@ -2203,13 +2203,13 @@ var f0 = H0((y6) => { : Y === y6.PatternStringExact ? this.String(W) : this.Throw( - "Unable to resolve key type from Record key pattern", + "Unable to resolve key type from Record key pattern" ); })() : A.TTuple($) ? (() => { const X = (V.IsUndefined($.items) ? [] : $.items).map((Z, Q) => - y6.Type.Literal(Q.toString()), + y6.Type.Literal(Q.toString()) ); return this.Union(X, W); })() @@ -2288,7 +2288,7 @@ var f0 = H0((y6) => { if (X.includes(Q)) delete Z.properties[Q]; return this.Create(Z); }, - Y, + Y ); } Partial($, W = {}) { @@ -2300,7 +2300,7 @@ var f0 = H0((y6) => { }, {}); return this.Object(X, this.Discard(Y, "required")); }, - W, + W ); } Pick($, W, Y = {}) { @@ -2319,7 +2319,7 @@ var f0 = H0((y6) => { if (!X.includes(Q)) delete Z.properties[Q]; return this.Create(Z); }, - Y, + Y ); } Record($, W, Y = {}) { @@ -2330,9 +2330,9 @@ var f0 = H0((y6) => { ? this.Object( [...T1.Generate(X)].reduce( (Z, Q) => ({ ...Z, [Q]: u.Type(W) }), - {}, + {} ), - Y, + Y ) : this.Create({ ...Y, @@ -2347,7 +2347,7 @@ var f0 = H0((y6) => { if (A.TUnionLiteral(X)) { const Z = X.anyOf.reduce( (Q, J) => ({ ...Q, [J.const]: u.Type(W) }), - {}, + {} ); return this.Object(Z, { ...Y, [y6.Hint]: "Record" }); } else @@ -2358,7 +2358,7 @@ var f0 = H0((y6) => { return V.IsString($.const) || V.IsNumber($.const) ? this.Object({ [$.const]: u.Type(W) }, Y) : this.Throw( - "Record key of type literal is not of type string or number", + "Record key of type literal is not of type string or number" ); })() : A.TInteger($) || A.TNumber($) @@ -2407,7 +2407,7 @@ var f0 = H0((y6) => { }, {}); return this.Object(X, Y); }, - W, + W ); } Rest($) { @@ -2965,7 +2965,7 @@ var a1 = H0((a6) => { const Z = e($.contains) ? $.contains : p0.Type.Never(), Q = X.reduce( (J, q, F) => (C0(Z, W, `${Y}${F}`, q).next().done === true ? J + 1 : J), - 0, + 0 ); if (Q === 0) yield f(k.ArrayContains, $, Y, X); if ((0, w0.IsNumber)($.minContains) && Q < $.minContains) @@ -3093,7 +3093,7 @@ var a1 = H0((a6) => { k.ObjectRequiredProperty, $.properties[q], `${Y}/${q}`, - undefined, + undefined ); } if ($.additionalProperties === false) { @@ -3945,7 +3945,7 @@ var X$ = H0((SW) => { } else if (I0.TypeGuard.TSchema($.unevaluatedProperties)) { const Z = new RegExp(I0.KeyResolver.ResolvePattern($)), Q = Object.getOwnPropertyNames(Y).every( - (J) => Z.test(J) || R0($.unevaluatedProperties, W, Y[J]), + (J) => Z.test(J) || R0($.unevaluatedProperties, W, Y[J]) ); return X && Q; } else return X; @@ -4010,7 +4010,7 @@ var X$ = H0((SW) => { else return Z.every((Q) => X.includes(Q)); } else if (typeof $.additionalProperties === "object") return Object.getOwnPropertyNames(Y).every( - (Q) => X.includes(Q) || R0($.additionalProperties, W, Y[Q]), + (Q) => X.includes(Q) || R0($.additionalProperties, W, Y[Q]) ); else return true; }, @@ -4205,11 +4205,11 @@ var p8 = H0((IW) => { n4 = function ($, W) { if ($.uniqueItems === true && !(0, W0.HasPropertyKey)($, "default")) throw new Error( - "ValueCreate.Array: Array with the uniqueItems constraint requires a default value", + "ValueCreate.Array: Array with the uniqueItems constraint requires a default value" ); else if ("contains" in $ && !(0, W0.HasPropertyKey)($, "default")) throw new Error( - "ValueCreate.Array: Array with the contains constraint requires a default value", + "ValueCreate.Array: Array with the contains constraint requires a default value" ); else if ("default" in $) return $.default; else if ($.minItems !== undefined) @@ -4331,13 +4331,13 @@ var p8 = H0((IW) => { if ($.pattern !== undefined) if (!(0, W0.HasPropertyKey)($, "default")) throw new Error( - "ValueCreate.String: String types with patterns must specify a default value", + "ValueCreate.String: String types with patterns must specify a default value" ); else return $.default; else if ($.format !== undefined) if (!(0, W0.HasPropertyKey)($, "default")) throw new Error( - "ValueCreate.String: String types with formats must specify a default value", + "ValueCreate.String: String types with formats must specify a default value" ); else return $.default; else if ((0, W0.HasPropertyKey)($, "default")) return $.default; @@ -4368,7 +4368,7 @@ var p8 = H0((IW) => { if ($.items === undefined) return []; else return Array.from({ length: $.minItems }).map((Y, X) => - y0($.items[X], W), + y0($.items[X], W) ); }, BJ = function ($, W) { @@ -4379,7 +4379,7 @@ var p8 = H0((IW) => { if ((0, W0.HasPropertyKey)($, "default")) return $.default; else if ($.anyOf.length === 0) throw new Error( - "ValueCreate.Union: Cannot create Union with zero variants", + "ValueCreate.Union: Cannot create Union with zero variants" ); else return y0($.anyOf[0], W); }, @@ -4514,7 +4514,7 @@ var p8 = H0((IW) => { class d8 extends g0.TypeBoxError { constructor($) { super( - "Intersect produced invalid value. Consider using a default value.", + "Intersect produced invalid value. Consider using a default value." ); this.schema = $; } @@ -4524,7 +4524,7 @@ var p8 = H0((IW) => { class y8 extends g0.TypeBoxError { constructor($) { super( - "Can only create template literal values from patterns that produce finite sequences. Consider using a default value.", + "Can only create template literal values from patterns that produce finite sequences. Consider using a default value." ); this.schema = $; } @@ -4534,7 +4534,7 @@ var p8 = H0((IW) => { class v8 extends g0.TypeBoxError { constructor($, W) { super( - "Value cannot be created as recursive type may produce value of infinite size. Consider using a default.", + "Value cannot be created as recursive type may produce value of infinite size. Consider using a default." ); (this.schema = $), (this.recursiveMaxDepth = W); } @@ -4810,7 +4810,7 @@ var pW = H0((yW) => { return ( (0, J0.IsString)($) && /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i.test( - $, + $ ) ); }, @@ -4824,7 +4824,7 @@ var pW = H0((yW) => { return ( (0, J0.IsString)($) && /^\d\d\d\d-[0-1]\d-[0-3]\dt(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i.test( - $, + $ ) ); }, @@ -4832,7 +4832,7 @@ var pW = H0((yW) => { return ( (0, J0.IsString)($) && /^\d\d\d\d-[0-1]\d-[0-3]\dt(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)?$/i.test( - $, + $ ) ); }, @@ -5870,7 +5870,7 @@ var wY = H0((Xz, AY) => { }, e0 = Array.from( { length: 256 }, - ($, W) => "%" + ((W < 16 ? "0" : "") + W.toString(16)).toUpperCase(), + ($, W) => "%" + ((W < 16 ? "0" : "") + W.toString(16)).toUpperCase() ), n9 = new Int8Array([ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5964,14 +5964,14 @@ var GY = H0((IY) => { throw new q$.TransformDecodeCheckError( this.schema, $, - this.Errors($).First(), + this.Errors($).First() ); return this.hasTransform ? q$.DecodeTransform.Decode( this.schema, this.references, $, - (W, Y, X) => this.Check(X), + (W, Y, X) => this.Check(X) ) : $; } @@ -5981,14 +5981,14 @@ var GY = H0((IY) => { this.schema, this.references, $, - (Y, X, Z) => this.Check(Z), + (Y, X, Z) => this.Check(Z) ) : $; if (!this.checkFunc(W)) throw new q$.TransformEncodeCheckError( this.schema, $, - this.Errors($).First(), + this.Errors($).First() ); return W; } @@ -6212,7 +6212,7 @@ var GY = H0((IY) => { y = `Object.getOwnPropertyNames(${j}).every(key => ${d}.test(key) || ${s( L.unevaluatedProperties, E, - `${j}[key]`, + `${j}[key]` )})`; yield `(${m} && ${y})`; } else yield `(${m})`; @@ -6445,7 +6445,7 @@ var GY = H0((IY) => { Q0 = $1("boolean"), M = [...i(E, j, m, d)].map((a) => `${Z0(4)}${a}`).join(` &&${y}`); return `function ${L}(${P0})${Q0} {${y}${Z0(2)}return (${y}${M}${y}${Z0( - 2, + 2 )})\n}`; } function U0(L, E) { @@ -6594,7 +6594,7 @@ class _1 { if (X.params === null) X.params = S6(B); else if (X.params.paramName !== B) throw Error( - `Cannot create route "${W}" with parameter "${B}" because a route already exists with a different parameter name ("${X.params.paramName}") in the same location`, + `Cannot create route "${W}" with parameter "${B}" because a route already exists with a different parameter name ("${X.params.paramName}") in the same location` ); let K = X.params; if (K.inert === null) { @@ -6636,7 +6636,7 @@ class _1 { if (X.params === null) X.params = S6(D); else if (X.params.paramName !== D) throw Error( - `Cannot create route "${W}" with parameter "${D}" because a route already exists with a different parameter name ("${X.params.paramName}") in the same location`, + `Cannot create route "${W}" with parameter "${D}" because a route already exists with a different parameter name ("${X.params.paramName}") in the same location` ); return X.params.store === null && (X.params.store = Y), X.params.store; } @@ -6763,7 +6763,7 @@ var I6 = ($, W) => { g.push( new Promise((n) => { M0 = n; - }), + }) ), O.push(M0); } @@ -7452,7 +7452,7 @@ var j1 = ($, W) => { }; var N1 = ( $, - { models: W = {}, additionalProperties: Y = false, dynamic: X = false }, + { models: W = {}, additionalProperties: Y = false, dynamic: X = false } ) => { if (!$) return; if (typeof $ === "string" && !($ in W)) return; @@ -7473,7 +7473,7 @@ var N1 = ( }; var q6 = ( $, - { models: W = {}, additionalProperties: Y = false, dynamic: X = false }, + { models: W = {}, additionalProperties: Y = false, dynamic: X = false } ) => { if (!$) return; if (typeof $ === "string" && !($ in W)) return; @@ -7657,7 +7657,7 @@ class c0 { add($) { const W = Object.assign( this.property, - typeof $ === "function" ? $(Object.assign(this.property, this.value)) : $, + typeof $ === "function" ? $(Object.assign(this.property, this.value)) : $ ); if ("value" in W) (this._value = W.value), delete W.value; return (this.property = W), this.sync(); @@ -8053,7 +8053,7 @@ var w1 = ($) => { var U$ = ($, W) => new Response( JSON.stringify({ name: $?.name, message: $?.message, cause: $?.cause }), - { status: W?.status !== 200 ? W?.status ?? 500 : 500, headers: W?.headers }, + { status: W?.status !== 200 ? W?.status ?? 500 : 500, headers: W?.headers } ); var U7 = new Headers().toJSON; var F7 = new RegExp(" (\\w+) = context", "g"); @@ -8083,7 +8083,7 @@ var iY = ({ ${D ? `unit: ${q},` : ""} ${J} })`.replace(/(\t| |\n)/g, "") + - "\n", + "\n" ); let B = false; return () => { @@ -8099,7 +8099,7 @@ var iY = ({ type: 'end', time: performance.now() })`.replace(/(\t| |\n)/g, "") + - "\n", + "\n" ), W && Z === "afterHandle") ) @@ -8268,7 +8268,7 @@ var mY = ({ const O = X || (W !== "GET" && W !== "HEAD") ? [Z, ...Y.transform, ...Y.beforeHandle, ...Y.afterHandle].map((T) => - T.toString(), + T.toString() ) : [], S = @@ -8283,7 +8283,7 @@ var mY = ({ if (G?.sign) { if (!G.secrets) throw new Error( - `t.Cookie required secret which is not set in (${W}) ${$}.`, + `t.Cookie required secret which is not set in (${W}) ${$}.` ); const T = !G.secrets ? undefined @@ -8761,7 +8761,7 @@ var mY = ({ }`), Function( "hooks", - N, + N )({ handler: Z, hooks: Y, @@ -8929,7 +8929,7 @@ var F6 = ($) => { ($.handleError = B6($)), Function( "data", - Y, + Y )({ app: $, mapEarlyResponse: l0, @@ -9154,18 +9154,18 @@ var A0 = Y1(f0(), 1); try { I1.TypeSystem.Format("email", ($) => /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i.test( - $, - ), + $ + ) ), I1.TypeSystem.Format("uuid", ($) => /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test( - $, - ), + $ + ) ), I1.TypeSystem.Format("date", ($) => !Number.isNaN(new Date($).getTime())), I1.TypeSystem.Format( "date-time", - ($) => !Number.isNaN(new Date($).getTime()), + ($) => !Number.isNaN(new Date($).getTime()) ); } catch ($) {} var nY = ($) => { @@ -9305,7 +9305,7 @@ class n$ { { allowMeta: Z = false, skipPrefix: Q = false } = { allowMeta: false, skipPrefix: false, - }, + } ) { if (typeof W === "string") W = [W]; for (let J of W) { @@ -9441,7 +9441,7 @@ class n$ { this.router.add( $, J.endsWith("/") ? J.slice(0, J.length - 1) : J + "/", - I, + I ); } } @@ -9554,13 +9554,13 @@ class n$ { : Array.isArray(K.error) ? [...K.error, ...Q.event.error] : [K.error, ...Q.event.error], - }), + }) ); } else this.add(J, q, F, j1(D, { error: Q.event.error }), { skipPrefix: true, }); - }, + } ), this ); @@ -9603,9 +9603,9 @@ class n$ { : Array.isArray(q.error) ? [...q.error, ...X.event.error] : [q.error, ...X.event.error], - }), + }) ); - }, + } ), this ); @@ -9618,7 +9618,7 @@ class n$ { if (typeof W === "function") return W(this); if (typeof W.default === "function") return W.default(this); return this._use(W.default); - }).then((W) => W.compile()), + }).then((W) => W.compile()) ), this ); @@ -9643,7 +9643,7 @@ class n$ { (Object.values($.routes).forEach( ({ method: Z, path: Q, handler: J, hooks: q }) => { this.add(Z, Q, J, j1(q, { error: $.event.error })); - }, + } ), !W) ) @@ -9764,7 +9764,7 @@ class n$ { headers: W.headers, params: W.params, query: W.query, - }, + } ), this ); @@ -9899,7 +9899,7 @@ class n$ { }; if (typeof Bun === "undefined") throw new Error( - ".listen() is designed to run on Bun only. If you are running Elysia in other environment please use a dedicated plugin or export the handler via Elysia.fetch", + ".listen() is designed to run on Bun only. If you are running Elysia in other environment please use a dedicated plugin or export the handler via Elysia.fetch" ); this.server = Bun?.serve(X); for (let Z = 0; Z < this.event.start.length; Z++) this.event.start[Z](this); @@ -9914,7 +9914,7 @@ class n$ { stop = async () => { if (!this.server) throw new Error( - "Elysia isn't running. Call `app.listen` to start the server.", + "Elysia isn't running. Call `app.listen` to start the server." ); this.server.stop(); for (let $ = 0; $ < this.event.stop.length; $++) @@ -9950,5 +9950,5 @@ var app = new n$() }) .listen(port); console.log( - `\uD83E\uDD8A Livereload running ${app.server?.hostname}:${app.server?.port}`, + `\uD83E\uDD8A Livereload running ${app.server?.hostname}:${app.server?.port}` ); diff --git a/packages/beth-stack/src/cache/persist.ts b/packages/beth-stack/src/cache/persist.ts index 2f58127..8e53302 100644 --- a/packages/beth-stack/src/cache/persist.ts +++ b/packages/beth-stack/src/cache/persist.ts @@ -18,7 +18,7 @@ export type GlobalCacheConfig = { export function persistedCache Promise>( callBack: T, key: string, - options?: CacheOptions, + options?: CacheOptions ): T { const filledOptions = { ...BETH_GLOBAL_PERSISTED_CACHE.getDefaultOptions(), @@ -33,7 +33,7 @@ export function persistedCache Promise>( }); } return cache(() => - BETH_GLOBAL_PERSISTED_CACHE.getCachedValue(key, filledOptions.persist), + BETH_GLOBAL_PERSISTED_CACHE.getCachedValue(key, filledOptions.persist) ) as T; } @@ -43,7 +43,7 @@ export async function revalidateTag(tag: string): Promise { } export function setGlobalPersistCacheConfig( - config: Partial, + config: Partial ) { BETH_GLOBAL_PERSISTED_CACHE.setConfig(config); } @@ -114,7 +114,7 @@ export class BethPersistCache { VALUES (?, ?) ON CONFLICT (key) DO UPDATE SET value = excluded.value; `, - [key, JSON.stringify(value)], + [key, JSON.stringify(value)] ); } @@ -150,7 +150,7 @@ export class BethPersistCache { if (this.keys.has(key)) { throw new Error( - `Persistant Cache Key already exists: ${key} - these much be unqiue across your entire app`, + `Persistant Cache Key already exists: ${key} - these much be unqiue across your entire app` ); } else { this.keys.add(key); @@ -240,7 +240,7 @@ export class BethPersistCache { if (this.config.log) console.log( "No entry found in memory cache when one was expected:", - key, + key ); throw new Error("Memory Cache Miss"); } diff --git a/packages/beth-stack/src/cache/render.ts b/packages/beth-stack/src/cache/render.ts index e1c1f46..dd6015f 100644 --- a/packages/beth-stack/src/cache/render.ts +++ b/packages/beth-stack/src/cache/render.ts @@ -16,7 +16,7 @@ function defaultCompare>(arr1: T, arr2: T): boolean { export function cache any>( fn: T, - compareFn: (oldArgs: Args, newArgs: Args) => boolean = defaultCompare, + compareFn: (oldArgs: Args, newArgs: Args) => boolean = defaultCompare ): T { return ((...args: Args) => { const cached = BETH_GLOBAL_RENDER_CACHE.dedupeCache.get(fn) || new Map(); diff --git a/packages/beth-stack/src/cache/tests/persist-cache.test.tsx b/packages/beth-stack/src/cache/tests/persist-cache.test.tsx index 4afd1a9..16e5042 100644 --- a/packages/beth-stack/src/cache/tests/persist-cache.test.tsx +++ b/packages/beth-stack/src/cache/tests/persist-cache.test.tsx @@ -135,7 +135,7 @@ test("json cache revalidate interval", async () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 500), + }, 500) ); // but after a second it should be different @@ -152,7 +152,7 @@ test("json cache revalidate interval", async () => { expect(html3).toBe(`

number: 3

number: 3

`); resolve(void 0); - }, 1100), + }, 1100) ); }); @@ -205,7 +205,7 @@ test("memory cache revalidate interval", async () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 500), + }, 500) ); // but after a second it should be different @@ -222,7 +222,7 @@ test("memory cache revalidate interval", async () => { expect(html3).toBe(`

number: 3

number: 3

`); resolve(void 0); - }, 1100), + }, 1100) ); }); diff --git a/packages/beth-stack/src/cache/tests/swr-behavior.test.tsx b/packages/beth-stack/src/cache/tests/swr-behavior.test.tsx index f826d11..27e1a57 100644 --- a/packages/beth-stack/src/cache/tests/swr-behavior.test.tsx +++ b/packages/beth-stack/src/cache/tests/swr-behavior.test.tsx @@ -46,7 +46,7 @@ describe("SWR OFF (not default)", () => { expect(html3).toBe(`

number: 2

number: 2

`); resolve(void 0); - }, 1050), + }, 1050) ); }); @@ -93,7 +93,7 @@ describe("SWR OFF (not default)", () => { expect(html3).toBe(`

number: 3

number: 3

`); resolve(void 0); - }, 1010), + }, 1010) ); }); @@ -143,7 +143,7 @@ describe("SWR OFF (not default)", () => { expect(html3).toBe(`

number: 3

number: 3

`); resolve(void 0); - }, 1100), + }, 1100) ); }); @@ -193,7 +193,7 @@ describe("SWR OFF (not default)", () => { expect(html3).toBe(`

number: 3

number: 3

`); resolve(void 0); - }, 1150), + }, 1150) ); }); }); @@ -242,7 +242,7 @@ describe("SWR ON (default)", () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 1010), + }, 1010) ); }); @@ -289,7 +289,7 @@ describe("SWR ON (default)", () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 1010), + }, 1010) ); }); @@ -339,7 +339,7 @@ describe("SWR ON (default)", () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 1100), + }, 1100) ); }); @@ -389,7 +389,7 @@ describe("SWR ON (default)", () => { expect(html3).toBe(`

number: 1

number: 1

`); resolve(void 0); - }, 1150), + }, 1150) ); }); }); diff --git a/packages/beth-stack/src/cli/index.ts b/packages/beth-stack/src/cli/index.ts index 8367c47..71858d1 100644 --- a/packages/beth-stack/src/cli/index.ts +++ b/packages/beth-stack/src/cli/index.ts @@ -34,5 +34,5 @@ const app = new Elysia() .listen(port); console.log( - `🦊 Livereload running ${app.server?.hostname}:${app.server?.port}`, + `🦊 Livereload running ${app.server?.hostname}:${app.server?.port}` ); diff --git a/packages/beth-stack/src/elysia/index.ts b/packages/beth-stack/src/elysia/index.ts index 8ef0533..2f07fda 100644 --- a/packages/beth-stack/src/elysia/index.ts +++ b/packages/beth-stack/src/elysia/index.ts @@ -12,7 +12,7 @@ export function bethStack(options: Partial = {}) { setGlobalPersistCacheConfig(options); async function html JSX.Element>( - lazyHtml: T, + lazyHtml: T ): Promise { return renderToStringResponse(lazyHtml); } diff --git a/packages/beth-stack/src/examples/example.tsx b/packages/beth-stack/src/examples/example.tsx index ab79df5..273f08d 100644 --- a/packages/beth-stack/src/examples/example.tsx +++ b/packages/beth-stack/src/examples/example.tsx @@ -9,14 +9,14 @@ const app = new Elysia() loading...

}> - )), + )) ) .get("/stream", () => renderToStreamResponse(() => ( loading...

}> - )), + )) ) .listen(3000); @@ -26,7 +26,7 @@ function wait(ms: number): Promise { return new Promise((resolve) => setTimeout(() => { resolve(ms); - }, ms), + }, ms) ); } diff --git a/packages/beth-stack/src/jsx/index.ts b/packages/beth-stack/src/jsx/index.ts index 76e2566..8eb0c1b 100644 --- a/packages/beth-stack/src/jsx/index.ts +++ b/packages/beth-stack/src/jsx/index.ts @@ -33,11 +33,11 @@ async function createElement( ): Promise { const hasAnyPromiseChildren = children.reduce( (acc, child) => acc || child instanceof Promise, - false, + false ); const hasAnyUnresolvedPromiseChildren = children.reduce( (acc, child) => acc || Bun.peek.status(child) !== "fulfilled", - false, + false ); const insideStreamCall = @@ -102,7 +102,7 @@ async function createElement( children, "safe" in attributes && typeof attributes.safe === "boolean" && - attributes.safe, + attributes.safe ) + "( cleanComponent: SyncComponent

, strict: boolean = true, - separator: string = "/*\x00*/", + separator: string = "/*\x00*/" ): SyncComponent

{ const properties = new Set(); @@ -143,8 +143,8 @@ function compile< : `${separator}\`\`${separator}` }) + ${separator}\``; }, - }, - ), + } + ) ); const sepLength = separator.length; @@ -190,7 +190,7 @@ function compile< // Function to throw when a property is not found 'function throwPropertyNotFound(name) { throw new Error("Property " + name + " was not provided.") };\n' + // Concatenates the body - `return \`${body}\``, + `return \`${body}\`` ) as SyncComponent

; } @@ -199,7 +199,7 @@ function compile< "args", // Adds a empty args object when it is not present "if (args === undefined) { args = Object.create(null) };\n" + - `return \`${body}\``, + `return \`${body}\`` ) as SyncComponent

; } diff --git a/packages/beth-stack/src/jsx/render.ts b/packages/beth-stack/src/jsx/render.ts index ddaa82b..13037a6 100644 --- a/packages/beth-stack/src/jsx/render.ts +++ b/packages/beth-stack/src/jsx/render.ts @@ -1,7 +1,7 @@ import { BETH_GLOBAL_RENDER_CACHE } from "../shared/global"; export async function renderToString JSX.Element>( - lazyHtml: T, + lazyHtml: T ): JSX.Element { BETH_GLOBAL_RENDER_CACHE.reset(); const resultPromise = lazyHtml(); @@ -10,7 +10,7 @@ export async function renderToString JSX.Element>( } export async function renderToStringResponse JSX.Element>( - lazyHtml: T, + lazyHtml: T ): Promise { const result = await renderToString(lazyHtml); return new Response(result, { @@ -21,7 +21,7 @@ export async function renderToStringResponse JSX.Element>( } export function renderToStreamResponse JSX.Element>( - lazyHtml: T, + lazyHtml: T ): Response { const stream = renderToStream(lazyHtml); return new Response(stream, { @@ -32,7 +32,7 @@ export function renderToStreamResponse JSX.Element>( } export function renderToStream JSX.Element>( - lazyHtml: T, + lazyHtml: T ): ReadableStream { BETH_GLOBAL_RENDER_CACHE.reset(); const stream = new ReadableStream({ diff --git a/packages/beth-stack/src/jsx/suspense.tsx b/packages/beth-stack/src/jsx/suspense.tsx index baf203e..26701e6 100644 --- a/packages/beth-stack/src/jsx/suspense.tsx +++ b/packages/beth-stack/src/jsx/suspense.tsx @@ -34,7 +34,7 @@ export async function Suspense({ const hasAnyUnresolvedPromiseChildren = children.reduce( (acc, child) => acc || Bun.peek.status(child) !== "fulfilled", - false, + false ); if (!hasAnyUnresolvedPromiseChildren) { @@ -47,7 +47,7 @@ export async function Suspense({ const id = BETH_GLOBAL_RENDER_CACHE.dismissChild(children); if (!id) { BETH_GLOBAL_RENDER_CACHE.streamController?.error( - "Suspense children not found", + "Suspense children not found" ); throw new Error("Suspense children not found"); } diff --git a/packages/beth-stack/src/jsx/tests/render.test.tsx b/packages/beth-stack/src/jsx/tests/render.test.tsx index ce10fdc..d55d605 100644 --- a/packages/beth-stack/src/jsx/tests/render.test.tsx +++ b/packages/beth-stack/src/jsx/tests/render.test.tsx @@ -12,7 +12,7 @@ function wait(ms: number): Promise { return new Promise((resolve) => setTimeout(() => { resolve(ms); - }, ms), + }, ms) ); } @@ -102,7 +102,7 @@ test("renderToStream, doesn't resolve immediately", async () => { for await (const chunk of stream) { expect(chunk.replace(/[\s\n\t\r]+/g, "")).toBe( - expectedChunks[index]!.replace(/[\s\n\t\r]+/g, ""), + expectedChunks[index]!.replace(/[\s\n\t\r]+/g, "") ); index++; } diff --git a/packages/beth-stack/src/jsx/utils.ts b/packages/beth-stack/src/jsx/utils.ts index 42c2eb1..850b5ac 100644 --- a/packages/beth-stack/src/jsx/utils.ts +++ b/packages/beth-stack/src/jsx/utils.ts @@ -308,7 +308,7 @@ function escapeHtml(value: any): string { export function contentsToString( contents: Children[], - escape?: boolean, + escape?: boolean ): string { const length = contents.length; diff --git a/prettier.config.cjs b/prettier.config.mjs similarity index 92% rename from prettier.config.cjs rename to prettier.config.mjs index 5188d96..2865ea8 100644 --- a/prettier.config.cjs +++ b/prettier.config.mjs @@ -11,4 +11,4 @@ const config = { plugins: ["@ianvs/prettier-plugin-sort-imports"], }; -module.exports = config; +export default config; diff --git a/reset.d.ts b/reset.d.ts index e186b1f..a3d4a03 100644 --- a/reset.d.ts +++ b/reset.d.ts @@ -1 +1 @@ -import "@total-typescript/ts-reset"; \ No newline at end of file +import "@total-typescript/ts-reset"; diff --git a/packages/beth-stack/tsconfig.json b/tsconfig.json similarity index 100% rename from packages/beth-stack/tsconfig.json rename to tsconfig.json diff --git a/www/package.json b/www/package.json index edb024d..af0fef5 100644 --- a/www/package.json +++ b/www/package.json @@ -2,4 +2,4 @@ "name": "@beth-stack/www", "version": "0.0.1", "private": true -} \ No newline at end of file +}