elysia 2.0.0-beta.2 → 2.0.0-beta.21

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

@@ -1,24 +1,13 @@
-import { CaptureImpl, CapturedHandler, CapturedValidator, CompiledSnapshot } from "./aot.js";
+import { CapturedHandler, CapturedValidator, CompiledSnapshot } from "./aot.js";
 
 //#region src/compile/aot-capture.d.ts
-declare function resetCompactErrorWarnings(): void;
 declare function beginValidatorCapture(): void;
 declare function abortCapture(): void;
 declare function endValidatorCapture(): CapturedValidator[];
 declare function endHandlerCapture(): CapturedHandler[];
-/** @internal deterministic session/capture assertions. */
-declare const getCompilerSessionDiagnostics: () => {
-  active: boolean;
-  appAttached: boolean;
-  validators: number;
-  handlers: number;
-  sucrose: number;
-};
 /** @internal preserve registry around in-process AOT analysis */
 declare const snapshotCompiled: () => CompiledSnapshot;
 /** @internal restore registry after in-process AOT analysis */
 declare function restoreCompiled(snapshot: CompiledSnapshot): void;
-declare const impl: CaptureImpl;
-declare function installCaptureImpl(): void;
 //#endregion
-export { abortCapture, beginValidatorCapture, impl as captureImplementation, endHandlerCapture, endValidatorCapture, getCompilerSessionDiagnostics, installCaptureImpl, resetCompactErrorWarnings, restoreCompiled, snapshotCompiled };
+export { abortCapture, beginValidatorCapture, endHandlerCapture, endValidatorCapture, restoreCompiled, snapshotCompiled };

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) {
@@ -124,13 +124,14 @@ function sourceOnlyValidator(schema) {
 }
 function maybeCapture(args) {
 	const { aot, slot, hasRef, originalSchema, schema, hasCodec, hasDefault, coerces, normalize, buildResult } = args;
+	const loc = {
+		method: aot.method,
+		path: aot.path,
+		slot
+	};
 	if (hasCodec && !hasRef && coerces && normalize !== false && normalize !== "typebox") {
 		const plan = require_type_coerce.captureCoercePlan(originalSchema, schema);
-		if (plan && externalsShape(require_type_coerce.buildCoercedFromPlan(originalSchema, plan)) === externalsShape(schema)) require_compile_aot.Capture.set({
-			method: aot.method,
-			path: aot.path,
-			slot
-		}, { coercePlan: plan });
+		if (plan && externalsShape(require_type_coerce.buildCoercedFromPlan(originalSchema, plan)) === externalsShape(schema)) require_compile_aot.Capture.set(loc, { coercePlan: plan });
 	}
 	const defaultFastPathCapture = {
 		precomputeSafe: void 0,
@@ -151,30 +152,14 @@ function maybeCapture(args) {
 			defaultFastPathCapture.objectDefaultMerger = defaults.ms ?? (defaults.pod !== void 0 ? require_type_validator_default_precompute.buildObjectDefaultMergeSource(defaults.pod) : void 0);
 		}
 	}
-	require_compile_aot.Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, defaultFastPathCapture);
+	require_compile_aot.Capture.set(loc, defaultFastPathCapture);
 	const customErrors = require_type_validator_custom_error.captureCustomErrors(schema);
-	if (customErrors) require_compile_aot.Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, { customErrors });
+	if (customErrors) require_compile_aot.Capture.set(loc, { customErrors });
 	const innerCodecs = require_type_validator_string_codec_aot.captureStringCodecEntries(schema, args.sanitize);
-	if (innerCodecs) require_compile_aot.Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, { innerCodecs });
+	if (innerCodecs) require_compile_aot.Capture.set(loc, { innerCodecs });
 	const cf = require_type_validator_frozen_check.buildFrozenCheck(buildResult, schema);
 	if (!cf) return;
