elysia 2.0.0-exp.8 → 2.0.0-exp.9

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

@@ -5,23 +5,23 @@ import { Context } from "../context.js";
 
 //#region src/adapter/utils.d.ts
 declare function handleFile(response: File | Blob, set?: Context['set'], request?: Request): Response;
-declare function parseSetCookies(headers: Headers, setCookie: string[]): Headers;
+declare function parseSetCookies(headers: Headers, setCookies: string[]): Headers;
 declare function responseToSetHeaders(response: Response, set?: Context['set']): {
   headers: HTTPHeaders;
   status?: number | keyof StatusMap;
   cookie?: Record<string, BaseCookie>;
-} | {
-  headers: any;
-  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;
   mapCompactResponse(response: unknown, request?: Request): Response;
 }
-declare function createStreamHandler(_: CreateHandlerParameter): (generator: Generator | AsyncGenerator | ReadableStream, set?: Context["set"], request?: Request, skipFormat?: boolean) => Promise<Response>;
+declare function createStreamHandler({
+  mapResponse,
+  mapCompactResponse
+}: CreateHandlerParameter): (generator: Generator | AsyncGenerator | ReadableStream, set?: Context["set"], request?: Request, skipFormat?: boolean) => Promise<Response>;
 declare function streamResponse(response: Response): AsyncGenerator<any, void, any>;
 declare function handleSet(set: Context['set']): void;
