elysia 2.0.0-beta.21 → 2.0.0-beta.22

package/dist/compile/handler/index.js

@@ -19,62 +19,15 @@ const require_adapter_constants = require('../../adapter/constants.js');
 //#region src/compile/handler/index.ts
 function applyHook(localHook, appHook, rootHook) {
 	let hook;
-	if (localHook && appHook) hook = require_utils.mergeHook(require_utils.cloneHook(localHook), appHook, true);
+	if (localHook && appHook) hook = require_utils.mergeHook(require_utils.cloneHook(localHook), appHook);
 	else {
 		const base = localHook ? require_utils.cloneHook(localHook) : appHook;
 		if (!rootHook) return base;
 		hook = base ?? require_utils.nullObject();
 	}
-	if (rootHook) require_utils.mergeHook(hook, rootHook, true, true);
+	if (rootHook) require_utils.mergeHook(hook, rootHook);
 	return hook;
 }
-function collectHookOrigins(hook, into) {
-	if (!hook) return into;
-	for (const key in hook) {
-		if (!require_utils.eventProperties.has(key)) continue;
-		const v = hook[key];
-		if (!v) continue;
-		if (Array.isArray(v)) for (const fn of v) {
-			const origin = require_utils.fnOrigin.get(fn);
-			if (origin !== void 0) (into ??= /* @__PURE__ */ new Set()).add(origin);
-		}
-		else {
-			const origin = require_utils.fnOrigin.get(v);
-			if (origin !== void 0) (into ??= /* @__PURE__ */ new Set()).add(origin);
-		}
-	}
-	return into;
-}
-function dropHooksByOrigin(hook, skip) {
-	let out = hook;
-	for (const key in hook) {
-		if (!require_utils.eventProperties.has(key)) continue;
-		const v = hook[key];
-		if (!v) continue;
-		if (Array.isArray(v)) {
-			let kept;
-			for (let i = 0; i < v.length; i++) {
-				const fn = v[i];
-				const origin = require_utils.fnOrigin.get(fn);
-				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;
-			}
-		} else {
-			const origin = require_utils.fnOrigin.get(v);
-			if (origin !== void 0 && skip.has(origin)) {
-				if (out === hook) out = { ...hook };
-				out[key] = [];
-			}
-		}
-	}
-	return out;
-}
 function promoteDerive(hook) {
 	const derive = hook.derive;
 	if (derive === void 0) return;
@@ -87,6 +40,12 @@ function promoteDerive(hook) {
 	}
 	hook.derive = void 0;
 }
