elysia 2.0.0-exp.2 → 2.0.0-exp.3

package/dist/compile/handler/index.mjs

@@ -10,7 +10,7 @@ import { sucrose } from "../../sucrose.mjs";
 import { Capture, Compiled } from "../aot.mjs";
 import { RouteValidator } from "../../validator/route.mjs";
 import { isAsyncFunction, isAsyncLifecycle, mayReturnPromise } from "../utils.mjs";
-import { cloneResponse, getQueryParseArgs, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform } from "./utils.mjs";
+import { cloneResponse, getQueryParseArgs, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform } from "./utils.mjs";
 import { defaultAdapter } from "../../adapter/constants.mjs";
 import { forwardError } from "../../handler/utils.mjs";
 import { createTracer } from "../../trace.mjs";
@@ -93,20 +93,22 @@ c.contentType=ct
 		const child = report?.resolveChild("default");
 		const begin = child ? child.begin : "";
 		const end = child ? child.end() : "";
-		const guard = bodyVali ? "ct" : "ct&&c.request.body";
+		const guard = bodyVali ? "ct" : "ct&&hb(c.request)";
 		code += hasFn ? `if(!hasBody&&${guard}){${begin}c.body=await pd(c,ct)\n${end}}\n` : `if(${guard}){${begin}c.body=await pd(c,ct)\n${end}}\n`;
+		if (!bodyVali) link(hasRequestBody, "hb");
 		link(adapter.default, "pd");
 	}
 	return hasFn ? "let hasBody=false,_bp\n" + code : code;
 }
 const isAsyncValidator = (vali) => vali?.isAsync ?? true;