-declare function mergeHeaders(responseHeaders: Headers, setHeaders: Context['set']['headers']): Headers;
+declare function mergeHeaders(responseHeaders: Headers, setHeaders?: Context['set']['headers']): Headers;
 declare function mergeStatus(responseStatus: number, setStatus: Context['set']['status']): number | undefined;
 declare function createResponseHandler(handler: CreateHandlerParameter): (response: Response, set?: Context["set"], request?: Request) => any;
 /**

package/dist/adapter/utils.js

@@ -3,10 +3,13 @@ const require_universal_constants = require('../universal/constants.js');
 const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_cookie_serialize = require('../cookie/serialize.js');
-const require_adapter_web_standard_handler = require('./web-standard/handler.js');
 
 //#region src/adapter/utils.ts
 const setCookie = "set-cookie";
+const rangeNotSatisfiable = (size, set) => new Response(null, {
+	status: 416,
+	headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers)
+});
 function handleFile(response, set, request) {
 	if (!require_universal_constants.isBun && response instanceof Promise) return response.then((res) => handleFile(res, set, request));
 	const size = response.size;
@@ -14,10 +17,7 @@ function handleFile(response, set, request) {
 	if (rangeHeader) {
 		const match = /bytes=(\d*)-(\d*)/.exec(rangeHeader);
 		if (match) {
-			if (!match[1] && !match[2]) return new Response(null, {
-				status: 416,
-				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? require_utils.nullObject())
-			});
+			if (!match[1] && !match[2]) return rangeNotSatisfiable(size, set);
 			let start;
 			let end;
 			if (!match[1] && match[2]) {
@@ -28,10 +28,7 @@ function handleFile(response, set, request) {
 				start = match[1] ? parseInt(match[1]) : 0;
 				end = match[2] ? Math.min(parseInt(match[2]), size - 1) : size - 1;
 			}
-			if (start >= size || start > end) return new Response(null, {
-				status: 416,
-				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? require_utils.nullObject())
-			});
+			if (start >= size || start > end) return rangeNotSatisfiable(size, set);
 			const contentLength = end - start + 1;
 			const rangeHeaders = new Headers({
 				"accept-ranges": "bytes",
@@ -40,7 +37,7 @@ function handleFile(response, set, request) {
 			});
 			return new Response(response.slice(start, end + 1, response.type), {
 				status: 206,
-				headers: mergeHeaders(rangeHeaders, set?.headers ?? require_utils.nullObject())
+				headers: mergeHeaders(rangeHeaders, set?.headers)
 			});
 		}
 	}
@@ -68,25 +65,21 @@ function handleFile(response, set, request) {
 		headers: defaultHeader
 	});
 }
-function parseSetCookies(headers, setCookie) {
+function parseSetCookies(headers, setCookies) {
 	if (!headers) return headers;
-	headers.delete("set-cookie");
-	for (let i = 0; i < setCookie.length; i++) {
-		const index = setCookie[i].indexOf("=");
-		headers.append("set-cookie", `${setCookie[i].slice(0, index)}=${setCookie[i].slice(index + 1) || ""}`);
+	headers.delete(setCookie);
+	for (let i = 0; i < setCookies.length; i++) {
+		const index = setCookies[i].indexOf("=");
+		headers.append(setCookie, `${setCookies[i].slice(0, index)}=${setCookies[i].slice(index + 1) || ""}`);
 	}
 	return headers;
 }
 function responseToSetHeaders(response, set) {
 	if (set?.headers) {
-		if (response) if (require_universal_constants.hasHeaderShorthand) Object.assign(set.headers, response.headers.toJSON());
+		if (require_universal_constants.hasHeaderShorthand) Object.assign(set.headers, response.headers.toJSON());
 		else for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 		if (set.status === void 0 || set.status === 200) set.status = response.status;
-	} else if (!response) return {
-		headers: require_utils.nullObject(),
-		status: set?.status ?? 200
-	};
-	else if (require_universal_constants.hasHeaderShorthand) set = {
+	} else if (require_universal_constants.hasHeaderShorthand) set = {
 		headers: response.headers.toJSON(),
 		status: set?.status ?? 200
 	};
@@ -121,15 +114,31 @@ function enqueueBinaryChunk(controller, chunk) {
 	}
 	return false;
 }
-function createStreamHandler(_) {
+function enqueueChunk(controller, chunk, format) {
+	if (chunk === void 0 || chunk === null) return;
+	if (chunk.toSSE) controller.enqueue(chunk.toSSE());
+	else if (enqueueBinaryChunk(controller, chunk)) return;
+	else if (typeof chunk === "object") try {
+		controller.enqueue(format(JSON.stringify(chunk)));
+	} catch {
+		controller.enqueue(format(chunk.toString()));
+	}
+	else controller.enqueue(format(chunk.toString()));
+}
+function safeClose(controller) {
+	try {
+		controller.close();
+	} catch {}
+}
+function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat) => {
 		let init = generator.next?.();
 		if (set) handleSet(set);
 		if (init instanceof Promise) init = await init;
 		if (init?.value instanceof ReadableStream) generator = init.value;
 		else if (init && (typeof init?.done === "undefined" || init?.done)) {
-			if (set) return require_adapter_web_standard_handler.mapResponse(init.value, set, request);
-			return require_adapter_web_standard_handler.mapCompactResponse(init.value, request);
+			if (set) return mapResponse(init.value, set, request);
+			return mapCompactResponse(init.value, request);
 		}
 		const isSSE = !skipFormat && (init?.value?.sse ?? generator?.sse ?? set?.headers["content-type"]?.startsWith("text/event-stream"));
 		const format = isSSE ? (data) => `data: ${data}\n\n` : (data) => data;
@@ -155,49 +164,20 @@ function createStreamHandler(_) {
 				request?.signal?.addEventListener("abort", () => {
 					end = true;
 					iterator.return?.();
-					try {
-						controller.close();
-					} catch {}
+					safeClose(controller);
 				});
-				if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
-				if (init.value.toSSE) controller.enqueue(init.value.toSSE());
-				else if (enqueueBinaryChunk(controller, init.value)) return;
-				else if (typeof init.value === "object") try {
-					controller.enqueue(format(JSON.stringify(init.value)));
-				} catch {
-					controller.enqueue(format(init.value.toString()));
-				}
-				else controller.enqueue(format(init.value.toString()));
+				if (!init || init.value instanceof ReadableStream) return;
+				enqueueChunk(controller, init.value, format);
 			},
 			async pull(controller) {
-				if (end) {
-					try {
-						controller.close();
-					} catch {}
-					return;
-				}
+				if (end) return safeClose(controller);
 				try {
 					const { value: chunk, done } = await iterator.next();
-					if (done || end) {
-						try {
-							controller.close();
-						} catch {}
-						return;
-					}
-					if (chunk === void 0 || chunk === null) return;
-					if (chunk.toSSE) controller.enqueue(chunk.toSSE());
-					else if (enqueueBinaryChunk(controller, chunk)) return;
-					else if (typeof chunk === "object") try {
-						controller.enqueue(format(JSON.stringify(chunk)));
-					} catch {
-						controller.enqueue(format(chunk.toString()));
-					}
-					else controller.enqueue(format(chunk.toString()));
+					if (done || end) return safeClose(controller);
+					enqueueChunk(controller, chunk, format);
 				} catch (error) {
 					console.warn(error);
-					try {
-						controller.close();
-					} catch {}
+					safeClose(controller);
 				}
 			},
 			cancel() {
@@ -235,6 +215,7 @@ function applySetHeaders(target, setHeaders, present) {
 	else if (!present.has(key)) target.set(key, setHeaders[key]);
 }
 function mergeHeaders(responseHeaders, setHeaders) {
+	if (!setHeaders) return responseHeaders;
 	const headers = new Headers(responseHeaders);
 	applySetHeaders(headers, setHeaders, responseHeaders);
 	return headers;

package/dist/adapter/utils.mjs

@@ -2,10 +2,13 @@ import { hasHeaderShorthand, isBun } from "../universal/constants.mjs";
 import { StatusMap } from "../constants.mjs";
 import { isNotEmpty, nullObject } from "../utils.mjs";
 import { serializeCookie } from "../cookie/serialize.mjs";
-import { mapCompactResponse, mapResponse } from "./web-standard/handler.mjs";
 
 //#region src/adapter/utils.ts
 const setCookie = "set-cookie";
+const rangeNotSatisfiable = (size, set) => new Response(null, {
+	status: 416,
+	headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers)
+});
 function handleFile(response, set, request) {
 	if (!isBun && response instanceof Promise) return response.then((res) => handleFile(res, set, request));
 	const size = response.size;
@@ -13,10 +16,7 @@ function handleFile(response, set, request) {
 	if (rangeHeader) {
 		const match = /bytes=(\d*)-(\d*)/.exec(rangeHeader);
 		if (match) {
-			if (!match[1] && !match[2]) return new Response(null, {
-				status: 416,
-				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? nullObject())
-			});
+			if (!match[1] && !match[2]) return rangeNotSatisfiable(size, set);
 			let start;
 			let end;
 			if (!match[1] && match[2]) {
@@ -27,10 +27,7 @@ function handleFile(response, set, request) {
 				start = match[1] ? parseInt(match[1]) : 0;
 				end = match[2] ? Math.min(parseInt(match[2]), size - 1) : size - 1;
 			}
-			if (start >= size || start > end) return new Response(null, {
-				status: 416,
-				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? nullObject())
-			});
+			if (start >= size || start > end) return rangeNotSatisfiable(size, set);
 			const contentLength = end - start + 1;
 			const rangeHeaders = new Headers({
 				"accept-ranges": "bytes",
@@ -39,7 +36,7 @@ function handleFile(response, set, request) {
 			});
 			return new Response(response.slice(start, end + 1, response.type), {
 				status: 206,
-				headers: mergeHeaders(rangeHeaders, set?.headers ?? nullObject())
+				headers: mergeHeaders(rangeHeaders, set?.headers)
 			});
 		}
 	}
@@ -67,25 +64,21 @@ function handleFile(response, set, request) {
 		headers: defaultHeader
 	});
 }
-function parseSetCookies(headers, setCookie) {
+function parseSetCookies(headers, setCookies) {
 	if (!headers) return headers;
-	headers.delete("set-cookie");
-	for (let i = 0; i < setCookie.length; i++) {
-		const index = setCookie[i].indexOf("=");
-		headers.append("set-cookie", `${setCookie[i].slice(0, index)}=${setCookie[i].slice(index + 1) || ""}`);
+	headers.delete(setCookie);
+	for (let i = 0; i < setCookies.length; i++) {
+		const index = setCookies[i].indexOf("=");
+		headers.append(setCookie, `${setCookies[i].slice(0, index)}=${setCookies[i].slice(index + 1) || ""}`);
 	}
 	return headers;
 }
 function responseToSetHeaders(response, set) {
 	if (set?.headers) {
-		if (response) if (hasHeaderShorthand) Object.assign(set.headers, response.headers.toJSON());
+		if (hasHeaderShorthand) Object.assign(set.headers, response.headers.toJSON());
 		else for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 		if (set.status === void 0 || set.status === 200) set.status = response.status;
-	} else if (!response) return {
-		headers: nullObject(),
-		status: set?.status ?? 200
-	};
-	else if (hasHeaderShorthand) set = {
+	} else if (hasHeaderShorthand) set = {
 		headers: response.headers.toJSON(),
 		status: set?.status ?? 200
 	};
@@ -120,7 +113,23 @@ function enqueueBinaryChunk(controller, chunk) {
 	}
 	return false;
 }
-function createStreamHandler(_) {
+function enqueueChunk(controller, chunk, format) {
+	if (chunk === void 0 || chunk === null) return;
+	if (chunk.toSSE) controller.enqueue(chunk.toSSE());
+	else if (enqueueBinaryChunk(controller, chunk)) return;
+	else if (typeof chunk === "object") try {
+		controller.enqueue(format(JSON.stringify(chunk)));
+	} catch {
+		controller.enqueue(format(chunk.toString()));
+	}
+	else controller.enqueue(format(chunk.toString()));
+}
+function safeClose(controller) {
+	try {
+		controller.close();
+	} catch {}
+}
+function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat) => {
 		let init = generator.next?.();
 		if (set) handleSet(set);
@@ -154,49 +163,20 @@ function createStreamHandler(_) {
 				request?.signal?.addEventListener("abort", () => {
 					end = true;
 					iterator.return?.();
-					try {
-						controller.close();
-					} catch {}
+					safeClose(controller);
 				});
-				if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
-				if (init.value.toSSE) controller.enqueue(init.value.toSSE());
-				else if (enqueueBinaryChunk(controller, init.value)) return;
-				else if (typeof init.value === "object") try {
-					controller.enqueue(format(JSON.stringify(init.value)));
-				} catch {
-					controller.enqueue(format(init.value.toString()));
-				}
-				else controller.enqueue(format(init.value.toString()));
+				if (!init || init.value instanceof ReadableStream) return;
+				enqueueChunk(controller, init.value, format);
 			},
 			async pull(controller) {
-				if (end) {
-					try {
-						controller.close();
-					} catch {}
-					return;
-				}
+				if (end) return safeClose(controller);
 				try {
 					const { value: chunk, done } = await iterator.next();
-					if (done || end) {
-						try {
-							controller.close();
-						} catch {}
-						return;
-					}
-					if (chunk === void 0 || chunk === null) return;
-					if (chunk.toSSE) controller.enqueue(chunk.toSSE());
-					else if (enqueueBinaryChunk(controller, chunk)) return;
-					else if (typeof chunk === "object") try {
-						controller.enqueue(format(JSON.stringify(chunk)));
-					} catch {
-						controller.enqueue(format(chunk.toString()));
-					}
-					else controller.enqueue(format(chunk.toString()));
+					if (done || end) return safeClose(controller);
+					enqueueChunk(controller, chunk, format);
 				} catch (error) {
 					console.warn(error);
-					try {
-						controller.close();
-					} catch {}
+					safeClose(controller);
 				}
 			},
 			cancel() {
@@ -234,6 +214,7 @@ function applySetHeaders(target, setHeaders, present) {
 	else if (!present.has(key)) target.set(key, setHeaders[key]);
 }
 function mergeHeaders(responseHeaders, setHeaders) {
+	if (!setHeaders) return responseHeaders;
 	const headers = new Headers(responseHeaders);
 	applySetHeaders(headers, setHeaders, responseHeaders);
 	return headers;

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

@@ -109,7 +109,7 @@ function errorToResponse(error, set) {
 		headers
 	});
 }
-function mapFallback(map, mustReturn = true) {
+function mapFallback(map) {
 	return (response, set, request) => {
 		if (response instanceof Response) return handleResponse(response, set, request);
 		if (response instanceof Promise) return response.then((x) => map(x, set, request));
@@ -126,7 +126,7 @@ function mapFallback(map, mustReturn = true) {
 		if (Array.isArray(response)) return Response.json(response);
 		if (typeof response?.toResponse === "function") return map(response.toResponse(), set, request);
 		if (response?.constructor?.name === "Cookie" && response.jar) return new Response(response.value, set);
-		if (mustReturn) return new Response(response, set);
+		return new Response(response, set);
 	};
 }
 const mapResponseFallback = mapFallback(mapResponse);

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

@@ -108,7 +108,7 @@ function errorToResponse(error, set) {
 		headers
 	});
 }
-function mapFallback(map, mustReturn = true) {
+function mapFallback(map) {
 	return (response, set, request) => {
 		if (response instanceof Response) return handleResponse(response, set, request);
 		if (response instanceof Promise) return response.then((x) => map(x, set, request));
@@ -125,7 +125,7 @@ function mapFallback(map, mustReturn = true) {
 		if (Array.isArray(response)) return Response.json(response);
 		if (typeof response?.toResponse === "function") return map(response.toResponse(), set, request);
 		if (response?.constructor?.name === "Cookie" && response.jar) return new Response(response.value, set);
-		if (mustReturn) return new Response(response, set);
+		return new Response(response, set);
 	};
 }
 const mapResponseFallback = mapFallback(mapResponse);

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

@@ -11,12 +11,19 @@ const require_handler_fetch = require('./handler/fetch.js');
 const require_compile_handler_index = require('./compile/handler/index.js');
 let memoirist = require("memoirist");
 memoirist = require_runtime.__toESM(memoirist);
+let deuri = require("deuri");
 
 //#region src/base.ts
 const useNodesBuffer = [];
+const extAssignKeys = [
+	"headers",
+	"models",
+	"parser",
+	"macro"
+];
 var Elysia = class Elysia {
-	#hasPlugin = false;
-	#hasGlobal = false;
+	#hasPlugin;
+	#hasGlobal;
 	#ready;
 	#pending = 0;
 	#error;
@@ -151,7 +158,11 @@ var Elysia = class Elysia {
 		this.#cachedRoutes = void 0;
 		if (scope === "plugin") this.#hasPlugin = true;
 		else if (scope === "global") this.#hasGlobal = true;
-		if (this.#hash !== void 0 && !require_utils.fnOrigin.has(fn)) require_utils.fnOrigin.set(fn, this.#hash);
+		if (this.#hash !== void 0) {
+			if (Array.isArray(fn)) {
+				for (const f of fn) if (typeof f === "function" && !require_utils.fnOrigin.has(f)) require_utils.fnOrigin.set(f, this.#hash);
+			} else if (typeof fn === "function" && !require_utils.fnOrigin.has(fn)) require_utils.fnOrigin.set(fn, this.#hash);
+		}
 		return this;
 	}
 	#onBranch(type, scopeOrFn, fn) {
@@ -273,15 +284,7 @@ var Elysia = class Elysia {
 		}
 	}
 	guard() {
-		if (arguments.length === 1) {
-			const arg = arguments[0];
-			let scope = "local";
-			if (arg && typeof arg === "object" && "as" in arg && arg.as) {
-				scope = arg.as;
-				delete arg.as;
-			}
-			return this.#guard(scope, arg);
-		}
+		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]);
 			return this.#guard(arguments[0], arguments[1]);
@@ -541,7 +544,8 @@ var Elysia = class Elysia {
 		}
 		const hookChain = app["~hookChain"];
 		if (app["~ext"]) {
-			const { decorator, store, headers, models, parser, macro, error, hoc } = app["~ext"];
+			const source = app["~ext"];
+			const { decorator, store, error, hoc } = source;
 			const ext = this["~ext"] ??= require_utils.nullObject();
 			if (decorator) {
 				const cloned = require_utils.clonePlainDecorators(decorator);
@@ -550,14 +554,12 @@ var Elysia = class Elysia {
 			}
 			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);
-			else ext.headers = Object.assign(require_utils.nullObject(), headers);
-			if (models) if (ext.models) Object.assign(ext.models, models);
-			else ext.models = Object.assign(require_utils.nullObject(), models);
-			if (parser) if (ext.parser) Object.assign(ext.parser, parser);
-			else ext.parser = Object.assign(require_utils.nullObject(), parser);
-			if (macro) if (ext.macro) Object.assign(ext.macro, macro);
-			else ext.macro = Object.assign(require_utils.nullObject(), macro);
+			for (const key of extAssignKeys) {
+				const value = source[key];
+				if (!value) continue;
+				if (ext[key]) Object.assign(ext[key], value);
+				else ext[key] = Object.assign(require_utils.nullObject(), value);
+			}
 			if (error) if (ext.error) for (const [code, handler] of error) ext.error.set(code, handler);
 			else ext.error = new Map(error);
 			if (hoc) if (ext.hoc) {
@@ -805,7 +807,7 @@ var Elysia = class Elysia {
 		}
 		const handle = typeof handleOrConfig === "function" ? handleOrConfig : null;
 		if (!handle) throw new Error("Invalid handler");
-		const length = (typeof path === "string" && this["~Prefix"] ? this["~Prefix"] + path : path).length - (path.endsWith("*") ? 1 : 0);
+		const length = (this["~Prefix"] ? require_utils.joinPath(this["~Prefix"], path) : path.charCodeAt(0) !== 47 ? "/" + path : path).length - (path.endsWith("*") ? 1 : 0);
 		const handler = (c) => handle(new Request(require_utils.replaceUrlPath(c.request.url, c.path.slice(length) || "/"), c.request));
 		this.all(path, options, handler);
 		this.all(path + (path.endsWith("/") ? "*" : "/*"), options, handler);
@@ -825,6 +827,7 @@ var Elysia = class Elysia {
 	compile() {
 		this["~config"] ??= require_utils.nullObject();
 		this["~config"].precompile = true;
+		this.#routerBuilt = false;
 		this.fetch;
 		return this;
 	}
@@ -897,7 +900,10 @@ var Elysia = class Elysia {
 		}
 		const wrapHeadHandler = Elysia.#wrapHeadHandler;
 		const strict = !!this["~config"]?.strictPath;
-		const routerOptions = strict ? void 0 : { loosePath: true };
+		const routerOptions = {
+			loosePath: !strict,
+			onParam: (value) => value.indexOf("%") !== -1 ? (0, deuri.decodeComponent)(value) ?? value : void 0
+		};
 		const getRouter = () => this["~router"] ??= new memoirist.default(routerOptions);
 		let explicitPaths;
 		if (!strict && this["~config"]?.distinctPath) {
@@ -937,11 +943,7 @@ var Elysia = class Elysia {
 					this["~config"] ??= require_utils.nullObject();
 					const existing = this["~config"].websocket;
 					if (existing && require_universal_constants.isBun) {
-						for (const key in options) if (key in existing && existing[key] !== options[key]) {
-							console.warn(`[Elysia] Conflicting per-route WebSocket option '${key}'`);
-							console.warn(`Bun uses one global WebSocket config per server, so per-route values are not enforced (the last-registered route wins).`);
-							console.warn((/* @__PURE__ */ new Error()).stack);
-						}
+						for (const key in options) if (key in existing && existing[key] !== options[key]) console.warn(`[Elysia] Conflicting per-route WebSocket option '${key}' — Bun uses one global WebSocket config per server, so the last-registered route wins.`);
 						Object.assign(existing, options);
 					} else this["~config"].websocket = options;
 				}