-	require_compile_aot.Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, {
+	require_compile_aot.Capture.set(loc, {
 		...cf,
 		async: buildResult.external.variables.some(require_type_elysia_file_type.isAsyncPredicate),
 		hasDefault,
@@ -187,27 +172,24 @@ 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
 		});
 		if (typeof emitted?.source === "string") {
 			const ext = emitted.externals;
-			if (!ext) require_compile_aot.Capture.set({
+			const loc = {
 				method: aot.method,
 				path: aot.path,
 				slot
-			}, { mirror: {
+			};
+			if (!ext) require_compile_aot.Capture.set(loc, { mirror: {
 				source: emitted.source,
 				hasExternals: false
 			} });
 			else if (ext.unions && !ext.hof) {
 				const u = require_compile_aot_emit.captureMirrorUnions(schema, ext.unions);
-				if (u) require_compile_aot.Capture.set({
-					method: aot.method,
-					path: aot.path,
-					slot
-				}, { mirror: {
+				if (u) require_compile_aot.Capture.set(loc, { mirror: {
 					source: emitted.source,
 					hasExternals: true,
 					u
@@ -222,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
@@ -254,9 +236,6 @@ function captureCodecMirror(schema, aot, slot, sanitize, dir) {
 }
 const compactErrorWarned = /* @__PURE__ */ new Set();
 const isVerboseAotWarnings = () => !!require_universal_env.env.ELYSIA_AOT_VERBOSE;
-function resetCompactErrorWarnings() {
-	compactErrorWarned.clear();
-}
 function warnCompactErrorLoss(aot, slot) {
 	const key = `${aot.method}\0${aot.path}\0${slot}`;
 	if (compactErrorWarned.has(key)) return;
@@ -266,22 +245,19 @@ function warnCompactErrorLoss(aot, slot) {
 function flushCompactErrorWarnings() {
 	const total = compactErrorWarned.size;
 	if (total > 0 && !isVerboseAotWarnings()) console.warn(`[elysia-aot]: ${total} sealed validator slot${total === 1 ? "" : "s"} ${total === 1 ? "carries" : "carry"} a coercion/codec schema; 422 error details will be coarse (best-effort). Set ELYSIA_AOT_VERBOSE=1 for per-route detail.`);
-	resetCompactErrorWarnings();
+	compactErrorWarned.clear();
 }
 function captureBridgeFree(aot, slot, rawSchema) {
-	const captured = require_compile_aot.Capture.get({
+	const loc = {
 		method: aot.method,
 		path: aot.path,
 		slot
-	});
+	};
+	const captured = require_compile_aot.Capture.get(loc);
 	if (captured) {
 		const coerced = captured.coercePlan && typeof rawSchema !== "string" ? require_type_coerce.buildCoercedFromPlan(rawSchema, captured.coercePlan) : rawSchema;
 		const bridgeFree = require_compile_handler_frozen_validator.isCapturedBridgeFree(captured, rawSchema, coerced);
-		require_compile_aot.Capture.set({
-			method: aot.method,
-			path: aot.path,
-			slot
-		}, { bridgeFree });
+		require_compile_aot.Capture.set(loc, { bridgeFree });
 		if (bridgeFree && !require_compile_handler_frozen_validator.isCompactWalkable(coerced)) warnCompactErrorLoss(aot, slot);
 	}
 }
@@ -333,44 +309,25 @@ function endHandlerCapture() {
 	}
 	return captured;
 }
-/** @internal deterministic session/capture assertions. */
-const getCompilerSessionDiagnostics = () => {
-	const session = require_compile_aot.CompilerState.session;
-	return {
-		active: session !== void 0,
-		appAttached: session?.app !== void 0,
-		validators: session?.capture?.size ?? 0,
-		handlers: session?.handlerCapture?.size ?? 0,
-		sucrose: session?.sucroseCache.size ?? 0
-	};
-};
 /** @internal preserve registry around in-process AOT analysis */
 const snapshotCompiled = () => require_compile_aot.CompilerState.registry;
 /** @internal restore registry after in-process AOT analysis */
 function restoreCompiled(snapshot) {
 	require_compile_aot.CompilerState.registry = snapshot;
 }
-const impl = {
+require_compile_aot.setCaptureImpl({
 	sourceOnlyValidator,
 	maybeCapture,
 	captureMirror,
 	captureCodecMirror,
 	captureBridgeFree
-};
-function installCaptureImpl() {
-	require_compile_aot.setCaptureImpl(impl);
-	require_compile_aot_emit.installReconstructImpl();
-}
-installCaptureImpl();
+});
+require_compile_aot_emit.installReconstructImpl();
 
 //#endregion
 exports.abortCapture = abortCapture;
 exports.beginValidatorCapture = beginValidatorCapture;
-exports.captureImplementation = impl;
 exports.endHandlerCapture = endHandlerCapture;
 exports.endValidatorCapture = endValidatorCapture;
-exports.getCompilerSessionDiagnostics = getCompilerSessionDiagnostics;
-exports.installCaptureImpl = installCaptureImpl;
-exports.resetCompactErrorWarnings = resetCompactErrorWarnings;
 exports.restoreCompiled = restoreCompiled;
 exports.snapshotCompiled = snapshotCompiled;

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) {
@@ -122,13 +122,14 @@ function sourceOnlyValidator(schema) {
 }
 function maybeCapture(args) {
 	const { aot, slot, hasRef, originalSchema, schema, hasCodec, hasDefault, coerces, normalize, buildResult } = args;
+	const loc = {
+		method: aot.method,
+		path: aot.path,
+		slot
+	};
 	if (hasCodec && !hasRef && coerces && normalize !== false && normalize !== "typebox") {
 		const plan = captureCoercePlan(originalSchema, schema);
-		if (plan && externalsShape(buildCoercedFromPlan(originalSchema, plan)) === externalsShape(schema)) Capture.set({
-			method: aot.method,
-			path: aot.path,
-			slot
-		}, { coercePlan: plan });
+		if (plan && externalsShape(buildCoercedFromPlan(originalSchema, plan)) === externalsShape(schema)) Capture.set(loc, { coercePlan: plan });
 	}
 	const defaultFastPathCapture = {
 		precomputeSafe: void 0,
@@ -149,30 +150,14 @@ function maybeCapture(args) {
 			defaultFastPathCapture.objectDefaultMerger = defaults.ms ?? (defaults.pod !== void 0 ? buildObjectDefaultMergeSource(defaults.pod) : void 0);
 		}
 	}
-	Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, defaultFastPathCapture);
+	Capture.set(loc, defaultFastPathCapture);
 	const customErrors = captureCustomErrors(schema);
-	if (customErrors) Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, { customErrors });
+	if (customErrors) Capture.set(loc, { customErrors });
 	const innerCodecs = captureStringCodecEntries(schema, args.sanitize);
-	if (innerCodecs) Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, { innerCodecs });
+	if (innerCodecs) Capture.set(loc, { innerCodecs });
 	const cf = buildFrozenCheck(buildResult, schema);
 	if (!cf) return;
-	Capture.set({
-		method: aot.method,
-		path: aot.path,
-		slot
-	}, {
+	Capture.set(loc, {
 		...cf,
 		async: buildResult.external.variables.some(isAsyncPredicate),
 		hasDefault,
@@ -185,27 +170,24 @@ function captureMirror(schema, aot, slot, sanitize) {
 	if (!createMirror) return;
 	try {
 		const emitted = createMirror(schema, {
-			Compile,
+			Compile: compileWithBuild,
 			sanitize,
 			emit: true
 		});
 		if (typeof emitted?.source === "string") {
 			const ext = emitted.externals;
-			if (!ext) Capture.set({
+			const loc = {
 				method: aot.method,
 				path: aot.path,
 				slot
-			}, { mirror: {
+			};
+			if (!ext) Capture.set(loc, { mirror: {
 				source: emitted.source,
 				hasExternals: false
 			} });
 			else if (ext.unions && !ext.hof) {
 				const u = captureMirrorUnions(schema, ext.unions);
-				if (u) Capture.set({
-					method: aot.method,
-					path: aot.path,
-					slot
-				}, { mirror: {
+				if (u) Capture.set(loc, { mirror: {
 					source: emitted.source,
 					hasExternals: true,
 					u
@@ -220,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
@@ -252,9 +234,6 @@ function captureCodecMirror(schema, aot, slot, sanitize, dir) {
 }
 const compactErrorWarned = /* @__PURE__ */ new Set();
 const isVerboseAotWarnings = () => !!env.ELYSIA_AOT_VERBOSE;
-function resetCompactErrorWarnings() {
-	compactErrorWarned.clear();
-}
 function warnCompactErrorLoss(aot, slot) {
 	const key = `${aot.method}\0${aot.path}\0${slot}`;
 	if (compactErrorWarned.has(key)) return;
@@ -264,22 +243,19 @@ function warnCompactErrorLoss(aot, slot) {
 function flushCompactErrorWarnings() {
 	const total = compactErrorWarned.size;
 	if (total > 0 && !isVerboseAotWarnings()) console.warn(`[elysia-aot]: ${total} sealed validator slot${total === 1 ? "" : "s"} ${total === 1 ? "carries" : "carry"} a coercion/codec schema; 422 error details will be coarse (best-effort). Set ELYSIA_AOT_VERBOSE=1 for per-route detail.`);
-	resetCompactErrorWarnings();
+	compactErrorWarned.clear();
 }
 function captureBridgeFree(aot, slot, rawSchema) {
-	const captured = Capture.get({
+	const loc = {
 		method: aot.method,
 		path: aot.path,
 		slot
-	});
+	};
+	const captured = Capture.get(loc);
 	if (captured) {
 		const coerced = captured.coercePlan && typeof rawSchema !== "string" ? buildCoercedFromPlan(rawSchema, captured.coercePlan) : rawSchema;
 		const bridgeFree = isCapturedBridgeFree(captured, rawSchema, coerced);
-		Capture.set({
-			method: aot.method,
-			path: aot.path,
-			slot
-		}, { bridgeFree });
+		Capture.set(loc, { bridgeFree });
 		if (bridgeFree && !isCompactWalkable(coerced)) warnCompactErrorLoss(aot, slot);
 	}
 }
@@ -331,35 +307,20 @@ function endHandlerCapture() {
 	}
 	return captured;
 }
-/** @internal deterministic session/capture assertions. */
-const getCompilerSessionDiagnostics = () => {
-	const session = CompilerState.session;
-	return {
-		active: session !== void 0,
-		appAttached: session?.app !== void 0,
-		validators: session?.capture?.size ?? 0,
-		handlers: session?.handlerCapture?.size ?? 0,
-		sucrose: session?.sucroseCache.size ?? 0
-	};
-};
 /** @internal preserve registry around in-process AOT analysis */
 const snapshotCompiled = () => CompilerState.registry;
 /** @internal restore registry after in-process AOT analysis */
 function restoreCompiled(snapshot) {
 	CompilerState.registry = snapshot;
 }
-const impl = {
+setCaptureImpl({
 	sourceOnlyValidator,
 	maybeCapture,
 	captureMirror,
 	captureCodecMirror,
 	captureBridgeFree
-};
-function installCaptureImpl() {
-	setCaptureImpl(impl);
-	installReconstructImpl();
-}
-installCaptureImpl();
+});
+installReconstructImpl();
 
 //#endregion
-export { abortCapture, beginValidatorCapture, impl as captureImplementation, endHandlerCapture, endValidatorCapture, getCompilerSessionDiagnostics, installCaptureImpl, resetCompactErrorWarnings, restoreCompiled, snapshotCompiled };
+export { abortCapture, beginValidatorCapture, endHandlerCapture, endValidatorCapture, restoreCompiled, snapshotCompiled };

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

@@ -28,7 +28,7 @@ function reconstructCheckCode(build) {
 	const { defs, value } = reconstructCheck(build);
 	return checkCode(defs, value);
 }
-const checkFactorySource = (identifier, code) => `function(${identifier}){${code}}`;
+const checkFactorySource = (identifier, code) => `(${identifier})=>{${code}}`;
 const handlerFactorySource = (alias, code) => `function(h${alias ? "," + alias : ""}){return ${code}}`;
 function externalsMatch(a, b) {
 	if (a.length !== b.length) return false;
@@ -40,19 +40,46 @@ function externalsMatch(a, b) {
 			if (x.source !== y.source || x.flags !== y.flags) return false;
 			continue;
 		}
-		if (Array.isArray(x) && Array.isArray(y)) {
-			if (x.length !== y.length) return false;
-			let ok = true;
-			for (let j = 0; j < x.length; j++) if (x[j] !== y[j]) {
-				ok = false;
-				break;
-			}
-			if (ok) continue;
-		}
+		if (Array.isArray(x) && Array.isArray(y) && x.length === y.length && x.findIndex((v, j) => v !== y[j]) === -1) continue;
 		return false;
 	}
 	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 = {
@@ -62,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;
@@ -76,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)
@@ -100,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

@@ -27,7 +27,7 @@ function reconstructCheckCode(build) {
 	const { defs, value } = reconstructCheck(build);
 	return checkCode(defs, value);
 }
-const checkFactorySource = (identifier, code) => `function(${identifier}){${code}}`;
+const checkFactorySource = (identifier, code) => `(${identifier})=>{${code}}`;
 const handlerFactorySource = (alias, code) => `function(h${alias ? "," + alias : ""}){return ${code}}`;
 function externalsMatch(a, b) {
 	if (a.length !== b.length) return false;
@@ -39,19 +39,46 @@ function externalsMatch(a, b) {
 			if (x.source !== y.source || x.flags !== y.flags) return false;
 			continue;
 		}
-		if (Array.isArray(x) && Array.isArray(y)) {
-			if (x.length !== y.length) return false;
-			let ok = true;
-			for (let j = 0; j < x.length; j++) if (x[j] !== y[j]) {
-				ok = false;
-				break;
-			}
-			if (ok) continue;
-		}
+		if (Array.isArray(x) && Array.isArray(y) && x.length === y.length && x.findIndex((v, j) => v !== y[j]) === -1) continue;
 		return false;
 	}
 	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 = {
@@ -61,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;
@@ -75,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)
@@ -98,4 +120,4 @@ function installReconstructImpl() {
 }
 
 //#endregion
-export { Source, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };
+export { Source, alignBuildExternals, captureMirrorCodecs, captureMirrorUnions, externalsMatch, installReconstructImpl, reconstructCheck };