elysia 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/compile/jit-probe.d.ts

@@ -1,8 +1,8 @@
 //#region src/compile/jit-probe.d.ts
 /** A handler-JIT entry point the frozen replay can trip over. */
-type JITProbeReason = 'sucrose' | 'handler:new-function';
+type JITProbeReason = 'sucrose' | 'handler:new-function' | 'handler:indexed-duplicate';
 interface JITProbeResult {
-  /** `sucrose` + the handler `new Function` codegen is unused. */
+  /** No route needs sucrose, handler codegen, or indexed duplicate replay. */
   jit: boolean;
   reasons: JITProbeReason[];
 }

package/dist/context.d.ts

@@ -9,7 +9,7 @@ import { AnyElysia } from "./base.js";
 
 //#region src/context.d.ts
 declare function createBaseContext(app: AnyElysia): any;
-declare function clearContextCache(): void;
+declare function clearContextCache(app?: AnyElysia): void;
 declare function createContext(app: AnyElysia): new (request: Request) => Context;
 interface ContextBase<in out Route extends RouteSchema, in out Singleton extends SingletonBase> {
   server: Server | null;

package/dist/context.js

@@ -41,7 +41,11 @@ function createBaseContext(app) {
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }
-function clearContextCache() {
+function clearContextCache(app) {
+	if (app !== void 0) {
+		contextCache.delete(app);
+		return;
+	}
 	contextCache = /* @__PURE__ */ new WeakMap();
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;

package/dist/context.mjs

@@ -40,7 +40,11 @@ function createBaseContext(app) {
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }
-function clearContextCache() {
+function clearContextCache(app) {
+	if (app !== void 0) {
+		contextCache.delete(app);
+		return;
+	}
 	contextCache = /* @__PURE__ */ new WeakMap();
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;

package/dist/package.js

@@ -1,6 +1,6 @@
 
 //#region package.json
-var version = "2.0.0-beta.3";
+var version = "2.0.0-beta.4";
 
 //#endregion
 Object.defineProperty(exports, 'version', {

package/dist/package.mjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "2.0.0-beta.3";
+var version = "2.0.0-beta.4";
 
 //#endregion
 export { version };

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

@@ -1,5 +1,6 @@
+import { CapturedValidator } from "../../compile/aot.js";
 import { JITProbeResult } from "../../compile/jit-probe.js";
-import { AotTarget } from "./source.js";
+import { AotModuleCondition, AotTarget } from "./source.js";
 
 //#region src/plugin/aot/core.d.ts
 interface ElysiaAotOptions {
@@ -93,6 +94,8 @@ interface ElysiaAotOptions {
   verbose?: boolean;
 }
 declare const resolveEntry: (entry: string) => string;
+/** @internal Resolve the package condition used to evaluate an AOT entry. */
+declare const resolveEntryModuleKind: (entry: string) => "cjs" | "esm";
 /** Runtime handler-JIT module a strip build can replace with a throwing stub. */
 interface StubPlan {
   /** Stub the internal handler codegen module. */
@@ -279,7 +282,7 @@ declare const OVERRIDE_MAP: Record<string, {
   leaf: string;
   export: string;
 }>;
-declare function generateVirtualType(typeSpecifier?: string): Promise<string>;
+declare function generateVirtualType(typeSpecifier?: string, moduleCondition?: AotModuleCondition): Promise<string>;
 interface CompiledArtifacts {
   source: string;
   /** Handler-JIT modules detection proved safe to stub for this app. */
@@ -305,9 +308,12 @@ declare const getAotWorkerDiagnostics: () => {
  */
 declare function siblingModuleExt(moduleUrl: string): '.mjs' | '.js' | '.ts';
 /** @internal Re-evaluate an entry in a disposable worker for watch rebuilds. */
-declare function generateCompiledArtifactsIsolated(file: string, options?: ElysiaAotOptions): Promise<CompiledArtifacts>;
-declare function generateCompiledArtifacts(file: string, options?: ElysiaAotOptions): Promise<CompiledArtifacts>;
+declare function generateCompiledArtifactsIsolated(file: string, options?: ElysiaAotOptions, moduleCondition?: string): Promise<CompiledArtifacts>;
+type ValidatorSlotIdentity = Pick<CapturedValidator, 'method' | 'path' | 'slot'>;
+/** @internal Exact logical-slot gate used by AOT mode selection. */
+declare function validatorSlotSetsMatch(expected: readonly ValidatorSlotIdentity[], captured: readonly ValidatorSlotIdentity[]): boolean;
+declare function generateCompiledArtifacts(file: string, options?: ElysiaAotOptions, moduleCondition?: string): Promise<CompiledArtifacts>;
 declare const SOURCE_REGEX: RegExp;
 declare const realPath: (path: string) => string;
 //#endregion
-export { ADAPTER_BUN_FILTER, ADAPTER_CONSTANTS_FILTER, BridgeMode, CompiledArtifacts, ELYSIA_MODULE_FILTER, ElysiaAotOptions, IS_PRODUCTION_FILTER, NO_STUB, OVERRIDE_MAP, SOURCE_REGEX, STUB_SOURCES, StubPlan, adapterConstantsSource, alignStubExtensions, bunAdapterStubSource, generateCompiledArtifacts, generateCompiledArtifactsIsolated, generateVirtualType, getAotWorkerDiagnostics, makeElysiaModuleFilterRegex, makeIsElysiaModule, planFromReport, realPath, resolveElysiaRoot, resolveEntry, rewriteIsProductionCalls, siblingModuleExt };
+export { ADAPTER_BUN_FILTER, ADAPTER_CONSTANTS_FILTER, BridgeMode, CompiledArtifacts, ELYSIA_MODULE_FILTER, ElysiaAotOptions, IS_PRODUCTION_FILTER, NO_STUB, OVERRIDE_MAP, SOURCE_REGEX, STUB_SOURCES, StubPlan, adapterConstantsSource, alignStubExtensions, bunAdapterStubSource, generateCompiledArtifacts, generateCompiledArtifactsIsolated, generateVirtualType, getAotWorkerDiagnostics, makeElysiaModuleFilterRegex, makeIsElysiaModule, planFromReport, realPath, resolveElysiaRoot, resolveEntry, resolveEntryModuleKind, rewriteIsProductionCalls, siblingModuleExt, validatorSlotSetsMatch };

package/dist/plugin/aot/core.js

@@ -20,6 +20,28 @@ function findPackageRoot(from = process.cwd()) {
 	return dir;
 }
 const resolveEntry = (entry) => (0, node_path.resolve)(findPackageRoot(), entry);
+/** @internal Resolve the package condition used to evaluate an AOT entry. */
+const resolveEntryModuleKind = (entry) => {
+	const entryPath = resolveEntry(entry);
+	switch ((0, node_path.extname)(entryPath)) {
+		case ".cjs":
+		case ".cts": return "cjs";
+		case ".mjs":
+		case ".mts":
+		case ".ts":
+		case ".tsx": return "esm";
+		case ".js":
+		case ".jsx": {
+			const packagePath = (0, node_path.join)(findPackageRoot((0, node_path.dirname)(entryPath)), "package.json");
+			if (!(0, node_fs.existsSync)(packagePath)) return "cjs";
+			const pkg = JSON.parse((0, node_fs.readFileSync)(packagePath, "utf8"));
+			if (pkg.type === "module") return "esm";
+			if (pkg.type === void 0 || pkg.type === "commonjs") return "cjs";
+			throw new Error(`[elysia-aot] package.json has unsupported "type" ${JSON.stringify(pkg.type)} for JavaScript entry ${JSON.stringify(entryPath)}.`);
+		}
+		default: throw new Error(`[elysia-aot] entry ${JSON.stringify(entryPath)} has an ambiguous module condition. Use a .cjs/.cts CommonJS entry or a .mjs/.mts/.ts/.tsx ESM entry; .js/.jsx follows the nearest package.json "type".`);
+	}
+};
 const NO_STUB = {
 	jit: false,
 	ws: false,
@@ -302,17 +324,20 @@ const OVERRIDE_MAP = {
 	}
 };
 const requireFromHere = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
-const resolveSpecifier = (specifier) => {
-	const meta = {};
-	if (typeof meta.resolve === "function") {
-		const url = meta.resolve(specifier);
+const moduleMeta = {};
+const loadedModuleCondition = require("url").pathToFileURL(__filename).href.endsWith(".js") ? "cjs" : "esm";
+const resolveSpecifier = (specifier, moduleCondition) => {
+	if (moduleCondition === "cjs") return requireFromHere.resolve(specifier);
+	if (moduleMeta.resolve) {
+		const url = moduleMeta.resolve(specifier);
 		return url.startsWith("file://") ? new URL(url).pathname : url;
 	}
+	if (moduleCondition === "esm") throw new Error("[elysia-aot] CommonJS-loaded build plugin cannot resolve the ESM package condition. Load the build plugin through import for an ESM entry.");
 	return requireFromHere.resolve(specifier);
 };
-async function generateVirtualType(typeSpecifier = "elysia/type") {
-	const typePath = resolveSpecifier(typeSpecifier);
-	const typeboxPath = resolveSpecifier("typebox/type");
+async function generateVirtualType(typeSpecifier = "elysia/type", moduleCondition) {
+	const typePath = resolveSpecifier(typeSpecifier, moduleCondition);
+	const typeboxPath = resolveSpecifier("typebox/type", moduleCondition);
 	const ext = typePath.slice(typePath.lastIndexOf("."));
 	const leafDir = (0, node_path.join)((0, node_path.dirname)(typePath), "elysia");
 	const typebox = await import((0, node_url.pathToFileURL)(typeboxPath).href);
@@ -348,12 +373,13 @@ const workerUrl = () => {
 	return new URL("./worker" + siblingModuleExt(moduleUrl), moduleUrl);
 };
 /** @internal Re-evaluate an entry in a disposable worker for watch rebuilds. */
-async function generateCompiledArtifactsIsolated(file, options) {
+async function generateCompiledArtifactsIsolated(file, options, moduleCondition = resolveEntryModuleKind(file)) {
 	const entry = resolveEntry(file);
 	console.warn("[elysia-aot] re-evaluating \"" + entry + "\" in an isolated worker for rebuild. Top-level side effects run only inside the worker.");
 	const worker = new node_worker_threads.Worker(workerUrl(), { workerData: {
 		file: entry,
-		options
+		options,
+		moduleCondition
 	} });
 	activeGenerationWorkers++;
 	const exit = new Promise((resolve) => worker.once("exit", resolve));
@@ -383,13 +409,14 @@ async function generateCompiledArtifactsIsolated(file, options) {
 		}
 	}
 }
-function isStandardResponse(response) {
-	if (response == null || typeof response !== "object") return false;
-	if (require_compile_handler_frozen_validator.isStandardSchema(response)) return true;
-	if ("~kind" in response || "~elyAcl" in response) return false;
-	const entries = Object.values(response);
-	if (entries.length === 0) return false;
-	return entries.every((v) => require_compile_handler_frozen_validator.isStandardSchema(v));
+const validatorSlotKey = ({ method, path, slot }) => `${method}\0${path}\0${slot}`;
+/** @internal Exact logical-slot gate used by AOT mode selection. */
+function validatorSlotSetsMatch(expected, captured) {
+	const expectedKeys = new Set(expected.map(validatorSlotKey));
+	const capturedKeys = new Set(captured.map(validatorSlotKey));
+	if (expectedKeys.size !== capturedKeys.size) return false;
+	for (const key of expectedKeys) if (!capturedKeys.has(key)) return false;
+	return true;
 }
 /**
 * The manifest is one flat `method -> path` table with no per-app namespace,
@@ -406,7 +433,8 @@ const assertNoMount = (app, entry) => {
 	if (!mounted.length) return;
 	throw new Error(`[elysia-aot] "${entry}" mounts a sub-app (${mounted.join(", ")}). AOT cannot compile a mounted sub-app. Compose with .use() instead of .mount(), or disable AOT plugin`);
 };
-async function generateCompiledArtifacts(file, options) {
+async function generateCompiledArtifacts(file, options, moduleCondition = resolveEntryModuleKind(file)) {
+	if (moduleCondition !== loadedModuleCondition) throw new Error(`[elysia-aot] entry uses the ${moduleCondition === "cjs" ? "CommonJS \"require\"" : "ESM \"import\""} package condition, but the AOT build plugin was loaded through ${loadedModuleCondition === "cjs" ? "CommonJS \"require\"" : "ESM \"import\""}; entry: ${JSON.stringify(resolveEntry(file))}. Load the plugin through ${moduleCondition === "cjs" ? "require()" : "import"} so capture and generated registration share one Elysia module instance.`);
 	const previousAotBuild = process.env.ELYSIA_AOT_BUILD;
 	process.env.ELYSIA_AOT_BUILD = "1";
 	const previousAotVerbose = process.env.ELYSIA_AOT_VERBOSE;
@@ -415,7 +443,7 @@ async function generateCompiledArtifacts(file, options) {
 	try {
 		const entry = resolveEntry(file);
 		const entryReal = realPath(entry);
-		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options);
+		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options, moduleCondition);
 		_importedEntries.add(entryReal);
 		const mod = await import(entry);
 		const app = mod.app ?? mod.default;
@@ -424,6 +452,7 @@ async function generateCompiledArtifacts(file, options) {
 		assertNoMount(typedApp, entry);
 		const sourceOptions = {
 			register: true,
+			moduleCondition,
 			registerFrom: options?.registerFrom,
 			reconstructFrom: options?.reconstructFrom,
 			lazy: options?.lazy,
@@ -450,31 +479,48 @@ async function generateCompiledArtifacts(file, options) {
 		const hasWS = !!typedApp["~hasWS"] || !!typedApp["~routes"]?.some((route) => route?.[0] === "WS");
 		const history = typedApp["~routes"] ?? [];
 		const mayTrace = !!typedApp["~hasTrace"] || history.some((route) => (route?.[4])?.trace?.length || route?.[2]?.["~mount"]);
-		let expectedSlots = 0;
+		const expectedSlots = [];
+		const declaredTypeBoxSlots = /* @__PURE__ */ new Set();
 		let routesForbidSeal = false;
 		let wsCookie = false;
 		for (const route of history) {
+			const method = route[0];
+			const path = route[1];
+			const expectTypeBoxSlot = (slot) => {
+				const identity = {
+					method,
+					path,
+					slot
+				};
+				const key = validatorSlotKey(identity);
+				if (declaredTypeBoxSlots.has(key)) routesForbidSeal = true;
+				else {
+					declaredTypeBoxSlots.add(key);
+					expectedSlots.push(identity);
+				}
+			};
 			const [, , , instance, hook, appHook, inheritedChain, macroScope] = route;
 			const hooks = require_compile_handler_index.composeRouteHook(instance, hook, appHook, inheritedChain, typedApp, macroScope);
 			if (route[0] === "WS" && (hook?.cookie !== void 0 || hooks?.cookie !== void 0)) wsCookie = true;
 			if (!hooks) continue;
 			let routeHasTypeBoxDirectSlot = false;
-			for (const slot of [
-				"body",
-				"query",
-				"params",
-				"headers",
-				"cookie"
-			]) {
-				const value = hooks[slot];
-				if (value === void 0) continue;
-				if (require_compile_handler_frozen_validator.isStandardSchema(value)) continue;
+			const classify = (schema, slot) => {
+				if (schema === void 0) {
+					routesForbidSeal = true;
+					return;
+				}
+				if (require_compile_handler_frozen_validator.isStandardSchema(schema)) return;
 				routeHasTypeBoxDirectSlot = true;
-				expectedSlots++;
+				expectTypeBoxSlot(slot);
+			};
+			for (const slot of require_compile_handler_frozen_validator.REQUEST_SLOTS) {
+				const value = hooks[slot];
+				if (value !== void 0) classify(require_compile_handler_frozen_validator.resolveModelRef(value, typedApp), slot);
 			}
-			if (hooks.response !== void 0 && !isStandardResponse(hooks.response)) {
-				routeHasTypeBoxDirectSlot = true;
-				expectedSlots++;
+			if (hooks.response !== void 0) {
+				const response = require_compile_handler_frozen_validator.resolveModelRef(hooks.response, typedApp);
+				if (require_compile_handler_frozen_validator.isResponseMap(response)) for (const status in response) classify(require_compile_handler_frozen_validator.resolveModelRef(response[status], typedApp), `response:${status}`);
+				else classify(response, "response:200");
 			}
 			const mergeSchemas = hooks.schemas;
 			if (Array.isArray(mergeSchemas) && mergeSchemas.length > 0) {
@@ -482,13 +528,13 @@ async function generateCompiledArtifacts(file, options) {
 			}
 		}
 		if (typedApp["~config"]?.normalize === "typebox") routesForbidSeal = true;
-		const frozenSlots = artifacts.validators.length;
-		const { plan: stub, mode } = planFromReport(strip, report, hasWS, mayTrace, aliases, (artifacts.handlers.length > 0 || artifacts.validators.length > 0) && !routesForbidSeal && frozenSlots === expectedSlots && artifacts.validators.every((v) => v.bridgeFree === true), artifacts.handlers.length === 0 && artifacts.validators.length === 0, adapterStub, productionStub, wsCookie);
+		const validatorSlotsMatch = validatorSlotSetsMatch(expectedSlots, artifacts.validators);
+		const { plan: stub, mode } = planFromReport(strip, report, hasWS, mayTrace, aliases, (artifacts.handlers.length > 0 || artifacts.validators.length > 0) && !routesForbidSeal && validatorSlotsMatch && artifacts.validators.every((v) => v.bridgeFree === true), artifacts.handlers.length === 0 && artifacts.validators.length === 0, adapterStub, productionStub, wsCookie);
 		if (options?.target === "workerd") {
 			if (!report.jit) throw new Error(`[elysia-aot] target 'workerd' but handler JIT is still reachable (${report.reasons.join(", ") || "unknown"}). Every route must be captured into the AOT manifest.`);
-			if (frozenSlots !== expectedSlots) console.warn(`[elysia-aot] target 'workerd': only ${frozenSlots}/${expectedSlots} validator slots were frozen unfrozen slots compile at runtime and will fail on workerd.`);
+			if (!validatorSlotsMatch) console.warn("[elysia-aot] target 'workerd': captured validator slots do not exactly match declared slots; unfrozen slots compile at runtime and will fail on workerd.");
 		}
-		const virtualType = mode === "off" ? void 0 : await generateVirtualType("elysia/type");
+		const virtualType = mode === "off" ? void 0 : await generateVirtualType("elysia/type", moduleCondition);
 		return {
 			source: artifacts.source,
 			stub,
@@ -533,5 +579,7 @@ exports.planFromReport = planFromReport;
 exports.realPath = realPath;
 exports.resolveElysiaRoot = resolveElysiaRoot;
 exports.resolveEntry = resolveEntry;
+exports.resolveEntryModuleKind = resolveEntryModuleKind;
 exports.rewriteIsProductionCalls = rewriteIsProductionCalls;
-exports.siblingModuleExt = siblingModuleExt;
+exports.siblingModuleExt = siblingModuleExt;
+exports.validatorSlotSetsMatch = validatorSlotSetsMatch;

package/dist/plugin/aot/core.mjs

@@ -1,9 +1,9 @@
-import { isStandardSchema, mergeSchemasAllStandard } from "../../compile/handler/frozen-validator.mjs";
+import { REQUEST_SLOTS, isResponseMap, isStandardSchema, mergeSchemasAllStandard, resolveModelRef } from "../../compile/handler/frozen-validator.mjs";
 import { composeRouteHook } from "../../compile/handler/index.mjs";
 import { captureArtifacts, compileToSource, replayStubbability } from "./source.mjs";
 import { createRequire } from "node:module";
-import { existsSync, realpathSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { existsSync, readFileSync, realpathSync } from "node:fs";
+import { dirname, extname, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { Worker } from "node:worker_threads";
 
@@ -18,6 +18,28 @@ function findPackageRoot(from = process.cwd()) {
 	return dir;
 }
 const resolveEntry = (entry) => resolve(findPackageRoot(), entry);
+/** @internal Resolve the package condition used to evaluate an AOT entry. */
+const resolveEntryModuleKind = (entry) => {
+	const entryPath = resolveEntry(entry);
+	switch (extname(entryPath)) {
+		case ".cjs":
+		case ".cts": return "cjs";
+		case ".mjs":
+		case ".mts":
+		case ".ts":
+		case ".tsx": return "esm";
+		case ".js":
+		case ".jsx": {
+			const packagePath = join(findPackageRoot(dirname(entryPath)), "package.json");
+			if (!existsSync(packagePath)) return "cjs";
+			const pkg = JSON.parse(readFileSync(packagePath, "utf8"));
+			if (pkg.type === "module") return "esm";
+			if (pkg.type === void 0 || pkg.type === "commonjs") return "cjs";
+			throw new Error(`[elysia-aot] package.json has unsupported "type" ${JSON.stringify(pkg.type)} for JavaScript entry ${JSON.stringify(entryPath)}.`);
+		}
+		default: throw new Error(`[elysia-aot] entry ${JSON.stringify(entryPath)} has an ambiguous module condition. Use a .cjs/.cts CommonJS entry or a .mjs/.mts/.ts/.tsx ESM entry; .js/.jsx follows the nearest package.json "type".`);
+	}
+};
 const NO_STUB = {
 	jit: false,
 	ws: false,
@@ -300,17 +322,20 @@ const OVERRIDE_MAP = {
 	}
 };
 const requireFromHere = createRequire(import.meta.url);
-const resolveSpecifier = (specifier) => {
-	const meta = import.meta;
-	if (typeof meta.resolve === "function") {
-		const url = meta.resolve(specifier);
+const moduleMeta = import.meta;
+const loadedModuleCondition = import.meta.url.endsWith(".js") ? "cjs" : "esm";
+const resolveSpecifier = (specifier, moduleCondition) => {
+	if (moduleCondition === "cjs") return requireFromHere.resolve(specifier);
+	if (moduleMeta.resolve) {
+		const url = moduleMeta.resolve(specifier);
 		return url.startsWith("file://") ? new URL(url).pathname : url;
 	}
+	if (moduleCondition === "esm") throw new Error("[elysia-aot] CommonJS-loaded build plugin cannot resolve the ESM package condition. Load the build plugin through import for an ESM entry.");
 	return requireFromHere.resolve(specifier);
 };
-async function generateVirtualType(typeSpecifier = "elysia/type") {
-	const typePath = resolveSpecifier(typeSpecifier);
-	const typeboxPath = resolveSpecifier("typebox/type");
+async function generateVirtualType(typeSpecifier = "elysia/type", moduleCondition) {
+	const typePath = resolveSpecifier(typeSpecifier, moduleCondition);
+	const typeboxPath = resolveSpecifier("typebox/type", moduleCondition);
 	const ext = typePath.slice(typePath.lastIndexOf("."));
 	const leafDir = join(dirname(typePath), "elysia");
 	const typebox = await import(pathToFileURL(typeboxPath).href);
@@ -346,12 +371,13 @@ const workerUrl = () => {
 	return new URL("./worker" + siblingModuleExt(moduleUrl), moduleUrl);
 };
 /** @internal Re-evaluate an entry in a disposable worker for watch rebuilds. */
-async function generateCompiledArtifactsIsolated(file, options) {
+async function generateCompiledArtifactsIsolated(file, options, moduleCondition = resolveEntryModuleKind(file)) {
 	const entry = resolveEntry(file);
 	console.warn("[elysia-aot] re-evaluating \"" + entry + "\" in an isolated worker for rebuild. Top-level side effects run only inside the worker.");
 	const worker = new Worker(workerUrl(), { workerData: {
 		file: entry,
-		options
+		options,
+		moduleCondition
 	} });
 	activeGenerationWorkers++;
 	const exit = new Promise((resolve) => worker.once("exit", resolve));
@@ -381,13 +407,14 @@ async function generateCompiledArtifactsIsolated(file, options) {
 		}
 	}
 }
-function isStandardResponse(response) {
-	if (response == null || typeof response !== "object") return false;
-	if (isStandardSchema(response)) return true;
-	if ("~kind" in response || "~elyAcl" in response) return false;
-	const entries = Object.values(response);
-	if (entries.length === 0) return false;
-	return entries.every((v) => isStandardSchema(v));
+const validatorSlotKey = ({ method, path, slot }) => `${method}\0${path}\0${slot}`;
+/** @internal Exact logical-slot gate used by AOT mode selection. */
+function validatorSlotSetsMatch(expected, captured) {
+	const expectedKeys = new Set(expected.map(validatorSlotKey));
+	const capturedKeys = new Set(captured.map(validatorSlotKey));
+	if (expectedKeys.size !== capturedKeys.size) return false;
+	for (const key of expectedKeys) if (!capturedKeys.has(key)) return false;
+	return true;
 }
 /**
 * The manifest is one flat `method -> path` table with no per-app namespace,
@@ -404,7 +431,8 @@ const assertNoMount = (app, entry) => {
 	if (!mounted.length) return;
 	throw new Error(`[elysia-aot] "${entry}" mounts a sub-app (${mounted.join(", ")}). AOT cannot compile a mounted sub-app. Compose with .use() instead of .mount(), or disable AOT plugin`);
 };
-async function generateCompiledArtifacts(file, options) {
+async function generateCompiledArtifacts(file, options, moduleCondition = resolveEntryModuleKind(file)) {
+	if (moduleCondition !== loadedModuleCondition) throw new Error(`[elysia-aot] entry uses the ${moduleCondition === "cjs" ? "CommonJS \"require\"" : "ESM \"import\""} package condition, but the AOT build plugin was loaded through ${loadedModuleCondition === "cjs" ? "CommonJS \"require\"" : "ESM \"import\""}; entry: ${JSON.stringify(resolveEntry(file))}. Load the plugin through ${moduleCondition === "cjs" ? "require()" : "import"} so capture and generated registration share one Elysia module instance.`);
 	const previousAotBuild = process.env.ELYSIA_AOT_BUILD;
 	process.env.ELYSIA_AOT_BUILD = "1";
 	const previousAotVerbose = process.env.ELYSIA_AOT_VERBOSE;
@@ -413,7 +441,7 @@ async function generateCompiledArtifacts(file, options) {
 	try {
 		const entry = resolveEntry(file);
 		const entryReal = realPath(entry);
-		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options);
+		if (_importedEntries.has(entryReal)) return generateCompiledArtifactsIsolated(file, options, moduleCondition);
 		_importedEntries.add(entryReal);
 		const mod = await import(entry);
 		const app = mod.app ?? mod.default;
@@ -422,6 +450,7 @@ async function generateCompiledArtifacts(file, options) {
 		assertNoMount(typedApp, entry);
 		const sourceOptions = {
 			register: true,
+			moduleCondition,
 			registerFrom: options?.registerFrom,
 			reconstructFrom: options?.reconstructFrom,
 			lazy: options?.lazy,
@@ -448,31 +477,48 @@ async function generateCompiledArtifacts(file, options) {
 		const hasWS = !!typedApp["~hasWS"] || !!typedApp["~routes"]?.some((route) => route?.[0] === "WS");
 		const history = typedApp["~routes"] ?? [];
 		const mayTrace = !!typedApp["~hasTrace"] || history.some((route) => (route?.[4])?.trace?.length || route?.[2]?.["~mount"]);
-		let expectedSlots = 0;
+		const expectedSlots = [];
+		const declaredTypeBoxSlots = /* @__PURE__ */ new Set();
 		let routesForbidSeal = false;
 		let wsCookie = false;
 		for (const route of history) {
+			const method = route[0];
+			const path = route[1];
+			const expectTypeBoxSlot = (slot) => {
+				const identity = {
+					method,
+					path,
+					slot
+				};
+				const key = validatorSlotKey(identity);
+				if (declaredTypeBoxSlots.has(key)) routesForbidSeal = true;
+				else {
+					declaredTypeBoxSlots.add(key);
+					expectedSlots.push(identity);
+				}
+			};
 			const [, , , instance, hook, appHook, inheritedChain, macroScope] = route;
 			const hooks = composeRouteHook(instance, hook, appHook, inheritedChain, typedApp, macroScope);
 			if (route[0] === "WS" && (hook?.cookie !== void 0 || hooks?.cookie !== void 0)) wsCookie = true;
 			if (!hooks) continue;
 			let routeHasTypeBoxDirectSlot = false;
-			for (const slot of [
-				"body",
-				"query",
-				"params",
-				"headers",
-				"cookie"
-			]) {
-				const value = hooks[slot];
-				if (value === void 0) continue;
-				if (isStandardSchema(value)) continue;
+			const classify = (schema, slot) => {
+				if (schema === void 0) {
+					routesForbidSeal = true;
+					return;
+				}
+				if (isStandardSchema(schema)) return;
 				routeHasTypeBoxDirectSlot = true;
-				expectedSlots++;
+				expectTypeBoxSlot(slot);
+			};
+			for (const slot of REQUEST_SLOTS) {
+				const value = hooks[slot];
+				if (value !== void 0) classify(resolveModelRef(value, typedApp), slot);
 			}
-			if (hooks.response !== void 0 && !isStandardResponse(hooks.response)) {
-				routeHasTypeBoxDirectSlot = true;
-				expectedSlots++;
+			if (hooks.response !== void 0) {
+				const response = resolveModelRef(hooks.response, typedApp);
+				if (isResponseMap(response)) for (const status in response) classify(resolveModelRef(response[status], typedApp), `response:${status}`);
+				else classify(response, "response:200");
 			}
 			const mergeSchemas = hooks.schemas;
 			if (Array.isArray(mergeSchemas) && mergeSchemas.length > 0) {
@@ -480,13 +526,13 @@ async function generateCompiledArtifacts(file, options) {
 			}
 		}
 		if (typedApp["~config"]?.normalize === "typebox") routesForbidSeal = true;
-		const frozenSlots = artifacts.validators.length;
-		const { plan: stub, mode } = planFromReport(strip, report, hasWS, mayTrace, aliases, (artifacts.handlers.length > 0 || artifacts.validators.length > 0) && !routesForbidSeal && frozenSlots === expectedSlots && artifacts.validators.every((v) => v.bridgeFree === true), artifacts.handlers.length === 0 && artifacts.validators.length === 0, adapterStub, productionStub, wsCookie);
+		const validatorSlotsMatch = validatorSlotSetsMatch(expectedSlots, artifacts.validators);
+		const { plan: stub, mode } = planFromReport(strip, report, hasWS, mayTrace, aliases, (artifacts.handlers.length > 0 || artifacts.validators.length > 0) && !routesForbidSeal && validatorSlotsMatch && artifacts.validators.every((v) => v.bridgeFree === true), artifacts.handlers.length === 0 && artifacts.validators.length === 0, adapterStub, productionStub, wsCookie);
 		if (options?.target === "workerd") {
 			if (!report.jit) throw new Error(`[elysia-aot] target 'workerd' but handler JIT is still reachable (${report.reasons.join(", ") || "unknown"}). Every route must be captured into the AOT manifest.`);
-			if (frozenSlots !== expectedSlots) console.warn(`[elysia-aot] target 'workerd': only ${frozenSlots}/${expectedSlots} validator slots were frozen unfrozen slots compile at runtime and will fail on workerd.`);
+			if (!validatorSlotsMatch) console.warn("[elysia-aot] target 'workerd': captured validator slots do not exactly match declared slots; unfrozen slots compile at runtime and will fail on workerd.");
 		}
-		const virtualType = mode === "off" ? void 0 : await generateVirtualType("elysia/type");
+		const virtualType = mode === "off" ? void 0 : await generateVirtualType("elysia/type", moduleCondition);
 		return {
 			source: artifacts.source,
 			stub,
@@ -510,4 +556,4 @@ const realPath = (path) => {
 };
 
 //#endregion
-export { ADAPTER_BUN_FILTER, ADAPTER_CONSTANTS_FILTER, ELYSIA_MODULE_FILTER, IS_PRODUCTION_FILTER, NO_STUB, OVERRIDE_MAP, SOURCE_REGEX, STUB_SOURCES, adapterConstantsSource, alignStubExtensions, bunAdapterStubSource, generateCompiledArtifacts, generateCompiledArtifactsIsolated, generateVirtualType, getAotWorkerDiagnostics, makeElysiaModuleFilterRegex, makeIsElysiaModule, planFromReport, realPath, resolveElysiaRoot, resolveEntry, rewriteIsProductionCalls, siblingModuleExt };
+export { ADAPTER_BUN_FILTER, ADAPTER_CONSTANTS_FILTER, ELYSIA_MODULE_FILTER, IS_PRODUCTION_FILTER, NO_STUB, OVERRIDE_MAP, SOURCE_REGEX, STUB_SOURCES, adapterConstantsSource, alignStubExtensions, bunAdapterStubSource, generateCompiledArtifacts, generateCompiledArtifactsIsolated, generateVirtualType, getAotWorkerDiagnostics, makeElysiaModuleFilterRegex, makeIsElysiaModule, planFromReport, realPath, resolveElysiaRoot, resolveEntry, resolveEntryModuleKind, rewriteIsProductionCalls, siblingModuleExt, validatorSlotSetsMatch };

package/dist/plugin/aot/esbuild.js

@@ -28,7 +28,11 @@ let node_fs_promises = require("node:fs/promises");
 const aot = (entry, options) => ({
 	name: "elysia-aot",
 	async setup(build) {
-		const hooks = require_plugin_aot_hooks.createAotPluginHooks(entry, options);
+		const entryPath = require_plugin_aot_core.resolveEntry(entry);
+		const moduleCondition = require_plugin_aot_core.resolveEntryModuleKind(entryPath);
+		if (build.initialOptions?.conditions?.includes("types")) throw new Error("[elysia-aot] esbuild conditions includes 'types'; this selects declaration files as runtime inputs. Remove the conflicting condition.");
+		if (moduleCondition === "cjs" && build.initialOptions?.conditions?.includes("import")) throw new Error("[elysia-aot] esbuild conditions includes 'import' for a CommonJS entry; this would load two Elysia module instances. Remove the conflicting condition.");
+		const hooks = require_plugin_aot_hooks.createAotPluginHooks(entry, options, moduleCondition);
 		let initial = true;
 		build.onStart(async () => {
 			if (initial) {
@@ -39,8 +43,10 @@ const aot = (entry, options) => ({
 		});
 		await require_plugin_aot_hooks.setupAotOnLoad(build, hooks, {
 			readText: (path) => (0, node_fs_promises.readFile)(path, "utf8"),
-			resolveDir: (0, node_path.dirname)(require_plugin_aot_core.resolveEntry(entry))
+			resolveDir: (0, node_path.dirname)(entryPath)
 		});
+		const allowedKinds = moduleCondition === "cjs" ? new Set(["require-call", "require-resolve"]) : new Set(["import-statement", "dynamic-import"]);
+		build.onResolve({ filter: /^elysia(?:\/.*)?$/ }, (args) => allowedKinds.has(args.kind) ? void 0 : { errors: [{ text: `[elysia-aot] ${args.path} uses esbuild edge kind ${JSON.stringify(args.kind)}, which conflicts with the ${JSON.stringify(moduleCondition)} entry module condition. Use one consistent import/require condition for Elysia.` }] });
 	}
 });
 

package/dist/plugin/aot/esbuild.mjs

@@ -1,4 +1,4 @@
-import { resolveEntry } from "./core.mjs";
+import { resolveEntry, resolveEntryModuleKind } from "./core.mjs";
 import { createAotPluginHooks, setupAotOnLoad } from "./hooks.mjs";
 import { dirname } from "node:path";
 import { readFile } from "node:fs/promises";
@@ -26,7 +26,11 @@ import { readFile } from "node:fs/promises";
 const aot = (entry, options) => ({
 	name: "elysia-aot",
 	async setup(build) {
-		const hooks = createAotPluginHooks(entry, options);
+		const entryPath = resolveEntry(entry);
+		const moduleCondition = resolveEntryModuleKind(entryPath);
+		if (build.initialOptions?.conditions?.includes("types")) throw new Error("[elysia-aot] esbuild conditions includes 'types'; this selects declaration files as runtime inputs. Remove the conflicting condition.");
+		if (moduleCondition === "cjs" && build.initialOptions?.conditions?.includes("import")) throw new Error("[elysia-aot] esbuild conditions includes 'import' for a CommonJS entry; this would load two Elysia module instances. Remove the conflicting condition.");
+		const hooks = createAotPluginHooks(entry, options, moduleCondition);
 		let initial = true;
 		build.onStart(async () => {
 			if (initial) {
@@ -37,8 +41,10 @@ const aot = (entry, options) => ({
 		});
 		await setupAotOnLoad(build, hooks, {
 			readText: (path) => readFile(path, "utf8"),
-			resolveDir: dirname(resolveEntry(entry))
+			resolveDir: dirname(entryPath)
 		});
+		const allowedKinds = moduleCondition === "cjs" ? new Set(["require-call", "require-resolve"]) : new Set(["import-statement", "dynamic-import"]);
+		build.onResolve({ filter: /^elysia(?:\/.*)?$/ }, (args) => allowedKinds.has(args.kind) ? void 0 : { errors: [{ text: `[elysia-aot] ${args.path} uses esbuild edge kind ${JSON.stringify(args.kind)}, which conflicts with the ${JSON.stringify(moduleCondition)} entry module condition. Use one consistent import/require condition for Elysia.` }] });
 	}
 });
 

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

@@ -1,3 +1,4 @@
+import { AotModuleCondition } from "./source.js";
 import { ElysiaAotOptions } from "./core.js";
 
 //#region src/plugin/aot/hooks.d.ts
@@ -9,7 +10,7 @@ interface AotPluginHooks {
   transform(code: string, id: string): string | undefined | Promise<string | undefined>;
   isTransformCandidate(id: string): boolean;
 }
-declare const createAotPluginHooks: (entry: string, options?: ElysiaAotOptions) => AotPluginHooks;
+declare const createAotPluginHooks: (entry: string, options?: ElysiaAotOptions, moduleCondition?: AotModuleCondition) => AotPluginHooks;
 interface AotOnLoadAdapterOptions {
   /** Read a file's UTF-8 text (abstracted so Bun and esbuild can supply their own reader). */
   readText: (path: string) => Promise<string>;