elysia 2.0.0-exp.41 → 2.0.0-exp.42

package/dist/adapter/bun/index.js

@@ -13,7 +13,7 @@ function collectStaticRoutes(app) {
 	app.fetch;
 	const fetchLevelHook = require_utils.flattenChain(app["~hookChain"]);
 	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || app["~ext"]?.hoc?.length) return;
-	const history = app.history;
+	const history = app["~routes"];
 	if (!history?.length) return;
 	const ready = require_utils.nullObject();
 	const pending = [];
@@ -86,9 +86,20 @@ const BunAdapter = require_adapter_index.createAdapter({
 		} : _options;
 		const server = app.server = Bun.serve(serve);
 		const onSetup = app["~ext"]?.setup;
-		if (onSetup) for (let i = 0; i < onSetup.length; i++) onSetup[i](app);
+		let setupReady;
+		if (onSetup) {
+			let pendingSetups;
+			for (let i = 0; i < onSetup.length; i++) {
+				const result = onSetup[i](app);
+				if (result && typeof result.then === "function") (pendingSetups ??= []).push(result);
+			}
+			if (pendingSetups) setupReady = Promise.all(pendingSetups);
+		}
 		const hasWs = app["~hasWS"];
-		if (!hasWs) callback?.(app.server);
+		if (!hasWs) {
+			if (callback) if (setupReady) setupReady.then(() => callback(app.server));
+			else callback(app.server);
+		}
 		queueMicrotask(() => {
 			if (app.server !== server) return;
 			if (!app.pending) serve.fetch = app.fetch;
@@ -122,7 +133,8 @@ const BunAdapter = require_adapter_index.createAdapter({
 				app.server.reload(serve);
 			}
 			require_memory.flushMemory();
-			if (hasWs) callback?.(app.server);
+			if (hasWs && callback) if (setupReady) setupReady.then(() => callback(app.server));
+			else callback(app.server);
 		});
 	}
 });

package/dist/adapter/bun/index.mjs

@@ -12,7 +12,7 @@ function collectStaticRoutes(app) {
 	app.fetch;
 	const fetchLevelHook = flattenChain(app["~hookChain"]);
 	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || app["~ext"]?.hoc?.length) return;
-	const history = app.history;
+	const history = app["~routes"];
 	if (!history?.length) return;
 	const ready = nullObject();
 	const pending = [];
@@ -85,9 +85,20 @@ const BunAdapter = createAdapter({
 		} : _options;
 		const server = app.server = Bun.serve(serve);
 		const onSetup = app["~ext"]?.setup;
-		if (onSetup) for (let i = 0; i < onSetup.length; i++) onSetup[i](app);
+		let setupReady;
+		if (onSetup) {
+			let pendingSetups;
+			for (let i = 0; i < onSetup.length; i++) {
+				const result = onSetup[i](app);
+				if (result && typeof result.then === "function") (pendingSetups ??= []).push(result);
+			}
+			if (pendingSetups) setupReady = Promise.all(pendingSetups);
+		}
 		const hasWs = app["~hasWS"];
-		if (!hasWs) callback?.(app.server);
+		if (!hasWs) {
+			if (callback) if (setupReady) setupReady.then(() => callback(app.server));
+			else callback(app.server);
+		}
 		queueMicrotask(() => {
 			if (app.server !== server) return;
 			if (!app.pending) serve.fetch = app.fetch;
@@ -121,7 +132,8 @@ const BunAdapter = createAdapter({
 				app.server.reload(serve);
 			}
 			flushMemory();
-			if (hasWs) callback?.(app.server);
+			if (hasWs && callback) if (setupReady) setupReady.then(() => callback(app.server));
+			else callback(app.server);
 		});
 	}
 });

package/dist/adapter/utils.d.ts

@@ -1,9 +1,10 @@
 import { StatusMap } from "../constants.js";
