elysia 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/base.js

@@ -61,25 +61,13 @@ const expandPaths = (path, needsEncode, registerLoose, explicit) => {
 	return paths;
 };
 var Elysia = class Elysia {
-	#hasPlugin;
-	#hasGlobal;
-	#ready;
-	#pending = 0;
-	#error;
-	#hash;
-	#childrenHash;
-	#scopeParent;
-	#pluginMacros;
-	#macroBaseline;
-	#declaredRoutes;
-	#routeSources;
 	get history() {
-		if (this.#declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
-		if (!this.#declaredRoutes?.length) return emptyHistory;
-		const history = new Array(this.#declaredRoutes.length);
-		for (let sequence = 0; sequence < this.#declaredRoutes.length; sequence++) {
-			const route = this.#declaredRoutes[sequence];
-			const source = this.#routeSources?.[sequence];
+		if (this.declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
+		if (!this.declaredRoutes?.length) return emptyHistory;
+		const history = new Array(this.declaredRoutes.length);
+		for (let sequence = 0; sequence < this.declaredRoutes.length; sequence++) {
+			const route = this.declaredRoutes[sequence];
+			const source = this.routeSources?.[sequence];
 			history[sequence] = Object.freeze({
 				sequence,
 				method: route[0],
@@ -90,9 +78,9 @@ var Elysia = class Elysia {
 		return Object.freeze(history);
 	}
 	get ["~routes"]() {
-		if (this.#declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
-		if (!this.#declaredRoutes?.length) return [];
-		const routes = this.#declaredRoutes;
+		if (this.declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
+		if (!this.declaredRoutes?.length) return [];
+		const routes = this.declaredRoutes;
 		if (!this["~ext"]?.macro && !this["~scopeChildren"]) return routes;
 		return routes.map((r) => {
 			const localHook = r[4];
@@ -115,16 +103,12 @@ var Elysia = class Elysia {
 		this.#registerRoute(route);
 		return this;
 	}
-	#compiled;
-	#jitColdRemaining;
-	#jitTable;
-	#jitRoute;
-	#jitStatic;
-	#jitAliases;
 	get ["~programId"]() {
 		return this;
 	}
 	constructor(config) {
+		this._pending = 0;
+		this.routerBuilt = false;
 		/**
 		* ! Don't tune
 		*
@@ -170,13 +154,13 @@ 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 = require_utils.fnv1a(seed ? `${name}_${typeof seed === "object" ? JSON.stringify(seed, require_utils.serializeMacroSeed) : seed}` : name);
+			if (name) this.hash = require_utils.fnv1a(seed ? `${name}_${typeof seed === "object" ? JSON.stringify(seed, require_utils.serializeMacroSeed) : seed}` : name);
 			if (adapter?.setup) this.#useFn(adapter.setup);
 		} else this["~Prefix"] = void 0;
 	}
 	get routes() {
-		if (this.#declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
-		if (!this.#declaredRoutes?.length) return [];
+		if (this.declaredRoutes === void 0 && this["~routeTable"]?.length) this.#materializeDeclaredRoutes();
+		if (!this.declaredRoutes?.length) return [];
 		return this["~routes"].map(([method, path, handler, instance, hook, appHook, inheritedChain, macroScope]) => {
 			const merged = require_compile_handler_index.composeRouteHook(instance, hook, appHook, inheritedChain, this, macroScope);
 			if (merged?.schemas?.length) for (const entry of merged.schemas) {
@@ -204,7 +188,7 @@ var Elysia = class Elysia {
 	}
 	#setField(field, as, name, value) {
 		if (this["~generation"] !== void 0) this.#assertMutable(field === "store" ? "state" : "decorate");
-		const ext = this.#ext;
+		const ext = this.ext;
 		const fresh = !ext[field];
 		const target = ext[field] ??= require_utils.nullObject();
 		switch (typeof value) {
@@ -248,7 +232,7 @@ var Elysia = class Elysia {
 	}
 	headers(headers) {
 		this.#assertMutable("headers");
-		const ext = this.#ext;
+		const ext = this.ext;
 		if (ext.headers) Object.assign(ext.headers, headers);
 		else ext.headers = Object.assign(require_utils.nullObject(), headers);
 		return this;
@@ -266,11 +250,11 @@ var Elysia = class Elysia {
 			scope,
 			owner: this
 		};
-		if (scope === "plugin") this.#hasPlugin = true;
-		else if (scope === "global") this.#hasGlobal = true;
-		if (this.#hash !== void 0) {
+		if (scope === "plugin") this.hasPlugin = true;
+		else if (scope === "global") this.hasGlobal = true;
+		if (this.hash !== void 0) {
 			const tag = (f) => {
-				if (typeof f === "function" && !require_utils.fnOrigin.has(f)) require_utils.fnOrigin.set(f, this.#hash);
+				if (typeof f === "function" && !require_utils.fnOrigin.has(f)) require_utils.fnOrigin.set(f, this.hash);
 			};
 			if (Array.isArray(fn)) for (const f of fn) tag(f);
 			else tag(fn);
@@ -292,7 +276,7 @@ var Elysia = class Elysia {
 	}
 	parser(name, fn) {
 		this.#assertMutable("parser");
-		const ext = this.#ext;
+		const ext = this.ext;
 		const parsers = ext.parser ??= require_utils.nullObject();
 		parsers[name] = fn;
 		return this;
@@ -313,7 +297,7 @@ var Elysia = class Elysia {
 	*/
 	setup(handler) {
 		this.#assertMutable("setup");
-		const arr = this.#ext.setup ??= [];
+		const arr = this.ext.setup ??= [];
 		if (Array.isArray(handler)) arr.push(...handler);
 		else arr.push(handler);
 		return this;
@@ -360,20 +344,20 @@ var Elysia = class Elysia {
 		switch (arguments.length) {
 			case 1:
 				if (scopeOrFnOrError && typeof scopeOrFnOrError === "object") {
-					for (const [code, ErrorClass] of Object.entries(scopeOrFnOrError)) if (typeof ErrorClass === "function") (this.#ext.error ??= /* @__PURE__ */ new Map()).set(ErrorClass, code);
+					for (const [code, ErrorClass] of Object.entries(scopeOrFnOrError)) if (typeof ErrorClass === "function") (this.ext.error ??= /* @__PURE__ */ new Map()).set(ErrorClass, code);
 					return this;
 				}
 				return this.#onBranch("error", scopeOrFnOrError);
 			case 2:
 				if (typeof scopeOrFnOrError === "function" && (scopeOrFnOrError === Error || scopeOrFnOrError.prototype instanceof Error)) {
 					const run = typeof fnOrError === "function" ? fnOrError : () => fnOrError;
-					(this.#ext.error ??= /* @__PURE__ */ new Map()).set(scopeOrFnOrError, scopeOrFnOrError.name);
+					(this.ext.error ??= /* @__PURE__ */ new Map()).set(scopeOrFnOrError, scopeOrFnOrError.name);
 					return this.#onBranch("error", require_utils.createErrorEventHandler(run, scopeOrFnOrError));
 				}
 				return this.#onBranch("error", scopeOrFnOrError, fnOrError);
 			case 3: {
 				const run = typeof fn === "function" ? fn : () => fn;
-				(this.#ext.error ??= /* @__PURE__ */ new Map()).set(fnOrError, fnOrError.name);
+				(this.ext.error ??= /* @__PURE__ */ new Map()).set(fnOrError, fnOrError.name);
 				return this.#onBranch("error", scopeOrFnOrError, require_utils.createErrorEventHandler(run, fnOrError));
 			}
 		}
@@ -403,8 +387,8 @@ var Elysia = class Elysia {
 					const fns = Array.isArray(v) ? v : [v];
 					for (const fn of fns) {
 						if (typeof fn !== "function") continue;
-						if (scope === "plugin") this.#hasPlugin = true;
-						else this.#hasGlobal = true;
+						if (scope === "plugin") this.hasPlugin = true;
+						else this.hasGlobal = true;
 					}
 				}
 			}
@@ -412,6 +396,8 @@ var Elysia = class Elysia {
 		}
 	}
 	guard() {
+		const maybeHook = typeof arguments[0] === "string" ? arguments[1] : arguments[0];
+		if (maybeHook && typeof maybeHook === "object" && "as" in maybeHook && maybeHook.as !== void 0) throw new Error(`[elysia] guard({ as: '${maybeHook.as}' }) was removed in 2.0. Pass the scope as the first argument instead: guard('${maybeHook.as === "scoped" ? "plugin" : maybeHook.as}', { ... }). To combine a guard schema with a route's own schema for the same slot, add schema: 'merge'.`);
 		if (arguments.length === 1) return this.#guard("local", arguments[0]);
 		if (arguments.length === 2) {
 			if (typeof arguments[1] === "function") return this.group("", arguments[0], arguments[1]);
@@ -424,7 +410,7 @@ var Elysia = class Elysia {
 		require_utils.hookToGuard(hook);
 		const trackFn = (fn) => {
 			if (typeof fn !== "function") return;
-			if (this.#hash !== void 0 && !require_utils.fnOrigin.has(fn)) require_utils.fnOrigin.set(fn, this.#hash);
+			if (this.hash !== void 0 && !require_utils.fnOrigin.has(fn)) require_utils.fnOrigin.set(fn, this.hash);
 		};
 		for (const key in hook) {
 			if (!require_utils.eventProperties.has(key)) continue;
@@ -453,7 +439,7 @@ var Elysia = class Elysia {
 			prefix
 		} : void 0);
 		child["~scopeChild"] = true;
-		child.#scopeParent = this;
+		child.scopeParent = this;
 		(this["~scopeChildren"] ??= []).push(child);
 		const src = this["~ext"];
 		if (src) {
@@ -476,7 +462,7 @@ var Elysia = class Elysia {
 		this.#use(child);
 		return this;
 	}
-	get #ext() {
+	get ext() {
 		return this["~ext"] ??= require_utils.nullObject();
 	}
 	["~resolvedCapability"](kind) {
@@ -495,9 +481,9 @@ 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;
+		const parent = this["~scopeChild"] ? this.scopeParent : void 0;
 		ext.macro = parent ? Object.create(parent.#ensureMacroTable()) : require_utils.nullObject();
 		return ext.macro;
 	}
@@ -536,10 +522,10 @@ var Elysia = class Elysia {
 		this.#assertMutable("macro");
 		if (typeof macro === "function") throw new Error("use `.macro({ name: fn })` instead of `.macro(fn)`");
 		const m = this.#ensureMacroTable();
-		const baseline = this.#macroBaseline;
+		const baseline = this.macroBaseline;
 		for (const key in macro) {
 			if (typeof macro[key] === "object") macro[key] = require_utils.hookToGuard(macro[key]);
-			if (this.#hash !== void 0 && !require_utils.macroOrigin.has(macro[key])) require_utils.macroOrigin.set(macro[key], this.#hash);
+			if (this.hash !== void 0 && !require_utils.macroOrigin.has(macro[key])) require_utils.macroOrigin.set(macro[key], this.hash);
 			if (baseline?.has(key) && key in m && m[key] !== macro[key]) throw new Error(`[Elysia] Macro "${key}" can be only define once`);
 		}
 		Object.assign(m, macro);
@@ -577,9 +563,7 @@ var Elysia = class Elysia {
 			}
 			for (const k in hook) {
 				const v = hook[k];
-				if (k === "seed") continue;
-				if (k === "meta") continue;
-				if (k === "$type") continue;
+				if (k === "seed" || k === "meta" || k === "$type") continue;
 				if (k === "introspect") {
 					v?.(input);
 					delete input[key];
@@ -654,21 +638,37 @@ var Elysia = class Elysia {
 		return this;
 	}
 	#useFn(app) {
-		const prevBaseline = this.#macroBaseline;
+		const prevBaseline = this.macroBaseline;
 		const baseline = /* @__PURE__ */ new Set();
 		const existingMacro = this["~ext"]?.macro;
 		if (existingMacro) for (const k in existingMacro) baseline.add(k);
-		this.#macroBaseline = baseline;
+		this.macroBaseline = baseline;
+		let wantSnapshot = false;
+		let settled = false;
+		let beforeMacro;
+		queueMicrotask(() => {
+			if (wantSnapshot && !settled) {
+				beforeMacro = new Map(Object.entries(this["~ext"]?.macro ?? require_utils.nullObject()));
+				(this.macroSnapshots ??= /* @__PURE__ */ new Set()).add(beforeMacro);
+			}
+		});
 		const result = app(this);
-		this.#macroBaseline = prevBaseline;
+		this.macroBaseline = prevBaseline;
 		if (result && typeof result.then === "function") {
-			const beforeMacro = new Map(Object.entries(this["~ext"]?.macro ?? require_utils.nullObject()));
-			return this.#useAsync(result.then((value) => {
+			wantSnapshot = true;
+			return this.#useAsync(Promise.resolve(result).then((value) => {
+				settled = true;
+				if (!beforeMacro) return value;
+				this.macroSnapshots?.delete(beforeMacro);
 				const after = this["~ext"]?.macro;
 				if (after) {
 					for (const [k, def] of Object.entries(after)) if (beforeMacro.get(k) !== def) throw new Error(`Macro ${k} can only run in sync plugin`);
 				}
 				return value;
+			}, (err) => {
+				settled = true;
+				if (beforeMacro) this.macroSnapshots?.delete(beforeMacro);
+				throw err;
 			}));
 		}
 		return this;
@@ -679,17 +679,17 @@ var Elysia = class Elysia {
 		if (app["~introspect"] || config?.introspect) this["~introspect"] = true;
 		const name = config?.name;
 		if (name) {
-			const hash = app.#hash;
-			if (this.#childrenHash?.has(hash)) return;
-			this.#childrenHash ??= /* @__PURE__ */ new Set();
-			this.#childrenHash.add(hash);
+			const hash = app.hash;
+			if (this.childrenHash?.has(hash)) return;
+			this.childrenHash ??= /* @__PURE__ */ new Set();
+			this.childrenHash.add(hash);
 			(addedByThisCall ??= /* @__PURE__ */ new Set()).add(hash);
 		}
-		if (app.#childrenHash) addedByThisCall = this.#absorbChildrenHash(app, addedByThisCall);
+		if (app.childrenHash) 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();
-		if (app.#declaredRoutes?.length) {
+		if (app.declaredRoutes === void 0 && app["~routeTable"]?.length) app.#materializeDeclaredRoutes();
+		if (app.declaredRoutes?.length) {
 			if (app["~hasWS"]) this["~hasWS"] = true;
 			this.#emitChildRoutes(app, this["~hookChain"], name);
 		}
@@ -699,17 +699,17 @@ var Elysia = class Elysia {
 		}
 		const hookChain = app["~hookChain"];
 		if (app["~ext"]) this.#absorbExt(app);
-		if (app.#hasPlugin || app.#hasGlobal || hookChain) this.#propagateHooks(app, hookChain, addedByThisCall);
+		if (app.hasPlugin || app.hasGlobal || 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 incoming = app.childrenHash;
+		if (this.childrenHash) for (const h of incoming) {
+			if (this.childrenHash.has(h)) continue;
+			this.childrenHash.add(h);
 			(addedByThisCall ??= /* @__PURE__ */ new Set()).add(h);
 		}
 		else {
-			this.#childrenHash = new Set(incoming);
+			this.childrenHash = new Set(incoming);
 			addedByThisCall = new Set(incoming);
 		}
 		return addedByThisCall;
@@ -728,7 +728,7 @@ var Elysia = class Elysia {
 			if (existing === incoming) continue;
 			const origin = require_utils.macroOrigin.get(existing);
 			if (origin !== void 0 && origin === require_utils.macroOrigin.get(incoming)) continue;
-			if (addedByThisCall) for (const h of addedByThisCall) this.#childrenHash.delete(h);
+			if (addedByThisCall) for (const h of addedByThisCall) this.childrenHash.delete(h);
 			throw new Error(`[Elysia] Macro "${macroName}" can be only define once`);
 		}
 	}
@@ -754,21 +754,21 @@ var Elysia = class Elysia {
 		if (parser) if (ext.parser) Object.assign(ext.parser, parser);
 		else ext.parser = Object.assign(require_utils.nullObject(), parser);
 		if (macro) if (app["~scopeChild"]) {
-			const pluginMacros = app.#pluginMacros;
+			const pluginMacros = app.pluginMacros;
 			let changed = false;
 			if (pluginMacros?.size) {
 				const target = this.#ensureMacroTable();
 				for (const [name, def] of pluginMacros) if (!(name in target)) {
 					target[name] = def;
 					changed = true;
-					if (this["~scopeChild"]) (this.#pluginMacros ??= /* @__PURE__ */ new Map()).set(name, def);
+					if (this["~scopeChild"]) (this.pluginMacros ??= /* @__PURE__ */ new Map()).set(name, def);
 				}
 			}
 			if (changed) require_utils.invalidateMacroEpoch();
 		} else {
 			Object.assign(this.#ensureMacroTable(), macro);
 			if (this["~scopeChild"]) {
-				const pluginMacros = this.#pluginMacros ??= /* @__PURE__ */ new Map();
+				const pluginMacros = this.pluginMacros ??= /* @__PURE__ */ new Map();
 				for (const name in macro) pluginMacros.set(name, macro[name]);
 			}
 			require_utils.invalidateMacroEpoch();
@@ -829,7 +829,7 @@ var Elysia = class Elysia {
 		let globalEvents;
 		let pluginMayRef = false;
 		let globalMayRef = false;
-		if (app.#hasGlobal) this.#hasGlobal = true;
+		if (app.hasGlobal) this.hasGlobal = true;
 		const nodes = useNodesBuffer;
 		nodes.length = 0;
 		let current = hookChain;
@@ -859,7 +859,7 @@ var Elysia = class Elysia {
 					else pluginMayRef = true;
 					for (const s of schemas) {
 						(target.schemas ??= []).push(s);
-						if (isGlobal) this.#hasGlobal = true;
+						if (isGlobal) this.hasGlobal = true;
 					}
 					continue;
 				}
@@ -870,13 +870,13 @@ var Elysia = class Elysia {
 					const count = many ? raw.length : 1;
 					for (let f = 0; f < count; f++) {
 						const fn = many ? raw[f] : raw;
-						const childrenHash = this.#childrenHash;
+						const childrenHash = this.childrenHash;
 						if (childrenHash !== void 0) {
 							const origin = require_utils.fnOrigin.get(fn);
 							if (origin !== void 0 && childrenHash.has(origin) && !addedByThisCall?.has(origin)) continue;
 						}
 						require_utils.pushField(isGlobal ? globalEvents ??= require_utils.nullObject() : pluginEvents ??= require_utils.nullObject(), key, fn);
-						if (isGlobal) this.#hasGlobal = true;
+						if (isGlobal) this.hasGlobal = true;
 					}
 					continue;
 				}
@@ -919,7 +919,7 @@ var Elysia = class Elysia {
 		}
 	}
 	#emitChildRoutes(app, preChain, name) {
-		const declared = app.#declaredRoutes;
+		const declared = app.declaredRoutes;
 		if (!declared?.length) return;
 		const limit = declared.length;
 		let lastChildChain;
@@ -957,55 +957,69 @@ var Elysia = class Elysia {
 		], source);
 	}
 	get modules() {
-		const ready = this.#ready;
+		const ready = this.ready;
 		if (!ready) {
-			if (this.#error !== void 0) return Promise.reject(this.#error.error);
+			if (this._error !== void 0) return Promise.reject(this._error.error);
 			return Promise.resolve();
 		}
 		return ready.then(() => {
-			if (this.#error !== void 0) throw this.#error.error;
-			if (this.#ready && this.#ready !== ready) return this.modules;
+			if (this._error !== void 0) throw this._error.error;
+			if (this.ready && this.ready !== ready) return this.modules;
 		});
 	}
 	get pending() {
-		return this.#pending > 0;
+		return this._pending > 0;
 	}
 	#useAsync(promise) {
-		if (!this.#ready) this.#error = void 0;
-		this.#pending++;
-		const next = (this.#ready ?? Promise.resolve()).then(() => promise).then((value) => {
+		if (!this.ready) this._error = void 0;
+		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;
+			let before;
+			if (snapshots?.size) {
+				const macro = this["~ext"]?.macro;
+				before = macro ? new Map(Object.entries(macro)) : /* @__PURE__ */ new Map();
+			}
 			if (plugin) try {
 				this.use(plugin);
 			} catch (err) {
-				this.#error ??= { error: err };
+				this._error ??= { error: err };
 				console.error(err);
 			}
+			if (before) {
+				const after = this["~ext"]?.macro;
+				if (after) {
+					for (const [k, def] of Object.entries(after)) if (before.get(k) !== def) {
+						for (const snap of snapshots) if (snap.has(k) === before.has(k) && snap.get(k) === before.get(k)) snap.set(k, def);
+					}
+				}
+			}
 		}).finally(() => {
-			this.#pending--;
+			this._pending--;
 		}).then(() => {}, (err) => {
-			this.#error ??= { error: err };
+			this._error ??= { error: err };
 			console.error(err);
 		}).finally(() => this.#tryDrain(next));
-		this.#ready = next;
+		this.ready = next;
 		return this;
 	}
 	#tryDrain(sentinel) {
-		if (this.#pending > 0) return;
-		if (this.#ready !== sentinel) return;
-		const previousCompiled = this.#compiled;
-		const previousJitColdRemaining = this.#jitColdRemaining;
-		this.#ready = void 0;
-		this.#compiled = void 0;
-		this.#fetchFn = void 0;
-		this.#routerBuilt = false;
+		if (this._pending > 0) return;
+		if (this.ready !== sentinel) return;
+		const previousCompiled = this.compiled;
+		const previousJitColdRemaining = this.jitColdRemaining;
+		this.ready = void 0;
+		this.compiled = void 0;
+		this.fetchFn = void 0;
+		this.routerBuilt = false;
 		require_context.clearContextCache(this);
 		try {
 			this.#buildRouter(false);
 		} catch (error) {
-			this.#compiled = previousCompiled;
-			this.#jitColdRemaining = previousJitColdRemaining;
-			this.#error ??= { error };
+			this.compiled = previousCompiled;
+			this.jitColdRemaining = previousJitColdRemaining;
+			this._error ??= { error };
 		}
 	}
 	#add(method, path, hookOrFn, fn, hasHook = fn !== void 0) {
@@ -1015,7 +1029,7 @@ var Elysia = class Elysia {
 		const hook = hasHook ? require_schema_snapshot.snapshotHookSchemas(hookOrFn) : void 0;
 		const appHook = this["~hookChain"];
 		if (this["~generation"] !== void 0) this.#assertMutable("route");
-		(this.#declaredRoutes ?? this.#materializeDeclaredRoutes()).push(appHook ? [
+		(this.declaredRoutes ?? this.#materializeDeclaredRoutes()).push(appHook ? [
 			method,
 			path,
 			handler,
@@ -1034,15 +1048,15 @@ var Elysia = class Elysia {
 			handler,
 			this
 		]);
-		if (this.#routerBuilt || this.#compiled !== void 0) {
-			this.#compiled = void 0;
-			this.#jitColdRemaining = void 0;
-			this.#jitTable = void 0;
-			this.#jitRoute = void 0;
-			this.#jitStatic = void 0;
-			this.#jitAliases = void 0;
-			this.#fetchFn = void 0;
-			this.#routerBuilt = false;
+		if (this.routerBuilt || this.compiled !== void 0) {
+			this.compiled = void 0;
+			this.jitColdRemaining = void 0;
+			this.jitTable = void 0;
+			this.jitRoute = void 0;
+			this.jitStatic = void 0;
+			this.jitAliases = void 0;
+			this.fetchFn = void 0;
+			this.routerBuilt = false;
 		}
 		return this;
 	}
@@ -1051,33 +1065,33 @@ var Elysia = class Elysia {
 		throw new Error(`[Elysia] .${api}() called after the app was sealed`);
 	}
 	#materializeDeclaredRoutes() {
-		if (this.#declaredRoutes !== void 0) return this.#declaredRoutes;
+		if (this.declaredRoutes !== void 0) return this.declaredRoutes;
 		const table = this["~routeTable"];
-		if (!table) return this.#declaredRoutes = [];
+		if (!table) return this.declaredRoutes = [];
 		const routes = new Array(table.length);
 		for (let i = 0; i < table.length; i++) routes[i] = require_route_table.routeRow(table, i);
-		return this.#declaredRoutes = routes;
+		return this.declaredRoutes = routes;
 	}
 	#registerRoute(route, source) {
 		if (this["~generation"] !== void 0) this.#assertMutable("route");
-		const routes = this.#declaredRoutes ?? this.#materializeDeclaredRoutes();
+		const routes = this.declaredRoutes ?? this.#materializeDeclaredRoutes();
 		const sequence = routes.length;
 		routes.push(route);
-		if (source) (this.#routeSources ??= [])[sequence] = source;
-		if (this.#routerBuilt || this.#compiled !== void 0) {
-			this.#compiled = void 0;
-			this.#jitColdRemaining = void 0;
-			this.#jitTable = void 0;
-			this.#jitRoute = void 0;
-			this.#jitStatic = void 0;
-			this.#jitAliases = void 0;
-			this.#fetchFn = void 0;
-			this.#routerBuilt = false;
+		if (source) (this.routeSources ??= [])[sequence] = source;
+		if (this.routerBuilt || this.compiled !== void 0) {
+			this.compiled = void 0;
+			this.jitColdRemaining = void 0;
+			this.jitTable = void 0;
+			this.jitRoute = void 0;
+			this.jitStatic = void 0;
+			this.jitAliases = void 0;
+			this.fetchFn = void 0;
+			this.routerBuilt = false;
 		}
 	}
 	model(name, model) {
 		this.#assertMutable("model");
-		const models = this.#ext.models ??= require_utils.nullObject();
+		const models = this.ext.models ??= require_utils.nullObject();
 		switch (typeof name) {
 			case "object":
 				const entries = Object.entries(name);
@@ -1103,7 +1117,7 @@ var Elysia = class Elysia {
 						next[key] = value;
 					}
 				}
-				this.#ext.models = next;
+				this.ext.models = next;
 				return this;
 			}
 			case "string":
@@ -1213,21 +1227,21 @@ var Elysia = class Elysia {
 	compile() {
 		this["~config"] ??= require_utils.nullObject();
 		this["~config"].precompile = true;
-		this.#routerBuilt = false;
-		this.#compiled = void 0;
-		this.#jitColdRemaining = void 0;
-		this.#jitTable = void 0;
-		this.#jitRoute = void 0;
-		this.#jitStatic = void 0;
-		this.#jitAliases = void 0;
-		this.#fetchFn = void 0;
+		this.routerBuilt = false;
+		this.compiled = void 0;
+		this.jitColdRemaining = void 0;
+		this.jitTable = void 0;
+		this.jitRoute = void 0;
+		this.jitStatic = void 0;
+		this.jitAliases = void 0;
+		this.fetchFn = void 0;
 		this.fetch;
 		return this;
 	}
 	handler(index, immediate, route, precomputedStatic, aliases, table) {
-		if (this.#compiled?.[index]) return this.#compiled[index];
-		const indexedTable = table ?? (this.#routerBuilt ? this["~routeTable"] : void 0);
-		const compiled = this.#compiled ??= new Array(indexedTable?.length ?? this["~routes"].length);
+		if (this.compiled?.[index]) return this.compiled[index];
+		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 ? require_route_table.routeRow(indexedTable, index) : this["~routes"][index]);
 			const exactDuplicate = ((indexedTable?.flags[index] ?? 0) & require_route_table.RouteFlag.ExactDuplicate) !== 0;
@@ -1244,10 +1258,10 @@ var Elysia = class Elysia {
 		return this.#jitHandler(index, route ?? (indexedTable ? void 0 : this["~routes"][index]), precomputedStatic, aliases, indexedTable);
 	}
 	#jitHandler(index, route, precomputedStatic, aliases, table) {
-		if (table !== void 0) this.#jitTable = table;
-		if (route !== void 0) (this.#jitRoute ??= [])[index] = route;
-		if (precomputedStatic !== void 0) (this.#jitStatic ??= [])[index] = precomputedStatic;
-		if (aliases !== void 0) (this.#jitAliases ??= [])[index] = aliases;
+		if (table !== void 0) this.jitTable = table;
+		if (route !== void 0) (this.jitRoute ??= [])[index] = route;
+		if (precomputedStatic !== void 0) (this.jitStatic ??= [])[index] = precomputedStatic;
+		if (aliases !== void 0) (this.jitAliases ??= [])[index] = aliases;
 		return (context) => this.#jitDispatch(index, context);
 	}
 	#staticAliases(table, index) {
@@ -1275,42 +1289,42 @@ var Elysia = class Elysia {
 	}
 	#releaseJit() {
 		require_compile_aot.Compiled.release(this["~programId"]);
-		this.#jitColdRemaining = void 0;
-		this.#jitRoute = void 0;
-		this.#jitStatic = void 0;
-		this.#jitAliases = void 0;
-		this.#jitTable = void 0;
+		this.jitColdRemaining = void 0;
+		this.jitRoute = void 0;
+		this.jitStatic = void 0;
+		this.jitAliases = void 0;
+		this.jitTable = void 0;
 	}
 	#satisfyJit(table, index) {
 		if ((table.flags[index] & require_route_table.RouteFlag.ExactDuplicate) !== 0) return false;
-		if (this.#jitColdRemaining === void 0) {
+		if (this.jitColdRemaining === void 0) {
 			if (this["~generation"] === void 0 && this["~config"]?.precompile !== true && require_universal_is_production.isProduction() && !require_compile_aot.Capture.isAotBuildEnv()) table.flags[index] |= require_route_table.RouteFlag.JITSatisfied;
 			return false;
 		}
 		if ((table.flags[index] & require_route_table.RouteFlag.JITCold) === 0) return false;
 		table.flags[index] &= ~require_route_table.RouteFlag.JITCold;
-		if (--this.#jitColdRemaining > 0) return false;
+		if (--this.jitColdRemaining > 0) return false;
 		this.#releaseJit();
 		return true;
 	}
 	#jitDispatch(index, context) {
-		if (this.#compiled[index]) return this.#compiled[index](context);
-		const route = this.#jitRoute?.[index];
-		const table = this.#jitTable ?? this["~routeTable"];
+		if (this.compiled[index]) return this.compiled[index](context);
+		const route = this.jitRoute?.[index];
+		const table = this.jitTable ?? this["~routeTable"];
 		const materialized = route ?? require_route_table.routeRow(table, index);
 		const exactDuplicate = ((table?.flags[index] ?? 0) & require_route_table.RouteFlag.ExactDuplicate) !== 0;
 		let handler;
 		try {
-			handler = require_compile_handler_index.compileHandler(materialized, this, this.#jitStatic?.[index], exactDuplicate && require_compile_aot.Compiled.hasProgram(this["~programId"]));
+			handler = require_compile_handler_index.compileHandler(materialized, this, this.jitStatic?.[index], exactDuplicate && require_compile_aot.Compiled.hasProgram(this["~programId"]));
 		} 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);
 			throw routeError;
 		}
-		this.#compiled[index] = handler;
+		this.compiled[index] = handler;
 		if (!exactDuplicate) {
-			const aliases = this.#jitAliases?.[index] ?? (table ? this.#staticAliases(table, index) : void 0);
+			const aliases = this.jitAliases?.[index] ?? (table ? this.#staticAliases(table, index) : void 0);
 			if (aliases) {
 				this.#initMap();
 				const map = this["~map"][aliases.method] ??= require_utils.nullObject();
@@ -1318,9 +1332,9 @@ var Elysia = class Elysia {
 			} else this.#saveHandler(materialized[0], materialized[1], handler);
 		}
 		if (!(table ? this.#satisfyJit(table, index) : false)) {
-			if (this.#jitRoute) this.#jitRoute[index] = void 0;
-			if (this.#jitStatic) this.#jitStatic[index] = void 0;
-			if (this.#jitAliases) this.#jitAliases[index] = void 0;
+			if (this.jitRoute) this.jitRoute[index] = void 0;
+			if (this.jitStatic) this.jitStatic[index] = void 0;
+			if (this.jitAliases) this.jitAliases[index] = void 0;
 		}
 		return handler(context);
 	}
@@ -1387,30 +1401,29 @@ 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;
 		}
 		const compilerSession = require_compile_aot.beginCompilerSession(this);
 		const previousMap = this["~map"];
 		const previousRouter = this["~router"];
-		const previousCompiled = this.#compiled;
-		const previousJitTable = this.#jitTable;
-		const previousJitRoute = this.#jitRoute;
-		const previousJitStatic = this.#jitStatic;
-		const previousJitAliases = this.#jitAliases;
+		const previousCompiled = this.compiled;
+		const previousJitTable = this.jitTable;
+		const previousJitRoute = this.jitRoute;
+		const previousJitStatic = this.jitStatic;
+		const previousJitAliases = this.jitAliases;
 		const previousHasDynamicWS = this["~hasDynamicWS"];
 		const previousGeneration = this["~generation"];
 		this["~map"] = void 0;
 		this["~router"] = void 0;
-		this.#compiled = previousCompiled?.slice();
-		this.#jitColdRemaining = void 0;
-		this.#jitTable = void 0;
-		this.#jitRoute = void 0;
-		this.#jitStatic = void 0;
-		this.#jitAliases = void 0;
+		this.compiled = previousCompiled?.slice();
+		this.jitColdRemaining = void 0;
+		this.jitTable = void 0;
+		this.jitRoute = void 0;
+		this.jitStatic = void 0;
+		this.jitAliases = void 0;
 		this["~hasDynamicWS"] = void 0;
 		this["~generation"] = void 0;
 		let buildSucceeded = false;
@@ -1426,18 +1439,18 @@ var Elysia = class Elysia {
 				Object.assign(previousRouter, nextRouter);
 				this["~router"] = previousRouter;
 			}
-			this.#routerBuilt = true;
+			this.routerBuilt = true;
 			if (seal) this.#publishGeneration();
 			buildSucceeded = true;
 		} catch (error) {
 			this["~map"] = previousMap;
 			this["~router"] = previousRouter;
-			this.#compiled = previousCompiled;
-			this.#jitColdRemaining = void 0;
-			this.#jitTable = previousJitTable;
-			this.#jitRoute = previousJitRoute;
-			this.#jitStatic = previousJitStatic;
-			this.#jitAliases = previousJitAliases;
+			this.compiled = previousCompiled;
+			this.jitColdRemaining = void 0;
+			this.jitTable = previousJitTable;
+			this.jitRoute = previousJitRoute;
+			this.jitStatic = previousJitStatic;
+			this.jitAliases = previousJitAliases;
 			this["~hasDynamicWS"] = previousHasDynamicWS;
 			this["~generation"] = previousGeneration;
 			throw error;
@@ -1462,7 +1475,7 @@ var Elysia = class Elysia {
 			else {
 				const table = this["~routeTable"];
 				const routeCount = table.length;
-				const compiled = this.#compiled;
+				const compiled = this.compiled;
 				let cold = 0;
 				for (let i = 0; i < routeCount; i++) {
 					const satisfied = (table.flags[i] & require_route_table.RouteFlag.JITSatisfied) !== 0;
@@ -1473,10 +1486,10 @@ var Elysia = class Elysia {
 					cold++;
 				}
 				if (cold === 0) this.#releaseJit();
-				else this.#jitColdRemaining = cold;
+				else this.jitColdRemaining = cold;
 			}
 			require_compile_analysis_cache.clearAuthoringAnalysisCaches(this);
-			if (!this["~ext"]?.macro && !this["~scopeChildren"]) this.#declaredRoutes = void 0;
+			if (!this["~ext"]?.macro && !this["~scopeChildren"]) this.declaredRoutes = void 0;
 		}
 		const ext = this["~ext"];
 		if (ext?.hoc) extCallbackIndexes.delete(ext.hoc);
@@ -1484,8 +1497,8 @@ var Elysia = class Elysia {
 		if (ext?.cleanup) extCallbackIndexes.delete(ext.cleanup);
 	}
 	["~newGeneration"]() {
-		this.#fetchFn = void 0;
-		this.#routerBuilt = false;
+		this.fetchFn = void 0;
+		this.routerBuilt = false;
 		this["~generation"] = void 0;
 		this.#buildRouter(true);
 		return this;
@@ -1584,15 +1597,13 @@ var Elysia = class Elysia {
 		}
 		this["~wsConfig"] = wsConfig;
 	}
-	#fetchFn;
 	get fetch() {
-		if (this.#fetchFn) return this.#fetchFn;
-		this.#buildRouter(!this.#pending);
-		return this.#fetchFn ??= require_handler_fetch.applyHoc(this, require_handler_fetch.createFetchHandler(this));
+		if (this.fetchFn) return this.fetchFn;
+		this.#buildRouter(!this._pending);
+		return this.fetchFn ??= require_handler_fetch.applyHoc(this, require_handler_fetch.createFetchHandler(this));
 	}
-	#handle;
 	get handle() {
-		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
+		return this._handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
 		const listen = (this["~config"]?.adapter ?? (require_universal_constants.isBun ? require_adapter_bun_index.BunAdapter : void 0))?.listen;
@@ -1617,8 +1628,8 @@ var Elysia = class Elysia {
 	*/
 	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);
 		return this;
 	}
@@ -1638,22 +1649,16 @@ var Elysia = class Elysia {
 	cleanup(handler) {
 		if (this["~ext"]?.cleanupEpoch?.(handler)) return this;
 		this.#assertMutable("cleanup");
-		const arr = this.#ext.cleanup ??= [];
+		const arr = this.ext.cleanup ??= [];
 		if (Array.isArray(handler)) arr.push(...handler);
 		else arr.push(handler);
 		return this;
 	}
 	/**
-	* Stop the underlying server (if any), then run every `cleanup` handler.
-	* Omitted and `false` are the same graceful stop: new requests are gated,
-	* tracked WebSockets are settled and active HTTP is drained, then cleanup
-	* runs and the epoch is released. `true` force-closes the transport
-	* instead of draining it, and escalates a graceful stop already in flight.
+	* Stop the underlying server (if any), then run every `cleanup` handler
 	*
 	* Awaiting `stop()` from inside a `setup`, `cleanup` or WebSocket lifecycle
-	* callback is only supported while that callback is still synchronous; the
-	* teardown is waiting on the callback, so after an `await` it can only be
-	* issued as `void app.stop()`.
+	* callback is only supported while that callback is still synchronous
 	*
 	* @param closeActiveConnections Pass `true` to terminate active
 	*   transports. Omit (or pass `false`) to drain safely.