elysia 2.0.0-beta.19 → 2.0.0-beta.20

package/dist/adapter/web-standard/handler.js

@@ -23,6 +23,7 @@ function handleElysiaFile(file, set = { headers: require_utils.nullObject() }, r
 	return require_adapter_utils.handleFile(file.value, set, request);
 }
 function responseTag(response) {
+	if (typeof response === "string") return "String";
 	if (response == null) return;
 	const constructor = Object.getPrototypeOf(response)?.constructor;
 	if (typeof constructor !== "function") return typeof response.next === "function" ? "" : void 0;

package/dist/adapter/web-standard/handler.mjs

@@ -22,6 +22,7 @@ function handleElysiaFile(file, set = { headers: nullObject() }, request) {
 	return handleFile(file.value, set, request);
 }
 function responseTag(response) {
+	if (typeof response === "string") return "String";
 	if (response == null) return;
 	const constructor = Object.getPrototypeOf(response)?.constructor;
 	if (typeof constructor !== "function") return typeof response.next === "function" ? "" : void 0;

package/dist/base.d.ts

@@ -4,7 +4,7 @@ import { ChainNode } from "./utils.js";
 import { ListenCallback, Serve, Server } from "./universal/server.js";
 import { Context, ErrorContext, LifecycleContext } from "./context.js";
 import { TraceCapability, TraceHandler } from "./trace.js";
-import { AddRoute, AddWSRoute, AfterHandler, AfterResponseHandler, AnyErrorConstructor, AnyLocalHook, BodyHandler, CompiledHandler, CreateEden, DefaultEphemeral, DefaultMetadata, DefaultSingleton, DefinitionBase, ElysiaConfig, ElysiaHandlerToResponseSchemaAmbiguous, EphemeralType, ErrorDefinitionEntry, ErrorHandler, EventScope, ExcludeElysiaResponse, ExtractErrorFromHandle, GlobalHookReturn, GracefulHandler, GuardHookSingleton, GuardLocalHook, HTTPMethod, HistoryEntry, HookContextSchema, HookContextSingleton, InlineHandler, InlineHandlerNonMacro, InputSchema, InputSchemaKey, InternalRoute, IntersectIfObjectSchema, JoinPath, LocalHook, LocalHookReturn, Macro, MacroToContext, MacroToProperty, MapResponse, MaybeArray, MaybePromise, MergeElysiaInstances, MergeSchema, MergeScopedSchemas, MetadataBase, ObjectMacroDefs, OptionalHandler, PluginHookReturn, PreHandler, Prettify, PublicRoute, ResolveRouteErrors, RouteBase, ScopedHookReturn, ScopedMapDeriveReturn, SingletonBase, StaticMapAliases, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
+import { AddRoute, AddWSRoute, AfterHandler, AfterResponseHandler, AnyErrorConstructor, AnyLocalHook, BodyHandler, CompiledHandler, CreateEden, DefaultEphemeral, DefaultMetadata, DefaultSingleton, DefinitionBase, ElysiaConfig, ElysiaHandlerToResponseSchemaAmbiguous, EphemeralType, ErrorDefinitionEntry, ErrorHandler, EventScope, ExcludeElysiaResponse, ExtractErrorFromHandle, GlobalHookReturn, GracefulHandler, GuardHookSingleton, GuardLocalHook, HTTPMethod, HistoryEntry, HookContextSchema, HookContextSingleton, InlineHandler, InlineHandlerNonMacro, InputSchema, InputSchemaKey, InternalRoute, IntersectIfObjectSchema, JoinPath, LocalHook, LocalHookReturn, Macro, MacroToContext, MacroToProperty, MapResponse, MaybeArray, MaybePromise, MergeElysiaInstances, MergeSchema, MergeScopedSchemas, MetadataBase, ObjectMacroDefs, OptionalHandler, ParentResponse, PluginHookReturn, PreHandler, Prettify, PublicRoute, ResolveRouteErrors, ResolveUsedRouteErrors, RouteBase, ScopedHookReturn, ScopedMapDeriveReturn, SingletonBase, StaticMapAliases, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
 import { AotFingerprint, CompilerSession, ProgramId } from "./compile/aot.js";
 import { WSCapability, WSHandlerResponse, WSLocalHook, WSMessageHandler, WSOptions, WSOptionsEntry } from "./ws/types.js";
 import { RouteTable } from "./route-table.js";
@@ -583,7 +583,7 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   }, {
     typebox: Definitions['typebox'] & NewElysia['~Definitions']['typebox'];
     error: [...Definitions['error'], ...NewElysia['~Definitions']['error']];
-  }, Metadata & NewElysia['~Metadata'], BasePath extends `` ? ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & ResolveRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']]> : ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & CreateEden<BasePath, ResolveRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']]>>, Ephemeral, {
+  }, Metadata & NewElysia['~Metadata'], BasePath extends `` ? ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & ResolveUsedRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']], ParentResponse<Metadata, Ephemeral, Volatile>> : ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & CreateEden<BasePath, ResolveUsedRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']], ParentResponse<Metadata, Ephemeral, Volatile>>>, Ephemeral, {
     derive: Volatile['derive'] & NewElysia['~Ephemeral']['derive'];
     schema: Volatile['schema'] & NewElysia['~Ephemeral']['schema'];
     schemas: Volatile['schemas'] & NewElysia['~Ephemeral']['schemas'];
@@ -629,7 +629,7 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   }, {
     typebox: Definitions['typebox'] & NewElysia['~Definitions']['typebox'];
     error: [...Definitions['error'], ...NewElysia['~Definitions']['error']];
-  }, Metadata & NewElysia['~Metadata'], BasePath extends `` ? ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & ResolveRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']]> : ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & CreateEden<BasePath, ResolveRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']]>>, Ephemeral, {
+  }, Metadata & NewElysia['~Metadata'], BasePath extends `` ? ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & ResolveUsedRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']], ParentResponse<Metadata, Ephemeral, Volatile>> : ResolveRouteErrors<Routes, [...NewElysia['~Definitions']['error'], ...NewElysia['~Ephemeral']['error']]> & CreateEden<BasePath, ResolveUsedRouteErrors<NewElysia['~Routes'], [...Definitions['error'], ...Ephemeral['error'], ...Volatile['error']], ParentResponse<Metadata, Ephemeral, Volatile>>>, Ephemeral, {
     derive: Volatile['derive'] & Partial<NewElysia['~Ephemeral']['derive']>;
     schema: Volatile['schema'] & NewElysia['~Ephemeral']['schema'];
     schemas: Volatile['schemas'] & NewElysia['~Ephemeral']['schemas'];

