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

package/dist/plugin/aot/source.js

@@ -18,10 +18,8 @@ async function captureArtifacts(app, options) {
 	const previousAotBuild = require_universal_env.env.ELYSIA_AOT_BUILD;
 	require_universal_env.env.ELYSIA_AOT_BUILD = "1";
 	try {
-		if (!require_compile_aot.Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
 		require_compile_aot_capture.beginValidatorCapture();
-		const modules = app.modules;
-		if (modules) await modules;
+		await app.modules;
 		if (options?.target !== void 0) require_compile_handler_jit.setCaptureHeaderShorthand(options.target === "bun");
 		app.compile();
 		const captured = require_compile_aot_capture.endValidatorCapture();
@@ -42,10 +40,14 @@ async function captureArtifacts(app, options) {
 }
 const materialiseHandlersForReplay = (captured) => {
 	const manifest = {};
-	for (const h of captured) (manifest[h.method] ??= {})[h.path] = {
-		a: h.alias ? h.alias.split(",") : [],
-		f: new Function(`return ${require_compile_aot_emit.Source.handlerFactory(h.alias, h.code)}`)()
-	};
+	for (const h of captured) {
+		if (!h.code) continue;
+		(manifest[h.method] ??= {})[h.path] = {
+			a: h.alias ? h.alias.split(",") : [],
+			f: new Function(`return ${require_compile_aot_emit.Source.handlerFactory(h.alias, h.code)}`)(),
+			k: h.k
+		};
+	}
 	return manifest;
 };
 function replayStubbability(app, handlers) {
@@ -56,23 +58,28 @@ function replayStubbability(app, handlers) {
 		require_compile_aot.Compiled.clear();
 		const fingerprint = require_compile_aot.createAotFingerprint();
 		require_compile_aot.Compiled.register({
-			bf: 1,
 			fingerprint,
 			handlers: materialiseHandlersForReplay(handlers)
 		});
 		require_compile_aot.Compiled.claim(app["~programId"], fingerprint);
 		require_validator_index.Validator.clear();
-		const history = app["~routes"] ?? [];
+		const history = app["~routes"];
 		require_compile_jit_probe.JITProbe.begin();
+		const exact = /* @__PURE__ */ new Map();
+		for (const route of history) {
+			const method = route[0];
+			if (method === "WS") continue;
+			let paths = exact.get(method);
+			if (!paths) exact.set(method, paths = /* @__PURE__ */ new Set());
+			if (paths.has(route[1])) require_compile_jit_probe.JITProbe.record("handler:indexed-duplicate");
+			else paths.add(route[1]);
+		}
 		for (const route of history) try {
 			if (route[0] === "WS") continue;
 			require_compile_handler_index.compileHandler(route, app);
 		} catch {
-			require_compile_jit_probe.JITProbe.end();
-			return {
-				jit: false,
-				reasons: ["handler:new-function"]
-			};
+			require_compile_jit_probe.JITProbe.record("handler:new-function");
+			return require_compile_jit_probe.JITProbe.end();
 		}
 		return require_compile_jit_probe.JITProbe.end();
 	} finally {
@@ -95,45 +102,33 @@ const normalizeCheckIdentifiers = (src) => {
 };
 function createEntryEncoder() {
 	const branchRef = /* @__PURE__ */ new Map();
-	let branchDecls = "";
 	const branchTable = (u) => "[" + u.map((branch) => "[" + branch.map((b) => {
 		const src = normalizeCheckIdentifiers(require_compile_aot_emit.Source.checkFactory(b.identifier, b.code));
 		let ref = branchRef.get(src);
 		if (ref === void 0) {
 			ref = `_b${branchRef.size}`;
 			branchRef.set(src, ref);
-			branchDecls += `const ${ref} = ${src}\n`;
+			enc.branchDecls += `const ${ref} = ${src}\n`;
 		}
 		return ref;
 	}).join(", ") + "]").join(", ") + "]";
 	const unionRef = /* @__PURE__ */ new Map();
-	let unionDecls = "";
-	let hasCoercePlan = false;
-	const unionTable = (u) => {
-		const str = branchTable(u);
-		let ref = unionRef.get(str);
-		if (ref === void 0) {
-			ref = `_u${unionRef.size}`;
-			unionRef.set(str, ref);
-			unionDecls += `const ${ref} = ${str}\n`;
-		}
-		return ref;
-	};
-	return {
-		unionTable,
-		setCoercePlan() {
-			hasCoercePlan = true;
-		},
-		get branchDecls() {
-			return branchDecls;
-		},
-		get unionDecls() {
-			return unionDecls;
-		},
-		get hasCoercePlan() {
-			return hasCoercePlan;
+	const enc = {
+		branchDecls: "",
+		unionDecls: "",
+		hasCoercePlan: false,
+		unionTable(u) {
+			const str = branchTable(u);
+			let ref = unionRef.get(str);
+			if (ref === void 0) {
+				ref = `_u${unionRef.size}`;
+				unionRef.set(str, ref);
+				enc.unionDecls += `const ${ref} = ${str}\n`;
+			}
+			return ref;
 		}
 	};
+	return enc;
 }
 function entryParts(c, enc) {
 	const parts = [];
@@ -193,14 +188,15 @@ function entryParts(c, enc) {
 		parts.push(`ic: [${ic}]`);
 	}
 	if (c.coercePlan) {
-		enc.setCoercePlan();
+		enc.hasCoercePlan = true;
 		parts.push(`cp: ${JSON.stringify(c.coercePlan)}`);
 	}
 	return parts;
 }
 function emitModule(captured, handlers, fingerprint, options) {
 	const enc = createEntryEncoder();
-	const treeToSource = (tree, slotRef, sink) => {
+	const treeToSource = (tree) => {
+		const slotRef = /* @__PURE__ */ new Map();
 		const methods = [];
 		for (const method in tree) {
 			const paths = [];
@@ -210,7 +206,7 @@ function emitModule(captured, handlers, fingerprint, options) {
 				if (ref === void 0) {
 					ref = `_s${slotRef.size}`;
 					slotRef.set(slotObj, ref);
-					sink(`const ${ref} = ${slotObj}\n`);
+					validatorDecls += `const ${ref} = ${slotObj}\n`;
 				}
 				paths.push(`${JSON.stringify(path)}:${ref}`);
 			}
@@ -342,7 +338,6 @@ function emitModule(captured, handlers, fingerprint, options) {
 		}
 		validatorDecls += `const _groups = [${thunks.join(", ")}]\n`;
 		validatorDecls += `const _groupOf = ${JSON.stringify(groupOf)}\n`;
-		validatorExport = options?.register ? "" : "export const groups = _groups\nexport const groupOf = _groupOf\n";
 	} else {
 		const factoryRef = /* @__PURE__ */ new Map();
 		const tree = require_utils.nullObject();
@@ -359,59 +354,64 @@ function emitModule(captured, handlers, fingerprint, options) {
 			const byPath = tree[c.method] ??= require_utils.nullObject();
 			(byPath[c.path] ??= require_utils.nullObject())[c.slot] = ref;
 		}
-		const treeStr = treeToSource(tree, /* @__PURE__ */ new Map(), (d) => {
-			validatorDecls += d;
-		});
-		validatorExport = options?.register ? `const validators = ${treeStr}\n` : `export const validators = ${treeStr}\n`;
+		validatorExport = `const validators = ${treeToSource(tree)}\n`;
 	}
 	const aliasRef = /* @__PURE__ */ new Map();
+	const factoryRef = /* @__PURE__ */ new Map();
 	const handlerRef = /* @__PURE__ */ new Map();
 	let handlerDecls = "";
 	const handlerTree = require_utils.nullObject();
 	for (const h of handlers) {
+		const k = h.k === void 0 ? "" : `k: ${JSON.stringify(h.k)}`;
+		if (!h.code) {
+			(handlerTree[h.method] ??= {})[h.path] = `{ ${k} }`;
+			continue;
+		}
 		const src = require_compile_aot_emit.Source.handlerFactory(h.alias, h.code);
-		let wref = handlerRef.get(src);
+		let fref = factoryRef.get(src);
+		if (fref === void 0) {
+			fref = `_h${factoryRef.size}`;
+			factoryRef.set(src, fref);
+			handlerDecls += `const ${fref} = ${src}\n`;
+		}
+		let wref = handlerRef.get(fref + k);
 		if (wref === void 0) {
-			const n = handlerRef.size;
 			let aref = aliasRef.get(h.alias);
 			if (aref === void 0) {
 				aref = `_a${aliasRef.size}`;
 				aliasRef.set(h.alias, aref);
 				handlerDecls += `const ${aref} = ${JSON.stringify(h.alias ? h.alias.split(",") : [])}\n`;
 			}
-			wref = `_w${n}`;
-			handlerRef.set(src, wref);
-			handlerDecls += `const _h${n} = ${src}\nconst ${wref} = { a: ${aref}, f: _h${n} }\n`;
+			wref = `_w${handlerRef.size}`;
+			handlerRef.set(fref + k, wref);
+			handlerDecls += `const ${wref} = { a: ${aref}, f: ${fref}, ${k} }\n`;
 		}
 		(handlerTree[h.method] ??= {})[h.path] = wref;
 	}
-	let handlerExport = options?.register ? "const handlers = {\n" : "export const handlers = {\n";
+	let handlerExport = "const handlers = {\n";
 	for (const method in handlerTree) {
 		handlerExport += `\t${JSON.stringify(method)}: {\n`;
 		for (const path in handlerTree[method]) handlerExport += `\t\t${JSON.stringify(path)}: ${handlerTree[method][path]},\n`;
 		handlerExport += "	},\n";
 	}
 	handlerExport += "}\n";
-	const fingerprintExport = options?.register ? `export const fingerprint = ${JSON.stringify(fingerprint)}\n` : "";
 	let body = "// Generated by Elysia build plugin. Do not edit.\n";
-	if (options?.register) body += `import { Compiled } from ${JSON.stringify(options.registerFrom ?? "elysia")}\n`;
-	if (options?.register && enc.hasCoercePlan) body += `import { buildCoercedFromPlan } from ${JSON.stringify("elysia/coerce-plan")}\n`;
-	if (options?.register && captured.length) body += `import { Reconstruct } from ${JSON.stringify(options.reconstructFrom ?? "elysia/reconstruct")}\n`;
+	const moduleCondition = options?.moduleCondition ?? "esm";
+	const importNamed = (name, specifier) => moduleCondition === "cjs" ? `const { ${name} } = require(${JSON.stringify(specifier)})\n` : `import { ${name} } from ${JSON.stringify(specifier)}\n`;
+	body += importNamed("Compiled", options?.registerFrom ?? "elysia");
+	if (enc.hasCoercePlan) body += importNamed("buildCoercedFromPlan", "elysia/coerce-plan");
+	if (captured.length) body += importNamed("Reconstruct", options?.reconstructFrom ?? "elysia/reconstruct");
 	const generated = enc.branchDecls + enc.unionDecls + validatorDecls + handlerDecls;
 	const needs = (symbol) => new RegExp(`\\b${symbol}\\b`).test(generated);
-	if (needs("CheckContext")) body += "import { CheckContext } from 'typebox/schema'\n";
-	if (needs("Guard")) body += "import { Guard } from 'typebox/guard'\n";
-	if (needs("Format")) body += "import { Format } from 'typebox/format'\n";
-	if (needs("Hashing")) body += "import { Hashing } from 'typebox/system'\n";
-	if (options?.register) {
-		body += "\n";
-		if (captured.length) body += "Compiled.reconstruct = Reconstruct\n";
-		body += fingerprintExport + "Compiled.register((() => {\n" + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\nreturn { bf: 1, fingerprint, " + (lazy ? "lazyGroups: _groups, lazyGroupOf: _groupOf, " : "validators, ") + `handlers${enc.hasCoercePlan ? ", planRebuilder: buildCoercedFromPlan" : ""} }\n})())
+	if (needs("CheckContext")) body += importNamed("CheckContext", "typebox/schema");
+	if (needs("Guard")) body += importNamed("Guard", "typebox/guard");
+	if (needs("Format")) body += importNamed("Format", "typebox/format");
+	if (needs("Hashing")) body += importNamed("Hashing", "typebox/system");
+	body += "\n";
+	if (captured.length) body += "Compiled.reconstruct = Reconstruct\n";
+	body += `export const fingerprint = ${JSON.stringify(fingerprint)}\nCompiled.register((() => {
+` + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\nreturn { fingerprint, " + (lazy ? "lazyGroups: _groups, lazyGroupOf: _groupOf, " : "validators, ") + `handlers${enc.hasCoercePlan ? ", planRebuilder: buildCoercedFromPlan" : ""} }\n})())
 `;
-	} else {
-		body += "\n" + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\n";
-		if (!lazy) body += "\nexport default validators\n";
-	}
 	return body;
 }
 

package/dist/plugin/aot/source.mjs

@@ -1,6 +1,6 @@
 import { nullObject } from "../../utils.mjs";
 import { env } from "../../universal/env.mjs";
-import { Capture, Compiled, createAotFingerprint } from "../../compile/aot.mjs";
+import { Compiled, createAotFingerprint } from "../../compile/aot.mjs";
 import { JITProbe } from "../../compile/jit-probe.mjs";
 import { setCaptureHeaderShorthand } from "../../compile/handler/jit.mjs";
 import { Validator } from "../../validator/index.mjs";
@@ -17,10 +17,8 @@ async function captureArtifacts(app, options) {
 	const previousAotBuild = env.ELYSIA_AOT_BUILD;
 	env.ELYSIA_AOT_BUILD = "1";
 	try {
-		if (!Capture.isCapturing()) throw new Error("[elysia-aot]: ELYSIA_AOT_BUILD=1 must be set to enable AOT capture mode");
 		beginValidatorCapture();
-		const modules = app.modules;
-		if (modules) await modules;
+		await app.modules;
 		if (options?.target !== void 0) setCaptureHeaderShorthand(options.target === "bun");
 		app.compile();
 		const captured = endValidatorCapture();
@@ -41,10 +39,14 @@ async function captureArtifacts(app, options) {
 }
 const materialiseHandlersForReplay = (captured) => {
 	const manifest = {};
-	for (const h of captured) (manifest[h.method] ??= {})[h.path] = {
-		a: h.alias ? h.alias.split(",") : [],
-		f: new Function(`return ${Source.handlerFactory(h.alias, h.code)}`)()
-	};
+	for (const h of captured) {
+		if (!h.code) continue;
+		(manifest[h.method] ??= {})[h.path] = {
+			a: h.alias ? h.alias.split(",") : [],
+			f: new Function(`return ${Source.handlerFactory(h.alias, h.code)}`)(),
+			k: h.k
+		};
+	}
 	return manifest;
 };
 function replayStubbability(app, handlers) {
@@ -55,23 +57,28 @@ function replayStubbability(app, handlers) {
 		Compiled.clear();
 		const fingerprint = createAotFingerprint();
 		Compiled.register({
-			bf: 1,
 			fingerprint,
 			handlers: materialiseHandlersForReplay(handlers)
 		});
 		Compiled.claim(app["~programId"], fingerprint);
 		Validator.clear();
-		const history = app["~routes"] ?? [];
+		const history = app["~routes"];
 		JITProbe.begin();
+		const exact = /* @__PURE__ */ new Map();
+		for (const route of history) {
+			const method = route[0];
+			if (method === "WS") continue;
+			let paths = exact.get(method);
+			if (!paths) exact.set(method, paths = /* @__PURE__ */ new Set());
+			if (paths.has(route[1])) JITProbe.record("handler:indexed-duplicate");
+			else paths.add(route[1]);
+		}
 		for (const route of history) try {
 			if (route[0] === "WS") continue;
 			compileHandler(route, app);
 		} catch {
-			JITProbe.end();
-			return {
-				jit: false,
-				reasons: ["handler:new-function"]
-			};
+			JITProbe.record("handler:new-function");
+			return JITProbe.end();
 		}
 		return JITProbe.end();
 	} finally {
@@ -94,45 +101,33 @@ const normalizeCheckIdentifiers = (src) => {
 };
 function createEntryEncoder() {
 	const branchRef = /* @__PURE__ */ new Map();
-	let branchDecls = "";
 	const branchTable = (u) => "[" + u.map((branch) => "[" + branch.map((b) => {
 		const src = normalizeCheckIdentifiers(Source.checkFactory(b.identifier, b.code));
 		let ref = branchRef.get(src);
 		if (ref === void 0) {
 			ref = `_b${branchRef.size}`;
 			branchRef.set(src, ref);
-			branchDecls += `const ${ref} = ${src}\n`;
+			enc.branchDecls += `const ${ref} = ${src}\n`;
 		}
 		return ref;
 	}).join(", ") + "]").join(", ") + "]";
 	const unionRef = /* @__PURE__ */ new Map();
-	let unionDecls = "";
-	let hasCoercePlan = false;
-	const unionTable = (u) => {
-		const str = branchTable(u);
-		let ref = unionRef.get(str);
-		if (ref === void 0) {
-			ref = `_u${unionRef.size}`;
-			unionRef.set(str, ref);
-			unionDecls += `const ${ref} = ${str}\n`;
-		}
-		return ref;
-	};
-	return {
-		unionTable,
-		setCoercePlan() {
-			hasCoercePlan = true;
-		},
-		get branchDecls() {
-			return branchDecls;
-		},
-		get unionDecls() {
-			return unionDecls;
-		},
-		get hasCoercePlan() {
-			return hasCoercePlan;
+	const enc = {
+		branchDecls: "",
+		unionDecls: "",
+		hasCoercePlan: false,
+		unionTable(u) {
+			const str = branchTable(u);
+			let ref = unionRef.get(str);
+			if (ref === void 0) {
+				ref = `_u${unionRef.size}`;
+				unionRef.set(str, ref);
+				enc.unionDecls += `const ${ref} = ${str}\n`;
+			}
+			return ref;
 		}
 	};
+	return enc;
 }
 function entryParts(c, enc) {
 	const parts = [];
@@ -192,14 +187,15 @@ function entryParts(c, enc) {
 		parts.push(`ic: [${ic}]`);
 	}
 	if (c.coercePlan) {
-		enc.setCoercePlan();
+		enc.hasCoercePlan = true;
 		parts.push(`cp: ${JSON.stringify(c.coercePlan)}`);
 	}
 	return parts;
 }
 function emitModule(captured, handlers, fingerprint, options) {
 	const enc = createEntryEncoder();
-	const treeToSource = (tree, slotRef, sink) => {
+	const treeToSource = (tree) => {
+		const slotRef = /* @__PURE__ */ new Map();
 		const methods = [];
 		for (const method in tree) {
 			const paths = [];
@@ -209,7 +205,7 @@ function emitModule(captured, handlers, fingerprint, options) {
 				if (ref === void 0) {
 					ref = `_s${slotRef.size}`;
 					slotRef.set(slotObj, ref);
-					sink(`const ${ref} = ${slotObj}\n`);
+					validatorDecls += `const ${ref} = ${slotObj}\n`;
 				}
 				paths.push(`${JSON.stringify(path)}:${ref}`);
 			}
@@ -341,7 +337,6 @@ function emitModule(captured, handlers, fingerprint, options) {
 		}
 		validatorDecls += `const _groups = [${thunks.join(", ")}]\n`;
 		validatorDecls += `const _groupOf = ${JSON.stringify(groupOf)}\n`;
-		validatorExport = options?.register ? "" : "export const groups = _groups\nexport const groupOf = _groupOf\n";
 	} else {
 		const factoryRef = /* @__PURE__ */ new Map();
 		const tree = nullObject();
@@ -358,59 +353,64 @@ function emitModule(captured, handlers, fingerprint, options) {
 			const byPath = tree[c.method] ??= nullObject();
 			(byPath[c.path] ??= nullObject())[c.slot] = ref;
 		}
-		const treeStr = treeToSource(tree, /* @__PURE__ */ new Map(), (d) => {
-			validatorDecls += d;
-		});
-		validatorExport = options?.register ? `const validators = ${treeStr}\n` : `export const validators = ${treeStr}\n`;
+		validatorExport = `const validators = ${treeToSource(tree)}\n`;
 	}
 	const aliasRef = /* @__PURE__ */ new Map();
+	const factoryRef = /* @__PURE__ */ new Map();
 	const handlerRef = /* @__PURE__ */ new Map();
 	let handlerDecls = "";
 	const handlerTree = nullObject();
 	for (const h of handlers) {
+		const k = h.k === void 0 ? "" : `k: ${JSON.stringify(h.k)}`;
+		if (!h.code) {
+			(handlerTree[h.method] ??= {})[h.path] = `{ ${k} }`;
+			continue;
+		}
 		const src = Source.handlerFactory(h.alias, h.code);
-		let wref = handlerRef.get(src);
+		let fref = factoryRef.get(src);
+		if (fref === void 0) {
+			fref = `_h${factoryRef.size}`;
+			factoryRef.set(src, fref);
+			handlerDecls += `const ${fref} = ${src}\n`;
+		}
+		let wref = handlerRef.get(fref + k);
 		if (wref === void 0) {
-			const n = handlerRef.size;
 			let aref = aliasRef.get(h.alias);
 			if (aref === void 0) {
 				aref = `_a${aliasRef.size}`;
 				aliasRef.set(h.alias, aref);
 				handlerDecls += `const ${aref} = ${JSON.stringify(h.alias ? h.alias.split(",") : [])}\n`;
 			}
-			wref = `_w${n}`;
-			handlerRef.set(src, wref);
-			handlerDecls += `const _h${n} = ${src}\nconst ${wref} = { a: ${aref}, f: _h${n} }\n`;
+			wref = `_w${handlerRef.size}`;
+			handlerRef.set(fref + k, wref);
+			handlerDecls += `const ${wref} = { a: ${aref}, f: ${fref}, ${k} }\n`;
 		}
 		(handlerTree[h.method] ??= {})[h.path] = wref;
 	}
-	let handlerExport = options?.register ? "const handlers = {\n" : "export const handlers = {\n";
+	let handlerExport = "const handlers = {\n";
 	for (const method in handlerTree) {
 		handlerExport += `\t${JSON.stringify(method)}: {\n`;
 		for (const path in handlerTree[method]) handlerExport += `\t\t${JSON.stringify(path)}: ${handlerTree[method][path]},\n`;
 		handlerExport += "	},\n";
 	}
 	handlerExport += "}\n";
-	const fingerprintExport = options?.register ? `export const fingerprint = ${JSON.stringify(fingerprint)}\n` : "";
 	let body = "// Generated by Elysia build plugin. Do not edit.\n";
-	if (options?.register) body += `import { Compiled } from ${JSON.stringify(options.registerFrom ?? "elysia")}\n`;
-	if (options?.register && enc.hasCoercePlan) body += `import { buildCoercedFromPlan } from ${JSON.stringify("elysia/coerce-plan")}\n`;
-	if (options?.register && captured.length) body += `import { Reconstruct } from ${JSON.stringify(options.reconstructFrom ?? "elysia/reconstruct")}\n`;
+	const moduleCondition = options?.moduleCondition ?? "esm";
+	const importNamed = (name, specifier) => moduleCondition === "cjs" ? `const { ${name} } = require(${JSON.stringify(specifier)})\n` : `import { ${name} } from ${JSON.stringify(specifier)}\n`;
+	body += importNamed("Compiled", options?.registerFrom ?? "elysia");
+	if (enc.hasCoercePlan) body += importNamed("buildCoercedFromPlan", "elysia/coerce-plan");
+	if (captured.length) body += importNamed("Reconstruct", options?.reconstructFrom ?? "elysia/reconstruct");
 	const generated = enc.branchDecls + enc.unionDecls + validatorDecls + handlerDecls;
 	const needs = (symbol) => new RegExp(`\\b${symbol}\\b`).test(generated);
-	if (needs("CheckContext")) body += "import { CheckContext } from 'typebox/schema'\n";
-	if (needs("Guard")) body += "import { Guard } from 'typebox/guard'\n";
-	if (needs("Format")) body += "import { Format } from 'typebox/format'\n";
-	if (needs("Hashing")) body += "import { Hashing } from 'typebox/system'\n";
-	if (options?.register) {
-		body += "\n";
-		if (captured.length) body += "Compiled.reconstruct = Reconstruct\n";
-		body += fingerprintExport + "Compiled.register((() => {\n" + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\nreturn { bf: 1, fingerprint, " + (lazy ? "lazyGroups: _groups, lazyGroupOf: _groupOf, " : "validators, ") + `handlers${enc.hasCoercePlan ? ", planRebuilder: buildCoercedFromPlan" : ""} }\n})())
+	if (needs("CheckContext")) body += importNamed("CheckContext", "typebox/schema");
+	if (needs("Guard")) body += importNamed("Guard", "typebox/guard");
+	if (needs("Format")) body += importNamed("Format", "typebox/format");
+	if (needs("Hashing")) body += importNamed("Hashing", "typebox/system");
+	body += "\n";
+	if (captured.length) body += "Compiled.reconstruct = Reconstruct\n";
+	body += `export const fingerprint = ${JSON.stringify(fingerprint)}\nCompiled.register((() => {
+` + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\nreturn { fingerprint, " + (lazy ? "lazyGroups: _groups, lazyGroupOf: _groupOf, " : "validators, ") + `handlers${enc.hasCoercePlan ? ", planRebuilder: buildCoercedFromPlan" : ""} }\n})())
 `;
-	} else {
-		body += "\n" + enc.branchDecls + (enc.branchDecls && "\n") + enc.unionDecls + (enc.unionDecls && "\n") + validatorDecls + handlerDecls + "\n" + validatorExport + "\n" + handlerExport + "\n";
-		if (!lazy) body += "\nexport default validators\n";
-	}
 	return body;
 }
 

package/dist/plugin/aot/treeshake.js

@@ -2,7 +2,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_compile_lexer = require('../../compile/lexer.js');
 
 //#region src/plugin/aot/treeshake.ts
-const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function nonCodeSpans(code) {
 	const spans = [];
 	const length = code.length;
@@ -49,7 +48,7 @@ function rewriteTypeImport(code) {
 	const from = "elysia";
 	const typeFrom = "elysia/type";
 	if (!code.includes(from)) return code;
-	const importRe = new RegExp(`(^|\\n)([ \\t]*)import\\s+(?!type\\b)((?:[A-Za-z_$][\\w$]*\\s*,\\s*)?\\{[^}]*\\})\\s+from\\s*(['"])${escape(from)}\\4(\\s*(?:with|assert)\\s*\\{[^}]*\\})?`, "g");
+	const importRe = new RegExp(`(^|\\n)([ \\t]*)import\\s+(?!type\\b)((?:[A-Za-z_$][\\w$]*\\s*,\\s*)?\\{[^}]*\\})\\s+from\\s*(['"])${from}\\4(\\s*(?:with|assert)\\s*\\{[^}]*\\})?`, "g");
 	const spans = nonCodeSpans(code);
 	const edits = [];
 	let m;
@@ -58,9 +57,7 @@ function rewriteTypeImport(code) {
 		const keyword = m.index + lead.length + indent.length;
 		if (spans.some(([start, end]) => keyword >= start && keyword < end)) continue;
 		const braceStart = clause.indexOf("{");
-		if (braceStart === -1) continue;
 		const braceEnd = clause.indexOf("}", braceStart);
-		if (braceEnd === -1) continue;
 		const before = clause.slice(0, braceStart).trim();
 		const memberSource = clause.slice(braceStart + 1, braceEnd);
 		if (/['"`]|\/\/|\/\*/.test(memberSource)) continue;
@@ -73,8 +70,7 @@ function rewriteTypeImport(code) {
 			else kept.push(member);
 		}
 		if (!alias) continue;
-		const head = before.replace(/,\s*$/, "").trim();
-		const keptClause = head && kept.length ? `${head}, { ${kept.join(", ")} }` : head ? head : kept.length ? `{ ${kept.join(", ")} }` : "";
+		const keptClause = [before.replace(/,\s*$/, "").trim(), kept.length ? `{ ${kept.join(", ")} }` : ""].filter(Boolean).join(", ");
 		const attr = attributes ?? "";
 		const lines = [];
 		if (keptClause) lines.push(`import ${keptClause} from '${from}'${attr}`);

package/dist/plugin/aot/treeshake.mjs

@@ -1,7 +1,6 @@
 import { skipString } from "../../compile/lexer.mjs";
 
 //#region src/plugin/aot/treeshake.ts
-const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function nonCodeSpans(code) {
 	const spans = [];
 	const length = code.length;
@@ -48,7 +47,7 @@ function rewriteTypeImport(code) {
 	const from = "elysia";
 	const typeFrom = "elysia/type";
 	if (!code.includes(from)) return code;
-	const importRe = new RegExp(`(^|\\n)([ \\t]*)import\\s+(?!type\\b)((?:[A-Za-z_$][\\w$]*\\s*,\\s*)?\\{[^}]*\\})\\s+from\\s*(['"])${escape(from)}\\4(\\s*(?:with|assert)\\s*\\{[^}]*\\})?`, "g");
+	const importRe = new RegExp(`(^|\\n)([ \\t]*)import\\s+(?!type\\b)((?:[A-Za-z_$][\\w$]*\\s*,\\s*)?\\{[^}]*\\})\\s+from\\s*(['"])${from}\\4(\\s*(?:with|assert)\\s*\\{[^}]*\\})?`, "g");
 	const spans = nonCodeSpans(code);
 	const edits = [];
 	let m;
@@ -57,9 +56,7 @@ function rewriteTypeImport(code) {
 		const keyword = m.index + lead.length + indent.length;
 		if (spans.some(([start, end]) => keyword >= start && keyword < end)) continue;
 		const braceStart = clause.indexOf("{");
-		if (braceStart === -1) continue;
 		const braceEnd = clause.indexOf("}", braceStart);
-		if (braceEnd === -1) continue;
 		const before = clause.slice(0, braceStart).trim();
 		const memberSource = clause.slice(braceStart + 1, braceEnd);
 		if (/['"`]|\/\/|\/\*/.test(memberSource)) continue;
@@ -72,8 +69,7 @@ function rewriteTypeImport(code) {
 			else kept.push(member);
 		}
 		if (!alias) continue;
-		const head = before.replace(/,\s*$/, "").trim();
-		const keptClause = head && kept.length ? `${head}, { ${kept.join(", ")} }` : head ? head : kept.length ? `{ ${kept.join(", ")} }` : "";
+		const keptClause = [before.replace(/,\s*$/, "").trim(), kept.length ? `{ ${kept.join(", ")} }` : ""].filter(Boolean).join(", ");
 		const attr = attributes ?? "";
 		const lines = [];
 		if (keptClause) lines.push(`import ${keptClause} from '${from}'${attr}`);

package/dist/plugin/aot/unplugin.d.ts

@@ -16,14 +16,11 @@ interface ElysiaAotUnpluginFactoryResult {
   resolveId?: (id: string) => string | undefined;
   load?: (id: string) => string | undefined;
   transformInclude?: (id: string) => boolean;
-  transform?: (code: string, id: string) => string | undefined | Promise<string | undefined>;
-  /** Vite-specific override (`apply: 'build'` keeps dev on runtime JIT). */
+  transform?: (code: string, id: string) => string | undefined;
   vite?: {
     apply?: 'build' | 'serve';
   };
-  /** rspack compiler hook: forces the manifest module side-effectful. */
   rspack?: (compiler: unknown) => void;
-  /** webpack compiler hook: forces the manifest module side-effectful. */
   webpack?: (compiler: unknown) => void;
 }
 /**

package/dist/plugin/aot/unplugin.js

@@ -2,7 +2,6 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const require_plugin_aot_hooks = require('./hooks.js');
 
 //#region src/plugin/aot/unplugin.ts
-const cleanIdOf = (id) => id.split("?", 1)[0];
 const VIRTUAL_MANIFEST_RESOURCE = /%00elysia%2Fcompiled/;
 const forceManifestSideEffect = (compiler) => {
 	compiler.options.module.rules.push({
@@ -37,18 +36,10 @@ const aotFactory = (options) => {
 		enforce: "pre",
 		buildStart: hooks.buildStart,
 		buildEnd: hooks.buildEnd,
-		resolveId(id) {
-			return hooks.resolveId(id) ?? void 0;
-		},
-		load(id) {
-			return hooks.load(id) ?? void 0;
-		},
-		transformInclude(id) {
-			return hooks.isTransformCandidate(cleanIdOf(id));
-		},
-		transform(code, id) {
-			return hooks.transform(code, id);
-		},
+		resolveId: hooks.resolveId,
+		load: hooks.load,
+		transformInclude: hooks.isTransformCandidate,
+		transform: hooks.transform,
 		vite: { apply: "build" },
 		rspack(compiler) {
 			forceManifestSideEffect(compiler);