+import { ElysiaFile } from "../universal/file.js";
 import { BaseCookie } from "../cookie/types.js";
 import { HTTPHeaders } from "../types.js";
 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 handleFile(response: File | Blob | ElysiaFile, set?: Context['set'], request?: Request, size?: number): Response;
 declare function parseSetCookies(headers: Headers, setCookie: string[]): Headers;
 declare function responseToSetHeaders(response: Response, set?: Context['set']): {
   headers: HTTPHeaders;

package/dist/adapter/utils.js

@@ -11,9 +11,8 @@ const sseFormat = (data) => `data: ${data}\n\n`;
 const identityFormat = (data) => data;
 const textEncoder = new TextEncoder();
 const encodeChunk = (s) => textEncoder.encode(s);
-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;
+function handleFile(response, set, request, size = response.size) {
+	if (!require_universal_constants.isBun && response instanceof Promise) return response.then((res) => handleFile(res, set, request, size));
 	const rangeHeader = request?.headers.get("range");
 	if (rangeHeader) {
 		const match = /bytes=(\d*)-(\d*)/.exec(rangeHeader);
@@ -48,26 +47,27 @@ function handleFile(response, set, request) {
 			});
 		}
 	}
+	const body = "value" in response ? response.value : response;
 	const immutable = set && (set.status === 206 || set.status === 304 || set.status === 412 || set.status === 416);
 	const defaultHeader = immutable ? require_utils.nullObject() : {
 		"accept-ranges": "bytes",
 		"content-range": size ? `bytes 0-${size - 1}/${size}` : void 0
 	};
-	if (!set && !size) return new Response(response);
-	if (!set) return new Response(response, { headers: defaultHeader });
+	if (!set && !size) return new Response(body);
+	if (!set) return new Response(body, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
 		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");
 		}
-		return new Response(response, set);
+		return new Response(body, set);
 	}