package/dist/base.js

@@ -415,7 +415,7 @@ var Elysia = class Elysia {
 				if (scopeOrFnOrError && typeof scopeOrFnOrError === "object") return this;
 				return this.#onBranch("error", scopeOrFnOrError);
 			case 2:
-				if (typeof scopeOrFnOrError === "function" && (scopeOrFnOrError === Error || scopeOrFnOrError.prototype instanceof Error)) return this.#errorClass(scopeOrFnOrError, fnOrError);
+				if (typeof scopeOrFnOrError === "function" && scopeOrFnOrError.prototype instanceof Object) return this.#errorClass(scopeOrFnOrError, fnOrError);
 				return this.#onBranch("error", scopeOrFnOrError, fnOrError);
 			case 3: return this.#errorClass(fnOrError, fn, scopeOrFnOrError);
 		}
@@ -915,13 +915,40 @@ var Elysia = class Elysia {
 	#emitChildRoutes(app, preChain, name) {
 		const declared = app.declaredRoutes;
 		const limit = declared.length;
+		const tail = app["~hookChain"];
+		let recent;
+		let hasLocal = false;
 		let lastChildChain;
 		let lastCombined;
+		let lastTailChild = null;
+		let lastTailCombined;
 		for (let i = 0; i < limit; i++) {
 			const route = declared[i];
 			const childChain = route[6];
+			const absorbed = tail !== void 0 && route[3] !== app;
+			if (absorbed && recent === void 0) {
+				recent = /* @__PURE__ */ new Set();
+				for (let node = tail; node && "added" in node; node = node.parent) {
+					recent.add(node);
+					if (require_utils.isLocalScope(node.scope)) {
+						hasLocal = true;
+						break;
+					}
+				}
+			}
 			let inheritedChain;
-			if (childChain === void 0) inheritedChain = preChain;
+			if (absorbed && hasLocal && !recent.has(require_utils.rootSnapshot(childChain))) {
+				if (childChain !== lastTailChild) {
+					lastTailChild = childChain;
+					lastTailCombined = {
+						combine: childChain,
+						over: preChain,
+						tail,
+						refs: !!(childChain?.refs || preChain?.refs || tail.refs)
+					};
+				}
+				inheritedChain = lastTailCombined;
+			} else if (childChain === void 0) inheritedChain = preChain;
 			else if (preChain === void 0) inheritedChain = childChain;
 			else if (childChain === lastChildChain) inheritedChain = lastCombined;
 			else {
@@ -1372,7 +1399,7 @@ var Elysia = class Elysia {
 				if (Elysia.#hookHasTypeBox(resolve ? resolve(node) : node.added, models)) return true;
 				node = node.parent;
 			} else {
-				if (Elysia.#chainHasTypeBox(node.combine, models, seen, resolve)) return true;
+				if (Elysia.#chainHasTypeBox(node.combine, models, seen, resolve) || Elysia.#chainHasTypeBox(node.tail, models, seen, resolve)) return true;
 				node = node.over;
 			}
 		}

package/dist/base.mjs

@@ -1,5 +1,5 @@
 import { isBun } from "./universal/constants.mjs";
-import { clearFlattenChainMemo, clonePlainDecorators, clonePlainDeep, coalesceSchemas, createErrorEventHandler, eventProperties, fnOrigin, fnv1a, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isEmpty, isHTMLBundle, isNotEmpty, isPlainObject, isRecordNumber, joinPath, macroOrigin, mapDeriveEntry, markSingletons, mergeDeep, mergeResponse, nullObject, pushField, schemaProperties, serializeMacroSeed, throwLifecycleErrors } from "./utils.mjs";
+import { clearFlattenChainMemo, clonePlainDecorators, clonePlainDeep, coalesceSchemas, createErrorEventHandler, eventProperties, fnOrigin, fnv1a, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isEmpty, isHTMLBundle, isLocalScope, isNotEmpty, isPlainObject, isRecordNumber, joinPath, macroOrigin, mapDeriveEntry, markSingletons, mergeDeep, mergeResponse, nullObject, pushField, rootSnapshot, schemaProperties, serializeMacroSeed, throwLifecycleErrors } from "./utils.mjs";
 import { Ref, warmTypebox } from "./type/bridge.mjs";
 import { isProduction } from "./universal/is-production.mjs";
 import { Capture, Compiled, beginCompilerSession, createAotFingerprint, endCompilerSession } from "./compile/aot.mjs";
@@ -412,7 +412,7 @@ var Elysia = class Elysia {
 				if (scopeOrFnOrError && typeof scopeOrFnOrError === "object") return this;
 				return this.#onBranch("error", scopeOrFnOrError);
 			case 2:
-				if (typeof scopeOrFnOrError === "function" && (scopeOrFnOrError === Error || scopeOrFnOrError.prototype instanceof Error)) return this.#errorClass(scopeOrFnOrError, fnOrError);
+				if (typeof scopeOrFnOrError === "function" && scopeOrFnOrError.prototype instanceof Object) return this.#errorClass(scopeOrFnOrError, fnOrError);
 				return this.#onBranch("error", scopeOrFnOrError, fnOrError);
 			case 3: return this.#errorClass(fnOrError, fn, scopeOrFnOrError);
 		}
@@ -912,13 +912,40 @@ var Elysia = class Elysia {
 	#emitChildRoutes(app, preChain, name) {
 		const declared = app.declaredRoutes;
 		const limit = declared.length;
+		const tail = app["~hookChain"];
+		let recent;
+		let hasLocal = false;
 		let lastChildChain;
 		let lastCombined;
+		let lastTailChild = null;
+		let lastTailCombined;
 		for (let i = 0; i < limit; i++) {
 			const route = declared[i];
 			const childChain = route[6];
+			const absorbed = tail !== void 0 && route[3] !== app;
+			if (absorbed && recent === void 0) {
+				recent = /* @__PURE__ */ new Set();
+				for (let node = tail; node && "added" in node; node = node.parent) {
+					recent.add(node);
+					if (isLocalScope(node.scope)) {
+						hasLocal = true;
+						break;
+					}
+				}
+			}
 			let inheritedChain;
-			if (childChain === void 0) inheritedChain = preChain;
+			if (absorbed && hasLocal && !recent.has(rootSnapshot(childChain))) {
+				if (childChain !== lastTailChild) {
+					lastTailChild = childChain;
+					lastTailCombined = {
+						combine: childChain,
+						over: preChain,
+						tail,
+						refs: !!(childChain?.refs || preChain?.refs || tail.refs)
+					};
+				}
+				inheritedChain = lastTailCombined;
+			} else if (childChain === void 0) inheritedChain = preChain;
 			else if (preChain === void 0) inheritedChain = childChain;
 			else if (childChain === lastChildChain) inheritedChain = lastCombined;
 			else {
@@ -1369,7 +1396,7 @@ var Elysia = class Elysia {
 				if (Elysia.#hookHasTypeBox(resolve ? resolve(node) : node.added, models)) return true;
 				node = node.parent;
 			} else {
-				if (Elysia.#chainHasTypeBox(node.combine, models, seen, resolve)) return true;
+				if (Elysia.#chainHasTypeBox(node.combine, models, seen, resolve) || Elysia.#chainHasTypeBox(node.tail, models, seen, resolve)) return true;
 				node = node.over;
 			}
 		}

package/dist/compile/aot-capture.js

@@ -3,9 +3,9 @@ const require_runtime = require('../_virtual/_rolldown/runtime.js');
 const require_utils = require('../utils.js');
 const require_universal_env = require('../universal/env.js');
 const require_compile_aot = require('./aot.js');
-const require_type_elysia_file_type = require('../type/elysia/file-type.js');
 const require_compile_handler_frozen_validator = require('./handler/frozen-validator.js');
 const require_type_coerce = require('../type/coerce.js');
+const require_type_elysia_file_type = require('../type/elysia/file-type.js');
 const require_type_validator_default_precompute = require('../type/validator/default-precompute.js');
 const require_compile_aot_reconstruct = require('./aot-reconstruct.js');
 const require_compile_aot_emit = require('./aot-emit.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) {
@@ -172,7 +172,7 @@ function captureMirror(schema, aot, slot, sanitize) {
 	if (!createMirror) return;
 	try {
 		const emitted = createMirror(schema, {
-			Compile: typebox_schema.Compile,
+			Compile: require_type_validator_string_codec_aot.compileWithBuild,
 			sanitize,
 			emit: true
 		});
@@ -204,7 +204,7 @@ function captureCodecMirror(schema, aot, slot, sanitize, dir) {
 	const dirOpt = dir === "decode" ? { decode: true } : { encode: true };
 	try {
 		const emitted = createMirror(schema, {
-			Compile: typebox_schema.Compile,
+			Compile: require_type_validator_string_codec_aot.compileWithBuild,
 			sanitize,
 			...dirOpt,
 			emit: true

package/dist/compile/aot-capture.mjs

@@ -1,18 +1,18 @@
 import { nullObject } from "../utils.mjs";
 import { env } from "../universal/env.mjs";
 import { Capture, CompilerState, aotActivationError, captureImpl, setCaptureImpl } from "./aot.mjs";
-import { isAsyncPredicate } from "../type/elysia/file-type.mjs";
 import { isCapturedBridgeFree, isCompactWalkable } from "./handler/frozen-validator.mjs";
 import { buildCoercedFromPlan, captureCoercePlan } from "../type/coerce.mjs";
+import { isAsyncPredicate } from "../type/elysia/file-type.mjs";
 import { applyPrecomputed, buildDefaultClonerSource, buildObjectDefaultMergeSource, canonical, createMergerFromSource, setDefaultProbeImpl, verifyPreallocatableDefault } from "../type/validator/default-precompute.mjs";
 import { collectExternals } from "./aot-reconstruct.mjs";
 import { captureMirrorCodecs, captureMirrorUnions, installReconstructImpl } from "./aot-emit.mjs";
 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 } from "../type/validator/string-codec-aot.mjs";
-import { Default } from "typebox/value";
+import { captureStringCodecEntries, compileWithBuild } from "../type/validator/string-codec-aot.mjs";
 import { Build, Compile } from "typebox/schema";
+import { Default } from "typebox/value";
 
 //#region src/compile/aot-capture.ts
 function emptyContainers(node, depth) {
@@ -170,7 +170,7 @@ function captureMirror(schema, aot, slot, sanitize) {
 	if (!createMirror) return;
 	try {
 		const emitted = createMirror(schema, {
-			Compile,
+			Compile: compileWithBuild,
 			sanitize,
 			emit: true
 		});
@@ -202,7 +202,7 @@ function captureCodecMirror(schema, aot, slot, sanitize, dir) {
 	const dirOpt = dir === "decode" ? { decode: true } : { encode: true };
 	try {
 		const emitted = createMirror(schema, {
-			Compile,
+			Compile: compileWithBuild,
 			sanitize,
 			...dirOpt,
 			emit: true

package/dist/compile/aot-emit.d.ts

@@ -6,6 +6,14 @@ declare function reconstructCheck(build: CheckBuildResult): {
   value: string;
 };
 declare function externalsMatch(a: unknown[], b: unknown[]): boolean;
+/**
+ * Align a TypeBox build's externals with the layout the runtime rebuilds from
+ * the schema (`collectExternals`). Returns the build as is when they already
+ * match, a copy with a prepended remap when TypeBox >= 1.3.31 passed a lone
+ * refinement instead of its `~refine` array, or undefined (don't freeze) when
+ * a slot can't be proven equal, e.g. a 1.3.31+ format function
+ */
+declare function alignBuildExternals(build: CheckBuildResult, schema: unknown): CheckBuildResult | undefined;
 declare const Source: {
   readonly checkFactory: (identifier: string, code: string) => string;
   readonly checkCode: (defs: string, value: string) => string;
@@ -13,12 +21,6 @@ declare const Source: {
   readonly mirrorFactory: (source: string, hasExternals: boolean) => string;
   readonly bothFactory: (identifier: string, checkDefs: string, checkValue: string, mirrorSource: string, mirrorHasExternals: boolean) => string;
 };
-/**
- * verify that mirror unions can be reconstructed in build time
- *
- * return undefined if not reconstructable
- * `truthUnions` is `mir.externals.unions` (compiled branches).
- */
 declare function captureMirrorUnions(schema: unknown, truthUnions: any[][]): {
   identifier: string;
   code: string;
@@ -26,4 +28,4 @@ declare function captureMirrorUnions(schema: unknown, truthUnions: any[][]): {
 declare function captureMirrorCodecs(schema: unknown, truthCodecs: Function[], dir?: 'decode' | 'encode'): boolean;
 declare function installReconstructImpl(): void;
 //#endregion
-export { Source, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };
+export { Source, alignBuildExternals, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };

package/dist/compile/aot-emit.js

@@ -45,6 +45,41 @@ function externalsMatch(a, b) {
 	}
 	return true;
 }
+/**
+* Align a TypeBox build's externals with the layout the runtime rebuilds from
+* the schema (`collectExternals`). Returns the build as is when they already
+* match, a copy with a prepended remap when TypeBox >= 1.3.31 passed a lone
+* refinement instead of its `~refine` array, or undefined (don't freeze) when
+* a slot can't be proven equal, e.g. a 1.3.31+ format function
+*/
+function alignBuildExternals(build, schema) {
+	const variables = build.external.variables;
+	const canonical = require_compile_aot_reconstruct.collectExternals(schema);
+	const id = build.external.identifier;
+	if (!/^[A-Za-z_$][\w$]*$/.test(id)) return;
+	const slots = [];
+	let j = 0;
+	let same = variables.length === canonical.length;
+	for (let i = 0; i < variables.length; i++) {
+		const v = variables[i];
+		const c = canonical[j];
+		if (j < canonical.length && externalsMatch([c], [v])) slots.push(`${id}[${j++}]`);
+		else if (Array.isArray(c) && c.length === 1 && c[0] === v) {
+			slots.push(`${id}[${j++}][0]`);
+			same = false;
+		} else return;
+	}
+	if (j !== canonical.length) return;
+	if (same) return build;
+	return {
+		...build,
+		functions: [`${id}=[${slots.join(",")}]`, ...build.functions],
+		external: {
+			identifier: id,
+			variables: canonical
+		}
+	};
+}
 const mirrorFactorySource = (source, hasExternals) => hasExternals ? `function(d){${source}}` : `function(v){${source}}`;
 const bothFactorySource = (identifier, checkDefs, checkValue, mirrorSource, mirrorHasExternals) => `function(${identifier},d){${checkDefs}; return{check:${checkValue},clean:${mirrorHasExternals ? `(function(d){${mirrorSource}})(d)` : `function(v){${mirrorSource}}`}}}`;
 const Source = {
@@ -54,12 +89,6 @@ const Source = {
 	mirrorFactory: mirrorFactorySource,
 	bothFactory: bothFactorySource
 };
-/**
-* verify that mirror unions can be reconstructed in build time
-*
-* return undefined if not reconstructable
-* `truthUnions` is `mir.externals.unions` (compiled branches).
-*/
 function captureMirrorUnions(schema, truthUnions) {
 	const branchSchemas = require_compile_aot_reconstruct.collectMirrorUnions(schema);
 	if (branchSchemas.length !== truthUnions.length) return;
@@ -68,9 +97,10 @@ function captureMirrorUnions(schema, truthUnions) {
 		if (!branchSchemas[ui] || branchSchemas[ui].length !== truthUnions[ui].length) return;
 		const branch = [];
 		for (let i = 0; i < truthUnions[ui].length; i++) {
-			const build = truthUnions[ui][i]?.buildResult;
-			if (!build?.functions?.length || !build.entry) return;
-			if (!externalsMatch(require_compile_aot_reconstruct.collectExternals(branchSchemas[ui][i]), build.external.variables)) return;
+			const raw = truthUnions[ui][i]?.buildResult;
+			if (!raw?.functions?.length || !raw.entry) return;
+			const build = alignBuildExternals(raw, branchSchemas[ui][i]);
+			if (!build) return;
 			branch.push({
 				identifier: build.external.identifier,
 				code: reconstructCheckCode(build)
@@ -92,6 +122,7 @@ function installReconstructImpl() {
 
 //#endregion
 exports.Source = Source;
+exports.alignBuildExternals = alignBuildExternals;
 exports.captureMirrorCodecs = captureMirrorCodecs;
 exports.captureMirrorUnions = captureMirrorUnions;
 exports.externalsMatch = externalsMatch;

package/dist/compile/aot-emit.mjs

@@ -44,6 +44,41 @@ function externalsMatch(a, b) {
 	}
 	return true;
 }
+/**
+* Align a TypeBox build's externals with the layout the runtime rebuilds from
+* the schema (`collectExternals`). Returns the build as is when they already
+* match, a copy with a prepended remap when TypeBox >= 1.3.31 passed a lone
+* refinement instead of its `~refine` array, or undefined (don't freeze) when
+* a slot can't be proven equal, e.g. a 1.3.31+ format function
+*/
+function alignBuildExternals(build, schema) {
+	const variables = build.external.variables;
+	const canonical = collectExternals(schema);
+	const id = build.external.identifier;
+	if (!/^[A-Za-z_$][\w$]*$/.test(id)) return;
+	const slots = [];
+	let j = 0;
+	let same = variables.length === canonical.length;
+	for (let i = 0; i < variables.length; i++) {
+		const v = variables[i];
+		const c = canonical[j];
+		if (j < canonical.length && externalsMatch([c], [v])) slots.push(`${id}[${j++}]`);
+		else if (Array.isArray(c) && c.length === 1 && c[0] === v) {
+			slots.push(`${id}[${j++}][0]`);
+			same = false;
+		} else return;
+	}
+	if (j !== canonical.length) return;
+	if (same) return build;
+	return {
+		...build,
+		functions: [`${id}=[${slots.join(",")}]`, ...build.functions],
+		external: {
+			identifier: id,
+			variables: canonical
+		}
+	};
+}
 const mirrorFactorySource = (source, hasExternals) => hasExternals ? `function(d){${source}}` : `function(v){${source}}`;
 const bothFactorySource = (identifier, checkDefs, checkValue, mirrorSource, mirrorHasExternals) => `function(${identifier},d){${checkDefs}; return{check:${checkValue},clean:${mirrorHasExternals ? `(function(d){${mirrorSource}})(d)` : `function(v){${mirrorSource}}`}}}`;
 const Source = {
@@ -53,12 +88,6 @@ const Source = {
 	mirrorFactory: mirrorFactorySource,
 	bothFactory: bothFactorySource
 };
-/**
-* verify that mirror unions can be reconstructed in build time
-*
-* return undefined if not reconstructable
-* `truthUnions` is `mir.externals.unions` (compiled branches).
-*/
 function captureMirrorUnions(schema, truthUnions) {
 	const branchSchemas = collectMirrorUnions(schema);
 	if (branchSchemas.length !== truthUnions.length) return;
@@ -67,9 +96,10 @@ function captureMirrorUnions(schema, truthUnions) {
 		if (!branchSchemas[ui] || branchSchemas[ui].length !== truthUnions[ui].length) return;
 		const branch = [];
 		for (let i = 0; i < truthUnions[ui].length; i++) {
-			const build = truthUnions[ui][i]?.buildResult;
-			if (!build?.functions?.length || !build.entry) return;
-			if (!externalsMatch(collectExternals(branchSchemas[ui][i]), build.external.variables)) return;
+			const raw = truthUnions[ui][i]?.buildResult;
+			if (!raw?.functions?.length || !raw.entry) return;
+			const build = alignBuildExternals(raw, branchSchemas[ui][i]);
+			if (!build) return;
 			branch.push({
 				identifier: build.external.identifier,
 				code: reconstructCheckCode(build)
@@ -90,4 +120,4 @@ function installReconstructImpl() {
 }
 
 //#endregion
-export { Source, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };
+export { Source, alignBuildExternals, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };

package/dist/compile/handler/index.js

@@ -6,6 +6,7 @@ const require_error = require('../../error.js');
 const require_adapter_web_standard_handler = require('../../adapter/web-standard/handler.js');
 const require_compile_aot = require('../aot.js');
 const require_generation = require('../../generation.js');
+const require_handler_utils = require('../../handler/utils.js');
 const require_compile_handler_params = require('./params.js');
 const require_compile_handler_jit = require('./jit.js');
 const require_compile_handler_descriptor = require('./descriptor.js');
@@ -187,6 +188,17 @@ 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;
@@ -197,14 +209,17 @@ function buildNativeStaticResponse(route, 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, inheritedChain, resolve);
+		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);
 	if (hook && !isEmptyPipelineHook(hook)) return;
+	if (require_handler_utils.returnedErrorClasses(hook, root)?.some((C) => handler instanceof C)) return;
 	const rootHeaders = frozenRoot["~ext"]?.headers;
 	if (handler instanceof Response && !rootHeaders) return handler;
 	const response = adapter.response;
@@ -214,7 +229,7 @@ function buildNativeStaticResponse(route, root) {
 function toArray(name, hook) {
 	if (typeof hook[name] === "function") hook[name] = [hook[name]];
 }
-function composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, allowCompactPrefix = true) {
+function composeRouteHook(instance, localHook, appHook, inheritedChain, root, macroScope, allowCompactPrefix = false) {
 	const resolve = chainResolver(root);
 	localHook = resolveLocalHook(localMacroRoot(macroScope ?? instance, root), localHook, root);
 	if (localHook && localHook.derive !== void 0) {
@@ -222,7 +237,7 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 		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, inheritedChain, 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);
@@ -235,11 +250,14 @@ function composeRouteHook(instance, localHook, appHook, inheritedChain, root, ma
 		return hook;
 	}
 	let inherited = instance !== root ? require_utils.flattenChainMemoReadonly(root, inheritedChain, resolve) : void 0;
-	if ((inherited || locals) && (flatAppHook || localHook) && present?.size) {
+	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);
 	}
 	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;
@@ -308,7 +326,8 @@ function compileHandler(route, root, liveOnly = false) {
 		toArray("error", hook);
 	}
 	const buildValidator = () => hook ? require_compile_handler_reconstruct.Reconstrct.validator(hook, root, method, path, liveOnly) : void 0;
-	if (handler instanceof Error) {
+	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;
@@ -341,7 +360,7 @@ function compileHandler(route, root, 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 && !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()) {
+	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;
 		if (!Object.hasOwn(handler, "toString")) {
 			const source = Function.prototype.toString.call(handler);
@@ -382,6 +401,7 @@ function compileHandler(route, root, liveOnly = false) {
 		isHandleFunction,
 		isStaticResponse,
 		isPromiseHandler,
+		errorClasses,
 		state
 	});
 }