elysia 2.0.0-beta.24 → 2.0.0-beta.26

package/dist/adapter/bun/index.js

@@ -105,7 +105,10 @@ function isNativePath(path) {
 function collectHTMLBundleRoutes(app, handoff, routes) {
 	let dynamic;
 	let bundles;
-	for (const route of app["~routes"]) {
+	const table = app["~generation"]?.routeTable;
+	if (table && !table.handler.some((h, i) => isNativeStaticMethod(table.method[i]) && require_utils.isHTMLBundle(h))) return routes;
+	const declared = table ? table.method.map((_, i) => require_route_table.routeRow(table, i)) : app["~routes"];
+	for (const route of declared) {
 		const [method, path, handler] = route;
 		if (!isNativeStaticMethod(method) || !require_utils.isHTMLBundle(handler)) continue;
 		if (path.indexOf(":") !== -1 || path.indexOf("*") !== -1) {
@@ -122,7 +125,7 @@ function collectHTMLBundleRoutes(app, handoff, routes) {
 	if (!dynamic) return routes;
 	const strictPath = app["~config"]?.strictPath === true;
 	const handoffs = [];
-	for (const [method, path, handler] of app["~routes"]) {
+	for (const [method, path, handler] of declared) {
 		if (require_utils.isHTMLBundle(handler)) continue;
 		const targets = method === "*" ? dynamic : dynamic.has(method) ? [method] : void 0;
 		if (!targets) continue;

package/dist/adapter/bun/index.mjs

@@ -105,7 +105,10 @@ function isNativePath(path) {
 function collectHTMLBundleRoutes(app, handoff, routes) {
 	let dynamic;
 	let bundles;
-	for (const route of app["~routes"]) {
+	const table = app["~generation"]?.routeTable;
+	if (table && !table.handler.some((h, i) => isNativeStaticMethod(table.method[i]) && isHTMLBundle(h))) return routes;
+	const declared = table ? table.method.map((_, i) => routeRow(table, i)) : app["~routes"];
+	for (const route of declared) {
 		const [method, path, handler] = route;
 		if (!isNativeStaticMethod(method) || !isHTMLBundle(handler)) continue;
 		if (path.indexOf(":") !== -1 || path.indexOf("*") !== -1) {
@@ -122,7 +125,7 @@ function collectHTMLBundleRoutes(app, handoff, routes) {
 	if (!dynamic) return routes;
 	const strictPath = app["~config"]?.strictPath === true;
 	const handoffs = [];
-	for (const [method, path, handler] of app["~routes"]) {
+	for (const [method, path, handler] of declared) {
 		if (isHTMLBundle(handler)) continue;
 		const targets = method === "*" ? dynamic : dynamic.has(method) ? [method] : void 0;
 		if (!targets) continue;

package/dist/base.d.ts

@@ -84,8 +84,11 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   '~router'?: Memoirist<CompiledHandler | number>;
   '~map'?: {
     [method: string]: {
-      [path: string]: CompiledHandler;
+      [path: string]: CompiledHandler | number;
     } | undefined;
+    WS?: {
+      [path: string]: CompiledHandler;
+    };
   };
   '~routeTable'?: RouteTable;
   '~hasWS'?: boolean;
@@ -102,8 +105,9 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   constructor(config?: ElysiaConfig<BasePath, Scope>);
   /**
    * Every registered route with its merged hooks.
-   * Development shares a frozen cache. Production rebuilds the list so its
-   * metadata can be released after startup.
+   * Development shares a frozen cache.
+   * Production rebuilds the list on every read
+   * so its metadata can be released after startup.
    */
   get routes(): PublicRoute[];
   /**

package/dist/base.js

@@ -224,8 +224,9 @@ var Elysia = class Elysia {
 	}
 	/**
 	* Every registered route with its merged hooks.
-	* Development shares a frozen cache. Production rebuilds the list so its
-	* metadata can be released after startup.
+	* Development shares a frozen cache.
+	* Production rebuilds the list on every read
+	* so its metadata can be released after startup.
 	*/
 	get routes() {
 		const generation = this["~generation"];
@@ -1517,7 +1518,7 @@ var Elysia = class Elysia {
 					const satisfied = (table.flags[i] & require_route_table.RouteFlag.JITSatisfied) !== 0;
 					table.flags[i] &= ~(require_route_table.RouteFlag.JITCold | require_route_table.RouteFlag.JITSatisfied);
 					const flags = table.flags[i];
-					if (satisfied || (flags & (require_route_table.RouteFlag.WS | require_route_table.RouteFlag.ExactDuplicate)) !== 0 || compiled?.[i] !== void 0) continue;
+					if (satisfied || (flags & (require_route_table.RouteFlag.WS | require_route_table.RouteFlag.ExactDuplicate)) !== 0 || compiled?.[i] !== void 0 || require_utils.isHTMLBundle(table.handler[i])) continue;
 					table.flags[i] |= require_route_table.RouteFlag.JITCold;
 					cold++;
 				}
@@ -1526,8 +1527,8 @@ var Elysia = class Elysia {
 			}
 			require_compile_handler_index.clearHandlerAnalysisCaches(this);
 			require_utils.clearFlattenChainMemo(this);
-			if (!this["~ext"]?.macro && !this["~scopeChildren"]) this.declaredRoutes = void 0;
 		}
+		if (!this["~ext"]?.macro && !this["~scopeChildren"] && !require_compile_aot.Capture.isAotBuildEnv()) this.declaredRoutes = void 0;
 		const ext = this["~ext"];
 		if (ext?.setup) extCallbackIndexes.delete(ext.setup);
 		if (ext?.cleanup) extCallbackIndexes.delete(ext.cleanup);
@@ -1623,32 +1624,32 @@ var Elysia = class Elysia {
 				}
 				continue;
 			}
+			const lazy = !precompile && !this.compiled?.[i];
+			if (lazy) {
+				this.compiled ??= new Array(length);
+				this.jitTable = table;
+			}
 			const isDynamic = (routeFlags & require_route_table.RouteFlag.Dynamic) !== 0;
 			const needsEncode = (routeFlags & require_route_table.RouteFlag.Encode) !== 0;
 			const registerLoose = isLoose && canRegisterLoose(routePath, isDynamic);
 			if (!isDynamic && !needsEncode && !registerLoose) {
 				const map = methods[routeMethod] ??= require_utils.nullObject();
-				map[routePath] = this.handler(i, precompile, void 0, void 0, table);
+				map[routePath] = lazy ? ~i : this.handler(i, precompile, void 0, void 0, table);
 				continue;
 			}
 			const paths = expandPaths(routePath, needsEncode, registerLoose, registerLoose ? explicitPaths?.get(routeMethod) : void 0);
 			if (isDynamic) {
 				if (require_utils.isHTMLBundle(table.handler[i])) continue;
 				const router = this["~router"] ??= new memoirist.default({ loosePath: isLoose });
-				let store;
-				if (precompile || this.compiled?.[i]) store = this.handler(i, precompile, void 0, void 0, table);
-				else {
-					this.compiled ??= new Array(length);
-					this.jitTable = table;
-					store = i;
-				}
+				const store = lazy ? i : this.handler(i, precompile, void 0, void 0, table);
 				for (let p = 0; p < paths.length; p++) router.add(routeMethod, paths[p], store);
 			} else {
 				const map = methods[routeMethod] ??= require_utils.nullObject();
-				const handler = this.handler(i, precompile, void 0, {
+				if (lazy) (this.jitAliases ??= [])[i] = {
 					method: routeMethod,
 					paths
-				}, table);
+				};
+				const handler = lazy ? ~i : this.handler(i, precompile, void 0, void 0, table);
 				for (let p = 0; p < paths.length; p++) map[paths[p]] = handler;
 			}
 		}

package/dist/base.mjs

@@ -222,8 +222,9 @@ var Elysia = class Elysia {
 	}
 	/**
 	* Every registered route with its merged hooks.
-	* Development shares a frozen cache. Production rebuilds the list so its
-	* metadata can be released after startup.
+	* Development shares a frozen cache.
+	* Production rebuilds the list on every read
+	* so its metadata can be released after startup.
 	*/
 	get routes() {
 		const generation = this["~generation"];
@@ -1515,7 +1516,7 @@ var Elysia = class Elysia {
 					const satisfied = (table.flags[i] & RouteFlag.JITSatisfied) !== 0;
 					table.flags[i] &= ~(RouteFlag.JITCold | RouteFlag.JITSatisfied);
 					const flags = table.flags[i];
-					if (satisfied || (flags & (RouteFlag.WS | RouteFlag.ExactDuplicate)) !== 0 || compiled?.[i] !== void 0) continue;
+					if (satisfied || (flags & (RouteFlag.WS | RouteFlag.ExactDuplicate)) !== 0 || compiled?.[i] !== void 0 || isHTMLBundle(table.handler[i])) continue;
 					table.flags[i] |= RouteFlag.JITCold;
 					cold++;
 				}
@@ -1524,8 +1525,8 @@ var Elysia = class Elysia {
 			}
 			clearHandlerAnalysisCaches(this);
 			clearFlattenChainMemo(this);
-			if (!this["~ext"]?.macro && !this["~scopeChildren"]) this.declaredRoutes = void 0;
 		}
+		if (!this["~ext"]?.macro && !this["~scopeChildren"] && !Capture.isAotBuildEnv()) this.declaredRoutes = void 0;
 		const ext = this["~ext"];
 		if (ext?.setup) extCallbackIndexes.delete(ext.setup);
 		if (ext?.cleanup) extCallbackIndexes.delete(ext.cleanup);
@@ -1621,32 +1622,32 @@ var Elysia = class Elysia {
 				}
 				continue;
 			}
+			const lazy = !precompile && !this.compiled?.[i];
+			if (lazy) {
+				this.compiled ??= new Array(length);
+				this.jitTable = table;
+			}
 			const isDynamic = (routeFlags & RouteFlag.Dynamic) !== 0;
 			const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
 			const registerLoose = isLoose && canRegisterLoose(routePath, isDynamic);
 			if (!isDynamic && !needsEncode && !registerLoose) {
 				const map = methods[routeMethod] ??= nullObject();
-				map[routePath] = this.handler(i, precompile, void 0, void 0, table);
+				map[routePath] = lazy ? ~i : this.handler(i, precompile, void 0, void 0, table);
 				continue;
 			}
 			const paths = expandPaths(routePath, needsEncode, registerLoose, registerLoose ? explicitPaths?.get(routeMethod) : void 0);
 			if (isDynamic) {
 				if (isHTMLBundle(table.handler[i])) continue;
 				const router = this["~router"] ??= new Memoirist({ loosePath: isLoose });
-				let store;
-				if (precompile || this.compiled?.[i]) store = this.handler(i, precompile, void 0, void 0, table);
-				else {
-					this.compiled ??= new Array(length);
-					this.jitTable = table;
-					store = i;
-				}
+				const store = lazy ? i : this.handler(i, precompile, void 0, void 0, table);
 				for (let p = 0; p < paths.length; p++) router.add(routeMethod, paths[p], store);
 			} else {
 				const map = methods[routeMethod] ??= nullObject();
-				const handler = this.handler(i, precompile, void 0, {
+				if (lazy) (this.jitAliases ??= [])[i] = {
 					method: routeMethod,
 					paths
-				}, table);
+				};
+				const handler = lazy ? ~i : this.handler(i, precompile, void 0, void 0, table);
 				for (let p = 0; p < paths.length; p++) map[paths[p]] = handler;
 			}
 		}

package/dist/compile/aot-capture.js

@@ -13,8 +13,8 @@ const require_type_validator_frozen_check = require('../type/validator/frozen-ch
 const require_type_validator_custom_error = require('../type/validator/custom-error.js');
 const require_type_validator_exact_mirror = require('../type/validator/exact-mirror.js');
 const require_type_validator_string_codec_aot = require('../type/validator/string-codec-aot.js');
-let typebox_value = require("typebox/value");
 let typebox_schema = require("typebox/schema");
+let typebox_value = require("typebox/value");
 
 //#region src/compile/aot-capture.ts
 function emptyContainers(node, depth) {

package/dist/compile/aot-capture.mjs

@@ -12,8 +12,8 @@ import { buildFrozenCheck } from "../type/validator/frozen-check.mjs";
 import { captureCustomErrors } from "../type/validator/custom-error.mjs";
 import { getExactMirror } from "../type/validator/exact-mirror.mjs";
 import { captureStringCodecEntries, compileWithBuild } from "../type/validator/string-codec-aot.mjs";
-import { Default } from "typebox/value";
 import { Build, Compile } from "typebox/schema";
+import { Default } from "typebox/value";
 
 //#region src/compile/aot-capture.ts
 function emptyContainers(node, depth) {

package/dist/compile/handler/jit.js

@@ -562,9 +562,11 @@ function compileHandlerJit(options, tailPass) {
 			], abortChainGuard(), require_compile_handler_utils.asyncTail(asyncMode)) + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule) + `return _efb(e,c)\n`;
 		} else body += endTrace("error") + freThenSchedule("e");
 		const hookThrew = `catch(_ee){${freThenSchedule("_ee").trimEnd()}}}\n`;
-		if (syncErrorHook) {
-			factoryHelpers += `function _ce(e,c){${abortOn ? "let _as\n" : ""}try{\n${body}}${hookThrew}`;
-			code += `}catch(e){return _ce(e,c)}\n`;
+		const syncFirst = typeof asyncMode === "object" && !asyncMode.async;
+		if (syncErrorHook || syncFirst) {
+			const live = syncFirst ? asyncMode.live : "";
+			factoryHelpers += `function _ce(e,c${live}){${abortOn ? "let _as\n" : ""}try{\n${body}}${hookThrew}`;
+			code += `}catch(e){return _ce(e,c${live})}\n`;
 		} else code += `}catch(e){try{\n${body}}${hookThrew}`;
 	} else code += catchSchedule ? `}catch(e){${freThenSchedule("e")}}\n` : `}catch(e){return fre(rt,c,e)}\n`;
 	if (tailPass) return code;

package/dist/compile/handler/jit.mjs

@@ -562,9 +562,11 @@ function compileHandlerJit(options, tailPass) {
 			], abortChainGuard(), asyncTail(asyncMode)) + endTrace("error") + (hasDeriveDispose ? schedule + abortCatch : abortCatch + schedule) + `return _efb(e,c)\n`;
 		} else body += endTrace("error") + freThenSchedule("e");
 		const hookThrew = `catch(_ee){${freThenSchedule("_ee").trimEnd()}}}\n`;
-		if (syncErrorHook) {
-			factoryHelpers += `function _ce(e,c){${abortOn ? "let _as\n" : ""}try{\n${body}}${hookThrew}`;
-			code += `}catch(e){return _ce(e,c)}\n`;
+		const syncFirst = typeof asyncMode === "object" && !asyncMode.async;
+		if (syncErrorHook || syncFirst) {
+			const live = syncFirst ? asyncMode.live : "";
+			factoryHelpers += `function _ce(e,c${live}){${abortOn ? "let _as\n" : ""}try{\n${body}}${hookThrew}`;
+			code += `}catch(e){return _ce(e,c${live})}\n`;
 		} else code += `}catch(e){try{\n${body}}${hookThrew}`;
 	} else code += catchSchedule ? `}catch(e){${freThenSchedule("e")}}\n` : `}catch(e){return fre(rt,c,e)}\n`;
 	if (tailPass) return code;

package/dist/compile/handler/utils.js

@@ -219,16 +219,12 @@ function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const modes = deriveModes(hooks, derive);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	let needsEs = false;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
@@ -246,9 +242,8 @@ else if(tmp){${merge};tmp=undefined}\n`;
 			}
 		} else code += "if(tmp!==undefined)_r=tmp\n";
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	if (needsEs) link(require_error.ElysiaStatus, "es");
 	return code;
 }
@@ -291,22 +286,17 @@ function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
@@ -324,18 +314,13 @@ function map(map) {
 	return function(event, rest, abortGuard, tail) {
 		if (Array.isArray(event)) {
 			let code = "";
-			let depth = 0;
 			for (let i = 0; i < event.length; i++) {
 				const guard = i > 0 && abortGuard ? `!${abortGuard}` : void 0;
 				if (tail) code += tailStage(tail, guard);
-				else if (guard) {
-					code += `if(${guard}){\n`;
-					depth++;
-				}
+				else if (guard) code += `if(${guard}){\n`;
 				code += map(i, event[i], rest);
-				if (tail) code += "}\n";
+				if (tail || guard) code += "}\n";
 			}
-			code += "}".repeat(depth);
 			return code;
 		} else if (tail) return tailStage(tail) + map(void 0, event, rest) + "}\n";
 		else return map(void 0, event, rest);

package/dist/compile/handler/utils.mjs

@@ -219,16 +219,12 @@ function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const modes = deriveModes(hooks, derive);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	let needsEs = false;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
@@ -246,9 +242,8 @@ else if(tmp){${merge};tmp=undefined}\n`;
 			}
 		} else code += "if(tmp!==undefined)_r=tmp\n";
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	if (needsEs) link(ElysiaStatus, "es");
 	return code;
 }
@@ -291,22 +286,17 @@ function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
@@ -324,18 +314,13 @@ function map(map) {
 	return function(event, rest, abortGuard, tail) {
 		if (Array.isArray(event)) {
 			let code = "";
-			let depth = 0;
 			for (let i = 0; i < event.length; i++) {
 				const guard = i > 0 && abortGuard ? `!${abortGuard}` : void 0;
 				if (tail) code += tailStage(tail, guard);
-				else if (guard) {
-					code += `if(${guard}){\n`;
-					depth++;
-				}
+				else if (guard) code += `if(${guard}){\n`;
 				code += map(i, event[i], rest);
-				if (tail) code += "}\n";
+				if (tail || guard) code += "}\n";
 			}
-			code += "}".repeat(depth);
 			return code;
 		} else if (tail) return tailStage(tail) + map(void 0, event, rest) + "}\n";
 		else return map(void 0, event, rest);

package/dist/handler/fetch.js

@@ -72,34 +72,40 @@ function dispatchResult(result, context, handleError, afterResponse) {
 function findRoute(context, request, map, router, onNotFound, handleError, afterResponse, strictPath, hasWS, hasDynamicWS, app) {
 	const path = context.path;
 	const method = request.method;
-	if (hasWS && method === "GET") {
-		const handler = map["WS"]?.[path];
-		const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
-		if (handler !== void 0 || found) {
-			const upgrade = request.headers.get("upgrade");
-			if (upgrade && upgrade.toLowerCase() === "websocket") {
-				if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
-				context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
-				return dispatchResult(found.store(context), context, handleError, afterResponse);
+	if (hasWS) {
+		const wsMap = map["WS"];
+		if (method === "GET") {
+			const handler = path.length === 1 && path === "/" ? wsMap?.["/"] : wsMap?.[path];
+			const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
+			if (handler !== void 0 || found) {
+				const upgrade = request.headers.get("upgrade");
+				if (upgrade && upgrade.toLowerCase() === "websocket") {
+					if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+					context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
+					return dispatchResult(found.store(context), context, handleError, afterResponse);
+				}
 			}
 		}
 	}
 	const methodMap = map[method];
-	let handler = methodMap?.[path];
-	if (!handler) if (!strictPath && path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
-		const loose = path.slice(0, -1);
-		handler = methodMap?.[loose];
-		if (!handler) {
-			const anyMap = map["*"];
-			handler = anyMap?.[path] ?? anyMap?.[loose];
-		}
-	} else handler = map["*"]?.[path];
-	if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+	let handler;
+	if (path.length > 1) {
+		handler = methodMap?.[path];
+		if (!handler) if (!strictPath && path.charCodeAt(path.length - 1) === 47) {
+			const loose = path.slice(0, -1);
+			handler = loose.length > 1 ? methodMap?.[loose] : methodMap?.[path[0]];
+			if (!handler) {
+				const anyMap = map["*"];
+				handler = anyMap?.[path] ?? anyMap?.[loose];
+			}
+		} else handler = map["*"]?.[path];
+	} else handler = methodMap?.[context.path] || map["*"]?.[path];
+	if (handler) return dispatchResult(typeof handler === "number" ? app["~dispatch"](~handler, context) : handler(context), context, handleError, afterResponse);
 	const found = router?.find(method, path) ?? router?.find("*", path);
 	if (found) {
 		context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
 		const store = found.store;
-		const dynamic = typeof store === "number" ? app["compiled"]?.[store] : store;
+		const dynamic = typeof store === "number" ? void 0 : store;
 		return dispatchResult(dynamic ? dynamic(context) : app["~dispatch"](store, context), context, handleError, afterResponse);
 	}
 	return onNotFound(context);

package/dist/handler/fetch.mjs

@@ -70,34 +70,40 @@ function dispatchResult(result, context, handleError, afterResponse) {
 function findRoute(context, request, map, router, onNotFound, handleError, afterResponse, strictPath, hasWS, hasDynamicWS, app) {
 	const path = context.path;
 	const method = request.method;
-	if (hasWS && method === "GET") {
-		const handler = map["WS"]?.[path];
-		const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
-		if (handler !== void 0 || found) {
-			const upgrade = request.headers.get("upgrade");
-			if (upgrade && upgrade.toLowerCase() === "websocket") {
-				if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
-				context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
-				return dispatchResult(found.store(context), context, handleError, afterResponse);
+	if (hasWS) {
+		const wsMap = map["WS"];
+		if (method === "GET") {
+			const handler = path.length === 1 && path === "/" ? wsMap?.["/"] : wsMap?.[path];
+			const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
+			if (handler !== void 0 || found) {
+				const upgrade = request.headers.get("upgrade");
+				if (upgrade && upgrade.toLowerCase() === "websocket") {
+					if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+					context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
+					return dispatchResult(found.store(context), context, handleError, afterResponse);
+				}
 			}
 		}
 	}
 	const methodMap = map[method];
-	let handler = methodMap?.[path];
-	if (!handler) if (!strictPath && path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
-		const loose = path.slice(0, -1);
-		handler = methodMap?.[loose];
-		if (!handler) {
-			const anyMap = map["*"];
-			handler = anyMap?.[path] ?? anyMap?.[loose];
-		}
-	} else handler = map["*"]?.[path];
-	if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+	let handler;
+	if (path.length > 1) {
+		handler = methodMap?.[path];
+		if (!handler) if (!strictPath && path.charCodeAt(path.length - 1) === 47) {
+			const loose = path.slice(0, -1);
+			handler = loose.length > 1 ? methodMap?.[loose] : methodMap?.[path[0]];
+			if (!handler) {
+				const anyMap = map["*"];
+				handler = anyMap?.[path] ?? anyMap?.[loose];
+			}
+		} else handler = map["*"]?.[path];
+	} else handler = methodMap?.[context.path] || map["*"]?.[path];
+	if (handler) return dispatchResult(typeof handler === "number" ? app["~dispatch"](~handler, context) : handler(context), context, handleError, afterResponse);
 	const found = router?.find(method, path) ?? router?.find("*", path);
 	if (found) {
 		context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
 		const store = found.store;
-		const dynamic = typeof store === "number" ? app["compiled"]?.[store] : store;
+		const dynamic = typeof store === "number" ? void 0 : store;
 		return dispatchResult(dynamic ? dynamic(context) : app["~dispatch"](store, context), context, handleError, afterResponse);
 	}
 	return onNotFound(context);

package/dist/package.js

@@ -1,6 +1,6 @@
 
 //#region package.json
-var version = "2.0.0-beta.24";
+var version = "2.0.0-beta.26";
 
 //#endregion
 Object.defineProperty(exports, 'version', {

package/dist/package.mjs

@@ -1,6 +1,6 @@
 // @bun
 //#region package.json
-var version = "2.0.0-beta.24";
+var version = "2.0.0-beta.26";
 
 //#endregion
 export { version };

package/dist/plugin/aot/core.js

@@ -463,8 +463,14 @@ async function generateCompiledArtifacts(file, options, moduleCondition = resolv
 		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options, moduleCondition);
 		_importedEntries.add(entryReal);
 		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`);
+		const isApp = (value) => typeof value?.compile === "function";
+		let app = isApp(mod.app) ? mod.app : mod.default;
+		if (!isApp(app)) {
+			const names = Object.keys(mod).filter((name) => isApp(mod[name]));
+			if (new Set(names.map((name) => mod[name])).size > 1) throw new Error(`[elysia-aot] "${entry}" exports multiple Elysia apps (${names.join(", ")}). Export the one to compile as \`app\` or default`);
+			app = names[0] ? mod[names[0]] : void 0;
+		}
+		if (!isApp(app)) throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
 		const typedApp = app;
 		assertNoMount(typedApp, entry);
 		const sourceOptions = {

package/dist/plugin/aot/core.mjs

@@ -461,8 +461,14 @@ async function generateCompiledArtifacts(file, options, moduleCondition = resolv
 		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options, moduleCondition);
 		_importedEntries.add(entryReal);
 		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`);
+		const isApp = (value) => typeof value?.compile === "function";
+		let app = isApp(mod.app) ? mod.app : mod.default;
+		if (!isApp(app)) {
+			const names = Object.keys(mod).filter((name) => isApp(mod[name]));
+			if (new Set(names.map((name) => mod[name])).size > 1) throw new Error(`[elysia-aot] "${entry}" exports multiple Elysia apps (${names.join(", ")}). Export the one to compile as \`app\` or default`);
+			app = names[0] ? mod[names[0]] : void 0;
+		}
+		if (!isApp(app)) throw new Error(`[elysia-aot] "${entry}" must export an Elysia app`);
 		const typedApp = app;
 		assertNoMount(typedApp, entry);
 		const sourceOptions = {

package/dist/type/bridge-live.d.ts

@@ -5,8 +5,8 @@ import { useTypebox as useTypebox$1 } from "./bridge.js";
 import { TypeBoxValidatorCache, mayHaveFileType } from "./validator/validator-cache.js";
 import { TypeBoxValidator } from "./validator/index.js";
 import { Ref } from "typebox/type";
-import { Compile } from "typebox/compile";
 import { Check, Clone, Create, Decode, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 
 //#region src/type/bridge-live.d.ts
 declare function useTypebox(_mod?: Parameters<typeof useTypebox$1>[0]): void;

package/dist/type/bridge-live.js

@@ -6,8 +6,8 @@ const require_type_validator_validator_cache = require('./validator/validator-ca
 const require_type_validator_index = require('./validator/index.js');
 const require_type_elysia_intersect = require('./elysia/intersect.js');
 let typebox_type = require("typebox/type");
-let typebox_compile = require("typebox/compile");
 let typebox_value = require("typebox/value");
+let typebox_compile = require("typebox/compile");
 let typebox_system = require("typebox/system");
 
 //#region src/type/bridge-live.ts

package/dist/type/bridge-live.mjs

@@ -5,8 +5,8 @@ import { TypeBoxValidatorCache, mayHaveFileType } from "./validator/validator-ca
 import { TypeBoxValidator } from "./validator/index.mjs";
 import { Intersect } from "./elysia/intersect.mjs";
 import { Ref } from "typebox/type";
-import { Compile } from "typebox/compile";
 import { Check, Clone, Create, Decode, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 import { Settings } from "typebox/system";
 
 //#region src/type/bridge-live.ts

package/dist/type/bridge.d.ts

@@ -4,8 +4,8 @@ import { hasTypes as hasTypes$1 } from "./utils.js";
 import { TypeBoxValidatorCache as TypeBoxValidatorCache$1, mayHaveFileType as mayHaveFileType$1 } from "./validator/validator-cache.js";
 import { TypeBoxValidator as TypeBoxValidator$1 } from "./validator/index.js";
 import { Ref as Ref$1, TAny, TSchema } from "typebox/type";
-import { Compile as Compile$1 } from "typebox/compile";
 import { Check as Check$1, Clone as Clone$1, Create as Create$1, Decode as Decode$2, HasCodec as HasCodec$1 } from "typebox/value";
+import { Compile as Compile$1 } from "typebox/compile";
 
 //#region src/type/bridge.d.ts
 interface TypeboxModule {

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<1 | 2 | 6 | 3 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<6 | 1 | 2 | 3 | 10 | 11 | 13 | 14>;
 declare const noEnumerable: {
   readonly enumerable: false;
 };

package/dist/type/typebox-value-live.d.ts

@@ -1,7 +1,7 @@
 import { TypeboxNamespaces } from "./typebox-value.js";
-import { Compile } from "typebox/compile";
-import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
 import { Build, Compile as SchemaCompile } from "typebox/schema";
+import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 
 //#region src/type/typebox-value-live.d.ts
 declare function injectTypebox(_typebox?: TypeboxNamespaces): void;

package/dist/type/typebox-value-live.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.js');
-let typebox_compile = require("typebox/compile");
+let typebox_schema = require("typebox/schema");
 let typebox_value = require("typebox/value");
+let typebox_compile = require("typebox/compile");
 let typebox_system = require("typebox/system");
-let typebox_schema = require("typebox/schema");
 
 //#region src/type/typebox-value-live.ts
 typebox_system.Settings.Set({ unionPrioritySort: false });

package/dist/type/typebox-value-live.mjs

@@ -1,8 +1,8 @@
 // @bun
-import { Compile } from "typebox/compile";
+import { Build, Compile as SchemaCompile } from "typebox/schema";
 import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 import { Settings } from "typebox/system";
-import { Build, Compile as SchemaCompile } from "typebox/schema";
 
 //#region src/type/typebox-value-live.ts
 Settings.Set({ unionPrioritySort: false });

package/dist/type/typebox-value-ops.d.ts

@@ -1,4 +1,4 @@
-import { Compile } from "typebox/compile";
-import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
 import { Build, Compile as SchemaCompile } from "typebox/schema";
+import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 export { Build, Check, Clean, Clone, Compile, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec, SchemaCompile };

package/dist/type/typebox-value-ops.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.js');
-let typebox_compile = require("typebox/compile");
-let typebox_value = require("typebox/value");
 let typebox_schema = require("typebox/schema");
+let typebox_value = require("typebox/value");
+let typebox_compile = require("typebox/compile");
 
 Object.defineProperty(exports, 'Build', {
   enumerable: true,

package/dist/type/typebox-value-ops.mjs

@@ -1,6 +1,6 @@
 // @bun
-import { Compile } from "typebox/compile";
-import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
 import { Build, Compile as SchemaCompile } from "typebox/schema";
+import { Check, Clean, Clone, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec } from "typebox/value";
+import { Compile } from "typebox/compile";
 
 export { Build, Check, Clean, Clone, Compile, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec, SchemaCompile };

package/dist/type/typebox-value.d.ts

@@ -1,9 +1,9 @@
-import * as _$typebox_compile0 from "typebox/compile";
-import { Compile as Compile$1 } from "typebox/compile";
+import * as _$typebox_schema0 from "typebox/schema";
+import { Build as Build$1, Compile as Compile$1 } from "typebox/schema";
 import * as _$typebox_value0 from "typebox/value";
 import { Check as Check$1, Clean as Clean$1, Clone as Clone$1, Create as Create$1, Decode as Decode$1, DecodeUnsafe as DecodeUnsafe$1, Default as Default$1, Encode as Encode$1, EncodeUnsafe as EncodeUnsafe$1, Errors as Errors$1, HasCodec as HasCodec$1 } from "typebox/value";
-import * as _$typebox_schema0 from "typebox/schema";
-import { Build as Build$1, Compile as Compile$2 } from "typebox/schema";
+import * as _$typebox_compile0 from "typebox/compile";
+import { Compile as Compile$2 } from "typebox/compile";
 
 //#region src/type/typebox-value.d.ts
 interface TypeboxNamespaces {
@@ -27,9 +27,9 @@ declare let Encode: typeof Encode$1;
 declare let EncodeUnsafe: typeof EncodeUnsafe$1;
 declare let Errors: typeof Errors$1;
 declare let HasCodec: typeof HasCodec$1;
-declare let SchemaCompile: typeof Compile$2;
+declare let SchemaCompile: typeof Compile$1;
 declare let Build: typeof Build$1;
-declare let Compile: typeof Compile$1;
+declare let Compile: typeof Compile$2;
 declare function injectTypebox(typebox: TypeboxNamespaces): void;
 //#endregion
 export { Build, Check, Clean, Clone, Compile, Create, Decode, DecodeUnsafe, Default, Encode, EncodeUnsafe, Errors, HasCodec, SchemaCompile, TypeboxNamespaces, injectTypebox, preloadTypebox, load as warmTypebox };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "2.0.0-beta.24",
+	"version": "2.0.0-beta.26",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",