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

package/dist/compile/handler/frozen-validator.js

@@ -9,10 +9,6 @@ const require_validator_index = require('../../validator/index.js');
 
 //#region src/compile/handler/frozen-validator.ts
 const isBridgeNotInitialized = (error) => error instanceof Error && error.message.startsWith("Typebox module isn't initialized");
-function codecCoercionBridgeFree(f, coerced, raw) {
-	return f.k === 1 && !!f.dm && !f.em && !f.ce && f.a !== 1 && !(f.d === 1 && f.ps !== 1) && innerCodecsAligned(f.ic?.length, coerced) && mirrorUnionsAligned(f.u, raw) && mirrorUnionsAligned(f.dm.u, coerced);
-}
-const innerCodecsAligned = (icLength, coerced) => require_compile_aot.reconstruct().collectStringCodecNodes(coerced).length === (icLength ?? 0);
 function mirrorUnionsAligned(u, schema) {
 	if (!u) return true;
 	const branches = require_compile_aot.reconstruct().collectMirrorUnions(schema);
@@ -22,25 +18,13 @@ function mirrorUnionsAligned(u, schema) {
 }
 function isBridgeFreeComplete(f, schema, raw) {
 	if (!f.cm) return false;
-	if (codecCoercionBridgeFree(f, schema, raw)) return true;
+	if (f.k === 1 && !!f.dm && !f.em && !f.ce && f.a !== 1 && !(f.d === 1 && f.ps !== 1) && (f.ic?.length ?? 0) === require_compile_aot.reconstruct().collectStringCodecNodes(schema).length && mirrorUnionsAligned(f.u, raw) && mirrorUnionsAligned(f.dm.u, schema)) return true;
 	if (f.e === 1 || f.u || f.dm || f.em || f.k === 1 || f.ce || f.ic || f.a === 1) return false;
 	if (f.d === 1 && f.ps !== 1) return false;
 	if (require_type_validator_clean_safe.isFullyClosedObject(schema)) return false;
 	return true;
 }
 const EMPTY_EXTERNALS = Object.freeze([]);
-function jsTypeMatches(value, type) {
-	switch (type) {
-		case "string": return typeof value === "string";
-		case "number": return typeof value === "number";
-		case "integer": return typeof value === "number" && Number.isInteger(value);
-		case "boolean": return typeof value === "boolean";
-		case "null": return value === null;
-		case "array": return Array.isArray(value);
-		case "object": return typeof value === "object" && value !== null && !Array.isArray(value);
-		default: return true;
-	}
-}
 const typeError = (schema, instancePath, schemaPath) => ({
 	keyword: "type",
 	schemaPath,
@@ -98,27 +82,34 @@ function walkCompactError(schema, value, instancePath, schemaPath) {
 		}
 		return;
 	}
-	if (typeof type === "string" && !jsTypeMatches(value, type)) return typeError(schema, instancePath, schemaPath);
-}
-function bestEffortCodecError(schema, value) {
-	if (schema?.type === "object" && typeof value === "object" && value !== null && !Array.isArray(value) && schema.properties) for (const key in schema.properties) {
-		if (!(key in value)) continue;
-		if (isCompactDiagnosable(schema.properties[key])) continue;
-		return {
-			keyword: "type",
-			schemaPath: `#/properties/${key}`,
-			instancePath: `/${key}`,
-			params: {},
-			message: `must match ${schema.properties[key]?.["~kind"] ?? "schema"}`
-		};
+	if (typeof type === "string") {
+		let matches;
+		switch (type) {
+			case "string":
+				matches = typeof value === "string";
+				break;
+			case "number":
+				matches = typeof value === "number";
+				break;
+			case "integer":
+				matches = typeof value === "number" && Number.isInteger(value);
+				break;
+			case "boolean":
+				matches = typeof value === "boolean";
+				break;
+			case "null":
+				matches = value === null;
+				break;
+			case "array":
+				matches = Array.isArray(value);
+				break;
+			case "object":
+				matches = typeof value === "object" && value !== null && !Array.isArray(value);
+				break;
+			default: matches = true;
+		}
+		if (!matches) return typeError(schema, instancePath, schemaPath);
 	}
-	return {
-		keyword: "type",
-		schemaPath: "#",
-		instancePath: "",
-		params: {},
-		message: `must match ${schema?.["~kind"] ?? "schema"}`
-	};
 }
 function isCompactDiagnosable(schema) {
 	if (!schema || typeof schema !== "object") return false;
@@ -190,7 +181,28 @@ var FrozenSlotValidator = class {
 	Errors(value) {
 		const hit = walkCompactError(this.schema, value, "", "#");
 		if (hit) return [hit];
-		return [bestEffortCodecError(this.schema, value)];
+		const schema = this.schema;
+		let error;
+		if (schema?.type === "object" && typeof value === "object" && value !== null && !Array.isArray(value) && schema.properties) for (const key in schema.properties) {
+			if (!(key in value)) continue;
+			if (isCompactDiagnosable(schema.properties[key])) continue;
+			error = {
+				keyword: "type",
+				schemaPath: `#/properties/${key}`,
+				instancePath: `/${key}`,
+				params: {},
+				message: `must match ${schema.properties[key]?.["~kind"] ?? "schema"}`
+			};
+			break;
+		}
+		if (!error) error = {
+			keyword: "type",
+			schemaPath: "#",
+			instancePath: "",
+			params: {},
+			message: `must match ${schema?.["~kind"] ?? "schema"}`
+		};
+		return [error];
 	}
 	#error(value, type) {
 		return new require_error.ValidationError(type, value, () => this.Errors(value), this.schema);
@@ -201,15 +213,12 @@ var FrozenSlotValidator = class {
 		if (value === null || typeof value !== "object") return value;
 		return defaults.clone ? defaults.clone() : structuredClone(value);
 	}
-	#applyDefault(value) {
-		return this.#defaultFastPath.merge(value);
-	}
 	From(value, type) {
 		if (this.#hasDefault) {
 			const defaults = this.#defaultFastPath;
 			if (defaults) {
 				if (value === void 0 || value === null && defaults.appliesToNull) value = this.#cloneSharedDefault();
-				else if (value !== null && typeof value === "object" && defaults.merge !== void 0) value = this.#applyDefault(value);
+				else if (value !== null && typeof value === "object" && defaults.merge !== void 0) value = this.#defaultFastPath.merge(value);
 			}
 		}
 		if (this.#hasOptional) {

package/dist/compile/handler/frozen-validator.mjs

@@ -8,10 +8,6 @@ import { StandardValidator } from "../../validator/index.mjs";
 
 //#region src/compile/handler/frozen-validator.ts
 const isBridgeNotInitialized = (error) => error instanceof Error && error.message.startsWith("Typebox module isn't initialized");
-function codecCoercionBridgeFree(f, coerced, raw) {
-	return f.k === 1 && !!f.dm && !f.em && !f.ce && f.a !== 1 && !(f.d === 1 && f.ps !== 1) && innerCodecsAligned(f.ic?.length, coerced) && mirrorUnionsAligned(f.u, raw) && mirrorUnionsAligned(f.dm.u, coerced);
-}
-const innerCodecsAligned = (icLength, coerced) => reconstruct().collectStringCodecNodes(coerced).length === (icLength ?? 0);
 function mirrorUnionsAligned(u, schema) {
 	if (!u) return true;
 	const branches = reconstruct().collectMirrorUnions(schema);
@@ -21,25 +17,13 @@ function mirrorUnionsAligned(u, schema) {
 }
 function isBridgeFreeComplete(f, schema, raw) {
 	if (!f.cm) return false;
-	if (codecCoercionBridgeFree(f, schema, raw)) return true;
+	if (f.k === 1 && !!f.dm && !f.em && !f.ce && f.a !== 1 && !(f.d === 1 && f.ps !== 1) && (f.ic?.length ?? 0) === reconstruct().collectStringCodecNodes(schema).length && mirrorUnionsAligned(f.u, raw) && mirrorUnionsAligned(f.dm.u, schema)) return true;
 	if (f.e === 1 || f.u || f.dm || f.em || f.k === 1 || f.ce || f.ic || f.a === 1) return false;
 	if (f.d === 1 && f.ps !== 1) return false;
 	if (isFullyClosedObject(schema)) return false;
 	return true;
 }
 const EMPTY_EXTERNALS = Object.freeze([]);
-function jsTypeMatches(value, type) {
-	switch (type) {
-		case "string": return typeof value === "string";
-		case "number": return typeof value === "number";
-		case "integer": return typeof value === "number" && Number.isInteger(value);
-		case "boolean": return typeof value === "boolean";
-		case "null": return value === null;
-		case "array": return Array.isArray(value);
-		case "object": return typeof value === "object" && value !== null && !Array.isArray(value);
-		default: return true;
-	}
-}
 const typeError = (schema, instancePath, schemaPath) => ({
 	keyword: "type",
 	schemaPath,
@@ -97,27 +81,34 @@ function walkCompactError(schema, value, instancePath, schemaPath) {
 		}
 		return;
 	}
-	if (typeof type === "string" && !jsTypeMatches(value, type)) return typeError(schema, instancePath, schemaPath);
-}
-function bestEffortCodecError(schema, value) {
-	if (schema?.type === "object" && typeof value === "object" && value !== null && !Array.isArray(value) && schema.properties) for (const key in schema.properties) {
-		if (!(key in value)) continue;
-		if (isCompactDiagnosable(schema.properties[key])) continue;
-		return {
-			keyword: "type",
-			schemaPath: `#/properties/${key}`,
-			instancePath: `/${key}`,
-			params: {},
-			message: `must match ${schema.properties[key]?.["~kind"] ?? "schema"}`
-		};
+	if (typeof type === "string") {
+		let matches;
+		switch (type) {
+			case "string":
+				matches = typeof value === "string";
+				break;
+			case "number":
+				matches = typeof value === "number";
+				break;
+			case "integer":
+				matches = typeof value === "number" && Number.isInteger(value);
+				break;
+			case "boolean":
+				matches = typeof value === "boolean";
+				break;
+			case "null":
+				matches = value === null;
+				break;
+			case "array":
+				matches = Array.isArray(value);
+				break;
+			case "object":
+				matches = typeof value === "object" && value !== null && !Array.isArray(value);
+				break;
+			default: matches = true;
+		}
+		if (!matches) return typeError(schema, instancePath, schemaPath);
 	}
-	return {
-		keyword: "type",
-		schemaPath: "#",
-		instancePath: "",
-		params: {},
-		message: `must match ${schema?.["~kind"] ?? "schema"}`
-	};
 }
 function isCompactDiagnosable(schema) {
 	if (!schema || typeof schema !== "object") return false;
@@ -189,7 +180,28 @@ var FrozenSlotValidator = class {
 	Errors(value) {
 		const hit = walkCompactError(this.schema, value, "", "#");
 		if (hit) return [hit];
-		return [bestEffortCodecError(this.schema, value)];
+		const schema = this.schema;
+		let error;
+		if (schema?.type === "object" && typeof value === "object" && value !== null && !Array.isArray(value) && schema.properties) for (const key in schema.properties) {
+			if (!(key in value)) continue;
+			if (isCompactDiagnosable(schema.properties[key])) continue;
+			error = {
+				keyword: "type",
+				schemaPath: `#/properties/${key}`,
+				instancePath: `/${key}`,
+				params: {},
+				message: `must match ${schema.properties[key]?.["~kind"] ?? "schema"}`
+			};
+			break;
+		}
+		if (!error) error = {
+			keyword: "type",
+			schemaPath: "#",
+			instancePath: "",
+			params: {},
+			message: `must match ${schema?.["~kind"] ?? "schema"}`
+		};
+		return [error];
 	}
 	#error(value, type) {
 		return new ValidationError(type, value, () => this.Errors(value), this.schema);
@@ -200,15 +212,12 @@ var FrozenSlotValidator = class {
 		if (value === null || typeof value !== "object") return value;
 		return defaults.clone ? defaults.clone() : structuredClone(value);
 	}
-	#applyDefault(value) {
-		return this.#defaultFastPath.merge(value);
-	}
 	From(value, type) {
 		if (this.#hasDefault) {
 			const defaults = this.#defaultFastPath;
 			if (defaults) {
 				if (value === void 0 || value === null && defaults.appliesToNull) value = this.#cloneSharedDefault();
-				else if (value !== null && typeof value === "object" && defaults.merge !== void 0) value = this.#applyDefault(value);
+				else if (value !== null && typeof value === "object" && defaults.merge !== void 0) value = this.#defaultFastPath.merge(value);
 			}
 		}
 		if (this.#hasOptional) {

package/dist/compile/handler/index.js

@@ -12,14 +12,6 @@ const require_compile_handler_reconstruct = require('./reconstruct.js');
 const require_adapter_constants = require('../../adapter/constants.js');
 
 //#region src/compile/handler/index.ts
-function resolveMountHandler(meta, path) {
-	const { handle, suffixLen } = meta;
-	const rawRoot = suffixLen ? path.slice(0, path.length - suffixLen) : path;
-	const encRoot = encodeURI(rawRoot);
-	const rawLen = rawRoot.length;
-	const encLen = encRoot.length;
-	return (c) => handle(new Request(require_utils.replaceUrlPath(c.request.url, c.path.slice(c.path.startsWith(encRoot) ? encLen : rawLen) || "/"), c.request));
-}
 function applyHook(localHook, appHook, rootHook, appHookFresh = false) {
 	let hook;
 	if (localHook && appHook) hook = require_utils.mergeHook(require_utils.cloneHook(localHook), appHook, true);
@@ -79,21 +71,6 @@ 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;
-}
 function promoteDerive(hook) {
 	const derive = hook.derive;
 	if (derive === void 0) return;
@@ -204,14 +181,6 @@ function chainResolver(root) {
 	return frozenRoot["~ext"]?.macro || frozenRoot["~scopeChildren"] ? (node) => resolveChainNode(root, node) : void 0;
 }
 const localMacroRoot = (instance, root) => instance !== root && instance["~scopeChild"] === true && require_generation.frozenRootOf(instance)["~ext"]?.macro ? instance : root;
-function composeRootHook(root, inheritedChain) {
-	const resolve = chainResolver(root);
-	const locals = require_utils.flattenChain(require_generation.frozenRootOf(root)["~hookChain"], require_utils.isLocalScope, inheritedChain, resolve);
-	const inherited = locals ? require_utils.flattenChainMemo(root, inheritedChain, resolve) : require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve);
-	if (!inherited) return locals;
-	if (!locals) return inherited;
-	return require_utils.mergeHook(inherited, locals);
-}
 function staticPrimitiveType(response, value) {
 	if ((typeof value === "string" || typeof value === "number" || typeof value === "boolean") && !response.headers.has("content-type")) response.headers.set("content-type", "text/plain;charset=utf-8");
 	return response;
@@ -221,7 +190,18 @@ function buildNativeStaticResponse(route, root) {
 	if (typeof handler === "function" || handler instanceof Error || handler instanceof Promise) return;
 	const frozenRoot = require_generation.frozenRootOf(root);
 	const adapter = frozenRoot["~config"]?.adapter ?? require_adapter_constants.defaultAdapter;
-	const hook = applyHook(resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root), require_utils.flattenChainMemo(root, appHook, chainResolver(root)), instance !== root ? composeRootHook(root, inheritedChain) : void 0, true);
+	const ownedHook = resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root);
+	const flatAppHook = require_utils.flattenChainMemo(root, appHook, chainResolver(root));
+	let rootHook;
+	if (instance !== root) {
+		const resolve = chainResolver(root);
+		const locals = require_utils.flattenChain(require_generation.frozenRootOf(root)["~hookChain"], require_utils.isLocalScope, inheritedChain, resolve);
+		const inherited = locals ? require_utils.flattenChainMemo(root, inheritedChain, resolve) : require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve);
+		if (!inherited) rootHook = locals;
+		else if (!locals) rootHook = inherited;
+		else rootHook = require_utils.mergeHook(inherited, locals);
+	} else rootHook = void 0;
+	const hook = applyHook(ownedHook, flatAppHook, rootHook, true);
 	if (hook && !require_compile_handler_descriptor.isEmptyPipelineHook(hook)) return;
 	const rootHeaders = frozenRoot["~ext"]?.headers;
 	if (handler instanceof Response && !rootHeaders) return handler;
@@ -278,28 +258,48 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 }
 const isBareArrow = /^(?:async\s*)?\(\s*\)\s*=>/;
 const isSucroseOpaque = /arguments|eval|\[native code\]/;
-function isContextFreeHandler(handler) {
-	if (Object.hasOwn(handler, "toString")) return false;
-	const source = Function.prototype.toString.call(handler);
-	return isBareArrow.test(source) && !isSucroseOpaque.test(source);
-}
 function compileHandler(route, root, precomputedStatic, liveOnly = false) {
 	let [_method, path, handler, instance, localHook, appHook, inheritedChain, macroScope] = route;
 	const frozenRoot = require_generation.frozenRootOf(root);
 	const adapter = frozenRoot["~config"]?.adapter ?? require_adapter_constants.defaultAdapter;
 	const method = _method;
 	const mountMeta = typeof handler === "function" ? handler["~mount"] : void 0;
-	if (mountMeta) handler = resolveMountHandler(mountMeta, path);
+	if (mountMeta) {
+		const { handle, suffixLen } = mountMeta;
+		const rawRoot = suffixLen ? path.slice(0, path.length - suffixLen) : path;
+		const encRoot = encodeURI(rawRoot);
+		const rawLen = rawRoot.length;
+		const encLen = encRoot.length;
+		handler = (c) => handle(new Request(require_utils.replaceUrlPath(c.request.url, c.path.slice(c.path.startsWith(encRoot) ? encLen : rawLen) || "/"), c.request));
+	}
 	const reconstructed = liveOnly ? void 0 : require_compile_aot.Compiled.getHandler(frozenRoot["~programId"], method, path);
-	if (reconstructed && !precomputedStatic && typeof handler === "function" && !frozenRoot["~ext"]?.macro && !require_generation.frozenRootOf(localMacroRoot(macroScope ?? instance, root))["~ext"]?.macro && !reconstructNeedsHookState(reconstructed.a)) return reconstructed.f(handler, ...require_compile_handler_params.resolveHandlerParams(reconstructed.a, {
-		root,
-		parse: adapter.parse,
-		res: adapter.response,
-		hook: require_utils.nullObject(),
-		vali: void 0,
-		cookieConfig: void 0,
-		tracers: void 0
-	}));
+	if (reconstructed && !precomputedStatic && typeof handler === "function" && !frozenRoot["~ext"]?.macro && !require_generation.frozenRootOf(localMacroRoot(macroScope ?? instance, root))["~ext"]?.macro) {
+		let needsHookState = false;
+		const names = reconstructed.a;
+		hookState: 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":
+				needsHookState = true;
+				break hookState;
+		}
+		if (!needsHookState) return reconstructed.f(handler, ...require_compile_handler_params.resolveHandlerParams(reconstructed.a, {
+			root,
+			parse: adapter.parse,
+			res: adapter.response,
+			hook: require_utils.nullObject(),
+			vali: void 0,
+			cookieConfig: void 0,
+			tracers: void 0
+		}));
+	}
 	const hook = composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, !reconstructed);
 	if (hook) {
 		promoteDerive(hook);
@@ -345,9 +345,16 @@ function compileHandler(route, root, precomputedStatic, liveOnly = false) {
 		cookieConfig: reconstructed.a.includes("cc") ? require_compile_handler_reconstruct.Reconstrct.cookie(hook, root) : void 0,
 		tracers: reconstructed.a.includes("tr") ? require_compile_handler_reconstruct.Reconstrct.trace(hook, root) : void 0
 	}));
-	if (hook === void 0 && isHandleFunction && !precomputedStatic && !mountMeta && (method === "GET" || method === "HEAD") && !root["~hasTrace"] && root["~introspect"] !== true && root["~config"]?.introspect !== true && !require_utils.isNotEmpty(frozenRoot["~ext"]?.headers) && !require_compile_aot.Capture.isAotBuildEnv() && !require_compile_aot.Capture.isCapturing() && isContextFreeHandler(handler)) {
-		const compact = adapter.response.compact;
-		if (compact) return require_compile_handler_jit.createInlineHandler(compact, handler);
+	if (hook === void 0 && isHandleFunction && !precomputedStatic && !mountMeta && (method === "GET" || method === "HEAD") && !root["~hasTrace"] && root["~introspect"] !== true && root["~config"]?.introspect !== true && !require_utils.isNotEmpty(frozenRoot["~ext"]?.headers) && !require_compile_aot.Capture.isAotBuildEnv() && !require_compile_aot.Capture.isCapturing()) {
+		let isContextFree = false;
+		if (!Object.hasOwn(handler, "toString")) {
+			const source = Function.prototype.toString.call(handler);
+			isContextFree = isBareArrow.test(source) && !isSucroseOpaque.test(source);
+		}
+		if (isContextFree) {
+			const compact = adapter.response.compact;
+			if (compact) return require_compile_handler_jit.createInlineHandler(compact, handler);
+		}
 	}
 	const state = require_compile_handler_descriptor.describeRoute({
 		method,

package/dist/compile/handler/index.mjs

@@ -11,14 +11,6 @@ import { Reconstrct } from "./reconstruct.mjs";
 import { defaultAdapter } from "../../adapter/constants.mjs";
 
 //#region src/compile/handler/index.ts
-function resolveMountHandler(meta, path) {
-	const { handle, suffixLen } = meta;
-	const rawRoot = suffixLen ? path.slice(0, path.length - suffixLen) : path;
-	const encRoot = encodeURI(rawRoot);
-	const rawLen = rawRoot.length;
-	const encLen = encRoot.length;
-	return (c) => handle(new Request(replaceUrlPath(c.request.url, c.path.slice(c.path.startsWith(encRoot) ? encLen : rawLen) || "/"), c.request));
-}
 function applyHook(localHook, appHook, rootHook, appHookFresh = false) {
 	let hook;
 	if (localHook && appHook) hook = mergeHook(cloneHook(localHook), appHook, true);
@@ -78,21 +70,6 @@ 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;
-}
 function promoteDerive(hook) {
 	const derive = hook.derive;
 	if (derive === void 0) return;
@@ -203,14 +180,6 @@ function chainResolver(root) {
 	return frozenRoot["~ext"]?.macro || frozenRoot["~scopeChildren"] ? (node) => resolveChainNode(root, node) : void 0;
 }
 const localMacroRoot = (instance, root) => instance !== root && instance["~scopeChild"] === true && frozenRootOf(instance)["~ext"]?.macro ? instance : root;
-function composeRootHook(root, inheritedChain) {
-	const resolve = chainResolver(root);
-	const locals = flattenChain(frozenRootOf(root)["~hookChain"], isLocalScope, inheritedChain, resolve);
-	const inherited = locals ? flattenChainMemo(root, inheritedChain, resolve) : flattenChainMemoReadonly(root, inheritedChain, resolve);
-	if (!inherited) return locals;
-	if (!locals) return inherited;
-	return mergeHook(inherited, locals);
-}
 function staticPrimitiveType(response, value) {
 	if ((typeof value === "string" || typeof value === "number" || typeof value === "boolean") && !response.headers.has("content-type")) response.headers.set("content-type", "text/plain;charset=utf-8");
 	return response;
@@ -220,7 +189,18 @@ function buildNativeStaticResponse(route, root) {
 	if (typeof handler === "function" || handler instanceof Error || handler instanceof Promise) return;
 	const frozenRoot = frozenRootOf(root);
 	const adapter = frozenRoot["~config"]?.adapter ?? defaultAdapter;
-	const hook = applyHook(resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root), flattenChainMemo(root, appHook, chainResolver(root)), instance !== root ? composeRootHook(root, inheritedChain) : void 0, true);
+	const ownedHook = resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root);
+	const flatAppHook = flattenChainMemo(root, appHook, chainResolver(root));
+	let rootHook;
+	if (instance !== root) {
+		const resolve = chainResolver(root);
+		const locals = flattenChain(frozenRootOf(root)["~hookChain"], isLocalScope, inheritedChain, resolve);
+		const inherited = locals ? flattenChainMemo(root, inheritedChain, resolve) : flattenChainMemoReadonly(root, inheritedChain, resolve);
+		if (!inherited) rootHook = locals;
+		else if (!locals) rootHook = inherited;
+		else rootHook = mergeHook(inherited, locals);
+	} else rootHook = void 0;
+	const hook = applyHook(ownedHook, flatAppHook, rootHook, true);
 	if (hook && !isEmptyPipelineHook(hook)) return;
 	const rootHeaders = frozenRoot["~ext"]?.headers;
 	if (handler instanceof Response && !rootHeaders) return handler;
@@ -277,28 +257,48 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 }
 const isBareArrow = /^(?:async\s*)?\(\s*\)\s*=>/;
 const isSucroseOpaque = /arguments|eval|\[native code\]/;
-function isContextFreeHandler(handler) {
-	if (Object.hasOwn(handler, "toString")) return false;
-	const source = Function.prototype.toString.call(handler);
-	return isBareArrow.test(source) && !isSucroseOpaque.test(source);
-}
 function compileHandler(route, root, precomputedStatic, liveOnly = false) {
 	let [_method, path, handler, instance, localHook, appHook, inheritedChain, macroScope] = route;
 	const frozenRoot = frozenRootOf(root);
 	const adapter = frozenRoot["~config"]?.adapter ?? defaultAdapter;
 	const method = _method;
 	const mountMeta = typeof handler === "function" ? handler["~mount"] : void 0;
-	if (mountMeta) handler = resolveMountHandler(mountMeta, path);
+	if (mountMeta) {
+		const { handle, suffixLen } = mountMeta;
+		const rawRoot = suffixLen ? path.slice(0, path.length - suffixLen) : path;
+		const encRoot = encodeURI(rawRoot);
+		const rawLen = rawRoot.length;
+		const encLen = encRoot.length;
+		handler = (c) => handle(new Request(replaceUrlPath(c.request.url, c.path.slice(c.path.startsWith(encRoot) ? encLen : rawLen) || "/"), c.request));
+	}
 	const reconstructed = liveOnly ? void 0 : Compiled.getHandler(frozenRoot["~programId"], method, path);
-	if (reconstructed && !precomputedStatic && typeof handler === "function" && !frozenRoot["~ext"]?.macro && !frozenRootOf(localMacroRoot(macroScope ?? instance, root))["~ext"]?.macro && !reconstructNeedsHookState(reconstructed.a)) return reconstructed.f(handler, ...resolveHandlerParams(reconstructed.a, {
-		root,
-		parse: adapter.parse,
-		res: adapter.response,
-		hook: nullObject(),
-		vali: void 0,
-		cookieConfig: void 0,
-		tracers: void 0
-	}));
+	if (reconstructed && !precomputedStatic && typeof handler === "function" && !frozenRoot["~ext"]?.macro && !frozenRootOf(localMacroRoot(macroScope ?? instance, root))["~ext"]?.macro) {
+		let needsHookState = false;
+		const names = reconstructed.a;
+		hookState: 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":
+				needsHookState = true;
+				break hookState;
+		}
+		if (!needsHookState) return reconstructed.f(handler, ...resolveHandlerParams(reconstructed.a, {
+			root,
+			parse: adapter.parse,
+			res: adapter.response,
+			hook: nullObject(),
+			vali: void 0,
+			cookieConfig: void 0,
+			tracers: void 0
+		}));
+	}
 	const hook = composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, !reconstructed);
 	if (hook) {
 		promoteDerive(hook);
@@ -344,9 +344,16 @@ function compileHandler(route, root, precomputedStatic, liveOnly = false) {
 		cookieConfig: reconstructed.a.includes("cc") ? Reconstrct.cookie(hook, root) : void 0,
 		tracers: reconstructed.a.includes("tr") ? Reconstrct.trace(hook, root) : void 0
 	}));
-	if (hook === void 0 && isHandleFunction && !precomputedStatic && !mountMeta && (method === "GET" || method === "HEAD") && !root["~hasTrace"] && root["~introspect"] !== true && root["~config"]?.introspect !== true && !isNotEmpty(frozenRoot["~ext"]?.headers) && !Capture.isAotBuildEnv() && !Capture.isCapturing() && isContextFreeHandler(handler)) {
-		const compact = adapter.response.compact;
-		if (compact) return createInlineHandler(compact, handler);
+	if (hook === void 0 && isHandleFunction && !precomputedStatic && !mountMeta && (method === "GET" || method === "HEAD") && !root["~hasTrace"] && root["~introspect"] !== true && root["~config"]?.introspect !== true && !isNotEmpty(frozenRoot["~ext"]?.headers) && !Capture.isAotBuildEnv() && !Capture.isCapturing()) {
+		let isContextFree = false;
+		if (!Object.hasOwn(handler, "toString")) {
+			const source = Function.prototype.toString.call(handler);
+			isContextFree = isBareArrow.test(source) && !isSucroseOpaque.test(source);
+		}
+		if (isContextFree) {
+			const compact = adapter.response.compact;
+			if (compact) return createInlineHandler(compact, handler);
+		}
 	}
 	const state = describeRoute({
 		method,