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

package/dist/base.mjs

@@ -1,10 +1,12 @@
+// @bun
 import { isBun } from "./universal/constants.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 { clearFlattenChainMemo, clonePlainDecorators, clonePlainDeep, coalesceSchemas, createErrorEventHandler, eventProperties, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isEmpty, isHTMLBundle, isNotEmpty, isPlainObject, isRecordNumber, joinPath, macroOrigin, mapDeriveEntry, markPropertySingletons, markSingletons, mergeDeep, mergeResponse, nullObject, pluginHash, pluginId, 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";
 import { traceCapabilityRequired, wsCapabilityRequired } from "./generation.mjs";
-import { chainResolver, clearHandlerAnalysisCaches, compileHandler, composeRouteHook, localMacroRoot, resolveLocalHook } from "./compile/handler/index.mjs";
+import { releaseAnalysisCaches } from "./compile/handler/descriptor.mjs";
+import { chainResolver, clearHandlerAnalysisCaches, compileHandler, composeRouteHook, localMacroRoot, resolveLocalHook, runIntrospect } from "./compile/handler/index.mjs";
 import { RouteFlag, buildRouteTable, routeRow } from "./route-table.mjs";
 import { BunAdapter } from "./adapter/bun/index.mjs";
 import { clearContextCache } from "./context.mjs";
@@ -14,6 +16,9 @@ import Memoirist from "memoirist";
 
 //#region src/base.ts
 const useNodesBuffer = [];
+const propagatedRegistrations = /* @__PURE__ */ new WeakMap();
+const liftedRequests = /* @__PURE__ */ new WeakMap();
+const hocOriginOf = (o) => typeof o === "object" ? o.origin : o;
 const emptyHistory = Object.freeze([]);
 let mutationEpoch = 0;
 const extCallbackIndexes = /* @__PURE__ */ new WeakMap();
@@ -39,6 +44,13 @@ const markStoredSingletons = (table, source) => {
 	if (!table) return;
 	for (const key in source) markSingletons(table[key]);
 };
+const sharedTables = [
+	"decorator",
+	"store",
+	"headers",
+	"models",
+	"parser"
+];
 const canRegisterLoose = (path, isDynamic) => !isDynamic && (path.length === 0 || path.charCodeAt(path.length - 1) === 47);
 const isSingleSchema = (value) => "~kind" in value || "~elyAcl" in value || "~standard" in value;
 const isSchemaValue = (value) => {
@@ -78,7 +90,7 @@ function assertSchemaShape(hook, where) {
 			}
 			if (isStatusMap) continue;
 		}
