elysia 2.0.0-exp.1 → 2.0.0-exp.3

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 | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | 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

@@ -9,7 +9,7 @@ const require_handler_error = require('../../handler/error.js');
 
 //#region src/adapter/bun/router.ts
 function createBunContext(app) {
-	const headers = app["~ext"]?.headers ? Object.assign(require_utils.nullObject(), structuredClone(app["~ext"].headers)) : null;
+	const headers = app["~ext"]?.headers ? Object.assign(require_utils.nullObject(), app["~ext"].headers) : null;
 	return class Context extends require_context.createBaseContext(app) {
 		constructor(request) {
 			super();
@@ -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

@@ -8,7 +8,7 @@ import { createErrorHandler } from "../../handler/error.mjs";
 
 //#region src/adapter/bun/router.ts
 function createBunContext(app) {
-	const headers = app["~ext"]?.headers ? Object.assign(nullObject(), structuredClone(app["~ext"].headers)) : null;
+	const headers = app["~ext"]?.headers ? Object.assign(nullObject(), app["~ext"].headers) : null;
 	return class Context extends createBaseContext(app) {
 		constructor(request) {
 			super();
@@ -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 | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | 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 | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | 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.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/handler.js

@@ -8,7 +8,7 @@ const require_adapter_utils = require('../utils.js');
 //#region src/adapter/web-standard/handler.ts
 function handleElysiaFile(file, set = { headers: require_utils.nullObject() }, request) {
 	const path = file.path;
-	const contentType = require_universal_file.mime[path.slice(path.lastIndexOf(".") + 1)];
+	const contentType = require_universal_file.mime[path.slice(path.lastIndexOf(".") + 1).toLowerCase()];
 	const headers = set.headers;
 	if (contentType) headers["content-type"] = contentType;
 	if (file.stats && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416) return file.stats.then((stat) => {
@@ -97,7 +97,10 @@ function errorToResponse(error, set) {
 		return typeof raw?.then === "function" ? raw.then(apply) : apply(raw);
 	}
 	const headers = set?.headers ?? require_utils.nullObject();
-	return Response.json({
+	return Response.json(require_error.isProduction() ? {
+		name: error?.name,
+		message: "Internal Server Error"
+	} : {
 		name: error?.name,
 		message: error?.message,
 		cause: error?.cause

package/dist/adapter/web-standard/handler.mjs

@@ -1,13 +1,13 @@
 import { isBun } from "../../universal/constants.mjs";
 import { mime } from "../../universal/file.mjs";
 import { formToFormData, isNotEmpty, nullObject } from "../../utils.mjs";
-import { ElysiaStatus } from "../../error.mjs";
+import { ElysiaStatus, isProduction } from "../../error.mjs";
 import { createResponseHandler, createStreamHandler, handleFile, handleSet } from "../utils.mjs";
 
 //#region src/adapter/web-standard/handler.ts
 function handleElysiaFile(file, set = { headers: nullObject() }, request) {
 	const path = file.path;
-	const contentType = mime[path.slice(path.lastIndexOf(".") + 1)];
+	const contentType = mime[path.slice(path.lastIndexOf(".") + 1).toLowerCase()];
 	const headers = set.headers;
 	if (contentType) headers["content-type"] = contentType;
 	if (file.stats && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416) return file.stats.then((stat) => {
@@ -96,7 +96,10 @@ function errorToResponse(error, set) {
 		return typeof raw?.then === "function" ? raw.then(apply) : apply(raw);
 	}
 	const headers = set?.headers ?? nullObject();
-	return Response.json({
+	return Response.json(isProduction() ? {
+		name: error?.name,
+		message: "Internal Server Error"
+	} : {
 		name: error?.name,
 		message: error?.message,
 		cause: error?.cause

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 | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | 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

@@ -31,7 +31,7 @@ var Elysia = class Elysia {
 		}
 	}
 	get history() {
-		if (!this.#history) return void 0;
+		if (!this.#history) return;
 		this.#resolveMacros();
 		return this.#history;
 	}
@@ -47,9 +47,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 +137,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 +292,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 +355,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 +543,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 = require_utils.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 +778,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") {
@@ -847,6 +851,7 @@ var Elysia = class Elysia {
 		};
 	}
 	#saveHandler(method, path, handler) {
+		if (require_constants.isDynamicRegex.test(path)) return;
 		this.#initMap();
 		const map = this["~map"][require_utils.mapMethodBack(method)] ??= require_utils.nullObject();
 		map[path] = handler;
@@ -892,6 +897,22 @@ var Elysia = class Elysia {
 		}
 		const wrapHeadHandler = Elysia.#wrapHeadHandler;
 		const strict = !!this["~config"]?.strictPath;
+		let explicitPaths;
+		if (!strict && this["~config"]?.distinctPath) {
+			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 +928,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,44 +954,46 @@ 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 add = (p) => {
-					registerMain(p, handler);
-					if (headHandler) registerHead(p, headHandler);
-					if (!strict) {
-						const loose = require_utils.getLoosePath(p);
-						if (loose !== p) {
-							registerMain(loose, handler);
-							if (headHandler) registerHead(loose, headHandler);
-						}
-					}
-				};
-				add(path);
-				if (require_constants.needEncodeRegex.test(path)) {
-					const encoded = encodeURI(path);
-					if (encoded !== path) add(encoded);
+			const isDynamic = require_constants.isDynamicRegex.test(path);
+			const registerLoose = !isDynamic && !strict;
+			const explicitMain = registerLoose ? explicitPaths?.get(method) : void 0;
+			const variants = [path];
+			if (require_constants.needEncodeRegex.test(path)) {
+				const encoded = encodeURI(path);
+				if (encoded !== path) variants.push(encoded);
+			}
+			const paths = [];
+			for (let v = 0; v < variants.length; v++) {
+				const p = variants[v];
+				paths.push(p);
+				if (registerLoose) {
+					const loose = require_utils.getLoosePath(p);
+					if (loose !== p && !explicitMain?.has(loose)) paths.push(loose);
 				}
-			};
-			if (require_constants.isDynamicRegex.test(path)) {
+			}
+			if (isDynamic) {
 				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);
+				const headHandler = autoHead ? wrapHeadHandler(handler) : void 0;
+				for (let p = 0; p < paths.length; p++) {
+					router.add(method, paths[p], handler, false);
+					if (headHandler) router.add("HEAD", paths[p], headHandler, false);
+				}
 			} else {
 				const map = methods[method] ??= require_utils.nullObject();
 				const handler = this.handler(i, precompile, route, sharedStatic);
 				const headHandler = autoHead ? wrapHeadHandler(handler) : void 0;
 				const head = autoHead ? methods["HEAD"] ??= require_utils.nullObject() : void 0;
-				registerPattern((p, h) => {
-					map[p] = h;
-				}, (p, h) => {
-					head[p] = h;
-				}, handler, headHandler);
+				for (let p = 0; p < paths.length; p++) {
+					map[paths[p]] = handler;
+					if (headHandler) head[paths[p]] = headHandler;
+				}
 			}
 		}
 	}

package/dist/base.mjs

@@ -1,12 +1,12 @@
 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 { clonePlainDecorators, 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
@@ -28,7 +28,7 @@ var Elysia = class Elysia {
 		}
 	}
 	get history() {
-		if (!this.#history) return void 0;
+		if (!this.#history) return;
 		this.#resolveMacros();
 		return this.#history;
 	}
@@ -44,9 +44,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 +134,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 +289,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 +352,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 +540,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 +775,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") {
@@ -844,6 +848,7 @@ var Elysia = class Elysia {
 		};
 	}
 	#saveHandler(method, path, handler) {
+		if (isDynamicRegex.test(path)) return;
 		this.#initMap();
 		const map = this["~map"][mapMethodBack(method)] ??= nullObject();
 		map[path] = handler;
@@ -889,6 +894,22 @@ var Elysia = class Elysia {
 		}
 		const wrapHeadHandler = Elysia.#wrapHeadHandler;
 		const strict = !!this["~config"]?.strictPath;
+		let explicitPaths;
+		if (!strict && this["~config"]?.distinctPath) {
+			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 +925,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,44 +951,46 @@ 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 add = (p) => {
-					registerMain(p, handler);
-					if (headHandler) registerHead(p, headHandler);
-					if (!strict) {
-						const loose = getLoosePath(p);
-						if (loose !== p) {
-							registerMain(loose, handler);
-							if (headHandler) registerHead(loose, headHandler);
-						}
-					}
-				};
-				add(path);
-				if (needEncodeRegex.test(path)) {
-					const encoded = encodeURI(path);
-					if (encoded !== path) add(encoded);
+			const isDynamic = isDynamicRegex.test(path);
+			const registerLoose = !isDynamic && !strict;
+			const explicitMain = registerLoose ? explicitPaths?.get(method) : void 0;
+			const variants = [path];
+			if (needEncodeRegex.test(path)) {
+				const encoded = encodeURI(path);
+				if (encoded !== path) variants.push(encoded);
+			}
+			const paths = [];
+			for (let v = 0; v < variants.length; v++) {
+				const p = variants[v];
+				paths.push(p);
+				if (registerLoose) {
+					const loose = getLoosePath(p);
+					if (loose !== p && !explicitMain?.has(loose)) paths.push(loose);
 				}
-			};
-			if (isDynamicRegex.test(path)) {
+			}
+			if (isDynamic) {
 				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);
+				const headHandler = autoHead ? wrapHeadHandler(handler) : void 0;
+				for (let p = 0; p < paths.length; p++) {
+					router.add(method, paths[p], handler, false);
+					if (headHandler) router.add("HEAD", paths[p], headHandler, false);
+				}
 			} else {
 				const map = methods[method] ??= nullObject();
 				const handler = this.handler(i, precompile, route, sharedStatic);
 				const headHandler = autoHead ? wrapHeadHandler(handler) : void 0;
 				const head = autoHead ? methods["HEAD"] ??= nullObject() : void 0;
-				registerPattern((p, h) => {
-					map[p] = h;
-				}, (p, h) => {
-					head[p] = h;
-				}, handler, headHandler);
+				for (let p = 0; p < paths.length; p++) {
+					map[paths[p]] = handler;
+					if (headHandler) head[paths[p]] = headHandler;
+				}
 			}
 		}
 	}