elysia 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/sucrose.js

@@ -258,12 +258,6 @@ function findAlias(type, body, seen = /* @__PURE__ */ new Set()) {
 	return aliases;
 }
 /**
-* Whitespace as JavaScript defines it, which is what `\s` matches: everything
-* `String.prototype.trim` removes, not just the three characters that happen to
-* appear in LF-formatted source.
-*/
-const isWhitespace = (char) => char === 32 || char >= 9 && char <= 13 || char === 160 || char === 5760 || char >= 8192 && char <= 8202 || char === 8232 || char === 8233 || char === 8239 || char === 8287 || char === 12288 || char === 65279;
-/**
 * Words that lex as an identifier but are operators, so a `/` after one opens a
 * regex instead of dividing. Padded so a lookup cannot match a substring.
 */
@@ -274,7 +268,11 @@ const operatorKeyword = " typeof void delete in of instanceof new return case do
 */
 function skipRegexLiteral(parameter, start, regexEnd) {
 	let previous = start - 1;
-	while (previous >= 0 && isWhitespace(parameter.charCodeAt(previous))) previous--;
+	while (previous >= 0) {
+		const char = parameter.charCodeAt(previous);
+		if (char === 32 || char >= 9 && char <= 13 || char === 160 || char === 5760 || char >= 8192 && char <= 8202 || char === 8232 || char === 8233 || char === 8239 || char === 8287 || char === 12288 || char === 65279) previous--;
+		else break;
+	}
 	if (previous >= 0) {
 		const char = parameter.charCodeAt(previous);
 		if (isIdentifierPart(char)) {
@@ -378,30 +376,13 @@ function markAllAccessed(i) {
 }
 const DEFAULT_CACHE_LIMIT = 1024;
 const globalSourceCache = /* @__PURE__ */ new Map();
-function sourceCache() {
-	const session = require_compile_aot.getCompilerSession();
-	return session?.external ? session.sucroseCache : globalSourceCache;
-}
 let functionCaches = /* @__PURE__ */ new WeakMap();
-function rememberInference(caches, key, cached, content, event, inference) {
-	if (!cached || cached.content !== content) {
-		if (caches.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(caches);
-		caches.set(key, {
-			content,
-			inference
-		});
-	}
-	if (typeof event === "function") functionCaches.set(event, inference);
-}
-function clearCache() {
+function clearSucroseCache(delay) {
+	if (delay === null) return;
 	globalSourceCache.clear();
 	require_compile_aot.getCompilerSession()?.sucroseCache.clear();
 	functionCaches = /* @__PURE__ */ new WeakMap();
 }
-function clearSucroseCache(delay) {
-	if (delay === null) return;
-	clearCache();
-}
 const mergeInference = (a, b) => ({
 	body: a.body || b.body,
 	cookie: a.cookie || b.cookie,
@@ -423,9 +404,6 @@ const emptyInference = Object.freeze(defaultSucrose());
 function push(target, array) {
 	for (let i = 0; i < array.length; i++) target.push(array[i]);
 }
-function pushParse(target, array) {
-	for (let i = 0; i < array.length; i++) if (typeof array[i] === "function") target.push(array[i]);
-}
 const prefixKeywords = new Set([
 	"await",
 	"case",
@@ -444,32 +422,6 @@ const prefixKeywords = new Set([
 ]);
 const isIdentifierStart = (char) => char >= 65 && char <= 90 || char >= 97 && char <= 122 || char === 36 || char === 95 || char >= 128;
 const isIdentifierPart = (char) => isIdentifierStart(char) || char >= 48 && char <= 57;
-function decodeIdentifier(value) {
-	if (!value.includes("\\u")) return value;
-	let decoded = "";
-	for (let i = 0; i < value.length; i++) {
-		if (value.charCodeAt(i) !== 92 || value.charCodeAt(i + 1) !== 117) {
-			decoded += value[i];
-			continue;
-		}
-		i += 2;
-		let hex;
-		if (value.charCodeAt(i) === 123) {
-			const end = value.indexOf("}", i + 1);
-			if (end === -1) return;
-			hex = value.slice(i + 1, end);
-			i = end;
-		} else {
-			hex = value.slice(i, i + 4);
-			if (hex.length !== 4) return;
-			i += 3;
-		}
-		const codePoint = Number.parseInt(hex, 16);
-		if (!Number.isFinite(codePoint) || codePoint > 1114111) return;
-		decoded += String.fromCodePoint(codePoint);
-	}
-	return decoded;
-}
 function scanTokens(source) {
 	const tokens = [];
 	let index = 0;
@@ -618,7 +570,44 @@ function scanTokens(source) {
 					}
 					break;
 				}
-				const value = decodeIdentifier(source.slice(start, index));
+				const identifierText = source.slice(start, index);
+				let value;
+				if (!identifierText.includes("\\u")) value = identifierText;
+				else {
+					let decoded = "";
+					let failed = false;
+					for (let i = 0; i < identifierText.length; i++) {
+						if (identifierText.charCodeAt(i) !== 92 || identifierText.charCodeAt(i + 1) !== 117) {
+							decoded += identifierText[i];
+							continue;
+						}
+						i += 2;
+						let hex;
+						if (identifierText.charCodeAt(i) === 123) {
+							const end = identifierText.indexOf("}", i + 1);
+							if (end === -1) {
+								failed = true;
+								break;
+							}
+							hex = identifierText.slice(i + 1, end);
+							i = end;
+						} else {
+							hex = identifierText.slice(i, i + 4);
+							if (hex.length !== 4) {
+								failed = true;
+								break;
+							}
+							i += 3;
+						}
+						const codePoint = Number.parseInt(hex, 16);
+						if (!Number.isFinite(codePoint) || codePoint > 1114111) {
+							failed = true;
+							break;
+						}
+						decoded += String.fromCodePoint(codePoint);
+					}
+					value = failed ? void 0 : decoded;
+				}
 				if (value === void 0) return false;
 				tokens.push({
 					k: "i",
@@ -864,14 +853,19 @@ function sucrose(handler, lifeCycle) {
 		if (lifeCycle) {
 			if (lifeCycle.request?.length) push(events, lifeCycle.request);
 			if (lifeCycle.beforeHandle?.length) push(events, lifeCycle.beforeHandle);
-			if (lifeCycle.parse?.length) pushParse(events, lifeCycle.parse);
+			if (lifeCycle.parse?.length) {
+				const target = events;
+				const array = lifeCycle.parse;
+				for (let i = 0; i < array.length; i++) if (typeof array[i] === "function") target.push(array[i]);
+			}
 			if (lifeCycle.error?.length) push(events, lifeCycle.error);
 			if (lifeCycle.transform?.length) push(events, lifeCycle.transform);
 			if (lifeCycle.afterHandle?.length) push(events, lifeCycle.afterHandle);
 			if (lifeCycle.mapResponse?.length) push(events, lifeCycle.mapResponse);
 			if (lifeCycle.afterResponse?.length) push(events, lifeCycle.afterResponse);
 		}
-		const caches = sourceCache();
+		const session = require_compile_aot.getCompilerSession();
+		const caches = session?.external ? session.sucroseCache : globalSourceCache;
 		for (let i = 0; i < events.length; i++) {
 			const event = events[i];
 			if (!event) continue;
@@ -894,7 +888,14 @@ function sucrose(handler, lifeCycle) {
 					if (typeof event === "function") functionCaches.set(event, inferred);
 				} else {
 					inferred = Object.freeze(inferFunction(content));
-					rememberInference(caches, key, cached, content, event, inferred);
+					if (!cached || cached.content !== content) {
+						if (caches.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(caches);
+						caches.set(key, {
+							content,
+							inference: inferred
+						});
+					}
+					if (typeof event === "function") functionCaches.set(event, inferred);
 				}
 			}
 			if (inference) {

package/dist/sucrose.mjs

@@ -257,12 +257,6 @@ function findAlias(type, body, seen = /* @__PURE__ */ new Set()) {
 	return aliases;
 }
 /**
-* Whitespace as JavaScript defines it, which is what `\s` matches: everything
-* `String.prototype.trim` removes, not just the three characters that happen to
-* appear in LF-formatted source.
-*/
-const isWhitespace = (char) => char === 32 || char >= 9 && char <= 13 || char === 160 || char === 5760 || char >= 8192 && char <= 8202 || char === 8232 || char === 8233 || char === 8239 || char === 8287 || char === 12288 || char === 65279;
-/**
 * Words that lex as an identifier but are operators, so a `/` after one opens a
 * regex instead of dividing. Padded so a lookup cannot match a substring.
 */
@@ -273,7 +267,11 @@ const operatorKeyword = " typeof void delete in of instanceof new return case do
 */
 function skipRegexLiteral(parameter, start, regexEnd) {
 	let previous = start - 1;
-	while (previous >= 0 && isWhitespace(parameter.charCodeAt(previous))) previous--;
+	while (previous >= 0) {
+		const char = parameter.charCodeAt(previous);
+		if (char === 32 || char >= 9 && char <= 13 || char === 160 || char === 5760 || char >= 8192 && char <= 8202 || char === 8232 || char === 8233 || char === 8239 || char === 8287 || char === 12288 || char === 65279) previous--;
+		else break;
+	}
 	if (previous >= 0) {
 		const char = parameter.charCodeAt(previous);
 		if (isIdentifierPart(char)) {
@@ -377,30 +375,13 @@ function markAllAccessed(i) {
 }
 const DEFAULT_CACHE_LIMIT = 1024;
 const globalSourceCache = /* @__PURE__ */ new Map();
-function sourceCache() {
-	const session = getCompilerSession();
-	return session?.external ? session.sucroseCache : globalSourceCache;
-}
 let functionCaches = /* @__PURE__ */ new WeakMap();
-function rememberInference(caches, key, cached, content, event, inference) {
-	if (!cached || cached.content !== content) {
-		if (caches.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(caches);
-		caches.set(key, {
-			content,
-			inference
-		});
-	}
-	if (typeof event === "function") functionCaches.set(event, inference);
-}
-function clearCache() {
+function clearSucroseCache(delay) {
+	if (delay === null) return;
 	globalSourceCache.clear();
 	getCompilerSession()?.sucroseCache.clear();
 	functionCaches = /* @__PURE__ */ new WeakMap();
 }
-function clearSucroseCache(delay) {
-	if (delay === null) return;
-	clearCache();
-}
 const mergeInference = (a, b) => ({
 	body: a.body || b.body,
 	cookie: a.cookie || b.cookie,
@@ -422,9 +403,6 @@ const emptyInference = Object.freeze(defaultSucrose());
 function push(target, array) {
 	for (let i = 0; i < array.length; i++) target.push(array[i]);
 }
-function pushParse(target, array) {
-	for (let i = 0; i < array.length; i++) if (typeof array[i] === "function") target.push(array[i]);
-}
 const prefixKeywords = new Set([
 	"await",
 	"case",
@@ -443,32 +421,6 @@ const prefixKeywords = new Set([
 ]);
 const isIdentifierStart = (char) => char >= 65 && char <= 90 || char >= 97 && char <= 122 || char === 36 || char === 95 || char >= 128;
 const isIdentifierPart = (char) => isIdentifierStart(char) || char >= 48 && char <= 57;
-function decodeIdentifier(value) {
-	if (!value.includes("\\u")) return value;
-	let decoded = "";
-	for (let i = 0; i < value.length; i++) {
-		if (value.charCodeAt(i) !== 92 || value.charCodeAt(i + 1) !== 117) {
-			decoded += value[i];
-			continue;
-		}
-		i += 2;
-		let hex;
-		if (value.charCodeAt(i) === 123) {
-			const end = value.indexOf("}", i + 1);
-			if (end === -1) return;
-			hex = value.slice(i + 1, end);
-			i = end;
-		} else {
-			hex = value.slice(i, i + 4);
-			if (hex.length !== 4) return;
-			i += 3;
-		}
-		const codePoint = Number.parseInt(hex, 16);
-		if (!Number.isFinite(codePoint) || codePoint > 1114111) return;
-		decoded += String.fromCodePoint(codePoint);
-	}
-	return decoded;
-}
 function scanTokens(source) {
 	const tokens = [];
 	let index = 0;
@@ -617,7 +569,44 @@ function scanTokens(source) {
 					}
 					break;
 				}
-				const value = decodeIdentifier(source.slice(start, index));
+				const identifierText = source.slice(start, index);
+				let value;
+				if (!identifierText.includes("\\u")) value = identifierText;
+				else {
+					let decoded = "";
+					let failed = false;
+					for (let i = 0; i < identifierText.length; i++) {
+						if (identifierText.charCodeAt(i) !== 92 || identifierText.charCodeAt(i + 1) !== 117) {
+							decoded += identifierText[i];
+							continue;
+						}
+						i += 2;
+						let hex;
+						if (identifierText.charCodeAt(i) === 123) {
+							const end = identifierText.indexOf("}", i + 1);
+							if (end === -1) {
+								failed = true;
+								break;
+							}
+							hex = identifierText.slice(i + 1, end);
+							i = end;
+						} else {
+							hex = identifierText.slice(i, i + 4);
+							if (hex.length !== 4) {
+								failed = true;
+								break;
+							}
+							i += 3;
+						}
+						const codePoint = Number.parseInt(hex, 16);
+						if (!Number.isFinite(codePoint) || codePoint > 1114111) {
+							failed = true;
+							break;
+						}
+						decoded += String.fromCodePoint(codePoint);
+					}
+					value = failed ? void 0 : decoded;
+				}
 				if (value === void 0) return false;
 				tokens.push({
 					k: "i",
@@ -863,14 +852,19 @@ function sucrose(handler, lifeCycle) {
 		if (lifeCycle) {
 			if (lifeCycle.request?.length) push(events, lifeCycle.request);
 			if (lifeCycle.beforeHandle?.length) push(events, lifeCycle.beforeHandle);
-			if (lifeCycle.parse?.length) pushParse(events, lifeCycle.parse);
+			if (lifeCycle.parse?.length) {
+				const target = events;
+				const array = lifeCycle.parse;
+				for (let i = 0; i < array.length; i++) if (typeof array[i] === "function") target.push(array[i]);
+			}
 			if (lifeCycle.error?.length) push(events, lifeCycle.error);
 			if (lifeCycle.transform?.length) push(events, lifeCycle.transform);
 			if (lifeCycle.afterHandle?.length) push(events, lifeCycle.afterHandle);
 			if (lifeCycle.mapResponse?.length) push(events, lifeCycle.mapResponse);
 			if (lifeCycle.afterResponse?.length) push(events, lifeCycle.afterResponse);
 		}
-		const caches = sourceCache();
+		const session = getCompilerSession();
+		const caches = session?.external ? session.sucroseCache : globalSourceCache;
 		for (let i = 0; i < events.length; i++) {
 			const event = events[i];
 			if (!event) continue;
@@ -893,7 +887,14 @@ function sucrose(handler, lifeCycle) {
 					if (typeof event === "function") functionCaches.set(event, inferred);
 				} else {
 					inferred = Object.freeze(inferFunction(content));
-					rememberInference(caches, key, cached, content, event, inferred);
+					if (!cached || cached.content !== content) {
+						if (caches.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(caches);
+						caches.set(key, {
+							content,
+							inference: inferred
+						});
+					}
+					if (typeof event === "function") functionCaches.set(event, inferred);
 				}
 			}
 			if (inference) {

package/dist/trace.js

@@ -188,7 +188,12 @@ var TraceRecorder = class {
 				return slot.#end();
 			},
 			get error() {
-				return slot.#error();
+				if (slot.errorPromise) return slot.errorPromise;
+				if (slot.ended) return slot.errorPromise = Promise.resolve(slot.endError);
+				const { promise, resolve } = withResolvers();
+				slot.errorPromise = promise;
+				slot.errorResolve = resolve;
+				return promise;
 			},
 			onEvent(callback) {
 				if (callback) (slot.callbacksChild ??= []).push(callback);
@@ -207,14 +212,6 @@ var TraceRecorder = class {
 		this.endResolve = resolve;
 		return promise;
 	}
-	#error() {
-		if (this.errorPromise) return this.errorPromise;
-		if (this.ended) return this.errorPromise = Promise.resolve(this.endError);
-		const { promise, resolve } = withResolvers();
-		this.errorPromise = promise;
-		this.errorResolve = resolve;
-		return promise;
-	}
 	begin(process) {
 		this.begun = process;
 		this.remaining = process.total ?? 0;

package/dist/trace.mjs

@@ -187,7 +187,12 @@ var TraceRecorder = class {
 				return slot.#end();
 			},
 			get error() {
-				return slot.#error();
+				if (slot.errorPromise) return slot.errorPromise;
+				if (slot.ended) return slot.errorPromise = Promise.resolve(slot.endError);
+				const { promise, resolve } = withResolvers();
+				slot.errorPromise = promise;
+				slot.errorResolve = resolve;
+				return promise;
 			},
 			onEvent(callback) {
 				if (callback) (slot.callbacksChild ??= []).push(callback);
@@ -206,14 +211,6 @@ var TraceRecorder = class {
 		this.endResolve = resolve;
 		return promise;
 	}
-	#error() {
-		if (this.errorPromise) return this.errorPromise;
-		if (this.ended) return this.errorPromise = Promise.resolve(this.endError);
-		const { promise, resolve } = withResolvers();
-		this.errorPromise = promise;
-		this.errorResolve = resolve;
-		return promise;
-	}
 	begin(process) {
 		this.begun = process;
 		this.remaining = process.total ?? 0;

package/dist/type/coerce-plan.js

@@ -24,28 +24,55 @@ const isCoerceUnion = (x) => Array.isArray(x.u);
 const icPlaceholder = () => {
 	throw new Error("[elysia] ObjectString/ArrayString shape placeholder was not reconstructed. missing inner-codec (ic) entry");
 };
-function ObjectStringShape(property, _options) {
-	const [{ properties, ...constraints }, meta] = require_type_elysia_utils.getMeta(_options ?? require_utils.nullObject());
-	const object = require_type_elysia_object.ObjectType(property, constraints);
-	const objectString = require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), icPlaceholder, () => "must be an object"), icPlaceholder);
-	return require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.ObjectString, require_type_elysia_union.Union([object, objectString], meta));
-}
-function ArrayStringShape(property, _options) {
-	const [constraints, meta] = require_type_elysia_utils.getMeta(_options ?? require_utils.nullObject());
-	const array = require_type_elysia_array.ArrayType(property, constraints);
-	const arrayString = require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), icPlaceholder, () => "must be an array"), icPlaceholder);
-	return require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.ArrayString, require_type_elysia_union.Union([array, arrayString], meta));
-}
 const rebuildObjStrShape = (original, site) => {
 	const { type, ...rest } = original;
-	const node = site.os === require_type_constants.ELYSIA_TYPES.ObjectString ? ObjectStringShape(rest.properties ?? require_utils.nullObject(), rest) : ArrayStringShape(rest.items ?? require_utils.nullObject(), rest);
+	let node;
+	if (site.os === require_type_constants.ELYSIA_TYPES.ObjectString) {
+		const property = rest.properties ?? require_utils.nullObject();
+		const [{ properties, ...constraints }, meta] = require_type_elysia_utils.getMeta(rest ?? require_utils.nullObject());
+		const object = require_type_elysia_object.ObjectType(property, constraints);
+		const objectString = require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), icPlaceholder, () => "must be an object"), icPlaceholder);
+		node = require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.ObjectString, require_type_elysia_union.Union([object, objectString], meta));
+	} else {
+		const property = rest.items ?? require_utils.nullObject();
+		const [constraints, meta] = require_type_elysia_utils.getMeta(rest ?? require_utils.nullObject());
+		const array = require_type_elysia_array.ArrayType(property, constraints);
+		const arrayString = require_type_typebox_type.Decode(require_type_typebox_type.Refine(require_type_elysia_string.StringType(), icPlaceholder, () => "must be an array"), icPlaceholder);
+		node = require_type_elysia_utils.elyType(require_type_constants.ELYSIA_TYPES.ArrayString, require_type_elysia_union.Union([array, arrayString], meta));
+	}
 	if ("o" in site) return Object.defineProperty(node, "~optional", {
 		value: site.o,
 		enumerable: false
 	});
 	return node;
 };
-const buildCoerceNode = (original, node, seen, objStr) => isCoerceLeaf(node) ? coerceLeaf(node, seen) : isCoerceObjStr(node) ? objStr(original, node) : isCoerceUnion(node) ? rebuildUnion(original, node, seen, objStr) : buildCoercedFromPlan(original, node, seen, objStr);
+const buildCoerceNode = (original, node, seen, objStr) => {
+	if (isCoerceLeaf(node)) {
+		const key = node.e + (node.c ? JSON.stringify(node.c) : "");
+		let leaf;
+		if (seen.has(key)) leaf = COERCE_LEAF_CTOR[node.e](node.c);
+		else {
+			seen.add(key);
+			leaf = require_type_shared.coerceLeafCache.get(key);
+			if (leaf === void 0) {
+				leaf = COERCE_LEAF_CTOR[node.e](node.c);
+				if (require_type_shared.coerceLeafCache.size >= 1024) require_utils.evictOldestHalf(require_type_shared.coerceLeafCache);
+				require_type_shared.coerceLeafCache.set(key, leaf);
+			} else if (require_type_shared.coerceLeafCache.size >= 1024) {
+				require_type_shared.coerceLeafCache.delete(key);
+				require_type_shared.coerceLeafCache.set(key, leaf);
+			}
+		}
+		if ("o" in node) return Object.defineProperty(Object.create(leaf), "~optional", {
+			value: node.o,
+			enumerable: false
+		});
+		return leaf;
+	}
+	if (isCoerceObjStr(node)) return objStr(original, node);
+	if (isCoerceUnion(node)) return rebuildUnion(original, node, seen, objStr);
+	return buildCoercedFromPlan(original, node, seen, objStr);
+};
 function cloneSchemaNode(original) {
 	const out = Object.create(Object.getPrototypeOf(original));
 	for (const k in original) out[k] = original[k];
@@ -62,28 +89,6 @@ function rebuildUnion(original, site, seen, objStr) {
 }
 /** @internal */
 const COERCE_LEAF_CACHE_LIMIT = 1024;
-function coerceLeaf(leaf, seen) {
-	const key = leaf.e + (leaf.c ? JSON.stringify(leaf.c) : "");
-	let node;
-	if (seen.has(key)) node = COERCE_LEAF_CTOR[leaf.e](leaf.c);
-	else {
-		seen.add(key);
-		node = require_type_shared.coerceLeafCache.get(key);
-		if (node === void 0) {
-			node = COERCE_LEAF_CTOR[leaf.e](leaf.c);
-			if (require_type_shared.coerceLeafCache.size >= 1024) require_utils.evictOldestHalf(require_type_shared.coerceLeafCache);
-			require_type_shared.coerceLeafCache.set(key, node);
-		} else if (require_type_shared.coerceLeafCache.size >= 1024) {
-			require_type_shared.coerceLeafCache.delete(key);
-			require_type_shared.coerceLeafCache.set(key, node);
-		}
-	}
-	if ("o" in leaf) return Object.defineProperty(Object.create(node), "~optional", {
-		value: leaf.o,
-		enumerable: false
-	});
-	return node;
-}
 function buildCoercedFromPlan(original, plan, seen = /* @__PURE__ */ new Set(), objStr = rebuildObjStrShape) {
 	if (isCoerceLeaf(plan) || isCoerceObjStr(plan) || isCoerceUnion(plan)) return buildCoerceNode(original, plan, seen, objStr);
 	const out = cloneSchemaNode(original);

package/dist/type/coerce-plan.mjs

@@ -23,28 +23,55 @@ const isCoerceUnion = (x) => Array.isArray(x.u);
 const icPlaceholder = () => {
 	throw new Error("[elysia] ObjectString/ArrayString shape placeholder was not reconstructed. missing inner-codec (ic) entry");
 };
-function ObjectStringShape(property, _options) {
-	const [{ properties, ...constraints }, meta] = getMeta(_options ?? nullObject());
-	const object = ObjectType(property, constraints);
-	const objectString = Decode(Refine(StringType(), icPlaceholder, () => "must be an object"), icPlaceholder);
-	return elyType(ELYSIA_TYPES.ObjectString, Union([object, objectString], meta));
-}
-function ArrayStringShape(property, _options) {
-	const [constraints, meta] = getMeta(_options ?? nullObject());
-	const array = ArrayType(property, constraints);
-	const arrayString = Decode(Refine(StringType(), icPlaceholder, () => "must be an array"), icPlaceholder);
-	return elyType(ELYSIA_TYPES.ArrayString, Union([array, arrayString], meta));
-}
 const rebuildObjStrShape = (original, site) => {
 	const { type, ...rest } = original;
-	const node = site.os === ELYSIA_TYPES.ObjectString ? ObjectStringShape(rest.properties ?? nullObject(), rest) : ArrayStringShape(rest.items ?? nullObject(), rest);
+	let node;
+	if (site.os === ELYSIA_TYPES.ObjectString) {
+		const property = rest.properties ?? nullObject();
+		const [{ properties, ...constraints }, meta] = getMeta(rest ?? nullObject());
+		const object = ObjectType(property, constraints);
+		const objectString = Decode(Refine(StringType(), icPlaceholder, () => "must be an object"), icPlaceholder);
+		node = elyType(ELYSIA_TYPES.ObjectString, Union([object, objectString], meta));
+	} else {
+		const property = rest.items ?? nullObject();
+		const [constraints, meta] = getMeta(rest ?? nullObject());
+		const array = ArrayType(property, constraints);
+		const arrayString = Decode(Refine(StringType(), icPlaceholder, () => "must be an array"), icPlaceholder);
+		node = elyType(ELYSIA_TYPES.ArrayString, Union([array, arrayString], meta));
+	}
 	if ("o" in site) return Object.defineProperty(node, "~optional", {
 		value: site.o,
 		enumerable: false
 	});
 	return node;
 };
-const buildCoerceNode = (original, node, seen, objStr) => isCoerceLeaf(node) ? coerceLeaf(node, seen) : isCoerceObjStr(node) ? objStr(original, node) : isCoerceUnion(node) ? rebuildUnion(original, node, seen, objStr) : buildCoercedFromPlan(original, node, seen, objStr);
+const buildCoerceNode = (original, node, seen, objStr) => {
+	if (isCoerceLeaf(node)) {
+		const key = node.e + (node.c ? JSON.stringify(node.c) : "");
+		let leaf;
+		if (seen.has(key)) leaf = COERCE_LEAF_CTOR[node.e](node.c);
+		else {
+			seen.add(key);
+			leaf = coerceLeafCache.get(key);
+			if (leaf === void 0) {
+				leaf = COERCE_LEAF_CTOR[node.e](node.c);
+				if (coerceLeafCache.size >= 1024) evictOldestHalf(coerceLeafCache);
+				coerceLeafCache.set(key, leaf);
+			} else if (coerceLeafCache.size >= 1024) {
+				coerceLeafCache.delete(key);
+				coerceLeafCache.set(key, leaf);
+			}
+		}
+		if ("o" in node) return Object.defineProperty(Object.create(leaf), "~optional", {
+			value: node.o,
+			enumerable: false
+		});
+		return leaf;
+	}
+	if (isCoerceObjStr(node)) return objStr(original, node);
+	if (isCoerceUnion(node)) return rebuildUnion(original, node, seen, objStr);
+	return buildCoercedFromPlan(original, node, seen, objStr);
+};
 function cloneSchemaNode(original) {
 	const out = Object.create(Object.getPrototypeOf(original));
 	for (const k in original) out[k] = original[k];
@@ -61,28 +88,6 @@ function rebuildUnion(original, site, seen, objStr) {
 }
 /** @internal */
 const COERCE_LEAF_CACHE_LIMIT = 1024;
-function coerceLeaf(leaf, seen) {
-	const key = leaf.e + (leaf.c ? JSON.stringify(leaf.c) : "");
-	let node;
-	if (seen.has(key)) node = COERCE_LEAF_CTOR[leaf.e](leaf.c);
-	else {
-		seen.add(key);
-		node = coerceLeafCache.get(key);
-		if (node === void 0) {
-			node = COERCE_LEAF_CTOR[leaf.e](leaf.c);
-			if (coerceLeafCache.size >= 1024) evictOldestHalf(coerceLeafCache);
-			coerceLeafCache.set(key, node);
-		} else if (coerceLeafCache.size >= 1024) {
-			coerceLeafCache.delete(key);
-			coerceLeafCache.set(key, node);
-		}
-	}
-	if ("o" in leaf) return Object.defineProperty(Object.create(node), "~optional", {
-		value: leaf.o,
-		enumerable: false
-	});
-	return node;
-}
 function buildCoercedFromPlan(original, plan, seen = /* @__PURE__ */ new Set(), objStr = rebuildObjStrShape) {
 	if (isCoerceLeaf(plan) || isCoerceObjStr(plan) || isCoerceUnion(plan)) return buildCoerceNode(original, plan, seen, objStr);
 	const out = cloneSchemaNode(original);

package/dist/type/coerce.d.ts

@@ -34,7 +34,7 @@ declare const coerceQuery: () => CoerceOption[];
 declare const coerceBody: () => CoerceOption[];
 declare const coerceFormData: () => CoerceOption[];
 declare const coerceStringToStructure: () => CoerceOption[];
-declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): BaseSchema | TSchema;
+declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): TSchema | BaseSchema;
 declare function captureCoercePlan(original: any, coerced: any): CoerceNode | null;
 /** Full rebuild: scalar leaves + ObjectString/ArrayString sites (wired path). */
 declare const buildCoercedFromPlan: (original: any, plan: CoerceNode, seen?: Set<string>) => any;

package/dist/type/constants.d.ts

@@ -17,7 +17,7 @@ declare const ELYSIA_TYPES: {
   readonly NoValidate: 15;
 };
 type ELYSIA_TYPES = typeof ELYSIA_TYPES;
-declare const primitiveElysiaTypes: Set<2 | 1 | 6 | 3 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<2 | 1 | 3 | 14 | 13 | 11 | 10 | 6>;
 declare const noEnumerable: {
   readonly enumerable: false;
 };

package/dist/type/elysia/cookie.js

@@ -16,27 +16,18 @@ const COOKIE_OPTION_KEYS = [
 	"sign",
 	"legacySignature"
 ];
-function extractConfig(options) {
-	if (!options) return {
-		config: void 0,
-		rest: void 0
-	};
-	let config;
+const isSchema = (value) => !!value && typeof value === "object" && "~kind" in value;
+function Cookie(first, options) {
+	const raw = options;
+	let configRaw;
 	let rest;
-	for (const key in options) {
-		const value = options[key];
+	if (raw) for (const key in raw) {
+		const value = raw[key];
 		if (value === void 0) continue;
-		if (COOKIE_OPTION_KEYS.includes(key)) (config ??= {})[key] = value;
+		if (COOKIE_OPTION_KEYS.includes(key)) (configRaw ??= {})[key] = value;
 		else (rest ??= {})[key] = value;
 	}
-	return {
-		config,
-		rest
-	};
-}
-const isSchema = (value) => !!value && typeof value === "object" && "~kind" in value;
-function Cookie(first, options) {
-	const { config, rest } = extractConfig(options);
+	const config = configRaw;
 	if (isSchema(first)) {
 		if (!config) return first;
 		const target = Object.create(Object.getPrototypeOf(first), Object.getOwnPropertyDescriptors(first));