elysia 2.0.0-beta.3 → 2.0.0-beta.31

package/dist/schema-snapshot.js

@@ -52,8 +52,7 @@ function isImmutableNode(value) {
 	immutableNodes.set(value, immutable);
 	return immutable;
 }
-let freezeClones = false;
-function deepCloneSchema(value, seen, canShare = true) {
+function deepCloneSchema(value, freeze, seen, canShare = true) {
 	if (value === null || typeof value !== "object") return value;
 	const cached = seen?.get(value);
 	if (cached) return cached;
@@ -61,8 +60,8 @@ function deepCloneSchema(value, seen, canShare = true) {
 		const out = [];
 		seen ??= /* @__PURE__ */ new Map();
 		seen.set(value, out);
-		for (let i = 0; i < value.length; i++) out[i] = deepCloneSchema(value[i], seen);
-		return freezeClones ? Object.freeze(out) : out;
+		for (let i = 0; i < value.length; i++) out[i] = deepCloneSchema(value[i], freeze, seen);
+		return freeze ? Object.freeze(out) : out;
 	}
 	if (canShare && isImmutableNode(value)) return value;
 	const proto = Object.getPrototypeOf(value);
@@ -77,14 +76,14 @@ function deepCloneSchema(value, seen, canShare = true) {
 		const property = value[key];
 		if (!allEnumerable && !isEnumerable.call(value, key)) {
 			Object.defineProperty(out, key, {
-				value: property,
+				value: key === "~cookieFrom" ? deepCloneSchema(property, freeze, seen) : property,
 				enumerable: false,
 				writable: true,
 				configurable: true
 			});
 			continue;
 		}
-		const cloned = deepCloneSchema(property, seen);
+		const cloned = deepCloneSchema(property, freeze, seen);
 		if (key === "__proto__") Object.defineProperty(out, key, {
 			value: cloned,
 			enumerable: true,
@@ -97,7 +96,7 @@ function deepCloneSchema(value, seen, canShare = true) {
 	for (let i = 0; i < symbols.length; i++) {
 		const key = symbols[i];
 		const property = value[key];
-		if (isEnumerable.call(value, key)) out[key] = deepCloneSchema(property, seen);
+		if (isEnumerable.call(value, key)) out[key] = deepCloneSchema(property, freeze, seen);
 		else Object.defineProperty(out, key, {
 			value: property,
 			enumerable: false,
@@ -105,7 +104,7 @@ function deepCloneSchema(value, seen, canShare = true) {
 			configurable: true
 		});
 	}
-	return freezeClones ? Object.freeze(out) : out;
+	return freeze ? Object.freeze(out) : out;
 }
 const refIds = /* @__PURE__ */ new WeakMap();
 let nextRefId = 0;
@@ -114,20 +113,19 @@ function refKey(value) {
 	if (id === void 0) refIds.set(value, id = ++nextRefId);
 	return "r" + id + ";";
 }
-let fingerprintBail = false;
-const byRefKey = (value) => value !== null && (typeof value === "object" || typeof value === "function") ? refKey(value) : fingerprint(value, void 0);
-function fingerprint(value, seen, canShare = true) {
+const byRefKey = (value, state) => value !== null && (typeof value === "object" || typeof value === "function") ? refKey(value) : fingerprint(value, void 0, state);
+function fingerprint(value, seen, state, canShare = true) {
 	if (value === null) return "z;";
 	const type = typeof value;
 	if (type !== "object") switch (type) {
 		case "string": return "s" + value.length + ":" + value;
-		case "number": return "n" + value + ";";
+		case "number": return "n" + (Object.is(value, -0) ? "-0" : value) + ";";
 		case "boolean": return value ? "T;" : "F;";
 		case "function": return refKey(value);
 		case "undefined": return "u;";
 		case "bigint": return "g" + value + ";";
 		default:
-			fingerprintBail = true;
+			state.bail = true;
 			return "y;";
 	}
 	const backReference = seen?.get(value);
@@ -136,7 +134,7 @@ function fingerprint(value, seen, canShare = true) {
 		seen ??= /* @__PURE__ */ new Map();
 		seen.set(value, seen.size);
 		let out = "[";
-		for (let i = 0; i < value.length; i++) out += fingerprint(value[i], seen);
+		for (let i = 0; i < value.length; i++) out += fingerprint(value[i], seen, state);
 		return out + "];";
 	}
 	if (canShare && isImmutableNode(value)) return refKey(value);
@@ -151,15 +149,19 @@ function fingerprint(value, seen, canShare = true) {
 		const key = keys[i];
 		const property = value[key];
 		out += "k" + key.length + ":" + key;
-		out += !allEnumerable && !isEnumerable.call(value, key) ? "!" + byRefKey(property) : "=" + fingerprint(property, seen);
+		const hidden = !allEnumerable && !isEnumerable.call(value, key);
+		out += hidden && key !== "~cookieFrom" ? "!" + byRefKey(property, state) : (hidden ? "~" : "=") + fingerprint(property, seen, state);
 	}
-	if (Object.getOwnPropertySymbols(value).length) fingerprintBail = true;
+	if (Object.getOwnPropertySymbols(value).length) state.bail = true;
 	return out + "};";
 }
-/**
-* The `.model()` snapshot: a private, MUTABLE clone. `base.ts` stamps `$id` onto
-* the node this returns, so it is never frozen and never interned.
-*/
+function cloneOrWarn(object, freeze) {
+	try {
+		return deepCloneSchema(object, freeze, void 0, false);
+	} catch (error) {
+		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
+	}
+}
 function snapshotSchema(schema) {
 	if (schema === null || typeof schema !== "object") return schema;
 	const object = schema;
@@ -167,21 +169,12 @@ function snapshotSchema(schema) {
 	if (produced.has(object) && !Object.isFrozen(object)) return schema;
 	const existing = modelSnapshots.get(object);
 	if (existing) return existing;
-	let cloned;
-	try {
-		cloned = deepCloneSchema(object, void 0, false);
-	} catch (error) {
-		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
-		return schema;
-	}
+	const cloned = cloneOrWarn(object, false);
+	if (cloned === void 0) return schema;
 	modelSnapshots.set(object, cloned);
 	produced.add(cloned);
 	return cloned;
 }
-/**
-* The route/guard hook snapshot: deep-frozen, and shared with every
-* structurally identical schema in the process.
-*/
 function internSchema(schema, intern) {
 	if (schema === null || typeof schema !== "object") return schema;
 	const object = schema;
@@ -193,11 +186,11 @@ function internSchema(schema, intern) {
 	if (existing) return existing;
 	let key;
 	if (intern) {
-		fingerprintBail = false;
+		const state = { bail: false };
 		try {
-			key = fingerprint(object, void 0, false);
+			key = fingerprint(object, void 0, state, false);
 		} catch {}
-		if (fingerprintBail) key = void 0;
+		if (state.bail) key = void 0;
 	}
 	if (key !== void 0) {
 		const shared = interned.get(key);
@@ -210,16 +203,8 @@ function internSchema(schema, intern) {
 			return shared;
 		}
 	}
-	let cloned;
-	freezeClones = true;
-	try {
-		cloned = deepCloneSchema(object, void 0, false);
-	} catch (error) {
-		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
-		return schema;
-	} finally {
-		freezeClones = false;
-	}
+	const cloned = cloneOrWarn(object, true);
+	if (cloned === void 0) return schema;
 	hookSnapshots.set(object, cloned);
 	produced.add(cloned);
 	if (key !== void 0) {
@@ -232,9 +217,34 @@ function snapshotSlots(target, intern) {
 	for (const slot of schemaSlots) if (target[slot] != null) target[slot] = internSchema(target[slot], intern);
 	const response = target.response;
 	if (response != null) if (typeof response === "object" && !("~standard" in response) && isStatusMap(response)) {
-		const next = {};
-		for (const status in response) next[status] = internSchema(response[status], intern);
-		target.response = next;
+		let next = {};
+		const state = { bail: false };
+		let key = "M";
+		for (const status in response) {
+			const schema = internSchema(response[status], intern);
+			Object.defineProperty(next, status, {
+				value: schema,
+				enumerable: true
+			});
+			key += status.length + ":" + status + byRefKey(schema, state);
+		}
+		if (key === "M") target.response = next;
+		else {
+			if (intern && !state.bail) {
+				const shared = interned.get(key);
+				if (shared === void 0) {
+					if (interned.size >= INTERN_LIMIT) require_utils.evictOldestHalf(interned);
+					interned.set(key, next);
+				} else {
+					if (interned.size >= INTERN_LIMIT) {
+						interned.delete(key);
+						interned.set(key, shared);
+					}
+					next = shared;
+				}
+			}
+			target.response = Object.freeze(next);
+		}
 	} else target.response = internSchema(response, intern);
 }
 function isStatusMap(response) {
@@ -242,18 +252,12 @@ function isStatusMap(response) {
 	for (const key in response) if (!Number.isInteger(Number(key))) return false;
 	return true;
 }
+const hasSlot = (target) => schemaSlots.some((slot) => target[slot] != null) || target.response != null;
 function snapshotHookSchemas(hook) {
 	if (!hook) return hook;
-	let needsCopy = false;
-	if (schemaSlots.some((slot) => hook[slot] != null) || hook.response != null) needsCopy = true;
+	const needsCopy = hasSlot(hook);
 	const schemas = hook.schemas;
-	if (!needsCopy && Array.isArray(schemas)) {
-		for (const entry of schemas) if (entry && (schemaSlots.some((slot) => entry[slot] != null) || entry.response != null)) {
-			needsCopy = true;
-			break;
-		}
-	}
-	if (!needsCopy) return hook;
+	if (!needsCopy && !(Array.isArray(schemas) && schemas.some((e) => e && hasSlot(e)))) return hook;
 	const intern = !require_universal_env.env.ELYSIA_AOT_BUILD;
 	const copy = Object.assign(Object.create(Object.getPrototypeOf(hook)), hook);
 	snapshotSlots(copy, intern);

package/dist/schema-snapshot.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { evictOldestHalf } from "./utils.mjs";
 import { env } from "./universal/env.mjs";
 
@@ -51,8 +52,7 @@ function isImmutableNode(value) {
 	immutableNodes.set(value, immutable);
 	return immutable;
 }
-let freezeClones = false;
-function deepCloneSchema(value, seen, canShare = true) {
+function deepCloneSchema(value, freeze, seen, canShare = true) {
 	if (value === null || typeof value !== "object") return value;
 	const cached = seen?.get(value);
 	if (cached) return cached;
@@ -60,8 +60,8 @@ function deepCloneSchema(value, seen, canShare = true) {
 		const out = [];
 		seen ??= /* @__PURE__ */ new Map();
 		seen.set(value, out);
-		for (let i = 0; i < value.length; i++) out[i] = deepCloneSchema(value[i], seen);
-		return freezeClones ? Object.freeze(out) : out;
+		for (let i = 0; i < value.length; i++) out[i] = deepCloneSchema(value[i], freeze, seen);
+		return freeze ? Object.freeze(out) : out;
 	}
 	if (canShare && isImmutableNode(value)) return value;
 	const proto = Object.getPrototypeOf(value);
@@ -76,14 +76,14 @@ function deepCloneSchema(value, seen, canShare = true) {
 		const property = value[key];
 		if (!allEnumerable && !isEnumerable.call(value, key)) {
 			Object.defineProperty(out, key, {
-				value: property,
+				value: key === "~cookieFrom" ? deepCloneSchema(property, freeze, seen) : property,
 				enumerable: false,
 				writable: true,
 				configurable: true
 			});
 			continue;
 		}
-		const cloned = deepCloneSchema(property, seen);
+		const cloned = deepCloneSchema(property, freeze, seen);
 		if (key === "__proto__") Object.defineProperty(out, key, {
 			value: cloned,
 			enumerable: true,
@@ -96,7 +96,7 @@ function deepCloneSchema(value, seen, canShare = true) {
 	for (let i = 0; i < symbols.length; i++) {
 		const key = symbols[i];
 		const property = value[key];
-		if (isEnumerable.call(value, key)) out[key] = deepCloneSchema(property, seen);
+		if (isEnumerable.call(value, key)) out[key] = deepCloneSchema(property, freeze, seen);
 		else Object.defineProperty(out, key, {
 			value: property,
 			enumerable: false,
@@ -104,7 +104,7 @@ function deepCloneSchema(value, seen, canShare = true) {
 			configurable: true
 		});
 	}
-	return freezeClones ? Object.freeze(out) : out;
+	return freeze ? Object.freeze(out) : out;
 }
 const refIds = /* @__PURE__ */ new WeakMap();
 let nextRefId = 0;
@@ -113,20 +113,19 @@ function refKey(value) {
 	if (id === void 0) refIds.set(value, id = ++nextRefId);
 	return "r" + id + ";";
 }
-let fingerprintBail = false;
-const byRefKey = (value) => value !== null && (typeof value === "object" || typeof value === "function") ? refKey(value) : fingerprint(value, void 0);
-function fingerprint(value, seen, canShare = true) {
+const byRefKey = (value, state) => value !== null && (typeof value === "object" || typeof value === "function") ? refKey(value) : fingerprint(value, void 0, state);
+function fingerprint(value, seen, state, canShare = true) {
 	if (value === null) return "z;";
 	const type = typeof value;
 	if (type !== "object") switch (type) {
 		case "string": return "s" + value.length + ":" + value;
-		case "number": return "n" + value + ";";
+		case "number": return "n" + (Object.is(value, -0) ? "-0" : value) + ";";
 		case "boolean": return value ? "T;" : "F;";
 		case "function": return refKey(value);
 		case "undefined": return "u;";
 		case "bigint": return "g" + value + ";";
 		default:
-			fingerprintBail = true;
+			state.bail = true;
 			return "y;";
 	}
 	const backReference = seen?.get(value);
@@ -135,7 +134,7 @@ function fingerprint(value, seen, canShare = true) {
 		seen ??= /* @__PURE__ */ new Map();
 		seen.set(value, seen.size);
 		let out = "[";
-		for (let i = 0; i < value.length; i++) out += fingerprint(value[i], seen);
+		for (let i = 0; i < value.length; i++) out += fingerprint(value[i], seen, state);
 		return out + "];";
 	}
 	if (canShare && isImmutableNode(value)) return refKey(value);
@@ -150,15 +149,19 @@ function fingerprint(value, seen, canShare = true) {
 		const key = keys[i];
 		const property = value[key];
 		out += "k" + key.length + ":" + key;
-		out += !allEnumerable && !isEnumerable.call(value, key) ? "!" + byRefKey(property) : "=" + fingerprint(property, seen);
+		const hidden = !allEnumerable && !isEnumerable.call(value, key);
+		out += hidden && key !== "~cookieFrom" ? "!" + byRefKey(property, state) : (hidden ? "~" : "=") + fingerprint(property, seen, state);
 	}
-	if (Object.getOwnPropertySymbols(value).length) fingerprintBail = true;
+	if (Object.getOwnPropertySymbols(value).length) state.bail = true;
 	return out + "};";
 }
-/**
-* The `.model()` snapshot: a private, MUTABLE clone. `base.ts` stamps `$id` onto
-* the node this returns, so it is never frozen and never interned.
-*/
+function cloneOrWarn(object, freeze) {
+	try {
+		return deepCloneSchema(object, freeze, void 0, false);
+	} catch (error) {
+		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
+	}
+}
 function snapshotSchema(schema) {
 	if (schema === null || typeof schema !== "object") return schema;
 	const object = schema;
@@ -166,21 +169,12 @@ function snapshotSchema(schema) {
 	if (produced.has(object) && !Object.isFrozen(object)) return schema;
 	const existing = modelSnapshots.get(object);
 	if (existing) return existing;
-	let cloned;
-	try {
-		cloned = deepCloneSchema(object, void 0, false);
-	} catch (error) {
-		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
-		return schema;
-	}
+	const cloned = cloneOrWarn(object, false);
+	if (cloned === void 0) return schema;
 	modelSnapshots.set(object, cloned);
 	produced.add(cloned);
 	return cloned;
 }
-/**
-* The route/guard hook snapshot: deep-frozen, and shared with every
-* structurally identical schema in the process.
-*/
 function internSchema(schema, intern) {
 	if (schema === null || typeof schema !== "object") return schema;
 	const object = schema;
@@ -192,11 +186,11 @@ function internSchema(schema, intern) {
 	if (existing) return existing;
 	let key;
 	if (intern) {
-		fingerprintBail = false;
+		const state = { bail: false };
 		try {
-			key = fingerprint(object, void 0, false);
+			key = fingerprint(object, void 0, state, false);
 		} catch {}
-		if (fingerprintBail) key = void 0;
+		if (state.bail) key = void 0;
 	}
 	if (key !== void 0) {
 		const shared = interned.get(key);
@@ -209,16 +203,8 @@ function internSchema(schema, intern) {
 			return shared;
 		}
 	}
-	let cloned;
-	freezeClones = true;
-	try {
-		cloned = deepCloneSchema(object, void 0, false);
-	} catch (error) {
-		console.warn("[Elysia] schema snapshot failed; schema kept by reference:", error);
-		return schema;
-	} finally {
-		freezeClones = false;
-	}
+	const cloned = cloneOrWarn(object, true);
+	if (cloned === void 0) return schema;
 	hookSnapshots.set(object, cloned);
 	produced.add(cloned);
 	if (key !== void 0) {
@@ -231,9 +217,34 @@ function snapshotSlots(target, intern) {
 	for (const slot of schemaSlots) if (target[slot] != null) target[slot] = internSchema(target[slot], intern);
 	const response = target.response;
 	if (response != null) if (typeof response === "object" && !("~standard" in response) && isStatusMap(response)) {
-		const next = {};
-		for (const status in response) next[status] = internSchema(response[status], intern);
-		target.response = next;
+		let next = {};
+		const state = { bail: false };
+		let key = "M";
+		for (const status in response) {
+			const schema = internSchema(response[status], intern);
+			Object.defineProperty(next, status, {
+				value: schema,
+				enumerable: true
+			});
+			key += status.length + ":" + status + byRefKey(schema, state);
+		}
+		if (key === "M") target.response = next;
+		else {
+			if (intern && !state.bail) {
+				const shared = interned.get(key);
+				if (shared === void 0) {
+					if (interned.size >= INTERN_LIMIT) evictOldestHalf(interned);
+					interned.set(key, next);
+				} else {
+					if (interned.size >= INTERN_LIMIT) {
+						interned.delete(key);
+						interned.set(key, shared);
+					}
+					next = shared;
+				}
+			}
+			target.response = Object.freeze(next);
+		}
 	} else target.response = internSchema(response, intern);
 }
 function isStatusMap(response) {
@@ -241,18 +252,12 @@ function isStatusMap(response) {
 	for (const key in response) if (!Number.isInteger(Number(key))) return false;
 	return true;
 }
+const hasSlot = (target) => schemaSlots.some((slot) => target[slot] != null) || target.response != null;
 function snapshotHookSchemas(hook) {
 	if (!hook) return hook;
-	let needsCopy = false;
-	if (schemaSlots.some((slot) => hook[slot] != null) || hook.response != null) needsCopy = true;
+	const needsCopy = hasSlot(hook);
 	const schemas = hook.schemas;
-	if (!needsCopy && Array.isArray(schemas)) {
-		for (const entry of schemas) if (entry && (schemaSlots.some((slot) => entry[slot] != null) || entry.response != null)) {
-			needsCopy = true;
-			break;
-		}
-	}
-	if (!needsCopy) return hook;
+	if (!needsCopy && !(Array.isArray(schemas) && schemas.some((e) => e && hasSlot(e)))) return hook;
 	const intern = !env.ELYSIA_AOT_BUILD;
 	const copy = Object.assign(Object.create(Object.getPrototypeOf(hook)), hook);
 	snapshotSlots(copy, intern);

package/dist/sucrose.d.ts

@@ -11,64 +11,15 @@ declare namespace Sucrose {
     route: boolean;
     afterResponse?: boolean;
   }
-  type LifeCycle = Partial<Partial<AppHook>>;
+  type LifeCycle = Partial<AppHook>;
 }
+declare function clearSucroseCache(): void;
+declare const mergeInference: (a: Sucrose.Inference, b: Sucrose.Inference) => Sucrose.Inference;
 /**
- * Separate stringified function body and parameter
- *
- * @example
- * ```typescript
- * separateFunction('async ({ hello }) => { return hello }') // => ['({ hello })', '{ return hello }']
- * ```
- */
-declare function separateFunction(code: string): [string, string];
-/**
- * Get range between bracket pair
- *
- * @example
- * ```typescript
- * bracketPairRange('hello: { world: { a } }, elysia') // [6, 20]
- * ```
- */
-declare function bracketPairRange(parameter: string): [number, number];
-/**
- * Similar to `bracketPairRange` but in reverse order
- * Get range between bracket pair from end to beginning
- *
- * @example
- * ```typescript
- * bracketPairRange('hello: { world: { a } }, elysia') // [6, 20]
- * ```
- */
-declare function bracketPairRangeReverse(parameter: string): [number, number];
-declare function removeColonAlias(parameter: string): string;
-/**
- * Retrieve only root parameters of a function
- *
- * @example
- * ```typescript
- * retrieveRootParameters('({ hello: { world: { a } }, elysia })') // => {
- *   parameters: ['hello', 'elysia'],
- *   hasParenthesis: true
- * }
- * ```
- */
-declare function retrieveRootparameters(parameter: string): {
-  hasParenthesis: boolean;
-  parameters: Record<string, true>;
-};
-/**
- * Find alias of variable from function body
- *
- * @example
- * ```typescript
- * findAlias('body', '{ const a = body, b = body }') // => ['a', 'b']
- * ```
+ * @internal Which `channelOf`-mapped members of a function's first parameter
+ * the function may read, or `null` when any member may be read
  */
-declare function findAlias(type: string, body: string, seen?: Set<string>): string[];
-declare function removeDefaultParameter(parameter: string): string;
-declare function clearSucroseCache(delay?: number | null): void;
-declare const mergeInference: (a: Sucrose.Inference, b: Sucrose.Inference) => Sucrose.Inference;
+declare function inferParameterReads<K extends string>(source: string, channelOf: (value: string) => K | undefined, strict?: boolean): Set<K> | null;
 declare function sucrose(handler: Handler | undefined, lifeCycle: Sucrose.LifeCycle | undefined): Sucrose.Inference;
 //#endregion
-export { Sucrose, bracketPairRange, bracketPairRangeReverse, clearSucroseCache, findAlias, mergeInference, removeColonAlias, removeDefaultParameter, retrieveRootparameters, separateFunction, sucrose };
+export { Sucrose, clearSucroseCache, inferParameterReads, mergeInference, sucrose };