+function runIntrospect(hook) {
+	const introspects = hook?.["~introspect"];
+	if (!introspects) return;
+	for (let i = 0; i < introspects.length; i++) introspects[i](hook);
+	delete hook["~introspect"];
+}
 function memoScope(memos, root, scope) {
 	let bucket = memos.get(root);
 	if (!bucket || bucket.e !== require_utils.macroEpoch()) {
@@ -136,9 +95,10 @@ function resolveLocalHook(scope, hook, root = scope) {
 }
 function resolveWSLocalHook(scope, hook, root = scope) {
 	const resolved = resolveLocalHook(scope, hook, root);
-	if (!resolved || resolved.derive === void 0) return resolved;
+	if (!resolved || resolved.derive === void 0 && !resolved["~introspect"]) return resolved;
 	const owned = require_utils.cloneHook(resolved);
 	promoteDerive(owned);
+	runIntrospect(owned);
 	return owned;
 }
 const chainNodeMemos = /* @__PURE__ */ new WeakMap();
@@ -165,6 +125,7 @@ function resolveChainNode(root, node) {
 		resolved = require_utils.cloneHook(added);
 		if (needsMacro) applyMacros(resolved, scope, frozenRoot, scopeMacro, rootMacro);
 		promoteDerive(resolved);
+		runIntrospect(resolved);
 		perScope.set(added, resolved);
 	}
 	return resolved;
@@ -191,17 +152,6 @@ function mapStaticValue(response, map, set, value) {
 	if ((typeof body === "string" || typeof body === "number" || typeof body === "boolean") && !mapped.headers.has("content-type")) mapped.headers.set("content-type", "text/plain;charset=utf-8");
 	return mapped;
 }
-function afterUseHooks(node, resolve) {
-	let after;
-	while (node && "combine" in node) {
-		if (node.tail) {
-			const own = require_utils.flattenChain(node.tail, require_utils.isLocalScope, require_utils.rootSnapshot(node.combine), resolve);
-			if (own) after = after ? require_utils.mergeHook(own, after, false, true) : own;
-		}
-		node = node.combine;
-	}
-	return after;
-}
 function buildNativeStaticResponse(route, root) {
 	const [, , handler, instance, localHook, appHook, inheritedChain, macroScope] = route;
 	if (typeof handler === "function" || handler instanceof Error || handler instanceof Promise) return;
@@ -209,20 +159,10 @@ function buildNativeStaticResponse(route, root) {
 	const adapter = frozenRoot["~config"]?.adapter ?? require_adapter_constants.defaultAdapter;
 	const ownedHook = resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root);
 	const resolve = chainResolver(root);
-	const flatAppHook = require_utils.flattenChainMemo(root, appHook, resolve);
-	let rootHook;
-	if (instance !== root) {
-		const locals = require_utils.flattenChain(require_generation.frozenRootOf(root)["~hookChain"], require_utils.isLocalScope, require_utils.rootSnapshot(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);
-		const after = afterUseHooks(inheritedChain, resolve);
-		if (after) rootHook = rootHook ? require_utils.mergeHook(after, rootHook) : after;
-	}
-	const hook = applyHook(ownedHook, flatAppHook, rootHook);
+	const hook = applyHook(ownedHook, require_utils.flattenChainMemo(root, appHook, resolve), instance !== root ? require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0);
 	if (hook && !isEmptyPipelineHook(hook)) return;
-	if (require_handler_utils.returnedErrorClasses(hook, root)?.some((C) => handler instanceof C)) return;
+	const callback = instance !== root ? callbackErrors(inheritedChain, appHook, root, resolve) : void 0;
+	if (require_handler_utils.returnedErrorClasses({ error: withCallbackErrors(hook?.error, callback ?? []) })?.some((C) => handler instanceof C)) return;
 	const rootHeaders = frozenRoot["~ext"]?.headers;
 	if (handler instanceof Response && !rootHeaders) return handler;
 	const response = adapter.response;
@@ -239,44 +179,57 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 		localHook = require_utils.cloneHook(localHook);
 		promoteDerive(localHook);
 	}
-	const flatAppHook = appHook ? require_utils.flattenChainMemo(root, appHook, resolve) : void 0;
-	let locals = instance !== root ? require_utils.flattenChain(require_generation.frozenRootOf(root)["~hookChain"], require_utils.isLocalScope, require_utils.rootSnapshot(inheritedChain), resolve) : void 0;
-	const instanceLocal = instance !== root ? require_utils.flattenChain(instance["~hookChain"], require_utils.isLocalScope) : void 0;
-	const compactPrefix = allowCompactPrefix && instance !== root && !require_compile_aot.Capture.isCapturing() && !require_compile_aot.Capture.isAotBuildEnv() && resolve === void 0 && require_utils.isCompactBeforeHandleOnly(localHook) && require_utils.isCompactBeforeHandleOnly(flatAppHook) && require_utils.isCompactBeforeHandleOnly(locals) && !instanceLocal?.error ? require_utils.compactBeforeHandlePrefix(inheritedChain) : void 0;
-	let present = collectHookOrigins(localHook, void 0);
-	present = collectHookOrigins(flatAppHook, present);
-	if (compactPrefix && !present?.size && !require_utils.compactBeforeHandleConflicts(localHook) && !require_utils.compactBeforeHandleConflicts(flatAppHook) && !require_utils.compactBeforeHandleConflicts(locals)) {
+	const own = require_utils.flattenChainInfo(root, appHook, resolve);
+	let skip;
+	if (own?.installs && instance !== root) {
+		const outer = require_utils.flattenChainInfo(root, inheritedChain, resolve)?.installs;
+		if (outer && !outer.isDisjointFrom(own.installs)) skip = outer;
+	}
+	const flatAppHook = require_utils.flattenChainMemo(root, appHook, resolve, skip);
+	const callback = instance !== root ? callbackErrors(inheritedChain, appHook, root, resolve) : void 0;
+	const compactPrefix = allowCompactPrefix && instance !== root && !require_compile_aot.Capture.isCapturing() && !require_compile_aot.Capture.isAotBuildEnv() && resolve === void 0 && require_utils.isCompactBeforeHandleOnly(localHook) && require_utils.isCompactBeforeHandleOnly(flatAppHook) && !callback ? require_utils.compactBeforeHandlePrefix(inheritedChain) : void 0;
+	if (compactPrefix && !own?.named && !require_utils.compactBeforeHandleConflicts(localHook) && !require_utils.compactBeforeHandleConflicts(flatAppHook)) {
 		let hook = applyHook(localHook, flatAppHook, void 0);
-		if (locals) hook = hook ? require_utils.mergeHook(hook, locals, false, true) : locals;
 		hook ??= require_utils.nullObject();
 		hook["~beforeHandlePrefix"] = compactPrefix;
 		return hook;
 	}
-	let inherited = instance !== root ? require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0;
-	let after = instance !== root ? afterUseHooks(inheritedChain, resolve) : void 0;
-	if ((inherited || after || locals) && (flatAppHook || localHook) && present?.size) {
-		if (inherited) inherited = dropHooksByOrigin(inherited, present);
-		if (after) after = dropHooksByOrigin(after, present);
-		if (locals) locals = dropHooksByOrigin(locals, present);
-	}
+	const inherited = instance !== root ? require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0;
+	const deriveEntries = require_compile_handler_utils.joinDeriveEntries([
+		inherited,
+		flatAppHook,
+		localHook
+	]);
 	let hook = applyHook(localHook, flatAppHook, inherited ? require_utils.cloneHook(inherited) : void 0);
-	if (after) hook = hook ? require_utils.mergeHook(hook, after, false, true) : after;
-	if (locals) hook = hook ? require_utils.mergeHook(hook, locals, false, true) : locals;
-	if (instance !== root) {
-		const errors = instanceLocal?.error;
-		if (errors) {
-			hook ??= require_utils.nullObject();
-			let existing = hook.error;
-			if (existing) {
-				if (!Array.isArray(existing)) existing = hook.error = [existing];
-				if (Array.isArray(errors)) {
-					for (const fn of errors) if (!existing.includes(fn)) existing.push(fn);
-				} else if (!existing.includes(errors)) existing.push(errors);
-			} else hook.error = Array.isArray(errors) ? errors.slice() : [errors];
-		}
+	if (deriveEntries) hook["~deriveEntries"] = deriveEntries;
+	if (callback) {
+		hook ??= require_utils.nullObject();
+		hook.error = withCallbackErrors(hook.error, callback);
 	}
 	return hook;
 }
+/**
+* Error hooks of the `.group()`/`.guard()` callbacks a route came out of
+* innermost first (see `ChainNode`)
+*/
+function callbackErrors(start, appHook, root, resolve) {
+	let out;
+	let outer = null;
+	for (let node = start; node && "combine" in node; node = node.combine) if (node.callback) {
+		if (outer === null) outer = require_utils.flattenChainInfo(root, start, resolve)?.installs;
+		if (!require_utils.flattenChainMemoReadonly(root, node.callback, resolve, outer)?.error) continue;
+		const has = /* @__PURE__ */ new Set();
+		const collect = (n) => {
+			has.add(n.registration ?? n);
+		};
+		require_utils.flattenChain(node.inner, collect);
+		require_utils.flattenChain(appHook, collect);
+		const error = require_utils.flattenChain(node.callback, (n) => has.has(n.registration ?? n) ? void 0 : resolve ? resolve(n) : n.added, outer)?.error;
+		if (error) out = [].concat(error, out ?? []);
+	}
+	return out;
+}
+const withCallbackErrors = (own, callback) => [].concat(own ?? [], callback);
 const shapeEvents = [
 	"parse",
 	"transform",
@@ -396,10 +349,16 @@ function routeShape(hook, handler, root) {
 		config?.abortSignal !== false,
 		require_utils.isNotEmpty(frozenRoot["~ext"]?.headers),
 		!!(config?.adapter ?? require_adapter_constants.defaultAdapter).response.supportsDefaultHeaderSink,
-		!!require_handler_utils.returnedErrorClasses(hook, root)
+		!!require_handler_utils.returnedErrorClasses(hook)
 	]) + shape(config?.sanitize);
 	return unsupported ? void 0 : require_utils.fnv1a(s);
 }
+const throwsOnCall = (error) => () => {
+	throw error;
+};
+const htmlBundleHandler = (method, path) => () => {
+	throw new Error(`[Elysia] ${method} ${path} is an HTML bundle, only Bun's native router serves it`);
+};
 const isBareArrow = /^(?:async\s*)?\(\s*\)\s*=>/;
 const isSucroseOpaque = /arguments|eval|\[native code\]/;
 function compileHandler(route, root, liveOnly = false) {
@@ -421,6 +380,7 @@ function compileHandler(route, root, liveOnly = false) {
 	const hook = composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, !reconstructed);
 	if (hook) {
 		promoteDerive(hook);
+		runIntrospect(hook);
 		toArray("parse", hook);
 		toArray("transform", hook);
 		toArray("beforeHandle", hook);
@@ -428,17 +388,14 @@ function compileHandler(route, root, liveOnly = false) {
 		toArray("mapResponse", hook);
 		toArray("afterResponse", hook);
 		toArray("error", hook);
+		toArray("handler", hook);
 	}
-	const buildValidator = () => hook ? require_compile_handler_reconstruct.Reconstrct.validator(hook, root, method, path, liveOnly) : void 0;
-	const errorClasses = require_handler_utils.returnedErrorClasses(hook, root);
-	if (handler instanceof Error || typeof handler !== "function" && errorClasses?.some((C) => handler instanceof C)) {
-		const error = handler;
-		handler = () => {
-			throw error;
-		};
-	} else if (require_utils.isHTMLBundle(handler)) handler = () => {
-		throw new Error(`[Elysia] ${method} ${path} is an HTML bundle, only Bun's native router serves it`);
-	};
+	const buildValidator = () => hook ? require_compile_handler_reconstruct.Reconstruct.validator(hook, root, method, path, liveOnly) : void 0;
+	const errorClasses = require_handler_utils.returnedErrorClasses(hook);
+	if (handler instanceof Error || typeof handler !== "function" && errorClasses?.some((C) => handler instanceof C)) handler = throwsOnCall(handler);
+	else if (require_utils.isHTMLBundle(handler)) handler = htmlBundleHandler(method, path);
+	const wrappers = hook?.handler;
+	if (wrappers && typeof handler === "function") for (let i = wrappers.length - 1; i >= 0; i--) handler = wrappers[i](handler);
 	const declaresResponse = !!hook && (hook.response != null || !!hook.schemas?.some((schema) => schema?.response));
 	const isHandleFunction = typeof handler === "function";
 	if (!isHandleFunction && !(handler instanceof Promise) && !(!require_universal_constants.isBun && handler instanceof require_universal_file.ElysiaFile) && !declaresResponse) {
@@ -463,7 +420,7 @@ function compileHandler(route, root, liveOnly = false) {
 			try {
 				live = compileHandler(route, root, true);
 			} catch (cause) {
-				throw new Error(require_compile_aot.aotDrift(method, path), { cause });
+				throw new Error(require_compile_aot.aotDriftMessage(method, path), { cause });
 			}
 			require_compile_aot.warnAotDrift(method, path);
 			return live;
@@ -474,9 +431,9 @@ function compileHandler(route, root, liveOnly = false) {
 		parse: adapter.parse,
 		res: adapter.response,
 		hook: hook ?? require_utils.nullObject(),
-		vali: reconstructed.a.includes("va") ? buildValidator() : void 0,
-		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
+		vali: reconstructed.a.some((name) => name === "va" || require_compile_handler_params.isResponseParam(name)) ? buildValidator() : void 0,
+		cookieConfig: reconstructed.a.includes("cc") ? require_compile_handler_reconstruct.Reconstruct.cookie(hook, root) : void 0,
+		tracers: reconstructed.a.includes("tr") ? require_compile_handler_reconstruct.Reconstruct.trace(hook, root) : void 0
 	}));
 	if (hook === void 0 && !errorClasses && isHandleFunction && !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;
@@ -532,7 +489,9 @@ exports.clearHandlerAnalysisCaches = clearHandlerAnalysisCaches;
 exports.compileHandler = compileHandler;
 exports.composeRouteHook = composeRouteHook;
 exports.localMacroRoot = localMacroRoot;
+exports.releaseAnalysisCaches = require_compile_handler_descriptor.releaseAnalysisCaches;
 exports.resolveLocalHook = resolveLocalHook;
 exports.resolveWSLocalHook = resolveWSLocalHook;
 exports.routeShape = routeShape;
+exports.runIntrospect = runIntrospect;
 exports.setCaptureHeaderShorthand = require_compile_handler_jit.setCaptureHeaderShorthand;

package/dist/compile/handler/index.mjs

@@ -1,79 +1,33 @@
+// @bun
 import { isBun } from "../../universal/constants.mjs";
 import { ElysiaFile } from "../../universal/file.mjs";
-import { cloneHook, compactBeforeHandleConflicts, compactBeforeHandlePrefix, compositionKeys, eventProperties, flattenChain, flattenChainMemo, flattenChainMemoReadonly, fnOrigin, fnv1a, isCompactBeforeHandleOnly, isHTMLBundle, isLocalScope, isNotEmpty, macroEpoch, mergeHook, nullObject, refTargets, replaceUrlPath, rootSnapshot } from "../../utils.mjs";
+import { cloneHook, compactBeforeHandleConflicts, compactBeforeHandlePrefix, compositionKeys, flattenChain, flattenChainInfo, flattenChainMemo, flattenChainMemoReadonly, fnv1a, isCompactBeforeHandleOnly, isHTMLBundle, isNotEmpty, macroEpoch, mergeHook, nullObject, refTargets, replaceUrlPath } from "../../utils.mjs";
 import { ElysiaStatus } from "../../error.mjs";
 import { mapResponse } from "../../adapter/web-standard/handler.mjs";
-import { Capture, Compiled, aotDrift, warnAotDrift } from "../aot.mjs";
+import { Capture, Compiled, aotDriftMessage, warnAotDrift } from "../aot.mjs";
 import { frozenRootOf } from "../../generation.mjs";
 import { isAsyncFunction } from "../utils.mjs";
 import { returnedErrorClasses } from "../../handler/utils.mjs";
-import { deriveModes } from "./utils.mjs";
-import { resolveHandlerParams } from "./params.mjs";
+import { deriveModes, joinDeriveEntries } from "./utils.mjs";
+import { isResponseParam, resolveHandlerParams } from "./params.mjs";
 import { compileHandlerJit, createInlineHandler, setCaptureHeaderShorthand } from "./jit.mjs";
 import { isResponseMap } from "./frozen-validator.mjs";
-import { Reconstrct } from "./reconstruct.mjs";
-import { describeRoute, routeDescriptors } from "./descriptor.mjs";
+import { Reconstruct } from "./reconstruct.mjs";
+import { describeRoute, releaseAnalysisCaches, routeDescriptors } from "./descriptor.mjs";
 import { defaultAdapter } from "../../adapter/constants.mjs";
 
 //#region src/compile/handler/index.ts
 function applyHook(localHook, appHook, rootHook) {
 	let hook;
-	if (localHook && appHook) hook = mergeHook(cloneHook(localHook), appHook, true);
+	if (localHook && appHook) hook = mergeHook(cloneHook(localHook), appHook);
 	else {
 		const base = localHook ? cloneHook(localHook) : appHook;
 		if (!rootHook) return base;
 		hook = base ?? nullObject();
 	}
-	if (rootHook) mergeHook(hook, rootHook, true, true);
+	if (rootHook) mergeHook(hook, rootHook);
 	return hook;
 }
-function collectHookOrigins(hook, into) {
-	if (!hook) return into;
-	for (const key in hook) {
-		if (!eventProperties.has(key)) continue;
-		const v = hook[key];
-		if (!v) continue;
-		if (Array.isArray(v)) for (const fn of v) {
-			const origin = fnOrigin.get(fn);
-			if (origin !== void 0) (into ??= /* @__PURE__ */ new Set()).add(origin);
-		}
-		else {
-			const origin = fnOrigin.get(v);
-			if (origin !== void 0) (into ??= /* @__PURE__ */ new Set()).add(origin);
-		}
-	}
-	return into;
-}
-function dropHooksByOrigin(hook, skip) {
-	let out = hook;
-	for (const key in hook) {
-		if (!eventProperties.has(key)) continue;
-		const v = hook[key];
-		if (!v) continue;
-		if (Array.isArray(v)) {
-			let kept;
-			for (let i = 0; i < v.length; i++) {
-				const fn = v[i];
-				const origin = fnOrigin.get(fn);
-				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;
-			}
-		} else {
-			const origin = fnOrigin.get(v);
-			if (origin !== void 0 && skip.has(origin)) {
-				if (out === hook) out = { ...hook };
-				out[key] = [];
-			}
-		}
-	}
-	return out;
-}
 function promoteDerive(hook) {
 	const derive = hook.derive;
 	if (derive === void 0) return;
@@ -86,6 +40,12 @@ function promoteDerive(hook) {
 	}
 	hook.derive = void 0;
 }
+function runIntrospect(hook) {
+	const introspects = hook?.["~introspect"];
+	if (!introspects) return;
+	for (let i = 0; i < introspects.length; i++) introspects[i](hook);
+	delete hook["~introspect"];
+}
 function memoScope(memos, root, scope) {
 	let bucket = memos.get(root);
 	if (!bucket || bucket.e !== macroEpoch()) {
@@ -135,9 +95,10 @@ function resolveLocalHook(scope, hook, root = scope) {
 }
 function resolveWSLocalHook(scope, hook, root = scope) {
 	const resolved = resolveLocalHook(scope, hook, root);
-	if (!resolved || resolved.derive === void 0) return resolved;
+	if (!resolved || resolved.derive === void 0 && !resolved["~introspect"]) return resolved;
 	const owned = cloneHook(resolved);
 	promoteDerive(owned);
+	runIntrospect(owned);
 	return owned;
 }
 const chainNodeMemos = /* @__PURE__ */ new WeakMap();
@@ -164,6 +125,7 @@ function resolveChainNode(root, node) {
 		resolved = cloneHook(added);
 		if (needsMacro) applyMacros(resolved, scope, frozenRoot, scopeMacro, rootMacro);
 		promoteDerive(resolved);
+		runIntrospect(resolved);
 		perScope.set(added, resolved);
 	}
 	return resolved;
@@ -190,17 +152,6 @@ function mapStaticValue(response, map, set, value) {
 	if ((typeof body === "string" || typeof body === "number" || typeof body === "boolean") && !mapped.headers.has("content-type")) mapped.headers.set("content-type", "text/plain;charset=utf-8");
 	return mapped;
 }
-function afterUseHooks(node, resolve) {
-	let after;
-	while (node && "combine" in node) {
-		if (node.tail) {
-			const own = flattenChain(node.tail, isLocalScope, rootSnapshot(node.combine), resolve);
-			if (own) after = after ? mergeHook(own, after, false, true) : own;
-		}
-		node = node.combine;
-	}
-	return after;
-}
 function buildNativeStaticResponse(route, root) {
 	const [, , handler, instance, localHook, appHook, inheritedChain, macroScope] = route;
 	if (typeof handler === "function" || handler instanceof Error || handler instanceof Promise) return;
@@ -208,20 +159,10 @@ function buildNativeStaticResponse(route, root) {
 	const adapter = frozenRoot["~config"]?.adapter ?? defaultAdapter;
 	const ownedHook = resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root);
 	const resolve = chainResolver(root);
-	const flatAppHook = flattenChainMemo(root, appHook, resolve);
-	let rootHook;
-	if (instance !== root) {
-		const locals = flattenChain(frozenRootOf(root)["~hookChain"], isLocalScope, rootSnapshot(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);
-		const after = afterUseHooks(inheritedChain, resolve);
-		if (after) rootHook = rootHook ? mergeHook(after, rootHook) : after;
-	}
-	const hook = applyHook(ownedHook, flatAppHook, rootHook);
+	const hook = applyHook(ownedHook, flattenChainMemo(root, appHook, resolve), instance !== root ? flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0);
 	if (hook && !isEmptyPipelineHook(hook)) return;
-	if (returnedErrorClasses(hook, root)?.some((C) => handler instanceof C)) return;
+	const callback = instance !== root ? callbackErrors(inheritedChain, appHook, root, resolve) : void 0;
+	if (returnedErrorClasses({ error: withCallbackErrors(hook?.error, callback ?? []) })?.some((C) => handler instanceof C)) return;
 	const rootHeaders = frozenRoot["~ext"]?.headers;
 	if (handler instanceof Response && !rootHeaders) return handler;
 	const response = adapter.response;
@@ -238,44 +179,57 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 		localHook = cloneHook(localHook);
 		promoteDerive(localHook);
 	}
-	const flatAppHook = appHook ? flattenChainMemo(root, appHook, resolve) : void 0;
-	let locals = instance !== root ? flattenChain(frozenRootOf(root)["~hookChain"], isLocalScope, rootSnapshot(inheritedChain), resolve) : void 0;
-	const instanceLocal = instance !== root ? flattenChain(instance["~hookChain"], isLocalScope) : void 0;
-	const compactPrefix = allowCompactPrefix && instance !== root && !Capture.isCapturing() && !Capture.isAotBuildEnv() && resolve === void 0 && isCompactBeforeHandleOnly(localHook) && isCompactBeforeHandleOnly(flatAppHook) && isCompactBeforeHandleOnly(locals) && !instanceLocal?.error ? compactBeforeHandlePrefix(inheritedChain) : void 0;
-	let present = collectHookOrigins(localHook, void 0);
-	present = collectHookOrigins(flatAppHook, present);
-	if (compactPrefix && !present?.size && !compactBeforeHandleConflicts(localHook) && !compactBeforeHandleConflicts(flatAppHook) && !compactBeforeHandleConflicts(locals)) {
+	const own = flattenChainInfo(root, appHook, resolve);
+	let skip;
+	if (own?.installs && instance !== root) {
+		const outer = flattenChainInfo(root, inheritedChain, resolve)?.installs;
+		if (outer && !outer.isDisjointFrom(own.installs)) skip = outer;
+	}
+	const flatAppHook = flattenChainMemo(root, appHook, resolve, skip);
+	const callback = instance !== root ? callbackErrors(inheritedChain, appHook, root, resolve) : void 0;
+	const compactPrefix = allowCompactPrefix && instance !== root && !Capture.isCapturing() && !Capture.isAotBuildEnv() && resolve === void 0 && isCompactBeforeHandleOnly(localHook) && isCompactBeforeHandleOnly(flatAppHook) && !callback ? compactBeforeHandlePrefix(inheritedChain) : void 0;
+	if (compactPrefix && !own?.named && !compactBeforeHandleConflicts(localHook) && !compactBeforeHandleConflicts(flatAppHook)) {
 		let hook = applyHook(localHook, flatAppHook, void 0);
-		if (locals) hook = hook ? mergeHook(hook, locals, false, true) : locals;
 		hook ??= nullObject();
 		hook["~beforeHandlePrefix"] = compactPrefix;
 		return hook;
 	}
-	let inherited = instance !== root ? flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0;
-	let after = instance !== root ? afterUseHooks(inheritedChain, resolve) : void 0;
-	if ((inherited || after || locals) && (flatAppHook || localHook) && present?.size) {
-		if (inherited) inherited = dropHooksByOrigin(inherited, present);
-		if (after) after = dropHooksByOrigin(after, present);
-		if (locals) locals = dropHooksByOrigin(locals, present);
-	}
+	const inherited = instance !== root ? flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0;
+	const deriveEntries = joinDeriveEntries([
+		inherited,
+		flatAppHook,
+		localHook
+	]);
 	let hook = applyHook(localHook, flatAppHook, inherited ? cloneHook(inherited) : void 0);
-	if (after) hook = hook ? mergeHook(hook, after, false, true) : after;
-	if (locals) hook = hook ? mergeHook(hook, locals, false, true) : locals;
-	if (instance !== root) {
-		const errors = instanceLocal?.error;
-		if (errors) {
-			hook ??= nullObject();
-			let existing = hook.error;
-			if (existing) {
-				if (!Array.isArray(existing)) existing = hook.error = [existing];
-				if (Array.isArray(errors)) {
-					for (const fn of errors) if (!existing.includes(fn)) existing.push(fn);
-				} else if (!existing.includes(errors)) existing.push(errors);
-			} else hook.error = Array.isArray(errors) ? errors.slice() : [errors];
-		}
+	if (deriveEntries) hook["~deriveEntries"] = deriveEntries;
+	if (callback) {
+		hook ??= nullObject();
+		hook.error = withCallbackErrors(hook.error, callback);
 	}
 	return hook;
 }
+/**
+* Error hooks of the `.group()`/`.guard()` callbacks a route came out of
+* innermost first (see `ChainNode`)
+*/
+function callbackErrors(start, appHook, root, resolve) {
+	let out;
+	let outer = null;
+	for (let node = start; node && "combine" in node; node = node.combine) if (node.callback) {
+		if (outer === null) outer = flattenChainInfo(root, start, resolve)?.installs;
+		if (!flattenChainMemoReadonly(root, node.callback, resolve, outer)?.error) continue;
+		const has = /* @__PURE__ */ new Set();
+		const collect = (n) => {
+			has.add(n.registration ?? n);
+		};
+		flattenChain(node.inner, collect);
+		flattenChain(appHook, collect);
+		const error = flattenChain(node.callback, (n) => has.has(n.registration ?? n) ? void 0 : resolve ? resolve(n) : n.added, outer)?.error;
+		if (error) out = [].concat(error, out ?? []);
+	}
+	return out;
+}
+const withCallbackErrors = (own, callback) => [].concat(own ?? [], callback);
 const shapeEvents = [
 	"parse",
 	"transform",
@@ -395,10 +349,16 @@ function routeShape(hook, handler, root) {
 		config?.abortSignal !== false,
 		isNotEmpty(frozenRoot["~ext"]?.headers),
 		!!(config?.adapter ?? defaultAdapter).response.supportsDefaultHeaderSink,
-		!!returnedErrorClasses(hook, root)
+		!!returnedErrorClasses(hook)
 	]) + shape(config?.sanitize);
 	return unsupported ? void 0 : fnv1a(s);
 }
+const throwsOnCall = (error) => () => {
+	throw error;
+};
+const htmlBundleHandler = (method, path) => () => {
+	throw new Error(`[Elysia] ${method} ${path} is an HTML bundle, only Bun's native router serves it`);
+};
 const isBareArrow = /^(?:async\s*)?\(\s*\)\s*=>/;
 const isSucroseOpaque = /arguments|eval|\[native code\]/;
 function compileHandler(route, root, liveOnly = false) {
@@ -420,6 +380,7 @@ function compileHandler(route, root, liveOnly = false) {
 	const hook = composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, !reconstructed);
 	if (hook) {
 		promoteDerive(hook);
+		runIntrospect(hook);
 		toArray("parse", hook);
 		toArray("transform", hook);
 		toArray("beforeHandle", hook);
@@ -427,17 +388,14 @@ function compileHandler(route, root, liveOnly = false) {
 		toArray("mapResponse", hook);
 		toArray("afterResponse", hook);
 		toArray("error", hook);
+		toArray("handler", hook);
 	}
-	const buildValidator = () => hook ? Reconstrct.validator(hook, root, method, path, liveOnly) : void 0;
-	const errorClasses = returnedErrorClasses(hook, root);
-	if (handler instanceof Error || typeof handler !== "function" && errorClasses?.some((C) => handler instanceof C)) {
-		const error = handler;
-		handler = () => {
-			throw error;
-		};
-	} else if (isHTMLBundle(handler)) handler = () => {
-		throw new Error(`[Elysia] ${method} ${path} is an HTML bundle, only Bun's native router serves it`);
-	};
+	const buildValidator = () => hook ? Reconstruct.validator(hook, root, method, path, liveOnly) : void 0;
+	const errorClasses = returnedErrorClasses(hook);
+	if (handler instanceof Error || typeof handler !== "function" && errorClasses?.some((C) => handler instanceof C)) handler = throwsOnCall(handler);
+	else if (isHTMLBundle(handler)) handler = htmlBundleHandler(method, path);
+	const wrappers = hook?.handler;
+	if (wrappers && typeof handler === "function") for (let i = wrappers.length - 1; i >= 0; i--) handler = wrappers[i](handler);
 	const declaresResponse = !!hook && (hook.response != null || !!hook.schemas?.some((schema) => schema?.response));
 	const isHandleFunction = typeof handler === "function";
 	if (!isHandleFunction && !(handler instanceof Promise) && !(!isBun && handler instanceof ElysiaFile) && !declaresResponse) {
@@ -462,7 +420,7 @@ function compileHandler(route, root, liveOnly = false) {
 			try {
 				live = compileHandler(route, root, true);
 			} catch (cause) {
-				throw new Error(aotDrift(method, path), { cause });
+				throw new Error(aotDriftMessage(method, path), { cause });
 			}
 			warnAotDrift(method, path);
 			return live;
@@ -473,9 +431,9 @@ function compileHandler(route, root, liveOnly = false) {
 		parse: adapter.parse,
 		res: adapter.response,
 		hook: hook ?? nullObject(),
-		vali: reconstructed.a.includes("va") ? buildValidator() : void 0,
-		cookieConfig: reconstructed.a.includes("cc") ? Reconstrct.cookie(hook, root) : void 0,
-		tracers: reconstructed.a.includes("tr") ? Reconstrct.trace(hook, root) : void 0
+		vali: reconstructed.a.some((name) => name === "va" || isResponseParam(name)) ? buildValidator() : void 0,
+		cookieConfig: reconstructed.a.includes("cc") ? Reconstruct.cookie(hook, root) : void 0,
+		tracers: reconstructed.a.includes("tr") ? Reconstruct.trace(hook, root) : void 0
 	}));
 	if (hook === void 0 && !errorClasses && isHandleFunction && !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;
@@ -525,4 +483,4 @@ function compileHandler(route, root, liveOnly = false) {
 }
 
 //#endregion
-export { buildNativeStaticResponse, chainResolver, clearHandlerAnalysisCaches, compileHandler, composeRouteHook, localMacroRoot, resolveLocalHook, resolveWSLocalHook, routeShape, setCaptureHeaderShorthand };
+export { buildNativeStaticResponse, chainResolver, clearHandlerAnalysisCaches, compileHandler, composeRouteHook, localMacroRoot, releaseAnalysisCaches, resolveLocalHook, resolveWSLocalHook, routeShape, runIntrospect, setCaptureHeaderShorthand };