-		throw new Error(`[Elysia] ${where}: "${key}" is not a schema — use t.Object({ ... })`);
+		throw new Error(`[Elysia] ${where}: "${key}" is not a schema \u2014 use t.Object({ ... })`);
 	}
 }
 /**
@@ -105,6 +117,7 @@ function expandPaths(path, needsEncode, registerLoose, explicit) {
 	return paths;
 }
 var Elysia = class Elysia {
+	#pending = 0;
 	get history() {
 		const generation = this["~generation"];
 		if (this.#isCacheable && this.cachedGeneration === generation && this.cachedEpoch === mutationEpoch && this.cachedHistory !== void 0) return this.cachedHistory;
@@ -158,8 +171,6 @@ var Elysia = class Elysia {
 		return this;
 	}
 	constructor(config) {
-		this._pending = 0;
-		this.routerBuilt = false;
 		/**
 		* ! Don't tune
 		*
@@ -205,7 +216,7 @@ var Elysia = class Elysia {
 		if (config) {
 			const { prefix, name, seed, adapter } = config;
 			this["~Prefix"] = prefix ? prefix.charCodeAt(0) === 47 ? prefix : `/${prefix}` : void 0;
-			if (name) this.hash = fnv1a(seed ? `${name}_${typeof seed === "object" ? JSON.stringify(seed, serializeMacroSeed) : seed}` : name);
+			if (name) this.hash = pluginHash(JSON.stringify(seed === void 0 ? [name] : [name, seed], serializeMacroSeed));
 			if (adapter?.setup) this.#useFn(adapter.setup);
 		} else this["~Prefix"] = void 0;
 	}
@@ -221,6 +232,7 @@ var Elysia = class Elysia {
 		if (!this.declaredRoutes?.length) return [];
 		const routes = this["~routes"].map(([method, path, handler, instance, hook, appHook, inheritedChain, macroScope]) => {
 			const merged = composeRouteHook(instance, hook, appHook, inheritedChain, this, macroScope);
+			runIntrospect(merged);
 			if (merged?.schemas?.length) for (const entry of merged.schemas) {
 				if (!entry?.response) continue;
 				merged.response = mergeResponse(merged.response, entry.response);
@@ -243,10 +255,10 @@ var Elysia = class Elysia {
 	decorate(typeOrNameOrDecorators, nameOrDecorators, value) {
 		return this.#setField("decorator", arguments.length, typeOrNameOrDecorators, nameOrDecorators, value);
 	}
-	#setField(field, length, typeOrName, nameOrValue, value) {
+	#setField(field, argCount, typeOrName, nameOrValue, value) {
 		let as = "append";
 		let name = "";
-		switch (length) {
+		switch (argCount) {
 			case 1:
 				value = typeOrName;
 				break;
@@ -261,10 +273,11 @@ var Elysia = class Elysia {
 				break;
 			default: return this;
 		}
-		this.#assertMutable(field === "store" ? "state" : "decorate");
-		const ext = this.ext;
-		const fresh = !ext[field];
-		const target = ext[field] ??= nullObject();
+		this.#assertTableMutable(field === "store" ? "state" : "decorate");
+		const ext = this.#ext;
+		let fresh = true;
+		for (let app = this; fresh && app; app = app.scopeParent) fresh = !app["~ext"]?.[field];
+		const target = this.#table(field);
 		switch (typeof value) {
 			case "object":
 				if (!value) return this;
@@ -300,9 +313,8 @@ var Elysia = class Elysia {
 		return this.#setField("store", arguments.length, typeOrNameOrStore, nameOrStore, value);
 	}
 	headers(headers) {
-		this.#assertMutable("headers");
-		const ext = this.ext;
-		ext.headers = Object.assign(ext.headers ?? nullObject(), headers);
+		this.#assertTableMutable("headers");
+		Object.assign(this.#table("headers"), headers);
 		return this;
 	}
 	#on(type, fn, scope = this["~config"]?.as) {
@@ -311,32 +323,30 @@ var Elysia = class Elysia {
 		const added = nullObject();
 		added[type] = fn;
 		if (type === "trace") this["~hasTrace"] = true;
-		this.#link(added, scope, this);
-		this.#tagOrigin(fn);
+		this.#pushChainNode(added, scope);
 		return this;
 	}
-	#link(added, scope, owner, mayRef = true, propagated) {
+	#pushChainNode(added, scope, registration, origin, owner) {
 		const parent = this["~hookChain"];
-		const refs = parent !== void 0 && parent.refs || mayRef && Elysia.#hookHasString(added);
-		this["~hookChain"] = propagated ? {
+		const refs = parent !== void 0 && parent.refs || Elysia.#hookHasString(added);
+		this["~hookChain"] = registration ? {
 			added,
 			parent,
 			refs,
 			scope,
-			propagated,
-			owner
+			propagated: true,
+			owner,
+			origin,
+			registration
 		} : {
 			added,
 			parent,
 			refs,
 			scope,
-			owner
+			owner: this,
+			origin: this.hash
 		};
 	}
-	#tagOrigin(value) {
-		if (this.hash === void 0) return;
-		for (const fn of Array.isArray(value) ? value : [value]) if (typeof fn === "function" && !fnOrigin.has(fn)) fnOrigin.set(fn, this.hash);
-	}
 	#onBranch(type, scopeOrFn, fn) {
 		return fn ? this.#on(type, fn, scopeOrFn) : this.#on(type, scopeOrFn);
 	}
@@ -351,9 +361,8 @@ var Elysia = class Elysia {
 		return this.#onBranch("parse", scopeOrFnOrName, fn);
 	}
 	parser(name, fn) {
-		this.#assertMutable("parser");
-		const ext = this.ext;
-		const parsers = ext.parser ??= nullObject();
+		this.#assertTableMutable("parser");
+		const parsers = this.#table("parser");
 		parsers[name] = fn;
 		return this;
 	}
@@ -373,7 +382,7 @@ var Elysia = class Elysia {
 	*/
 	setup(handler) {
 		this.#assertMutable("setup");
-		(this.ext.setup ??= []).push(...[].concat(handler));
+		(this.#ext.setup ??= []).push(...[].concat(handler));
 		return this;
 	}
 	transform(scopeOrFn, fn) {
@@ -412,13 +421,13 @@ var Elysia = class Elysia {
 				if (scopeOrFnOrError && typeof scopeOrFnOrError === "object") return this;
 				return this.#onBranch("error", scopeOrFnOrError);
 			case 2:
-				if (typeof scopeOrFnOrError === "function" && scopeOrFnOrError.prototype instanceof Object) return this.#errorClass(scopeOrFnOrError, fnOrError);
+				if (typeof scopeOrFnOrError === "function" && scopeOrFnOrError.prototype instanceof Object) return this.#onErrorClass(scopeOrFnOrError, fnOrError);
 				return this.#onBranch("error", scopeOrFnOrError, fnOrError);
-			case 3: return this.#errorClass(fnOrError, fn, scopeOrFnOrError);
+			case 3: return this.#onErrorClass(fnOrError, fn, scopeOrFnOrError);
 		}
 		return this;
 	}
-	#errorClass(ErrorClass, fn, scope) {
+	#onErrorClass(ErrorClass, fn, scope) {
 		const run = typeof fn === "function" ? fn : () => fn;
 		return this.#on("error", createErrorEventHandler(run, ErrorClass), scope);
 	}
@@ -437,9 +446,10 @@ var Elysia = class Elysia {
 				node = node.over;
 				continue;
 			}
-			if (node.scope !== "global") {
+			if (node.scope !== "global" && (node.scope !== scope || node.propagated)) {
 				node.scope = scope;
 				node.propagated = false;
+				invalidateMacroEpoch();
 			}
 			node = node.parent;
 		}