-	if (require_utils.isNotEmpty(set.headers)) return new Response(response, {
+	if (require_utils.isNotEmpty(set.headers)) return new Response(body, {
 		status: set.status,
 		headers: Object.assign(defaultHeader, set.headers)
 	});
-	return new Response(response, {
+	return new Response(body, {
 		status: set.status,
 		headers: defaultHeader
 	});
@@ -270,12 +270,26 @@ function handleSet(set) {
 }
 function applySetHeaders(target, setHeaders, present) {
 	if (setHeaders instanceof Headers) {
-		for (const key of setHeaders.keys()) if (key === setCookie) {
-			if (target.has(setCookie)) continue;
-			for (const cookie of setHeaders.getSetCookie()) target.append(setCookie, cookie);
-		} else if (!present.has(key)) target.set(key, setHeaders.get(key) ?? "");
-	} else for (const key in setHeaders) if (key === setCookie) target.append(key, setHeaders[key]);
-	else if (!present.has(key)) target.set(key, setHeaders[key]);
+		const incoming = setHeaders.getSetCookie();
+		if (incoming.length) {
+			const cookies = target.getSetCookie();
+			for (const cookie of incoming) if (!cookies.includes(cookie)) {
+				target.append(setCookie, cookie);
+				cookies.push(cookie);
+			}
+		}
+		for (const key of setHeaders.keys()) if (key !== setCookie && !present.has(key)) target.set(key, setHeaders.get(key) ?? "");
+	} else {
+		let cookies;
+		for (const key in setHeaders) if (key === setCookie) {
+			const cookie = setHeaders[key];
+			cookies ??= target.getSetCookie();
+			if (!cookies.includes(cookie)) {
+				target.append(key, cookie);
+				cookies.push(cookie);
+			}
+		} else if (!present.has(key)) target.set(key, setHeaders[key]);
+	}
 }
 function mergeHeaders(responseHeaders, setHeaders) {
 	const headers = new Headers(responseHeaders);
@@ -327,7 +341,15 @@ function createResponseHandler(handler) {
 		return newResponse;
 	};
 }
-const teeChunkCost = (chunk) => typeof chunk === "string" ? chunk.length : chunk?.byteLength ?? 64;
+function teeChunkCost(chunk) {
+	if (typeof chunk === "string") return chunk.length;
+	if (typeof chunk !== "object" || chunk === null) return 64;
+	const byteLength = chunk.byteLength;
+	if (typeof byteLength === "number") return byteLength;
+	const size = chunk.size;
+	if (typeof size === "number") return size;
+	return 64;
+}
 const doneResult = {
 	done: true,
 	value: void 0

package/dist/adapter/utils.mjs

@@ -10,9 +10,8 @@ const sseFormat = (data) => `data: ${data}\n\n`;
 const identityFormat = (data) => data;
 const textEncoder = new TextEncoder();
 const encodeChunk = (s) => textEncoder.encode(s);
-function handleFile(response, set, request) {
-	if (!isBun && response instanceof Promise) return response.then((res) => handleFile(res, set, request));
-	const size = response.size;
+function handleFile(response, set, request, size = response.size) {
+	if (!isBun && response instanceof Promise) return response.then((res) => handleFile(res, set, request, size));
 	const rangeHeader = request?.headers.get("range");
 	if (rangeHeader) {
 		const match = /bytes=(\d*)-(\d*)/.exec(rangeHeader);
@@ -47,26 +46,27 @@ function handleFile(response, set, request) {
 			});
 		}
 	}
+	const body = "value" in response ? response.value : response;
 	const immutable = set && (set.status === 206 || set.status === 304 || set.status === 412 || set.status === 416);
 	const defaultHeader = immutable ? nullObject() : {
 		"accept-ranges": "bytes",
 		"content-range": size ? `bytes 0-${size - 1}/${size}` : void 0
 	};
-	if (!set && !size) return new Response(response);
-	if (!set) return new Response(response, { headers: defaultHeader });
+	if (!set && !size) return new Response(body);
+	if (!set) return new Response(body, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
 		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");
 		}
-		return new Response(response, set);
+		return new Response(body, set);
 	}
-	if (isNotEmpty(set.headers)) return new Response(response, {
+	if (isNotEmpty(set.headers)) return new Response(body, {
 		status: set.status,
 		headers: Object.assign(defaultHeader, set.headers)
 	});
-	return new Response(response, {
+	return new Response(body, {
 		status: set.status,
 		headers: defaultHeader
 	});
@@ -269,12 +269,26 @@ function handleSet(set) {
 }
 function applySetHeaders(target, setHeaders, present) {
 	if (setHeaders instanceof Headers) {
-		for (const key of setHeaders.keys()) if (key === setCookie) {
-			if (target.has(setCookie)) continue;
-			for (const cookie of setHeaders.getSetCookie()) target.append(setCookie, cookie);
-		} else if (!present.has(key)) target.set(key, setHeaders.get(key) ?? "");
-	} else for (const key in setHeaders) if (key === setCookie) target.append(key, setHeaders[key]);
-	else if (!present.has(key)) target.set(key, setHeaders[key]);
+		const incoming = setHeaders.getSetCookie();
+		if (incoming.length) {
+			const cookies = target.getSetCookie();
+			for (const cookie of incoming) if (!cookies.includes(cookie)) {
+				target.append(setCookie, cookie);
+				cookies.push(cookie);
+			}
+		}
+		for (const key of setHeaders.keys()) if (key !== setCookie && !present.has(key)) target.set(key, setHeaders.get(key) ?? "");
+	} else {
+		let cookies;
+		for (const key in setHeaders) if (key === setCookie) {
+			const cookie = setHeaders[key];
+			cookies ??= target.getSetCookie();
+			if (!cookies.includes(cookie)) {
+				target.append(key, cookie);
+				cookies.push(cookie);
+			}
+		} else if (!present.has(key)) target.set(key, setHeaders[key]);
+	}
 }
 function mergeHeaders(responseHeaders, setHeaders) {
 	const headers = new Headers(responseHeaders);
@@ -326,7 +340,15 @@ function createResponseHandler(handler) {
 		return newResponse;
 	};
 }
-const teeChunkCost = (chunk) => typeof chunk === "string" ? chunk.length : chunk?.byteLength ?? 64;
+function teeChunkCost(chunk) {
+	if (typeof chunk === "string") return chunk.length;
+	if (typeof chunk !== "object" || chunk === null) return 64;
+	const byteLength = chunk.byteLength;
+	if (typeof byteLength === "number") return byteLength;
+	const size = chunk.size;
+	if (typeof size === "number") return size;
+	return 64;
+}
 const doneResult = {
 	done: true,
 	value: void 0

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

@@ -11,13 +11,14 @@ function handleElysiaFile(file, set = { headers: require_utils.nullObject() }, r
 	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) => {
+	const stats = file.stats;
+	if (stats) return stats.then((stat) => {
 		const size = stat.size;
-		if (size !== void 0) {
+		if (size !== void 0 && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416) {
 			headers["content-range"] = `bytes 0-${size - 1}/${size}`;
 			headers["content-length"] = size;
 		}
-		return require_adapter_utils.handleFile(file.value, set, request);
+		return require_adapter_utils.handleFile(file, set, request, size);
 	});
 	return require_adapter_utils.handleFile(file.value, set, request);
 }

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

@@ -10,13 +10,14 @@ function handleElysiaFile(file, set = { headers: nullObject() }, request) {
 	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) => {
+	const stats = file.stats;
+	if (stats) return stats.then((stat) => {
 		const size = stat.size;
-		if (size !== void 0) {
+		if (size !== void 0 && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416) {
 			headers["content-range"] = `bytes 0-${size - 1}/${size}`;
 			headers["content-length"] = size;
 		}
-		return handleFile(file.value, set, request);
+		return handleFile(file, set, request, size);
 	});
 	return handleFile(file.value, set, request);
 }

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

@@ -22,7 +22,12 @@ function parseFormData(context, contentType) {
 		const fixedCt = semi === -1 ? lowercaseContentType(fullCt) : lowercaseContentType(fullCt.slice(0, semi)) + fullCt.slice(semi);
 		const headers = new Headers(context.request.headers);
 		headers.set("content-type", fixedCt);
-		return new Request(context.request, { headers }).formData().then(require_adapter_web_standard_utils.formDataToObject);
+		return new Request(context.request.url, {
+			method: context.request.method,
+			headers,
+			body: context.request.body,
+			duplex: "half"
+		}).formData().then(require_adapter_web_standard_utils.formDataToObject);
 	}
 	return context.request.formData().then(require_adapter_web_standard_utils.formDataToObject);
 }
@@ -45,7 +50,10 @@ const WebStandardAdapter = require_adapter_index.createAdapter({
 					break;
 				case 111: return context.request.arrayBuffer();
 				case 114: return parseFormData(context, contentType);
-				default: if (ct.charCodeAt(0) === 116) return context.request.text();
+				default:
+					if (ct.charCodeAt(0) === 116) return context.request.text();
+					const semi = ct.indexOf(";");
+					if ((semi === -1 ? ct : ct.slice(0, semi)).endsWith("+json")) return context.request.json();
 			}
 		}
 	},

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

@@ -21,7 +21,12 @@ function parseFormData(context, contentType) {
 		const fixedCt = semi === -1 ? lowercaseContentType(fullCt) : lowercaseContentType(fullCt.slice(0, semi)) + fullCt.slice(semi);
 		const headers = new Headers(context.request.headers);
 		headers.set("content-type", fixedCt);
-		return new Request(context.request, { headers }).formData().then(formDataToObject);
+		return new Request(context.request.url, {
+			method: context.request.method,
+			headers,
+			body: context.request.body,
+			duplex: "half"
+		}).formData().then(formDataToObject);
 	}
 	return context.request.formData().then(formDataToObject);
 }
@@ -44,7 +49,10 @@ const WebStandardAdapter = createAdapter({
 					break;
 				case 111: return context.request.arrayBuffer();
 				case 114: return parseFormData(context, contentType);
-				default: if (ct.charCodeAt(0) === 116) return context.request.text();
+				default:
+					if (ct.charCodeAt(0) === 116) return context.request.text();
+					const semi = ct.indexOf(";");
+					if ((semi === -1 ? ct : ct.slice(0, semi)).endsWith("+json")) return context.request.json();
 			}
 		}
 	},

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

@@ -83,8 +83,14 @@ function setNested(body, path, value, budget) {
 				i += 2;
 			} else {
 				const start = i;
-				while (i < len && path.charCodeAt(i) !== BRACKET_C) i++;
-				key = +path.slice(start, i);
+				let allDigits = i < len;
+				while (i < len && path.charCodeAt(i) !== BRACKET_C) {
+					const c = path.charCodeAt(i);
+					if (c < ZERO || c > NINE) allDigits = false;
+					i++;
+				}
+				const segment = path.slice(start, i);
+				key = allDigits ? +segment : segment;
 				i++;
 			}
 		} else {

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

@@ -82,8 +82,14 @@ function setNested(body, path, value, budget) {
 				i += 2;
 			} else {
 				const start = i;
-				while (i < len && path.charCodeAt(i) !== BRACKET_C) i++;
-				key = +path.slice(start, i);
+				let allDigits = i < len;
+				while (i < len && path.charCodeAt(i) !== BRACKET_C) {
+					const c = path.charCodeAt(i);
+					if (c < ZERO || c > NINE) allDigits = false;
+					i++;
+				}
+				const segment = path.slice(start, i);
+				key = allDigits ? +segment : segment;
 				i++;
 			}
 		} else {

package/dist/base.d.ts

@@ -2,7 +2,7 @@ import { ElysiaStatus } from "./error.js";
 import { TraceHandler } from "./trace.js";
 import { AnySchema } from "./type/types.js";
 import { ListenCallback, Serve, Server } from "./universal/server.js";
-import { AddRoute, AddWSRoute, AfterHandler, AfterResponseHandler, AnyErrorConstructor, AnyLocalHook, BodyHandler, CompiledHandler, CreateEden, DefaultEphemeral, DefaultMetadata, DefaultSingleton, DefinitionBase, DocumentDecoration, ElysiaConfig, ElysiaHandlerToResponseSchemaAmbiguous, EphemeralType, ErrorDefinitionEntry, ErrorHandler, EventScope, ExcludeElysiaResponse, ExtractErrorFromHandle, GlobalHookReturn, GracefulHandler, GuardHookSingleton, GuardLocalHook, HTTPMethod, HookContextSchema, HookContextSingleton, InlineHandler, InlineHandlerNonMacro, InputSchema, InputSchemaKey, InternalRoute, IntersectIfObjectSchema, JoinPath, LocalHook, LocalHookReturn, Macro, MacroSchemaChannel, MacroToContext, MacroToProperty, MapResponse, MaybeArray, MaybePromise, MergeElysiaInstances, MergeSchema, MergeScopedSchemas, MetadataBase, NonResolvableMacroKey, ObjectMacroDefs, OptionalHandler, PluginHookReturn, PreHandler, Prettify, PublicRoute, ResolveRouteErrors, RouteBase, SingletonBase, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
+import { AddRoute, AddWSRoute, AfterHandler, AfterResponseHandler, AnyErrorConstructor, AnyLocalHook, BodyHandler, CompiledHandler, CreateEden, DefaultEphemeral, DefaultMetadata, DefaultSingleton, DefinitionBase, DocumentDecoration, ElysiaConfig, ElysiaHandlerToResponseSchemaAmbiguous, EphemeralType, ErrorDefinitionEntry, ErrorHandler, EventScope, ExcludeElysiaResponse, ExtractErrorFromHandle, GlobalHookReturn, GracefulHandler, GuardHookSingleton, GuardLocalHook, HTTPMethod, HistoryEntry, HookContextSchema, HookContextSingleton, InlineHandler, InlineHandlerNonMacro, InputSchema, InputSchemaKey, InternalRoute, IntersectIfObjectSchema, JoinPath, LocalHook, LocalHookReturn, Macro, MacroSchemaChannel, MacroToContext, MacroToProperty, MapResponse, MaybeArray, MaybePromise, MergeElysiaInstances, MergeSchema, MergeScopedSchemas, MetadataBase, NonResolvableMacroKey, ObjectMacroDefs, OptionalHandler, PluginHookReturn, PreHandler, Prettify, PublicRoute, ResolveRouteErrors, RouteBase, SingletonBase, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
 import { ChainNode } from "./utils.js";
 import { Context, ErrorContext, LifecycleContext } from "./context.js";
 import { WSHandlerResponse, WSLocalHook, WSMessageHandler } from "./ws/types.js";
@@ -14,7 +14,6 @@ type AnyElysia = Elysia<any, any, any, any, any, any, any, any>;
 interface StaticMapAliases {
   method: string;
   paths: string[];
-  head: boolean;
 }
 declare class Elysia<const in out BasePath extends string = '', const in out Scope extends EventScope = 'local', const in out Singleton extends SingletonBase = DefaultSingleton, const in out Definitions extends DefinitionBase = {
   typebox: {};
@@ -44,7 +43,9 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   };
   '~hookChain'?: ChainNode;
   server?: Server;
-  get history(): InternalRoute[] | undefined;
+  get history(): readonly HistoryEntry[];
+  get ['~routes'](): readonly InternalRoute[];
+  ['~addRoute'](route: InternalRoute): this;
   '~router'?: Memoirist<CompiledHandler>;
   '~map'?: {
     [method: string]: {
@@ -860,4 +861,4 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   stop(closeActiveConnections?: boolean): Promise<void> | void;
 }
 //#endregion
-export { AnyElysia, Elysia, StaticMapAliases };
+export { AnyElysia, Elysia };