elysia 2.0.0-beta.13 → 2.0.0-beta.15

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

@@ -1,7 +1,9 @@
+import { BunHTMLBundlelike } from "../../types.js";
 import { AnyElysia } from "../../base.js";
 import { ElysiaAdapterOptions } from "../types.js";
 //#region src/adapter/bun/index.d.ts
-declare function collectStaticRoutes(app: AnyElysia): Record<string, Record<string, Response>> | undefined;
+declare const isHTMLBundle: (value: unknown) => value is BunHTMLBundlelike;
+declare function collectStaticRoutes(app: AnyElysia): Record<string, Record<string, Response | BunHTMLBundlelike>> | undefined;
 declare const BunAdapter: ElysiaAdapterOptions<void>;
 //#endregion
-export { BunAdapter, collectStaticRoutes };
+export { BunAdapter, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/bun/index.js

@@ -21,29 +21,11 @@ const unavailableFetch = () => new Response(null, {
 	headers: { connection: "close" },
 	status: 503
 });
-function reloadServer(server, serve) {
-	try {
-		server.reload(serve);
-	} catch (error) {
-		if (!serve.routes) throw error;
-		delete serve.routes;
-		console.warn("[Elysia] Native static promotion was skipped:", error);
-		try {
-			server.reload(serve);
-		} catch (fallbackError) {
-			console.error("[Elysia] Failed to reload Bun server:", fallbackError);
-			throw fallbackError;
-		}
-	}
-}
 function releaseLifecycle(app, ext, createdExt, stop, registerCleanup) {
 	if (ext.stop === stop) delete ext.stop;
 	if (ext.cleanupEpoch === registerCleanup) delete ext.cleanupEpoch;
 	if (createdExt && app["~ext"] === ext && !Object.keys(ext).length) app["~ext"] = void 0;
 }
-function clearAppServer(app, server) {
-	if (app.server === server) app.server = void 0;
-}
 async function waitForServerRequests(server, abandoned) {
 	while (server.pendingRequests && !abandoned()) await Bun.sleep(1);
 }
@@ -68,17 +50,6 @@ async function settleServerWebSockets(lifecycle, errors) {
 	} while (lifecycle.sockets.size);
 	return true;
 }