-function applyHook(localHook, appHook, rootHook) {
+function applyHook(localHook, appHook, rootHook, appHookFresh = false) {
 	let hook;
 	if (localHook && appHook) hook = mergeHook(cloneHook(localHook), appHook, true);
 	else {
 		const base = localHook ?? appHook;
-		if (!rootHook) return base ? cloneHook(base) : base;
-		hook = base ? cloneHook(base) : nullObject();
+		const ownsBase = appHookFresh && !localHook && base !== void 0;
+		if (!rootHook) return ownsBase ? base : base ? cloneHook(base) : base;
+		hook = ownsBase ? base : base ? cloneHook(base) : nullObject();
 	}
 	if (rootHook) mergeHook(hook, rootHook, true, true);
 	return hook;
@@ -134,11 +136,16 @@ function dropHooksByOrigin(hook, skip) {
 		const v = hook[key];
 		if (!v) continue;
 		if (Array.isArray(v)) {
-			const kept = v.filter((fn) => {
+			let kept;
+			for (let i = 0; i < v.length; i++) {
+				const fn = v[i];
 				const origin = fnOrigin.get(fn);
-				return origin === void 0 || !skip.has(origin);
-			});
-			if (kept.length !== v.length) {
+				const keep = origin === void 0 || !skip.has(origin);
+				if (kept) {
+					if (keep) kept.push(fn);
+				} else if (!keep) kept = v.slice(0, i);
+			}
+			if (kept) {
 				if (out === hook) out = { ...hook };
 				out[key] = kept;
 			}
@@ -152,6 +159,21 @@ function dropHooksByOrigin(hook, skip) {
 	}
 	return out;
 }
+function reconstructNeedsHookState(names) {
+	for (let i = 0; i < names.length; i++) switch (names[i]) {
+		case "ho":
+		case "tf":
+		case "bf":
+		case "af":
+		case "mr":
+		case "er":
+		case "ar":
+		case "va":
+		case "cc":
+		case "tr": return true;
+	}
+	return false;
+}
 const createInlineHandler = (map, h) => ((c) => {
 	const r = h(c);
 	if (r instanceof Error) throw r;
@@ -202,7 +224,7 @@ function buildNativeStaticResponse([, , handler, instance, localHook, appHook, i
 	if (localHook) root["~applyMacro"](localHook);
 	resolveChainMacros(root, appHook);
 	if (inheritedChain) resolveChainMacros(root, inheritedChain);
-	const hook = applyHook(localHook, flattenChainMemo(root, appHook), instance !== root ? composeRootHook(root, inheritedChain) : void 0);
+	const hook = applyHook(localHook, flattenChainMemo(root, appHook), instance !== root ? composeRootHook(root, inheritedChain) : void 0, true);
 	const has = (v) => Array.isArray(v) ? v.length > 0 : !!v;
 	if (has(hook?.parse) || has(hook?.transform) || has(hook?.beforeHandle) || has(hook?.afterHandle) || has(hook?.mapResponse) || has(hook?.afterResponse) || has(hook?.trace)) return;
 	if (hook?.body || hook?.query || hook?.params || hook?.headers || hook?.cookie || (hook?.schemas)?.length) return;
@@ -230,7 +252,7 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root) {
 		collectHookOrigins(flatAppHook, present);
 		if (present.size) rootHook = dropHooksByOrigin(rootHook, present);
 	}
-	let hook = applyHook(localHook, flatAppHook, rootHook);
+	let hook = applyHook(localHook, flatAppHook, rootHook, true);
 	if (instance !== root) {
 		const errors = flattenChain(instance["~hookChain"], isLocalScope)?.error;
 		if (errors) {
@@ -248,6 +270,16 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root) {
 }
 function compileHandler([_method, path, handler, instance, localHook, appHook, inheritedChain], root, precomputedStatic) {
 	const adapter = root["~config"]?.adapter ?? defaultAdapter;
+	const method = mapMethodBack(_method);
+	const reconstructed = Compiled.handlers?.[method]?.[path];
+	if (reconstructed && !precomputedStatic && typeof handler === "function" && !root["~ext"]?.macro && !reconstructNeedsHookState(reconstructed.a)) return reconstructed.f(handler, ...resolveHandlerParams(reconstructed.a, {
+		parse: adapter.parse,
+		res: adapter.response,
+		hook: nullObject(),
+		vali: void 0,
+		cookieConfig: void 0,
+		tracers: void 0
+	}));
 	if (root["~ext"]?.macro) {
 		if (localHook) root["~applyMacro"](localHook);
 		if (appHook) resolveChainMacros(root, appHook);
@@ -264,8 +296,7 @@ function compileHandler([_method, path, handler, instance, localHook, appHook, i
 		toArray("afterResponse", hook);
 		toArray("error", hook);
 	}
-	const method = mapMethodBack(_method);
-	const vali = hook ? new RouteValidator(hook, {
+	const buildValidator = () => hook ? new RouteValidator(hook, {
 		models: root["~ext"]?.models,
 		normalize: root["~config"]?.normalize,
 		sanitize: root["~config"]?.sanitize,
@@ -296,15 +327,15 @@ function compileHandler([_method, path, handler, instance, localHook, appHook, i
 		const resolve = (p) => typeof p === "string" && p in namedParsers ? namedParsers[p] : p;
 		hook.parse = Array.isArray(hook.parse) ? hook.parse.map(resolve) : resolve(hook.parse);
 	}
-	const reconstructed = Compiled.handlers?.[method]?.[path];
 	if (reconstructed) return reconstructed.f(handler, ...resolveHandlerParams(reconstructed.a, {
 		parse: adapter.parse,
 		res: adapter.response,
 		hook: hook ?? nullObject(),
-		vali,
+		vali: reconstructed.a.includes("va") ? buildValidator() : void 0,
 		cookieConfig: reconstructed.a.includes("cc") ? compileCookieConfig(hook?.cookie, root["~config"]?.cookie) : void 0,
 		tracers: reconstructed.a.includes("tr") ? (hook?.trace)?.map((fn) => createTracer(fn)) : void 0
 	}));
+	const vali = buildValidator();
 	const inference = sucrose(handler, hook);
 	const params = /* @__PURE__ */ new Set();
 	let alias = "";
@@ -373,7 +404,13 @@ function compileHandler([_method, path, handler, instance, localHook, appHook, i
 			};
 		} };
 	};
-	const responseValiAsync = !!(vali?.response && Object.values(vali.response).find(isAsyncValidator));
+	let responseValiAsync = false;
+	if (vali?.response) {
+		for (const code in vali.response) if (isAsyncValidator(vali.response[code])) {
+			responseValiAsync = true;
+			break;
+		}
+	}
 	const handlerIsAsync = isHandleFunction && isAsyncFunction(handler);
 	const errorHookForcesAsync = hasErrorHook && (hasAfterHandle || hasMapResponse || hasResponseValidator);
 	const responseValiForcesAsync = hasResponseValidator && isHandleFunction && !handlerIsAsync && (mayReturnPromise(handler) || mayReturnIdentifier(handler));
@@ -609,7 +646,7 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
 		if (alias === "rc" || !isAsync && !syncErrorHook && alias === "rc,fe") return createInlineHandler(res.compact ?? res.map, handler);
 		else if (alias === "rm" || !isAsync && !syncErrorHook && alias === "rm,fe") return createInlineHandlerWithSet(res.map, handler);
 	}
-	if (!precomputedStatic) Capture.handler({
+	Capture.handler({
 		method,
 		path,
 		alias,

package/dist/compile/handler/params.js

@@ -15,6 +15,7 @@ const HANDLER_PARAMS = {
 	pa: (c) => c.parse.arrayBuffer,
 	pt: (c) => c.parse.text,
 	pd: (c) => c.parse.default,
+	hb: () => require_compile_handler_utils.hasRequestBody,
 	rm: (c) => c.res.map,
 	rc: (c) => c.res.compact ?? c.res.map,
 	rid: () => require_utils.requestId,

package/dist/compile/handler/params.mjs

@@ -3,7 +3,7 @@ import { ElysiaStatus, ParseError, ValidationError } from "../../error.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawSync, signCookieValues } from "../../cookie/utils.mjs";
 import { tee } from "../../adapter/utils.mjs";
 import { parseQueryFromURL } from "../../parse-query.mjs";
-import { cloneResponse } from "./utils.mjs";
+import { cloneResponse, hasRequestBody } from "./utils.mjs";
 import { forwardError } from "../../handler/utils.mjs";
 
 //#region src/compile/handler/params.ts
@@ -14,6 +14,7 @@ const HANDLER_PARAMS = {
 	pa: (c) => c.parse.arrayBuffer,
 	pt: (c) => c.parse.text,
 	pd: (c) => c.parse.default,
+	hb: () => hasRequestBody,
 	rm: (c) => c.res.map,
 	rc: (c) => c.res.compact ?? c.res.map,
 	rid: () => requestId,

package/dist/compile/handler/utils.d.ts

@@ -11,6 +11,7 @@ interface TraceReporter {
   };
 }
 declare const cloneResponse: (r: unknown) => unknown;
+declare function hasRequestBody(request: Request): boolean;
 declare const mapTransform: (event: MaybeArray<TransformHandler<any, any, undefined, "local">>, rest?: [report?: TraceReporter | undefined] | undefined) => string;
 declare function extractDeriveKeys(fn: Function): string[] | null;
 declare function mapBeforeHandle(_hooks: AppHook['beforeHandle'] | AppHook['beforeHandle'][0], derive: AnyElysia['~derive'], link: Link, report?: TraceReporter): string;
@@ -26,4 +27,4 @@ declare function getQueryParseChannels(querySchema: any): QueryWalkState | undef
 declare function getQueryParseArgs(querySchema: any): string;
 declare const Await: (fn: Function) => "" | "await ";
 //#endregion
-export { Await, TraceReporter, cloneResponse, extractDeriveKeys, getQueryParseArgs, getQueryParseChannels, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };
+export { Await, TraceReporter, cloneResponse, extractDeriveKeys, getQueryParseArgs, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };

package/dist/compile/handler/utils.js

@@ -10,6 +10,11 @@ const noTrace = {
 	end: () => ""
 };
 const cloneResponse = (r) => r instanceof Response ? r.clone() : r;
+function hasRequestBody(request) {
+	const length = request.headers.get("content-length");
+	if (length !== null) return length !== "0";
+	return request.body != null;
+}
 const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
 const mapTransform = map((i, fn, [report]) => {
@@ -434,6 +439,7 @@ exports.cloneResponse = cloneResponse;
 exports.extractDeriveKeys = extractDeriveKeys;
 exports.getQueryParseArgs = getQueryParseArgs;
 exports.getQueryParseChannels = getQueryParseChannels;
+exports.hasRequestBody = hasRequestBody;
 exports.mapAfterHandle = mapAfterHandle;
 exports.mapAfterResponse = mapAfterResponse;
 exports.mapBeforeHandle = mapBeforeHandle;

package/dist/compile/handler/utils.mjs

@@ -9,6 +9,11 @@ const noTrace = {
 	end: () => ""
 };
 const cloneResponse = (r) => r instanceof Response ? r.clone() : r;
+function hasRequestBody(request) {
+	const length = request.headers.get("content-length");
+	if (length !== null) return length !== "0";
+	return request.body != null;
+}
 const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
 const mapTransform = map((i, fn, [report]) => {
@@ -428,4 +433,4 @@ function getQueryParseArgs(querySchema) {
 const Await = (fn) => isAsyncFunction(fn) ? "await " : "";
 
 //#endregion
-export { Await, cloneResponse, extractDeriveKeys, getQueryParseArgs, getQueryParseChannels, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };
+export { Await, cloneResponse, extractDeriveKeys, getQueryParseArgs, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform };

package/dist/cookie/utils.js

@@ -104,7 +104,7 @@ function signCookieValues(cookies, config) {
 		if (value === void 0 || value === null) continue;
 		if (typeof value === "object") value = JSON.stringify(value);
 		else if (typeof value !== "string") value = value + "";
-		const secret = Array.isArray(r.secrets) ? r.secrets.find((s) => s !== null) ?? null : r.secrets;
+		const secret = Array.isArray(r.secrets) ? r.secrets[0] ?? null : r.secrets;
 		if (secret === null) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
 		(pending ??= []).push([
 			property,

package/dist/cookie/utils.mjs

@@ -102,7 +102,7 @@ function signCookieValues(cookies, config) {
 		if (value === void 0 || value === null) continue;
 		if (typeof value === "object") value = JSON.stringify(value);
 		else if (typeof value !== "string") value = value + "";
-		const secret = Array.isArray(r.secrets) ? r.secrets.find((s) => s !== null) ?? null : r.secrets;
+		const secret = Array.isArray(r.secrets) ? r.secrets[0] ?? null : r.secrets;
 		if (secret === null) throw new TypeError(`Cookie field "${key}" is signed but no \`secrets\` is provided.`);
 		(pending ??= []).push([
 			property,

package/dist/error.d.ts

@@ -85,7 +85,7 @@ declare class ElysiaStatus<const in out Code extends number | keyof StatusMap, T
   constructor(code: Code, res: T);
   get status(): number;
 }
-declare const status: <const Code extends number | keyof StatusMap, const T = (Code extends keyof StatusMapBack ? StatusMapBack[Code] : Code)>(code: Code, response?: T) => ElysiaStatus<Code, T, Code extends "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Bad Request" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required" ? {
+declare const status: <const Code extends number | keyof StatusMap, const T = (Code extends keyof StatusMapBack ? StatusMapBack[Code] : Code)>(code: Code, response?: T) => ElysiaStatus<Code, T, Code extends "Bad Request" | "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required" ? {
   readonly Continue: 100;
   readonly 'Switching Protocols': 101;
   readonly Processing: 102;

package/dist/handler/error.js

@@ -18,10 +18,10 @@ function fallbackResponse(context, error, mapResponse, defaultError) {
 	return fallbackErrorResponse(context, error, mapResponse, defaultError);
 }
 function fallbackErrorResponse(context, error, mapResponse, defaultError) {
-	if (error?.status) return mapResponse(error.response !== void 0 ? error.response : error.message ?? "", context.set, context);
+	if (error?.status) return mapResponse(error.response !== void 0 ? error.response : require_error.isProduction() && error.status >= 500 ? "Internal Server Error" : error.message ?? "", context.set, context);
 	if (error?.message != null) {
 		if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-		return mapResponse(error.message, context.set, context);
+		return mapResponse(require_error.isProduction() ? "Internal Server Error" : error.message, context.set, context);
 	}
 	return defaultError ? defaultError.clone() : getDefaultError();
 }

package/dist/handler/error.mjs

@@ -1,4 +1,4 @@
-import { ElysiaStatus, ValidationError } from "../error.mjs";
+import { ElysiaStatus, ValidationError, isProduction } from "../error.mjs";
 import { parseQueryFromURL } from "../parse-query.mjs";
 import { cachedResponse, getAsyncIndexes } from "./utils.mjs";
 
@@ -17,10 +17,10 @@ function fallbackResponse(context, error, mapResponse, defaultError) {
 	return fallbackErrorResponse(context, error, mapResponse, defaultError);
 }
 function fallbackErrorResponse(context, error, mapResponse, defaultError) {
-	if (error?.status) return mapResponse(error.response !== void 0 ? error.response : error.message ?? "", context.set, context);
+	if (error?.status) return mapResponse(error.response !== void 0 ? error.response : isProduction() && error.status >= 500 ? "Internal Server Error" : error.message ?? "", context.set, context);
 	if (error?.message != null) {
 		if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-		return mapResponse(error.message, context.set, context);
+		return mapResponse(isProduction() ? "Internal Server Error" : error.message, context.set, context);
 	}
 	return defaultError ? defaultError.clone() : getDefaultError();
 }

package/dist/handler/fetch.js

@@ -140,25 +140,27 @@ function createFetchHandler(app) {
 			const trace = new Array(traceLength);
 			for (let i = 0; i < traceLength; i++) trace[i] = tracerFactories[i](context);
 			context.trace = trace;
-			const requestReports = trace.map((c) => c.request({
+			const requestReports = new Array(traceLength);
+			for (let i = 0; i < traceLength; i++) requestReports[i] = trace[i].request({
 				id: context.rid,
 				event: "request",
 				name: "request",
 				begin: performance.now(),
 				total: onRequests.length
-			}));
+			});
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
-					const endReports = requestReports.map((r) => r.resolveChild?.shift?.()?.({
+					const endReports = new Array(traceLength);
+					for (let j = 0; j < traceLength; j++) endReports[j] = requestReports[j].resolveChild?.shift?.()?.({
 						id: context.rid,
 						event: "request",
 						name: onRequests[i].name || "anonymous",
 						begin: performance.now()
-					}));
+					});
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
 					if (result !== void 0) {
-						requestReports.forEach((r) => r.resolve());
+						for (let j = 0; j < traceLength; j++) requestReports[j].resolve();
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);
 						return response;

package/dist/handler/fetch.mjs

@@ -138,25 +138,27 @@ function createFetchHandler(app) {
 			const trace = new Array(traceLength);
 			for (let i = 0; i < traceLength; i++) trace[i] = tracerFactories[i](context);
 			context.trace = trace;
-			const requestReports = trace.map((c) => c.request({
+			const requestReports = new Array(traceLength);
+			for (let i = 0; i < traceLength; i++) requestReports[i] = trace[i].request({
 				id: context.rid,
 				event: "request",
 				name: "request",
 				begin: performance.now(),
 				total: onRequests.length
-			}));
+			});
 			try {
 				for (let i = 0; i < onRequests.length; i++) {
-					const endReports = requestReports.map((r) => r.resolveChild?.shift?.()?.({
+					const endReports = new Array(traceLength);
+					for (let j = 0; j < traceLength; j++) endReports[j] = requestReports[j].resolveChild?.shift?.()?.({
 						id: context.rid,
 						event: "request",
 						name: onRequests[i].name || "anonymous",
 						begin: performance.now()
-					}));
+					});
 					const result = asyncIndexes?.[i] ? await onRequests[i](context) : onRequests[i](context);
 					for (let i = 0; i < traceLength; i++) endReports[i]?.();
 					if (result !== void 0) {
-						requestReports.forEach((r) => r.resolve());
+						for (let j = 0; j < traceLength; j++) requestReports[j].resolve();
 						const response = mapResponse(result, context.set);
 						afterResponse?.(context);
 						return response;

package/dist/parse-query.js

@@ -60,7 +60,7 @@ function parseQueryFromURL(input, startIndex = input.indexOf("?", 11), array, ob
 			}
 			else finalValue = finalValue.slice(1, -1).split(",");
 			if (currentValue === void 0) result[finalKey] = finalValue;
-			else if (Array.isArray(currentValue)) currentValue.push(...finalValue);
+			else if (Array.isArray(currentValue)) for (let i = 0; i < finalValue.length; i++) currentValue.push(finalValue[i]);
 			else {
 				result[finalKey] = finalValue;
 				result[finalKey].unshift(currentValue);

package/dist/parse-query.mjs

@@ -58,7 +58,7 @@ function parseQueryFromURL(input, startIndex = input.indexOf("?", 11), array, ob
 			}
 			else finalValue = finalValue.slice(1, -1).split(",");
 			if (currentValue === void 0) result[finalKey] = finalValue;
-			else if (Array.isArray(currentValue)) currentValue.push(...finalValue);
+			else if (Array.isArray(currentValue)) for (let i = 0; i < finalValue.length; i++) currentValue.push(finalValue[i]);
 			else {
 				result[finalKey] = finalValue;
 				result[finalKey].unshift(currentValue);

package/dist/plugin/core.js

@@ -21,17 +21,23 @@ function resolveLoader(entryPath) {
 }
 const entryFilter = (entryPath) => new RegExp("^" + entryPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$");
 async function generateCompiledModule(file, options) {
+	const previousAotBuild = process.env.ELYSIA_AOT_BUILD;
 	process.env.ELYSIA_AOT_BUILD = "1";
-	const entry = resolveEntry(file);
-	const mod = await import(entry);
-	const app = mod.app ?? mod.default;
-	if (!app || typeof app.compile !== "function") throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
-	return require_plugin_source.compileToSource(app, {
-		register: true,
-		registerFrom: options?.registerFrom,
-		lazy: options?.lazy,
-		target: options?.target
-	});
+	try {
+		const entry = resolveEntry(file);
+		const mod = await import(entry);
+		const app = mod.app ?? mod.default;
+		if (!app || typeof app.compile !== "function") throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
+		return await require_plugin_source.compileToSource(app, {
+			register: true,
+			registerFrom: options?.registerFrom,
+			lazy: options?.lazy,
+			target: options?.target
+		});
+	} finally {
+		if (previousAotBuild === void 0) delete process.env.ELYSIA_AOT_BUILD;
+		else process.env.ELYSIA_AOT_BUILD = previousAotBuild;
+	}
 }
 
 //#endregion

package/dist/plugin/core.mjs

@@ -19,17 +19,23 @@ function resolveLoader(entryPath) {
 }
 const entryFilter = (entryPath) => new RegExp("^" + entryPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$");
 async function generateCompiledModule(file, options) {
+	const previousAotBuild = process.env.ELYSIA_AOT_BUILD;
 	process.env.ELYSIA_AOT_BUILD = "1";
-	const entry = resolveEntry(file);
-	const mod = await import(entry);
-	const app = mod.app ?? mod.default;
-	if (!app || typeof app.compile !== "function") throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
-	return compileToSource(app, {
-		register: true,
-		registerFrom: options?.registerFrom,
-		lazy: options?.lazy,
-		target: options?.target
-	});
+	try {
+		const entry = resolveEntry(file);
+		const mod = await import(entry);
+		const app = mod.app ?? mod.default;
+		if (!app || typeof app.compile !== "function") throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
+		return await compileToSource(app, {
+			register: true,
+			registerFrom: options?.registerFrom,
+			lazy: options?.lazy,
+			target: options?.target
+		});
+	} finally {
+		if (previousAotBuild === void 0) delete process.env.ELYSIA_AOT_BUILD;
+		else process.env.ELYSIA_AOT_BUILD = previousAotBuild;
+	}
 }
 
 //#endregion

package/dist/plugin/source.js

@@ -7,17 +7,20 @@ const require_compile_handler_index = require('../compile/handler/index.js');
 //#region src/plugin/source.ts
 const autoGroupSize = (routes) => routes < 64 ? 1 : routes < 256 ? 2 : routes < 2048 ? 4 : routes < 8192 ? 16 : 64;
 async function compileToSource(app, options) {
+	const previousAotBuild = require_universal_env.env.ELYSIA_AOT_BUILD;
 	require_universal_env.env.ELYSIA_AOT_BUILD = "1";
-	if (!require_compile_aot.Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
-	require_compile_aot.beginValidatorCapture();
-	const modules = app.modules;
-	if (modules) await modules;
-	if (options?.target !== void 0) require_compile_handler_index.setCaptureHeaderShorthand(options.target === "bun");
 	try {
+		if (!require_compile_aot.Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
+		require_compile_aot.beginValidatorCapture();
+		const modules = app.modules;
+		if (modules) await modules;
+		if (options?.target !== void 0) require_compile_handler_index.setCaptureHeaderShorthand(options.target === "bun");
 		app.compile();
 		return emitModule(require_compile_aot.endValidatorCapture(), require_compile_aot.endHandlerCapture(), options);
 	} finally {
 		require_compile_handler_index.setCaptureHeaderShorthand(void 0);
+		if (previousAotBuild === void 0) delete require_universal_env.env.ELYSIA_AOT_BUILD;
+		else require_universal_env.env.ELYSIA_AOT_BUILD = previousAotBuild;
 	}
 }
 function emitModule(captured, handlers, options) {
@@ -99,6 +102,7 @@ function emitModule(captured, handlers, options) {
 			}).join(", ");
 			parts.push(`ic: [${ic}]`);
 		}
+		if (c.coercePlan) parts.push(`cp: ${JSON.stringify(c.coercePlan)}`);
 		return parts;
 	};
 	const treeToSource = (tree, slotRef, sink) => {

package/dist/plugin/source.mjs

@@ -6,17 +6,20 @@ import { setCaptureHeaderShorthand } from "../compile/handler/index.mjs";
 //#region src/plugin/source.ts
 const autoGroupSize = (routes) => routes < 64 ? 1 : routes < 256 ? 2 : routes < 2048 ? 4 : routes < 8192 ? 16 : 64;
 async function compileToSource(app, options) {
+	const previousAotBuild = env.ELYSIA_AOT_BUILD;
 	env.ELYSIA_AOT_BUILD = "1";
-	if (!Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
-	beginValidatorCapture();
-	const modules = app.modules;
-	if (modules) await modules;
-	if (options?.target !== void 0) setCaptureHeaderShorthand(options.target === "bun");
 	try {
+		if (!Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
+		beginValidatorCapture();
+		const modules = app.modules;
+		if (modules) await modules;
+		if (options?.target !== void 0) setCaptureHeaderShorthand(options.target === "bun");
 		app.compile();
 		return emitModule(endValidatorCapture(), endHandlerCapture(), options);
 	} finally {
 		setCaptureHeaderShorthand(void 0);
+		if (previousAotBuild === void 0) delete env.ELYSIA_AOT_BUILD;
+		else env.ELYSIA_AOT_BUILD = previousAotBuild;
 	}
 }
 function emitModule(captured, handlers, options) {
@@ -98,6 +101,7 @@ function emitModule(captured, handlers, options) {
 			}).join(", ");
 			parts.push(`ic: [${ic}]`);
 		}
+		if (c.coercePlan) parts.push(`cp: ${JSON.stringify(c.coercePlan)}`);
 		return parts;
 	};
 	const treeToSource = (tree, slotRef, sink) => {

package/dist/sucrose.js

@@ -14,7 +14,7 @@ const require_utils = require('./utils.js');
 function separateFunction(code) {
 	if (code.startsWith("async")) code = code.slice(5);
 	code = code.trimStart();
-	let index = -1;
+	let index;
 	if (code.charCodeAt(0) === 40) {
 		index = code.indexOf("=>", code.indexOf(")"));
 		if (index !== -1) {
@@ -167,10 +167,19 @@ function findParameterReference(parameter, inference) {
 	return Object.keys(parameters).join(", ");
 }
 function findEndIndex(type, content, index) {
-	const regex = new RegExp(`${type.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\n\\t,; ]`);
-	if (index !== void 0) regex.lastIndex = index;
-	const match = regex.exec(content);
-	return match ? match.index : -1;
+	let search = index ?? 0;
+	while (true) {
+		const found = content.indexOf(type, search);
+		if (found === -1) return -1;
+		switch (content.charCodeAt(found + type.length)) {
+			case 10:
+			case 9:
+			case 44:
+			case 59:
+			case 32: return found;
+		}
+		search = found + 1;
+	}
 }
 /**
 * Find alias of variable from function body
@@ -246,7 +255,7 @@ function extractMainParameter(parameter) {
 * Analyze if context is mentioned in body
 */
 function inferBodyReference(code, aliases, inference) {
-	const access = (type, alias) => new RegExp(`${alias}\\??\\.(${type})|${alias}(?:\\?\\.)?\\["${type}"\\]|${alias}(?:\\?\\.)?\\['${type}'\\]`).test(code);
+	const access = (type, alias) => code.includes(`${alias}.${type}`) || code.includes(`${alias}?.${type}`) || code.includes(`${alias}["${type}"]`) || code.includes(`${alias}?.["${type}"]`) || code.includes(`${alias}['${type}']`) || code.includes(`${alias}?.['${type}']`);
 	for (const alias of aliases) {
 		if (!alias) continue;
 		if (alias.charCodeAt(0) === 123) {
@@ -357,6 +366,11 @@ function clearSucroseCache(delay) {
 		clearCache();
 	}
 }
+function scheduleSucroseCacheClear() {
+	if (pendingGC || require_universal_constants.isCloudflareWorker) return;
+	pendingGC = setTimeout(clearCache, 60 * 1e3);
+	pendingGC.unref?.();
+}
 function mergeInference(a, b) {
 	return {
 		body: a.body || b.body,
@@ -425,9 +439,9 @@ function sucrose(handler, lifeCycle) {
 		inference ??= defaultSucrose();
 		if (needGc) {
 			needGc = false;
-			clearSucroseCache();
+			scheduleSucroseCacheClear();
 		}
-		let fnInference = defaultSucrose();
+		const fnInference = defaultSucrose();
 		const [parameter, body] = separateFunction(content);
 		const mainParameter = extractMainParameter(findParameterReference(parameter, fnInference));
 		if (mainParameter) {
@@ -448,8 +462,7 @@ function sucrose(handler, lifeCycle) {
 		}
 		if (typeof event === "function") functionCaches.set(event, fnInference);
 		inference = mergeInference(inference, fnInference);
-		fnInference = void 0;
-		if (inference.query && inference.headers && inference.body && inference.cookie && inference.set && inference.server && inference.url && inference.route && inference.path) break;
+		if (inference && inference.query && inference.headers && inference.body && inference.cookie && inference.set && inference.server && inference.url && inference.route && inference.path) break;
 	}
 	events.length = 0;
 	return inference ?? defaultSucrose();