@@ -459,13 +469,11 @@ var Elysia = class Elysia {
 		if (hook) assertSchemaShape(hook, ".guard()");
 		hook = snapshotHookSchemas(hook);
 		hookToGuard(hook);
-		for (const key in hook) if (eventProperties.has(key)) this.#tagOrigin(hook[key]);
-		this.#tagOrigin(hook.derive);
 		this.#pushHook(hook, scope);
 		return this;
 	}
 	group() {
-		this.#assertMutable("group");
+		this.#assertTableMutable("group");
 		const prefix = arguments[0];
 		const schemaOrRun = arguments[1];
 		const run = arguments[2];
@@ -484,12 +492,8 @@ var Elysia = class Elysia {
 		const src = this["~ext"];
 		if (src) {
 			const ext = child["~ext"] ??= nullObject();
-			if (src.decorator) ext.decorator = Object.assign(nullObject(), src.decorator);
-			if (src.store) ext.store = Object.assign(nullObject(), src.store);
-			if (src.headers) ext.headers = Object.assign(nullObject(), src.headers);
-			if (src.models) ext.models = Object.assign(nullObject(), src.models);
+			for (const field of sharedTables) if (src[field]) ext[field] = src[field];
 			if (src.macro) ext.macro = Object.create(src.macro);
-			if (src.parser) ext.parser = Object.assign(nullObject(), src.parser);
 			if (src.capability) {
 				const cap = ext.capability = nullObject();
 				if (src.capability.trace) cap.trace = src.capability.trace;
@@ -502,9 +506,13 @@ var Elysia = class Elysia {
 		this.#use(child);
 		return this;
 	}
-	get ext() {
+	get #ext() {
 		return this["~ext"] ??= nullObject();
 	}
+	/** A group child starts or takes up its parent's table, see `group()` */
+	#table(field) {
+		return this.#ext[field] ??= this.scopeParent ? this.scopeParent.#table(field) : nullObject();
+	}
 	["~resolvedCapability"](kind) {
 		if (kind === "ws") {
 			const ws = this["~ext"]?.capability?.ws;
@@ -521,7 +529,7 @@ var Elysia = class Elysia {
 		return provider;
 	}
 	#ensureMacroTable() {
-		const ext = this.ext;
+		const ext = this.#ext;
 		if (ext.macro) return ext.macro;
 		const parent = this["~scopeChild"] ? this.scopeParent : void 0;
 		ext.macro = parent ? Object.create(parent.#ensureMacroTable()) : nullObject();
@@ -540,13 +548,13 @@ var Elysia = class Elysia {
 			}
 		}
 		if (hook.trace) this["~hasTrace"] = true;
-		this.#link(hook, scope, this);
+		this.#pushChainNode(hook, scope);
 		return this;
 	}
 	macro(macro, definition) {
 		this.#assertMutable("macro");
 		if (typeof macro === "function") throw new Error("use `.macro({ name: fn })` instead of `.macro(fn)`");
-		if (definition != null || typeof macro === "string") throw new Error("[Elysia] .macro(name, definition) was removed in 2.0 — use .macro({ [name]: definition })");
+		if (definition != null || typeof macro === "string") throw new Error("[Elysia] .macro(name, definition) was removed in 2.0 \u2014 use .macro({ [name]: definition })");
 		const m = this.#ensureMacroTable();
 		const baseline = this.macroBaseline;
 		for (const key in macro) {
@@ -577,7 +585,7 @@ var Elysia = class Elysia {
 				const seedSource = hook.seed ?? value;
 				const seedType = typeof seedSource;
 				let seedKey;
-				if (seedSource === null || seedType !== "object") seedKey = key + "\0" + seedType + "\0" + String(seedSource);
+				if (seedSource === null || seedType !== "object") seedKey = `${key}\0${seedType}\0${serializeMacroSeed("", seedSource)}`;
 				else try {
 					seedKey = key + "\0object\0" + JSON.stringify(seedSource, serializeMacroSeed);
 				} catch {
@@ -594,7 +602,7 @@ var Elysia = class Elysia {
 				const v = hook[k];
 				if (k === "seed" || k === "meta" || k === "$type") continue;
 				if (k === "introspect") {
-					v?.(input);
+					if (v) (input["~introspect"] ??= []).push(v);
 					delete input[key];
 					continue;
 				}
@@ -630,15 +638,9 @@ var Elysia = class Elysia {
 				if (eventProperties.has(k) || k === "derive") {
 					const incoming = Array.isArray(v) ? v : [v];
 					const existing = k in input ? Array.isArray(input[k]) ? input[k] : [input[k]] : [];
-					const added = [];
-					for (const fn of incoming) if (!existing.includes(fn) && !added.includes(fn)) added.push(fn);
 					const at = insertions.get(k) ?? 0;
-					input[k] = [
-						...existing.slice(0, at),
-						...added,
-						...existing.slice(at)
-					];
-					insertions.set(k, at + added.length);
+					input[k] = existing.toSpliced(at, 0, ...incoming);
+					insertions.set(k, at + incoming.length);
 				} else if (k in input) {
 					if (Array.isArray(input[k])) {
 						for (const item of Array.isArray(v) ? v : [v]) if (!input[k].includes(item)) input[k].unshift(item);
@@ -651,7 +653,7 @@ var Elysia = class Elysia {
 	}
 	use(app) {
 		if (!app) return this;
-		this.#assertMutable("use");
+		this.#assertTableMutable("use");
 		if (typeof app === "function") return this.#useFn(app);
 		if (typeof app.then === "function") return this.#useAsync(app);
 		if (Array.isArray(app)) {
@@ -664,6 +666,9 @@ var Elysia = class Elysia {
 		this.#use(app);
 		return this;
 	}
+	has(plugin) {
+		return this.childrenHash?.has(plugin.hash ?? pluginId(plugin)) ?? false;
+	}
 	#useFn(app) {
 		const prevBaseline = this.macroBaseline;
 		const baseline = /* @__PURE__ */ new Set();
@@ -705,14 +710,15 @@ var Elysia = class Elysia {
 		const config = app["~config"];
 		if (app["~introspect"] || config?.introspect) this["~introspect"] = true;
 		const name = config?.name;
-		if (name) {
-			const hash = app.hash;
-			if (this.childrenHash?.has(hash)) return;
+		const childKey = name ? app.hash : pluginId(app);
+		const exists = this.childrenHash?.has(childKey);
+		if (name && exists) return;
+		if (!exists) {
 			this.childrenHash ??= /* @__PURE__ */ new Set();
-			this.childrenHash.add(hash);
-			(addedByThisCall ??= /* @__PURE__ */ new Set()).add(hash);
+			this.childrenHash.add(childKey);
+			(addedByThisCall ??= /* @__PURE__ */ new Set()).add(childKey);
 		}
-		if (app.childrenHash) addedByThisCall = this.#absorbChildrenHash(app, addedByThisCall);
+		if (app.childrenHash && !app["~scopeChild"]) addedByThisCall = this.#absorbChildrenHash(app, addedByThisCall);
 		if (app["~ext"]) this.#assertMacroUnique(app, addedByThisCall);
 		if (app["~hasTrace"]) this["~hasTrace"] = true;
 		if (app.declaredRoutes === void 0 && app["~routeTable"]?.length) app.#materializeDeclaredRoutes();
@@ -725,20 +731,17 @@ var Elysia = class Elysia {
 			for (const child of app["~scopeChildren"]) children.push(child);
 		}
 		const hookChain = app["~hookChain"];
-		if (app["~ext"]) this.#absorbExt(app);
+		if (app["~ext"]) this.#absorbExt(app, addedByThisCall);
 		if (hookChain) this.#propagateHooks(app, hookChain, addedByThisCall);
 	}
 	#absorbChildrenHash(app, addedByThisCall) {
-		const incoming = app.childrenHash;
-		if (this.childrenHash) for (const h of incoming) {
-			if (this.childrenHash.has(h)) continue;
-			this.childrenHash.add(h);
+		const childrenHash = this.childrenHash;
+		for (let h of app.childrenHash) {
+			if (typeof h === "object") h = pluginId(h);
+			if (childrenHash.has(h)) continue;
+			childrenHash.add(h);
 			(addedByThisCall ??= /* @__PURE__ */ new Set()).add(h);
 		}
-		else {
-			this.childrenHash = new Set(incoming);
-			addedByThisCall = new Set(incoming);
-		}
 		return addedByThisCall;
 	}
 	/**
@@ -767,22 +770,26 @@ var Elysia = class Elysia {
 	*
 	* Keep the cold blocks in their own frames.
 	*/
-	#absorbExt(app) {
-		const { decorator, store, headers, models, parser, macro, hoc, setup, cleanup, capability } = app["~ext"];
+	#absorbExt(app, addedByThisCall) {
+		const source = app["~ext"];
+		const { decorator, store, headers, models, parser, macro, hoc, setup, cleanup, capability } = source;
 		const ext = this["~ext"] ??= nullObject();
-		if (decorator) {
+		if (app.scopeParent === this) {
+			for (const field of sharedTables) if (source[field]) ext[field] ??= source[field];
+		}
+		if (decorator && decorator !== ext.decorator) {
 			if (ext.decorator) mergeDeep(ext.decorator, decorator, void 0, true, false, void 0, { map: void 0 });
 			else ext.decorator = clonePlainDecorators(decorator);
 			markStoredSingletons(ext.decorator, decorator);
 		}
-		if (store) {
+		if (store && store !== ext.store) {
 			if (ext.store) mergeDeep(ext.store, store);
 			else ext.store = Object.assign(nullObject(), store);
 			markStoredSingletons(ext.store, store);
 		}
-		if (headers) ext.headers = Object.assign(ext.headers ?? nullObject(), headers);
-		if (models) ext.models = Object.assign(ext.models ?? nullObject(), models);
-		if (parser) ext.parser = Object.assign(ext.parser ?? nullObject(), parser);
+		if (headers && headers !== ext.headers) ext.headers = Object.assign(ext.headers ?? nullObject(), headers);
+		if (models && models !== ext.models) ext.models = Object.assign(ext.models ?? nullObject(), models);
+		if (parser && parser !== ext.parser) ext.parser = Object.assign(ext.parser ?? nullObject(), parser);
 		if (macro) if (app["~scopeChild"]) {
 			const pluginMacros = app.pluginMacros;
 			let changed = false;
@@ -803,7 +810,20 @@ var Elysia = class Elysia {
 			}
 			invalidateMacroEpoch();
 		}
-		if (hoc) ext.hoc = mergeExtCallbacks(ext.hoc, hoc);
+		if (hoc) {
+			const childrenHash = this.childrenHash;
+			const target = ext.hoc ??= [];
+			const origins = ext.hocOrigin ??= [];
+			for (let i = 0; i < hoc.length; i++) {
+				const fn = hoc[i];
+				const registration = source.hocOrigin?.[i] ?? app.hash;
+				const origin = typeof registration === "object" ? registration.origin ??= app.hash : registration;
+				if (origin !== void 0 && childrenHash.has(origin) && !addedByThisCall?.has(origin)) continue;
+				if (target.some((f, j) => f === fn && hocOriginOf(origins[j]) === origin)) continue;
+				origins.push(registration);
+				target.push(fn);
+			}
+		}
 		if (setup) ext.setup = mergeExtCallbacks(ext.setup, setup);
 		if (cleanup) ext.cleanup = mergeExtCallbacks(ext.cleanup, cleanup);
 		if (capability) {
@@ -841,10 +861,6 @@ var Elysia = class Elysia {
 	* Split out from #use, see #absorbExt
 	*/
 	#propagateHooks(app, hookChain, addedByThisCall) {
-		let pluginEvents;
-		let globalEvents;
-		let pluginMayRef = false;
-		let globalMayRef = false;
 		const nodes = useNodesBuffer;
 		nodes.length = 0;
 		let current = hookChain;
@@ -856,96 +872,71 @@ var Elysia = class Elysia {
 			nodes.push(current);
 			current = current.parent;
 		}
+		const childrenHash = this.childrenHash;
+		const scopeChild = app["~scopeChild"];
+		let held = propagatedRegistrations.get(this);
+		const lifted = liftedRequests.get(this);
+		let lifting;
 		for (let i = nodes.length - 1; i >= 0; i--) {
 			const node = nodes[i];
-			const nodeScope = node.scope;
-			if (nodeScope !== "plugin" && nodeScope !== "global") continue;
-			if (nodeScope === "plugin" && node.propagated) continue;
-			const isGlobal = nodeScope === "global";
-			const added = node.added;
-			const keys = Object.keys(added);
-			for (let k = 0; k < keys.length; k++) {
-				const key = keys[k];
-				if (key === "schemas") {
-					const schemas = added.schemas;
-					if (!schemas) continue;
-					const target = isGlobal ? globalEvents ??= nullObject() : pluginEvents ??= nullObject();
-					if (isGlobal) globalMayRef = true;
-					else pluginMayRef = true;
-					for (const s of schemas) (target.schemas ??= []).push(s);
-					continue;
-				}
-				if (key === "schema") continue;
-				if (eventProperties.has(key)) {
-					const raw = added[key];
-					const many = Array.isArray(raw);
-					const count = many ? raw.length : 1;
-					for (let f = 0; f < count; f++) {
-						const fn = many ? raw[f] : raw;
-						const childrenHash = this.childrenHash;
-						if (childrenHash !== void 0) {
-							const origin = fnOrigin.get(fn);
-							if (origin !== void 0 && childrenHash.has(origin) && !addedByThisCall?.has(origin)) continue;
-						}
-						pushField(isGlobal ? globalEvents ??= nullObject() : pluginEvents ??= nullObject(), key, fn);
-					}
-					continue;
-				}
-				if (key === "~deriveEntries") {
-					const entries = added[key];
-					if (!entries) continue;
-					const target = isGlobal ? globalEvents ??= nullObject() : pluginEvents ??= nullObject();
-					const list = target[key] ??= [];
-					for (let j = 0; j < entries.length; j++) list.push(entries[j]);
-					continue;
-				}
-				const target = isGlobal ? globalEvents ??= nullObject() : pluginEvents ??= nullObject();
-				if (isGlobal) globalMayRef = true;
-				else pluginMayRef = true;
-				target[key] = added[key];
+			const scope = node.scope;
+			if (scope === "plugin" ? node.propagated : scope !== "global") continue;
+			let source = node.added;
+			if (scopeChild) {
+				const request = source.request;
+				if (!request) continue;
+				source = nullObject();
+				source.request = request;
+			}
+			const origin = node.origin ?? app.hash;
+			const registration = node.registration ?? node;
+			let added = source;
+			let repeated = false;
+			if (origin !== void 0) {
+				if (!held) propagatedRegistrations.set(this, held = /* @__PURE__ */ new WeakMap());
+				const through = held.get(registration);
+				if (!through) held.set(registration, [origin]);
+				else if (through.includes(origin)) repeated = true;
+				else through.push(origin);
 			}
+			const registrant = registration.origin;
+			if (repeated) {
+				const schemas = source.schemas;
+				if (!schemas) continue;
+				added = nullObject();
+				added.schemas = schemas;
+			} else if (registrant !== void 0 && childrenHash?.has(registrant) && !addedByThisCall?.has(registrant)) {
+				added = nullObject();
+				for (const key in source) if (key !== "~deriveEntries" && !eventProperties.has(key)) added[key] = source[key];
+			}
+			let dropRequest = false;
+			if (origin !== void 0 && "request" in added) {
+				if (lifted?.has(origin)) dropRequest = true;
+				else if (scopeChild) (lifting ??= new Set(lifted)).add(origin);
+			}
+			if ("schema" in added || dropRequest) {
+				if (added === source) added = Object.assign(nullObject(), source);
+				delete added.schema;
+				if (dropRequest) delete added.request;
+			}
+			if (isNotEmpty(added)) this.#pushChainNode(added, scope, registration, origin, app);
 		}
+		if (lifting) liftedRequests.set(this, lifting);
 		nodes.length = 0;
-		if (globalEvents) this.#link(globalEvents, "global", app, globalMayRef, true);
-		if (pluginEvents) this.#link(pluginEvents, "plugin", app, pluginMayRef, true);
 	}
 	#emitChildRoutes(app, preChain, name) {
 		const declared = app.declaredRoutes;
 		const limit = declared.length;
-		const tail = app["~hookChain"];
-		let recent;
-		let hasLocal = false;
+		const callback = app["~scopeChild"] ? app["~hookChain"] : void 0;
 		let lastChildChain;
 		let lastCombined;
-		let lastTailChild = null;
-		let lastTailCombined;
+		let lastInner = null;
+		let lastCovered;
 		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 (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;
+			if (childChain === void 0) inheritedChain = preChain;
 			else if (preChain === void 0) inheritedChain = childChain;
 			else if (childChain === lastChildChain) inheritedChain = lastCombined;
 			else {
@@ -956,6 +947,19 @@ var Elysia = class Elysia {
 					refs: childChain.refs || preChain.refs
 				};
 			}
+			if (callback) {
+				if (inheritedChain !== lastInner) {
+					lastInner = inheritedChain;
+					lastCovered = {
+						combine: inheritedChain,
+						over: void 0,
+						callback,
+						inner: childChain,
+						refs: !!(inheritedChain?.refs || callback.refs)
+					};
+				}
+				inheritedChain = lastCovered;
+			}
 			this.#emitRoute(route, this["~scopeChild"] ? this : void 0, this["~Prefix"], inheritedChain, name);
 		}
 	}
@@ -985,11 +989,11 @@ var Elysia = class Elysia {
 		});
 	}
 	get pending() {
-		return this._pending > 0;
+		return this.#pending > 0;
 	}
 	#useAsync(promise) {
 		if (!this.ready) this._error = void 0;
-		this._pending++;
+		this.#pending++;
 		const next = (this.ready ?? Promise.resolve()).then(() => promise).then((value) => {
 			const plugin = value && typeof value === "object" && "default" in value && value.default ? value.default : value;
 			const snapshots = this.macroSnapshots;
@@ -1013,19 +1017,19 @@ var Elysia = class Elysia {
 				}
 			}
 		}).finally(() => {
-			this._pending--;
+			this.#pending--;
 		}).then(() => {}, (err) => {
 			this._error ??= { error: err };
 			console.error(err);
 		}).finally(() => {
-			if (this._pending > 0) return;
+			if (this.#pending > 0) return;
 			if (this.ready !== next) return;
 			const previousCompiled = this.compiled;
 			const previousJitColdRemaining = this.jitColdRemaining;
 			this.ready = void 0;
 			this.compiled = void 0;
 			this.fetchFn = void 0;
-			this.routerBuilt = false;
+			this.#routerBuilt = false;
 			clearContextCache(this);
 			try {
 				this.#buildRouter(false);
@@ -1050,7 +1054,7 @@ var Elysia = class Elysia {
 					break;
 				}
 			}
-			if (isHook) throw new Error(`[Elysia] .${method === "*" ? "all" : method.toLowerCase()}('${path}', handler, hook) is the 1.x order; Elysia 2 takes (path, hook, handler) — see the 2.0 migration guide`);
+			if (isHook) throw new Error(`[Elysia] .${method === "*" ? "all" : method.toLowerCase()}('${path}', handler, hook) is the 1.x order; Elysia 2 takes (path, hook, handler) \u2014 see the 2.0 migration guide`);
 		}
 		if (hasHook && hookOrFn) assertSchemaShape(hookOrFn, `${method} ${path}`);
 		const handler = hasHook ? fn : hookOrFn;
@@ -1077,7 +1081,7 @@ var Elysia = class Elysia {
 			handler,
 			this
 		]);
-		if (this.routerBuilt || this.compiled !== void 0) this.#invalidate();
+		if (this.#routerBuilt || this.compiled !== void 0) this.#invalidateRouter();
 		return this;
 	}
 	#assertMutable(api) {
@@ -1085,8 +1089,15 @@ var Elysia = class Elysia {
 		if (this["~generation"] === void 0) return;
 		throw new Error(`[Elysia] .${api}() called after the app was sealed by its first request, listen or compile`);
 	}
+	/**
+	* `#assertMutable` for the tables a group child shares with its parents:
+	* a child kept past its callback must not write into a sealed one
+	*/
+	#assertTableMutable(api) {
+		for (let app = this; app; app = app.scopeParent) app.#assertMutable(api);
+	}
 	get #isCacheable() {
-		return this["~generation"] !== void 0 && this.routerBuilt && !Capture.isCapturing();
+		return this["~generation"] !== void 0 && this.#routerBuilt && !Capture.isCapturing();
 	}
 	#cacheRoutes(generation) {
 		if (this.cachedGeneration === generation && this.cachedEpoch === mutationEpoch) return;
@@ -1109,29 +1120,29 @@ var Elysia = class Elysia {
 		const sequence = routes.length;
 		routes.push(route);
 		if (source) (this.routeSources ??= [])[sequence] = source;
-		if (this.routerBuilt || this.compiled !== void 0) this.#invalidate();
+		if (this.#routerBuilt || this.compiled !== void 0) this.#invalidateRouter();
 	}
-	#invalidate() {
+	#invalidateRouter() {
 		this.compiled = void 0;
 		this.jitColdRemaining = void 0;
 		this.jitTable = void 0;
 		this.jitRoute = void 0;
 		this.jitAliases = void 0;
 		this.fetchFn = void 0;
-		this.routerBuilt = false;
+		this.#routerBuilt = false;
 	}
 	model(name, model) {
-		this.#assertMutable("model");
-		const models = this.ext.models ??= nullObject();
+		this.#assertTableMutable("model");
+		const models = this.#table("models");
 		switch (typeof name) {
 			case "object":
 				for (const [key, value] of Object.entries(name)) if (!(key in models)) models[key] = toModel(key, value);
 				return this;
 			case "function": {
 				const remapped = name(models);
-				const next = nullObject();
+				const next = remapped === models ? models : nullObject();
 				for (const key in remapped) next[key] = toModel(key, remapped[key]);
-				this.ext.models = next;
+				this.#ext.models = next;
 				return this;
 			}
 			case "string":
@@ -1143,7 +1154,7 @@ var Elysia = class Elysia {
 	* Registered reusable models (via `.model()`), keyed by name.
 	*/
 	get models() {
-		return this["~ext"]?.models ?? nullObject();
+		return this["~ext"]?.models ?? this.scopeParent?.models ?? nullObject();
 	}
 	Ref(key) {
 		return Ref(key);
@@ -1240,13 +1251,13 @@ var Elysia = class Elysia {
 	compile() {
 		this["~config"] ??= nullObject();
 		this["~config"].precompile = true;
-		this.#invalidate();
+		this.#invalidateRouter();
 		this.fetch;
 		return this;
 	}
 	handler(index, immediate, route, aliases, table) {
 		if (this.compiled?.[index]) return this.compiled[index];
-		const indexedTable = table ?? (this.routerBuilt ? this["~routeTable"] : void 0);
+		const indexedTable = table ?? (this.#routerBuilt ? this["~routeTable"] : void 0);
 		const compiled = this.compiled ??= new Array(indexedTable?.length ?? this["~routes"].length);
 		if (immediate ?? this["~config"]?.precompile) {
 			const row = route ?? (indexedTable ? routeRow(indexedTable, index) : this["~routes"][index]);
@@ -1265,7 +1276,7 @@ var Elysia = class Elysia {
 		if (indexedTable !== void 0) this.jitTable = indexedTable;
 		if (jitRoute !== void 0) (this.jitRoute ??= [])[index] = jitRoute;
 		if (aliases !== void 0) (this.jitAliases ??= [])[index] = aliases;
-		return (context) => this.#jitDispatch(index, context);
+		return (context) => this["~dispatch"](index, context);
 	}
 	#staticAliases(table, index) {
 		const flags = table.flags[index];
@@ -1291,6 +1302,7 @@ var Elysia = class Elysia {
 		};
 	}
 	#releaseJit() {
+		releaseAnalysisCaches();
 		Compiled.release(this["~programId"]);
 		this.jitColdRemaining = void 0;
 		this.jitRoute = void 0;
@@ -1309,7 +1321,7 @@ var Elysia = class Elysia {
 		this.#releaseJit();
 		return true;
 	}
-	#jitDispatch(index, context) {
+	"~dispatch"(index, context) {
 		if (this.compiled[index]) return this.compiled[index](context);
 		const route = this.jitRoute?.[index];
 		const table = this.jitTable ?? this["~routeTable"];
@@ -1321,7 +1333,7 @@ var Elysia = class Elysia {
 		} catch (error) {
 			const routeError = new Error(`[Elysia] Failed to compile route ${materialized[0]} ${materialized[1]}: ${error?.message ?? error}`, { cause: error });
 			const finalize = this["~finalizeError"];
-			if (finalize) return finalize(context, routeError);
+			if (finalize) return finalize(context, routeError, void 0, true);
 			throw routeError;
 		}
 		this.compiled[index] = handler;
@@ -1366,11 +1378,11 @@ var Elysia = class Elysia {
 		}
 		return false;
 	}
-	static #slotHasTypeBox(value, models, record) {
+	static #slotHasTypeBox(value, models, allowStatusMap) {
 		if (typeof value === "string") value = models?.[value];
 		if (!value || typeof value !== "object") return false;
 		if ("~kind" in value || "~elyAcl" in value) return true;
-		if (!record || "~standard" in value) return false;
+		if (!allowStatusMap || "~standard" in value) return false;
 		for (const status in value) if (Elysia.#slotHasTypeBox(value[status], models)) return true;
 		return false;
 	}
@@ -1396,7 +1408,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) || Elysia.#chainHasTypeBox(node.tail, models, seen, resolve)) return true;
+				if (Elysia.#chainHasTypeBox(node.combine, models, seen, resolve)) return true;
 				node = node.over;
 			}
 		}
@@ -1427,8 +1439,9 @@ var Elysia = class Elysia {
 		const schemas = hook?.schemas;
 		if (Array.isArray(schemas)) for (let s = 0; s < schemas.length; s++) checkSlots(schemas[s]);
 	}
+	#routerBuilt = false;
 	#buildRouter(seal = false) {
-		if (this.routerBuilt) {
+		if (this.#routerBuilt) {
 			if (seal && this["~generation"] === void 0) this.#publishGeneration();
 			return;
 		}
@@ -1463,8 +1476,8 @@ var Elysia = class Elysia {
 				Object.assign(previousRouter, nextRouter);
 				this["~router"] = previousRouter;
 			}
-			this.routerBuilt = true;
 			if (seal) this.#publishGeneration();
+			this.#routerBuilt = true;
 			buildSucceeded = true;
 		} catch (error) {
 			this["~map"] = previousMap;
@@ -1516,9 +1529,10 @@ var Elysia = class Elysia {
 			if (!this["~ext"]?.macro && !this["~scopeChildren"]) this.declaredRoutes = void 0;
 		}
 		const ext = this["~ext"];
-		if (ext?.hoc) extCallbackIndexes.delete(ext.hoc);
 		if (ext?.setup) extCallbackIndexes.delete(ext.setup);
 		if (ext?.cleanup) extCallbackIndexes.delete(ext.cleanup);
+		if (ext?.decorator) markPropertySingletons(ext.decorator);
+		if (ext?.store) markPropertySingletons(ext.store);
 	}
 	#buildRouterUnsafe() {
 		const precompile = this["~config"]?.precompile;
@@ -1621,8 +1635,14 @@ var Elysia = class Elysia {
 			if (isDynamic) {
 				if (isHTMLBundle(table.handler[i])) continue;
 				const router = this["~router"] ??= new Memoirist({ loosePath: isLoose });
-				const handler = this.handler(i, precompile, void 0, void 0, table);
-				for (let p = 0; p < paths.length; p++) router.add(routeMethod, paths[p], handler);
+				let store;
+				if (precompile || this.compiled?.[i]) store = this.handler(i, precompile, void 0, void 0, table);
+				else {
+					this.compiled ??= new Array(length);
+					this.jitTable = table;
+					store = i;
+				}
+				for (let p = 0; p < paths.length; p++) router.add(routeMethod, paths[p], store);
 			} else {
 				const map = methods[routeMethod] ??= nullObject();
 				const handler = this.handler(i, precompile, void 0, {
@@ -1640,21 +1660,21 @@ var Elysia = class Elysia {
 			const run = () => this.fetch(request, ...rest);
 			return this.ready ? this.modules.then(run, run) : run();
 		};
-		return this.#dispatch();
+		return this.#buildFetch();
 	}
-	#dispatch() {
-		this.#buildRouter(!this._pending);
+	#buildFetch() {
+		this.#buildRouter(!this.#pending);
 		if (this.ready) return applyHoc(this, createFetchHandler(this));
 		return this.fetchFn ??= applyHoc(this, createFetchHandler(this));
 	}
 	get handle() {
-		return this._handle ??= async (requestOrUrl, options) => (this.fetchFn ?? this.#dispatch())(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
+		return this._handle ??= async (requestOrUrl, options) => (this.fetchFn ?? this.#buildFetch())(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
 		const listen = (this["~config"]?.adapter ?? (isBun ? BunAdapter : void 0))?.listen;
 		if (!listen) {
 			const deno = typeof Deno !== "undefined";
-			throw new Error(`[Elysia] listen() requires an adapter on ${deno ? "Deno" : typeof process === "undefined" ? "this runtime" : "Node.js"} — https://elysiajs.com/integrations/${deno ? "deno" : "node"}`);
+			throw new Error(`[Elysia] listen() requires an adapter on ${deno ? "Deno" : typeof process === "undefined" ? "this runtime" : "Node.js"} \u2014 https://elysiajs.com/integrations/${deno ? "deno" : "node"}`);
 		}
 		if (!Capture.isAotBuildEnv()) listen(this, options, callback);
 		return this;
@@ -1668,17 +1688,18 @@ var Elysia = class Elysia {
 	*
 	* new Elysia()
 	*	.wrap(
-	*		(fetch) => (request) =>
-	*			ctx.run({ counter: 0 }, () => fetch(request))
+	*		(fetch) => (request, ...rest) =>
+	*			ctx.run({ counter: 0 }, () => fetch(request, ...rest))
 	*	)
 	*	.get('/', () => ctx.getStore())
 	* ```
 	*/
 	wrap(callback) {
 		this.#assertMutable("wrap");
-		if (this.fetchFn && !this._pending) console.warn("[Elysia] .wrap() was called after the fetch handler was built");
-		const ext = this.ext;
+		if (this.fetchFn && !this.#pending) console.warn("[Elysia] .wrap() was called after the fetch handler was built");
+		const ext = this.#ext;
 		(ext.hoc ??= []).push(callback);
+		(ext.hocOrigin ??= []).push(this.hash ?? {});
 		return this;
 	}
 	/**
@@ -1697,7 +1718,7 @@ var Elysia = class Elysia {
 	cleanup(handler) {
 		if (this["~ext"]?.cleanupEpoch?.(handler)) return this;
 		this.#assertMutable("cleanup");
-		(this.ext.cleanup ??= []).push(...[].concat(handler));
+		(this.#ext.cleanup ??= []).push(...[].concat(handler));
 		return this;
 	}
 	/**