-const closeServerIdle = (server, errors) => {
-	const close = server.closeIdleConnections;
-	if (!close) return true;
-	try {
-		close.call(server);
-		return true;
-	} catch (error) {
-		errors.push(error);
-		return false;
-	}
-};
 /**
 * ! This may looks like it would cause race condition, but it is not
 * Bun is single-threaded and synchronous, so the `finally` block will
@@ -97,12 +68,12 @@ const withOrigin = (fetch) => (request, server) => {
 	}
 };
 const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
+const isHTMLBundle = (value) => typeof value === "object" && value !== null && typeof value.index === "string";
 function collectStaticRoutes(app) {
-	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
 	const frozenRoot = require_generation.frozenRootOf(app);
 	const fetchLevelHook = require_utils.flattenChain(frozenRoot["~hookChain"]);
-	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || frozenRoot["~ext"]?.hoc?.length) return;
+	const promoteResponses = app["~config"]?.nativeStaticResponse !== false && !fetchLevelHook?.request?.length && !fetchLevelHook?.trace?.length && !frozenRoot["~ext"]?.hoc?.length;
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
@@ -111,7 +82,7 @@ function collectStaticRoutes(app) {
 	for (let i = 0; i < length; i++) {
 		if (!isNativeStaticMethod(methods[i]) || (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0) continue;
 		const h = handlers[i];
-		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
 			hasCandidate = true;
 			break;
 		}
@@ -146,8 +117,10 @@ function collectStaticRoutes(app) {
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
-		if (typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
-		const value = require_compile_handler_index.buildNativeStaticResponse(require_route_table.routeRow(table, i), app);
+		let value;
+		if (isHTMLBundle(h)) value = h;
+		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		else value = require_compile_handler_index.buildNativeStaticResponse(require_route_table.routeRow(table, i), app);
 		if (!value) continue;
 		const needsEncode = (routeFlags & require_route_table.RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
@@ -329,7 +302,13 @@ const BunAdapter = require_adapter_index.createAdapter({
 			}
 			let idleClosed = true;
 			if (idleRequired) {
-				idleClosed = closeServerIdle(server, errors);
+				const closeIdle = server.closeIdleConnections;
+				if (closeIdle) try {
+					closeIdle.call(server);
+				} catch (error) {
+					errors.push(error);
+					idleClosed = false;
+				}
 				if (idleClosed && !gateFailure) idleRequired = false;
 			}
 			const safe = socketsSettled && stopped && idleClosed && (!gateFailure || forceDone);
@@ -368,7 +347,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			}
 			cancelled = true;
 			requestReady.resolve();
-			clearAppServer(app, server);
+			if (app.server === server) app.server = void 0;
 			let outcome;
 			if (shutdownAttempt) {
 				if (closeActiveConnections === true && !forceDone) {
@@ -423,6 +402,11 @@ const BunAdapter = require_adapter_index.createAdapter({
 										(cleanupFailures ??= []).push(error);
 									}
 								}
+								try {
+									await require_utils.disposeDecorators(app);
+								} catch (error) {
+									(cleanupFailures ??= []).push(error);
+								}
 							}
 							cleanupCompleted = true;
 							epochCleanup.length = 0;
@@ -457,7 +441,19 @@ const BunAdapter = require_adapter_index.createAdapter({
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
 				if (built.routes) serve.routes = built.routes;
-				reloadServer(server, serve);
+				try {
+					server.reload(serve);
+				} catch (error) {
+					if (!serve.routes) throw error;
+					delete serve.routes;
+					console.warn("[Elysia] Native static promotion was skipped:", error);
+					try {
+						server.reload(serve);
+					} catch (fallbackError) {
+						console.error("[Elysia] Failed to reload Bun server:", fallbackError);
+						throw fallbackError;
+					}
+				}
 				if (callback) callback(server);
 			} catch (error) {
 				startupFailure ??= { error };
@@ -490,4 +486,5 @@ const BunAdapter = require_adapter_index.createAdapter({
 
 //#endregion
 exports.BunAdapter = BunAdapter;
-exports.collectStaticRoutes = collectStaticRoutes;
+exports.collectStaticRoutes = collectStaticRoutes;
+exports.isHTMLBundle = isHTMLBundle;

package/dist/adapter/bun/index.mjs

@@ -1,5 +1,5 @@
 import { createAdapter } from "../index.mjs";
-import { flattenChain, getLoosePath, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
+import { disposeDecorators, flattenChain, getLoosePath, isSocketQuiet, nullObject, throwLifecycleErrors } from "../../utils.mjs";
 import { WebStandardAdapter } from "../web-standard/index.mjs";
 import { frozenRootOf, resolvedWsOf } from "../../generation.mjs";
 import { origin } from "../origin.mjs";
@@ -20,29 +20,11 @@ const unavailableFetch = () => new Response(null, {
 	headers: { connection: "close" },
 	status: 503
 });
-function reloadServer(server, serve) {
-	try {
-		server.reload(serve);
-	} catch (error) {
-		if (!serve.routes) throw error;
-		delete serve.routes;
-		console.warn("[Elysia] Native static promotion was skipped:", error);
-		try {
-			server.reload(serve);
-		} catch (fallbackError) {
-			console.error("[Elysia] Failed to reload Bun server:", fallbackError);
-			throw fallbackError;
-		}
-	}
-}
 function releaseLifecycle(app, ext, createdExt, stop, registerCleanup) {
 	if (ext.stop === stop) delete ext.stop;
 	if (ext.cleanupEpoch === registerCleanup) delete ext.cleanupEpoch;
 	if (createdExt && app["~ext"] === ext && !Object.keys(ext).length) app["~ext"] = void 0;
 }
-function clearAppServer(app, server) {
-	if (app.server === server) app.server = void 0;
-}
 async function waitForServerRequests(server, abandoned) {
 	while (server.pendingRequests && !abandoned()) await Bun.sleep(1);
 }
@@ -67,17 +49,6 @@ async function settleServerWebSockets(lifecycle, errors) {
 	} while (lifecycle.sockets.size);
 	return true;
 }
-const closeServerIdle = (server, errors) => {
-	const close = server.closeIdleConnections;
-	if (!close) return true;
-	try {
-		close.call(server);
-		return true;
-	} catch (error) {
-		errors.push(error);
-		return false;
-	}
-};
 /**
 * ! This may looks like it would cause race condition, but it is not
 * Bun is single-threaded and synchronous, so the `finally` block will
@@ -96,12 +67,12 @@ const withOrigin = (fetch) => (request, server) => {
 	}
 };
 const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
+const isHTMLBundle = (value) => typeof value === "object" && value !== null && typeof value.index === "string";
 function collectStaticRoutes(app) {
-	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
 	const frozenRoot = frozenRootOf(app);
 	const fetchLevelHook = flattenChain(frozenRoot["~hookChain"]);
-	if (fetchLevelHook?.request?.length || fetchLevelHook?.trace?.length || frozenRoot["~ext"]?.hoc?.length) return;
+	const promoteResponses = app["~config"]?.nativeStaticResponse !== false && !fetchLevelHook?.request?.length && !fetchLevelHook?.trace?.length && !frozenRoot["~ext"]?.hoc?.length;
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
@@ -110,7 +81,7 @@ function collectStaticRoutes(app) {
 	for (let i = 0; i < length; i++) {
 		if (!isNativeStaticMethod(methods[i]) || (flags[i] & RouteFlag.Dynamic) !== 0) continue;
 		const h = handlers[i];
-		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+		if (isHTMLBundle(h) || promoteResponses && typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
 			hasCandidate = true;
 			break;
 		}
@@ -145,8 +116,10 @@ function collectStaticRoutes(app) {
 		const path = paths[i];
 		if (pathsByMethod.get(path) !== i) continue;
 		const h = handlers[i];
-		if (typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
-		const value = buildNativeStaticResponse(routeRow(table, i), app);
+		let value;
+		if (isHTMLBundle(h)) value = h;
+		else if (!promoteResponses || typeof h === "function" || h instanceof Error || h instanceof Promise) continue;
+		else value = buildNativeStaticResponse(routeRow(table, i), app);
 		if (!value) continue;
 		const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
 		add(method, path, value, needsEncode);
@@ -328,7 +301,13 @@ const BunAdapter = createAdapter({
 			}
 			let idleClosed = true;
 			if (idleRequired) {
-				idleClosed = closeServerIdle(server, errors);
+				const closeIdle = server.closeIdleConnections;
+				if (closeIdle) try {
+					closeIdle.call(server);
+				} catch (error) {
+					errors.push(error);
+					idleClosed = false;
+				}
 				if (idleClosed && !gateFailure) idleRequired = false;
 			}
 			const safe = socketsSettled && stopped && idleClosed && (!gateFailure || forceDone);
@@ -367,7 +346,7 @@ const BunAdapter = createAdapter({
 			}
 			cancelled = true;
 			requestReady.resolve();
-			clearAppServer(app, server);
+			if (app.server === server) app.server = void 0;
 			let outcome;
 			if (shutdownAttempt) {
 				if (closeActiveConnections === true && !forceDone) {
@@ -422,6 +401,11 @@ const BunAdapter = createAdapter({
 										(cleanupFailures ??= []).push(error);
 									}
 								}
+								try {
+									await disposeDecorators(app);
+								} catch (error) {
+									(cleanupFailures ??= []).push(error);
+								}
 							}
 							cleanupCompleted = true;
 							epochCleanup.length = 0;
@@ -456,7 +440,19 @@ const BunAdapter = createAdapter({
 				published = true;
 				if (built.websocket) serve.websocket = built.websocket;
 				if (built.routes) serve.routes = built.routes;
-				reloadServer(server, serve);
+				try {
+					server.reload(serve);
+				} catch (error) {
+					if (!serve.routes) throw error;
+					delete serve.routes;
+					console.warn("[Elysia] Native static promotion was skipped:", error);
+					try {
+						server.reload(serve);
+					} catch (fallbackError) {
+						console.error("[Elysia] Failed to reload Bun server:", fallbackError);
+						throw fallbackError;
+					}
+				}
 				if (callback) callback(server);
 			} catch (error) {
 				startupFailure ??= { error };
@@ -488,4 +484,4 @@ const BunAdapter = createAdapter({
 });
 
 //#endregion
-export { BunAdapter, collectStaticRoutes };
+export { BunAdapter, collectStaticRoutes, isHTMLBundle };

package/dist/adapter/utils.js

@@ -124,25 +124,6 @@ function responseToSetHeaders(response, set) {
 	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-function enqueueBinaryChunk(controller, chunk) {
-	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
-		controller.enqueue(new Uint8Array(buffer));
-		return true;
-	});
-	if (chunk instanceof Uint8Array) {
-		controller.enqueue(chunk);
-		return true;
-	}
-	if (chunk instanceof ArrayBuffer) {
-		controller.enqueue(new Uint8Array(chunk));
-		return true;
-	}
-	if (ArrayBuffer.isView(chunk)) {
-		controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
-		return true;
-	}
-	return false;
-}
 function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat, owned = false) => {
 		if (request === null) return void 0;
@@ -253,7 +234,21 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 				controller.enqueue(encodeChunk(value.toSSE()));
 				return;
 			}
-			const p = enqueueBinaryChunk(controller, value);
+			let p;
+			if (value instanceof Blob) p = value.arrayBuffer().then((buffer) => {
+				controller.enqueue(new Uint8Array(buffer));
+				return true;
+			});
+			else if (value instanceof Uint8Array) {
+				controller.enqueue(value);
+				p = true;
+			} else if (value instanceof ArrayBuffer) {
+				controller.enqueue(new Uint8Array(value));
+				p = true;
+			} else if (ArrayBuffer.isView(value)) {
+				controller.enqueue(new Uint8Array(value.buffer, value.byteOffset, value.byteLength));
+				p = true;
+			} else p = false;
 			if (p !== false) return void await p;
 			if (typeof value === "object") try {
 				controller.enqueue(encodeChunk(format(JSON.stringify(value))));
@@ -540,7 +535,7 @@ function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
 			wakeAll();
 		}
 	})();
-	const makeBranch = (me) => ({
+	const makeBranch = (me) => Object.assign(Object.create(null), {
 		[Symbol.asyncIterator]() {
 			return this;
 		},

package/dist/adapter/utils.mjs

@@ -123,25 +123,6 @@ function responseToSetHeaders(response, set) {
 	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-function enqueueBinaryChunk(controller, chunk) {
-	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
-		controller.enqueue(new Uint8Array(buffer));
-		return true;
-	});
-	if (chunk instanceof Uint8Array) {
-		controller.enqueue(chunk);
-		return true;
-	}
-	if (chunk instanceof ArrayBuffer) {
-		controller.enqueue(new Uint8Array(chunk));
-		return true;
-	}
-	if (ArrayBuffer.isView(chunk)) {
-		controller.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
-		return true;
-	}
-	return false;
-}
 function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat, owned = false) => {
 		if (request === null) return void 0;
@@ -252,7 +233,21 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 				controller.enqueue(encodeChunk(value.toSSE()));
 				return;
 			}
-			const p = enqueueBinaryChunk(controller, value);
+			let p;
+			if (value instanceof Blob) p = value.arrayBuffer().then((buffer) => {
+				controller.enqueue(new Uint8Array(buffer));
+				return true;
+			});
+			else if (value instanceof Uint8Array) {
+				controller.enqueue(value);
+				p = true;
+			} else if (value instanceof ArrayBuffer) {
+				controller.enqueue(new Uint8Array(value));
+				p = true;
+			} else if (ArrayBuffer.isView(value)) {
+				controller.enqueue(new Uint8Array(value.buffer, value.byteOffset, value.byteLength));
+				p = true;
+			} else p = false;
 			if (p !== false) return void await p;
 			if (typeof value === "object") try {
 				controller.enqueue(encodeChunk(format(JSON.stringify(value))));
@@ -539,7 +534,7 @@ function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
 			wakeAll();
 		}
 	})();
-	const makeBranch = (me) => ({
+	const makeBranch = (me) => Object.assign(Object.create(null), {
 		[Symbol.asyncIterator]() {
 			return this;
 		},

package/dist/base.d.ts

@@ -50,6 +50,14 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
     hoc?: WrapFn<any>[];
     setup?: GracefulHandler<any>[];
     cleanup?: GracefulHandler<any>[];
+    /**
+     * Accepted `.decorate()` values implementing an explicit disposer, in
+     * registration order.
+     *
+     * Recorded at registration so the original reference survives a
+     * `.use()` clone, a same-name merge and a later override
+     */
+    disposable?: unknown[];
     cleanupEpoch?: (handler: GracefulHandler<any> | GracefulHandler<any>[]) => boolean;
     stop?: (closeActiveConnections?: boolean, failure?: {
       error: unknown;
@@ -826,6 +834,26 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   options<const Path extends string, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<{}, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>, '', true>, MergeScopedSchemas<Metadata['schemas'], Ephemeral['schemas'], Volatile['schemas']>>, const Decorator extends Singleton & {
     derive: Ephemeral['derive'] & Volatile['derive'];
   }, const Handle extends InlineHandlerNonMacro<NoInfer<Schema>, NoInfer<Decorator>>>(path: Path, fn: Handle & Metadata['macro']): AddRoute<BasePath, Scope, Singleton, Definitions, Metadata, Routes, Ephemeral, Volatile, 'options', Path, Schema, {}, Handle>;
+  /**
+   * ### query
+   * Register handler for path with method [OPTIONS]
+   *
+   * ---
+   * @example
+   * ```typescript
+   * import { Elysia, t } from 'elysia'
+   *
+   * new Elysia()
+   *     .query('/', () => 'hi')
+   *     .query('/hook', { query: t.Object({ name: t.String() }) }, () => 'hi')
+   * ```
+   */
+  query<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>, '', undefined extends Input['params'] ? true : false>, MergeScopedSchemas<Metadata['schemas'], Ephemeral['schemas'], Volatile['schemas']>>, const Decorator extends Singleton & {
+    derive: Ephemeral['derive'] & Volatile['derive'];
+  }, const MacroContext extends ({} extends Metadata['macroFn'] ? {} : MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>), const Handle extends ({} extends MacroContext ? InlineHandlerNonMacro<NoInfer<Schema>, NoInfer<Decorator>> : InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>)>(path: Path, hook: LocalHook<Input, Schema & MacroContext, Decorator, Definitions['error'], keyof Metadata['parser']>, fn: Handle): AddRoute<BasePath, Scope, Singleton, Definitions, Metadata, Routes, Ephemeral, Volatile, 'query', Path, Schema, MacroContext, Handle>;
+  query<const Path extends string, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<{}, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>, '', true>, MergeScopedSchemas<Metadata['schemas'], Ephemeral['schemas'], Volatile['schemas']>>, const Decorator extends Singleton & {
+    derive: Ephemeral['derive'] & Volatile['derive'];
+  }, const Handle extends InlineHandlerNonMacro<NoInfer<Schema>, NoInfer<Decorator>>>(path: Path, fn: Handle & Metadata['macro']): AddRoute<BasePath, Scope, Singleton, Definitions, Metadata, Routes, Ephemeral, Volatile, 'query', Path, Schema, {}, Handle>;
   /**
    * ### head
    * Register handler for path with method [HEAD]