elysia 2.0.0-exp.1 → 2.0.0-exp.2

package/dist/_virtual/_rolldown/runtime.js

@@ -32,7 +32,6 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
@@ -41,5 +40,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 
 exports.__exportAll = __exportAll;
-exports.__reExport = __reExport;
 exports.__toESM = __toESM;

package/dist/adapter/bun/index.d.ts

@@ -6,7 +6,7 @@ import { AnyElysia } from "../../base.js";
 declare function collectStaticRoutes(app: AnyElysia): readonly [Record<string, Record<string, Response>>, Promise<void>[]] | undefined;
 declare const BunAdapter: {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
+    default: (context: Context, contentType: string) => string | unknown[] | ArrayBuffer | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/bun/router.js

@@ -62,13 +62,13 @@ function createPlainHandler(handler, handleError, Context) {
 }
 function createRouteMap(app) {
 	const Context = createBunContext(app);
+	const handleError = require_handler_error.createErrorHandler(require_utils.flattenChain(app["~hookChain"])?.error, require_adapter_web_standard_index.WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	function fetch(request) {
 		return handleError(new Context(request), new require_error.NotFound());
 	}
 	const history = app.history;
 	const length = history?.length ?? 0;
 	if (length === 0) return [{ "/elysia": new Response("hi") }, fetch];
-	const handleError = require_handler_error.createErrorHandler(require_utils.flattenChain(app["~hookChain"])?.error, require_adapter_web_standard_index.WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	const routes = require_utils.nullObject();
 	for (let i = 0; i < length; i++) {
 		const route = history[i];

package/dist/adapter/bun/router.mjs

@@ -61,13 +61,13 @@ function createPlainHandler(handler, handleError, Context) {
 }
 function createRouteMap(app) {
 	const Context = createBunContext(app);
+	const handleError = createErrorHandler(flattenChain(app["~hookChain"])?.error, WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	function fetch(request) {
 		return handleError(new Context(request), new NotFound());
 	}
 	const history = app.history;
 	const length = history?.length ?? 0;
 	if (length === 0) return [{ "/elysia": new Response("hi") }, fetch];
-	const handleError = createErrorHandler(flattenChain(app["~hookChain"])?.error, WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	const routes = nullObject();
 	for (let i = 0; i < length; i++) {
 		const route = history[i];

package/dist/adapter/constants.d.ts

@@ -5,7 +5,7 @@ import { AnyElysia } from "../base.js";
 //#region src/adapter/constants.d.ts
 declare const defaultAdapter: {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
+    default: (context: Context, contentType: string) => string | unknown[] | ArrayBuffer | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/index.d.ts

@@ -7,7 +7,7 @@ import { AnyElysia } from "../base.js";
 //#region src/adapter/index.d.ts
 declare function createAdapter(adapter: ElysiaAdapterOptions): {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
+    default: (context: Context, contentType: string) => string | unknown[] | ArrayBuffer | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/utils.d.ts

@@ -12,7 +12,7 @@ declare function responseToSetHeaders(response: Response, set?: Context['set']):
   cookie?: Record<string, BaseCookie>;
 } | {
   headers: any;
-  status: number | "Bad Request" | "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required";
+  status: number | "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Bad Request" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required";
 };
 interface CreateHandlerParameter {
   mapResponse(response: unknown, set: Context['set'], request?: Request): Response;

package/dist/adapter/utils.js

@@ -51,7 +51,7 @@ function handleFile(response, set, request) {
 	if (!set && !size) return new Response(response);
 	if (!set) return new Response(response, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
-		for (const key of Object.keys(defaultHeader)) if (key in set.headers) set.headers.append(key, defaultHeader[key]);
+		for (const key of Object.keys(defaultHeader)) if (!set.headers.has(key)) set.headers.append(key, defaultHeader[key]);
 		if (immutable) {
 			set.headers.delete("content-length");
 			set.headers.delete("accept-ranges");
@@ -96,7 +96,9 @@ function responseToSetHeaders(response, set) {
 		};
 		for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 	}
-	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
+	if (set.headers instanceof Headers) {
+		if (set.headers.has("content-encoding")) set.headers.delete("content-encoding");
+	} else if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
 const enqueueBinaryChunk = (controller, chunk) => {

package/dist/adapter/utils.mjs

@@ -50,7 +50,7 @@ function handleFile(response, set, request) {
 	if (!set && !size) return new Response(response);
 	if (!set) return new Response(response, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
-		for (const key of Object.keys(defaultHeader)) if (key in set.headers) set.headers.append(key, defaultHeader[key]);
+		for (const key of Object.keys(defaultHeader)) if (!set.headers.has(key)) set.headers.append(key, defaultHeader[key]);
 		if (immutable) {
 			set.headers.delete("content-length");
 			set.headers.delete("accept-ranges");
@@ -95,7 +95,9 @@ function responseToSetHeaders(response, set) {
 		};
 		for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 	}
-	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
+	if (set.headers instanceof Headers) {
+		if (set.headers.has("content-encoding")) set.headers.delete("content-encoding");
+	} else if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
 const enqueueBinaryChunk = (controller, chunk) => {

package/dist/adapter/web-standard/index.d.ts

@@ -5,7 +5,7 @@ import { AnyElysia } from "../../base.js";
 //#region src/adapter/web-standard/index.d.ts
 declare const WebStandardAdapter: {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
+    default: (context: Context, contentType: string) => string | unknown[] | ArrayBuffer | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/base.js

@@ -14,6 +14,22 @@ memoirist = require_runtime.__toESM(memoirist);
 
 //#region src/base.ts
 const useNodesBuffer = [];
+const isPlainObject = (v) => {
+	if (!v || typeof v !== "object" || Array.isArray(v)) return false;
+	const proto = Object.getPrototypeOf(v);
+	return proto === Object.prototype || proto === null;
+};
+function clonePlainDecorators(source, seen = /* @__PURE__ */ new WeakMap()) {
+	const existing = seen.get(source);
+	if (existing) return existing;
+	const out = require_utils.nullObject();
+	seen.set(source, out);
+	for (const key in source) {
+		const value = source[key];
+		out[key] = isPlainObject(value) ? clonePlainDecorators(value, seen) : value;
+	}
+	return out;
+}
 var Elysia = class Elysia {
 	#hasPlugin = false;
 	#hasGlobal = false;
@@ -31,7 +47,7 @@ var Elysia = class Elysia {
 		}
 	}
 	get history() {
-		if (!this.#history) return void 0;
+		if (!this.#history) return;
 		this.#resolveMacros();
 		return this.#history;
 	}
@@ -47,9 +63,8 @@ var Elysia = class Elysia {
 		if (!this.#history) return [];
 		if (this.#cachedRoutes) return this.#cachedRoutes;
 		this.#resolveMacros();
-		const routes = this.#history.map(([method, path, handler, , hook, appHook]) => {
-			const flatAppHook = require_utils.flattenChain(appHook);
-			const merged = flatAppHook ? hook ? require_utils.mergeHook(require_utils.cloneHook(hook), flatAppHook) : flatAppHook : hook;
+		const routes = this.#history.map(([method, path, handler, instance, hook, appHook, inheritedChain]) => {
+			const merged = require_compile_handler_index.composeRouteHook(instance, hook, appHook, inheritedChain, this);
 			if (merged?.schemas?.length) for (const entry of merged.schemas) {
 				if (!entry?.response) continue;
 				merged.response = require_utils.mergeResponse(merged.response, entry.response);
@@ -138,7 +153,7 @@ var Elysia = class Elysia {
 	headers(headers) {
 		const ext = this.#ext;
 		if (ext.headers) Object.assign(ext.headers, headers);
-		else ext.headers = headers;
+		else ext.headers = Object.assign(require_utils.nullObject(), headers);
 		return this;
 	}
 	#on(type, fn, scope = this["~config"]?.as) {
@@ -293,7 +308,8 @@ var Elysia = class Elysia {
 		require_utils.hookToGuard(hook);
 		if (hook.derive) {
 			this["~derive"] ??= /* @__PURE__ */ new WeakSet();
-			this["~derive"].add(hook.derive);
+			if (Array.isArray(hook.derive)) for (const fn of hook.derive) this["~derive"].add(fn);
+			else this["~derive"].add(hook.derive);
 		}
 		const trackFn = (fn) => {
 			if (typeof fn !== "function") return;
@@ -355,7 +371,8 @@ var Elysia = class Elysia {
 		if (hook.derive) {
 			const promoted = require_utils.nullObject();
 			for (const key of Object.keys(hook)) {
-				if (!require_utils.eventProperties.has(key)) continue;
+				if (key === "derive" || key === "resolve") continue;
+				if (!require_utils.eventProperties.has(key) && !require_utils.schemaProperties.has(key) && key !== "schema" && key !== "schemas") continue;
 				promoted[key] = hook[key];
 			}
 			const extras = [];
@@ -542,8 +559,11 @@ var Elysia = class Elysia {
 		if (app["~ext"]) {
 			const { decorator, store, headers, models, parser, macro, error, hoc } = app["~ext"];
 			const ext = this["~ext"] ??= require_utils.nullObject();
-			if (decorator) if (ext.decorator) require_utils.mergeDeep(ext.decorator, decorator);
-			else ext.decorator = Object.assign(require_utils.nullObject(), decorator);
+			if (decorator) {
+				const cloned = clonePlainDecorators(decorator);
+				if (ext.decorator) require_utils.mergeDeep(ext.decorator, cloned);
+				else ext.decorator = Object.assign(require_utils.nullObject(), cloned);
+			}
 			if (store) if (ext.store) require_utils.mergeDeep(ext.store, store);
 			else ext.store = Object.assign(require_utils.nullObject(), store);
 			if (headers) if (ext.headers) Object.assign(ext.headers, headers);
@@ -774,7 +794,7 @@ var Elysia = class Elysia {
 		if (!adapter?.websocket && !require_universal_constants.isBun) throw new Error(`[Elysia] WebSocket is not supported on '${adapter?.name ?? "web-standard"}' adapter.`);
 		let opts;
 		if (handler !== void 0) {
-			opts = optionsOrHandler ?? require_utils.nullObject();
+			opts = Object.assign(require_utils.nullObject(), optionsOrHandler);
 			if (opts.message != null && opts.message !== handler) throw new Error("[Elysia] .ws(): cannot specify 'message' as both positional handler and options.message");
 			opts.message = handler;
 		} else if (typeof optionsOrHandler === "function") {
@@ -892,6 +912,22 @@ var Elysia = class Elysia {
 		}
 		const wrapHeadHandler = Elysia.#wrapHeadHandler;
 		const strict = !!this["~config"]?.strictPath;
+		let explicitPaths;
+		if (!strict) {
+			explicitPaths = /* @__PURE__ */ new Map();
+			for (let i = 0; i < length; i++) {
+				const route = this.#history[i];
+				const m = route[0] === "WS" ? "WS" : require_utils.mapMethodBack(route[0]);
+				const p = route[1];
+				let set = explicitPaths.get(m);
+				if (!set) explicitPaths.set(m, set = /* @__PURE__ */ new Set());
+				set.add(p);
+				if (require_constants.needEncodeRegex.test(p)) {
+					const encoded = encodeURI(p);
+					if (encoded !== p) set.add(encoded);
+				}
+			}
+		}
 		for (let i = 0; i < length; i++) {
 			const route = this.#history[i];
 			const method = require_utils.mapMethodBack(route[0]);
@@ -907,7 +943,7 @@ var Elysia = class Elysia {
 					wsMap[path] = handler;
 					if (!this["~config"]?.strictPath) {
 						const loose = require_utils.getLoosePath(path);
-						if (loose !== path) wsMap[loose] = handler;
+						if (loose !== path && !explicitPaths?.get("WS")?.has(loose)) wsMap[loose] = handler;
 					}
 				}
 				if (options && require_utils.isNotEmpty(options)) {
@@ -933,19 +969,20 @@ var Elysia = class Elysia {
 					(target[path] ??= require_utils.nullObject())[method] = staticResponse;
 					if (!this["~config"]?.strictPath) {
 						const loose = require_utils.getLoosePath(path);
-						(target[loose] ??= require_utils.nullObject())[method] = staticResponse;
+						if (!explicitPaths?.get(method)?.has(loose)) (target[loose] ??= require_utils.nullObject())[method] = staticResponse;
 					}
 				}
 			}
 			const sharedStatic = maybeStatic && staticResponse instanceof Response ? staticResponse : void 0;
 			const autoHead = enableAutoHead && method === "GET" && !explicitHead?.has(path);
-			const registerPattern = (registerMain, registerHead, handler, headHandler) => {
+			const registerPattern = (registerMain, registerHead, handler, headHandler, registerLoose) => {
+				const explicitMain = explicitPaths?.get(method);
 				const add = (p) => {
 					registerMain(p, handler);
 					if (headHandler) registerHead(p, headHandler);
-					if (!strict) {
+					if (registerLoose) {
 						const loose = require_utils.getLoosePath(p);
-						if (loose !== p) {
+						if (loose !== p && !explicitMain?.has(loose)) {
 							registerMain(loose, handler);
 							if (headHandler) registerHead(loose, headHandler);
 						}
@@ -960,7 +997,7 @@ var Elysia = class Elysia {
 			if (require_constants.isDynamicRegex.test(path)) {
 				const router = this["~router"] ??= new memoirist.default();
 				const handler = this.handler(i, precompile, void 0, sharedStatic);
-				registerPattern((p, h) => router.add(method, p, h, false), (p, h) => router.add("HEAD", p, h, false), handler, autoHead ? wrapHeadHandler(handler) : void 0);
+				registerPattern((p, h) => router.add(method, p, h, false), (p, h) => router.add("HEAD", p, h, false), handler, autoHead ? wrapHeadHandler(handler) : void 0, false);
 			} else {
 				const map = methods[method] ??= require_utils.nullObject();
 				const handler = this.handler(i, precompile, route, sharedStatic);
@@ -970,7 +1007,7 @@ var Elysia = class Elysia {
 					map[p] = h;
 				}, (p, h) => {
 					head[p] = h;
-				}, handler, headHandler);
+				}, handler, headHandler, !strict);
 			}
 		}
 	}

package/dist/base.mjs

@@ -1,16 +1,32 @@
 import { isBun } from "./universal/constants.mjs";
 import { MethodMap, isDynamicRegex, needEncodeRegex } from "./constants.mjs";
-import { cloneHook, coalesceStandaloneSchemas, createErrorEventHandler, eventProperties, flattenChain, fnOrigin, fnv1a, getLoosePath, hookToGuard, isEmpty, isNotEmpty, isRecordNumber, joinPath, mapMethodBack, mergeDeep, mergeHook, mergeResponse, nullObject, pushField, replaceUrlPath, schemaProperties } from "./utils.mjs";
+import { coalesceStandaloneSchemas, createErrorEventHandler, eventProperties, flattenChain, fnOrigin, fnv1a, getLoosePath, hookToGuard, isEmpty, isNotEmpty, isRecordNumber, joinPath, mapMethodBack, mergeDeep, mergeResponse, nullObject, pushField, replaceUrlPath, schemaProperties } from "./utils.mjs";
 import { Ref } from "./type/bridge.mjs";
 import { env } from "./universal/env.mjs";
 import { buildWSRoute } from "./ws/route.mjs";
 import { BunAdapter } from "./adapter/bun/index.mjs";
 import { applyHoc, createFetchHandler } from "./handler/fetch.mjs";
-import { buildNativeStaticResponse, compileHandler } from "./compile/handler/index.mjs";
+import { buildNativeStaticResponse, compileHandler, composeRouteHook } from "./compile/handler/index.mjs";
 import Memoirist from "memoirist";
 
 //#region src/base.ts
 const useNodesBuffer = [];
+const isPlainObject = (v) => {
+	if (!v || typeof v !== "object" || Array.isArray(v)) return false;
+	const proto = Object.getPrototypeOf(v);
+	return proto === Object.prototype || proto === null;
+};
+function clonePlainDecorators(source, seen = /* @__PURE__ */ new WeakMap()) {
+	const existing = seen.get(source);
+	if (existing) return existing;
+	const out = nullObject();
+	seen.set(source, out);
+	for (const key in source) {
+		const value = source[key];
+		out[key] = isPlainObject(value) ? clonePlainDecorators(value, seen) : value;
+	}
+	return out;
+}
 var Elysia = class Elysia {
 	#hasPlugin = false;
 	#hasGlobal = false;
@@ -28,7 +44,7 @@ var Elysia = class Elysia {
 		}
 	}
 	get history() {
-		if (!this.#history) return void 0;
+		if (!this.#history) return;
 		this.#resolveMacros();
 		return this.#history;
 	}
@@ -44,9 +60,8 @@ var Elysia = class Elysia {
 		if (!this.#history) return [];
 		if (this.#cachedRoutes) return this.#cachedRoutes;
 		this.#resolveMacros();
-		const routes = this.#history.map(([method, path, handler, , hook, appHook]) => {
-			const flatAppHook = flattenChain(appHook);
-			const merged = flatAppHook ? hook ? mergeHook(cloneHook(hook), flatAppHook) : flatAppHook : hook;
+		const routes = this.#history.map(([method, path, handler, instance, hook, appHook, inheritedChain]) => {
+			const merged = composeRouteHook(instance, hook, appHook, inheritedChain, this);
 			if (merged?.schemas?.length) for (const entry of merged.schemas) {
 				if (!entry?.response) continue;
 				merged.response = mergeResponse(merged.response, entry.response);
@@ -135,7 +150,7 @@ var Elysia = class Elysia {
 	headers(headers) {
 		const ext = this.#ext;
 		if (ext.headers) Object.assign(ext.headers, headers);
-		else ext.headers = headers;
+		else ext.headers = Object.assign(nullObject(), headers);
 		return this;
 	}
 	#on(type, fn, scope = this["~config"]?.as) {
@@ -290,7 +305,8 @@ var Elysia = class Elysia {
 		hookToGuard(hook);
 		if (hook.derive) {
 			this["~derive"] ??= /* @__PURE__ */ new WeakSet();
-			this["~derive"].add(hook.derive);
+			if (Array.isArray(hook.derive)) for (const fn of hook.derive) this["~derive"].add(fn);
+			else this["~derive"].add(hook.derive);
 		}
 		const trackFn = (fn) => {
 			if (typeof fn !== "function") return;
@@ -352,7 +368,8 @@ var Elysia = class Elysia {
 		if (hook.derive) {
 			const promoted = nullObject();
 			for (const key of Object.keys(hook)) {
-				if (!eventProperties.has(key)) continue;
+				if (key === "derive" || key === "resolve") continue;
+				if (!eventProperties.has(key) && !schemaProperties.has(key) && key !== "schema" && key !== "schemas") continue;
 				promoted[key] = hook[key];
 			}
 			const extras = [];
@@ -539,8 +556,11 @@ var Elysia = class Elysia {
 		if (app["~ext"]) {
 			const { decorator, store, headers, models, parser, macro, error, hoc } = app["~ext"];
 			const ext = this["~ext"] ??= nullObject();
-			if (decorator) if (ext.decorator) mergeDeep(ext.decorator, decorator);
-			else ext.decorator = Object.assign(nullObject(), decorator);
+			if (decorator) {
+				const cloned = clonePlainDecorators(decorator);
+				if (ext.decorator) mergeDeep(ext.decorator, cloned);
+				else ext.decorator = Object.assign(nullObject(), cloned);
+			}
 			if (store) if (ext.store) mergeDeep(ext.store, store);
 			else ext.store = Object.assign(nullObject(), store);
 			if (headers) if (ext.headers) Object.assign(ext.headers, headers);
@@ -771,7 +791,7 @@ var Elysia = class Elysia {
 		if (!adapter?.websocket && !isBun) throw new Error(`[Elysia] WebSocket is not supported on '${adapter?.name ?? "web-standard"}' adapter.`);
 		let opts;
 		if (handler !== void 0) {
-			opts = optionsOrHandler ?? nullObject();
+			opts = Object.assign(nullObject(), optionsOrHandler);
 			if (opts.message != null && opts.message !== handler) throw new Error("[Elysia] .ws(): cannot specify 'message' as both positional handler and options.message");
 			opts.message = handler;
 		} else if (typeof optionsOrHandler === "function") {
@@ -889,6 +909,22 @@ var Elysia = class Elysia {
 		}
 		const wrapHeadHandler = Elysia.#wrapHeadHandler;
 		const strict = !!this["~config"]?.strictPath;
+		let explicitPaths;
+		if (!strict) {
+			explicitPaths = /* @__PURE__ */ new Map();
+			for (let i = 0; i < length; i++) {
+				const route = this.#history[i];
+				const m = route[0] === "WS" ? "WS" : mapMethodBack(route[0]);
+				const p = route[1];
+				let set = explicitPaths.get(m);
+				if (!set) explicitPaths.set(m, set = /* @__PURE__ */ new Set());
+				set.add(p);
+				if (needEncodeRegex.test(p)) {
+					const encoded = encodeURI(p);
+					if (encoded !== p) set.add(encoded);
+				}
+			}
+		}
 		for (let i = 0; i < length; i++) {
 			const route = this.#history[i];
 			const method = mapMethodBack(route[0]);
@@ -904,7 +940,7 @@ var Elysia = class Elysia {
 					wsMap[path] = handler;
 					if (!this["~config"]?.strictPath) {
 						const loose = getLoosePath(path);
-						if (loose !== path) wsMap[loose] = handler;
+						if (loose !== path && !explicitPaths?.get("WS")?.has(loose)) wsMap[loose] = handler;
 					}
 				}
 				if (options && isNotEmpty(options)) {
@@ -930,19 +966,20 @@ var Elysia = class Elysia {
 					(target[path] ??= nullObject())[method] = staticResponse;
 					if (!this["~config"]?.strictPath) {
 						const loose = getLoosePath(path);
-						(target[loose] ??= nullObject())[method] = staticResponse;
+						if (!explicitPaths?.get(method)?.has(loose)) (target[loose] ??= nullObject())[method] = staticResponse;
 					}
 				}
 			}
 			const sharedStatic = maybeStatic && staticResponse instanceof Response ? staticResponse : void 0;
 			const autoHead = enableAutoHead && method === "GET" && !explicitHead?.has(path);
-			const registerPattern = (registerMain, registerHead, handler, headHandler) => {
+			const registerPattern = (registerMain, registerHead, handler, headHandler, registerLoose) => {
+				const explicitMain = explicitPaths?.get(method);
 				const add = (p) => {
 					registerMain(p, handler);
 					if (headHandler) registerHead(p, headHandler);
-					if (!strict) {
+					if (registerLoose) {
 						const loose = getLoosePath(p);
-						if (loose !== p) {
+						if (loose !== p && !explicitMain?.has(loose)) {
 							registerMain(loose, handler);
 							if (headHandler) registerHead(loose, headHandler);
 						}
@@ -957,7 +994,7 @@ var Elysia = class Elysia {
 			if (isDynamicRegex.test(path)) {
 				const router = this["~router"] ??= new Memoirist();
 				const handler = this.handler(i, precompile, void 0, sharedStatic);
-				registerPattern((p, h) => router.add(method, p, h, false), (p, h) => router.add("HEAD", p, h, false), handler, autoHead ? wrapHeadHandler(handler) : void 0);
+				registerPattern((p, h) => router.add(method, p, h, false), (p, h) => router.add("HEAD", p, h, false), handler, autoHead ? wrapHeadHandler(handler) : void 0, false);
 			} else {
 				const map = methods[method] ??= nullObject();
 				const handler = this.handler(i, precompile, route, sharedStatic);
@@ -967,7 +1004,7 @@ var Elysia = class Elysia {
 					map[p] = h;
 				}, (p, h) => {
 					head[p] = h;
-				}, handler, headHandler);
+				}, handler, headHandler, !strict);
 			}
 		}
 	}

package/dist/compile/aot.d.ts

@@ -29,6 +29,22 @@ interface FrozenValidator {
   d?: 1;
   k?: 1;
   r?: 1;
+  ps?: 1;
+  pd?: unknown;
+  pod?: Record<string, unknown>;
+  ce?: Array<{
+    p: string;
+    c: FrozenCheckFactory;
+    e?: 1;
+  }>;
+  ic?: Array<{
+    o: number;
+    c: FrozenCheckFactory;
+    e?: 1;
+    d: FrozenMirror & {
+      x?: 1;
+    };
+  }>;
 }
 interface ValidatorManifest {
   [method: string]: {
@@ -83,8 +99,9 @@ declare const Source: {
   readonly bothFactory: (identifier: string, checkDefs: string, checkValue: string, mirrorSource: string, mirrorHasExternals: boolean) => string;
 };
 declare function instantiateFrozenMirror(frozen: FrozenMirror, schema: unknown): (value: unknown) => unknown;
-declare function instantiateFrozenDecodeMirror(frozen: FrozenMirror, schema: unknown): (value: unknown) => unknown;
-declare function instantiateFrozenEncodeMirror(frozen: FrozenMirror, schema: unknown): (value: unknown) => unknown;
+declare function instantiateFrozenDecodeMirror(frozen: FrozenMirror, schema: unknown, dir?: 'decode' | 'encode'): (value: unknown) => unknown;
+declare const instantiateFrozenEncodeMirror: (frozen: FrozenMirror, schema: unknown) => ((value: unknown) => unknown);
+declare const EMPTY_EXTERNALS: unknown[];
 declare function instantiateFrozenBoth(frozen: FrozenValidator, checkSchema: unknown, mirrorSchema: unknown): {
   check?: (value: unknown) => boolean;
   clean?: (value: unknown) => unknown;
@@ -123,6 +140,24 @@ interface CapturedValidator {
   mirror?: CapturedMirror;
   decodeMirror?: CapturedMirror;
   encodeMirror?: CapturedMirror;
+  precomputeSafe?: boolean;
+  precomputedDefault?: unknown;
+  precomputedObjectDefault?: Record<string, unknown>;
+  customErrors?: Array<{
+    path: string;
+    identifier: string;
+    checkDefs: string;
+    checkValue: string;
+    external: boolean;
+  }>;
+  innerCodecs?: Array<{
+    open: number;
+    identifier: string;
+    checkDefs: string;
+    checkValue: string;
+    external: boolean;
+    decode: CapturedMirror;
+  }>;
 }
 declare function beginValidatorCapture(): void;
 declare function endValidatorCapture(): CapturedValidator[];
@@ -134,46 +169,17 @@ interface CapturedHandler {
 }
 declare function captureHandler(v: CapturedHandler): void;
 declare function endHandlerCapture(): CapturedHandler[];
-declare function captureValidator(v: {
-  method: string;
-  path: string;
-  slot: ValidatorSlot;
-  identifier: string;
-  checkDefs: string;
-  checkValue: string;
-  external: boolean;
-  async: boolean;
-  hasDefault: boolean;
-  hasCodec: boolean;
-  hasRef: boolean;
-}): void;
-declare function captureMirror(v: {
-  method: string;
-  path: string;
-  slot: ValidatorSlot;
-  mirror: CapturedMirror;
-}): void;
-declare function captureDecodeMirror(v: {
-  method: string;
-  path: string;
-  slot: ValidatorSlot;
-  mirror: CapturedMirror;
-}): void;
-declare function captureEncodeMirror(v: {
+declare function captureSet(loc: {
   method: string;
   path: string;
   slot: ValidatorSlot;
-  mirror: CapturedMirror;
-}): void;
+}, partial: Partial<CapturedValidator>): void;
 declare const Capture: {
-  readonly validator: typeof captureValidator;
+  readonly set: typeof captureSet;
   readonly handler: typeof captureHandler;
-  readonly mirror: typeof captureMirror;
-  readonly mirrorDecode: typeof captureDecodeMirror;
-  readonly mirrorEncode: typeof captureEncodeMirror;
   readonly mirrorUnions: typeof captureMirrorUnions;
   readonly mirrorCodecs: typeof captureMirrorCodecs;
   readonly isCapturing: () => boolean;
 };
 //#endregion
-export { Capture, CapturedHandler, CapturedMirror, CapturedValidator, CheckBuildResult, Compiled, FrozenBothFactory, FrozenCheckFactory, FrozenHandler, FrozenMirror, FrozenMirrorFactory, FrozenValidator, HandlerManifest, Source, ValidatorManifest, ValidatorSlot, beginValidatorCapture, collectExternals, endHandlerCapture, endValidatorCapture, externalsMatch, instantiateFrozenBoth, instantiateFrozenDecodeMirror, instantiateFrozenEncodeMirror, instantiateFrozenMirror, reconstructCheck };
+export { Capture, CapturedHandler, CapturedMirror, CapturedValidator, CheckBuildResult, Compiled, EMPTY_EXTERNALS, FrozenBothFactory, FrozenCheckFactory, FrozenHandler, FrozenMirror, FrozenMirrorFactory, FrozenValidator, HandlerManifest, Source, ValidatorManifest, ValidatorSlot, beginValidatorCapture, collectExternals, endHandlerCapture, endValidatorCapture, externalsMatch, instantiateFrozenBoth, instantiateFrozenDecodeMirror, instantiateFrozenEncodeMirror, instantiateFrozenMirror, reconstructCheck };