elysia 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/adapter/bun/index.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_adapter_index = require('../index.js');
-const require_constants = require('../../constants.js');
 const require_utils = require('../../utils.js');
 const require_adapter_web_standard_index = require('../web-standard/index.js');
 const require_generation = require('../../generation.js');
@@ -97,6 +96,7 @@ const withOrigin = (fetch) => (request, server) => {
 		require_adapter_origin.origin.request = void 0;
 	}
 };
+const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
 function collectStaticRoutes(app) {
 	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
@@ -106,66 +106,57 @@ function collectStaticRoutes(app) {
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
-	const { method: methods, path: paths, handler: handlers } = table;
-	const nativeStaticMethods = new Set([
-		"GET",
-		"POST",
-		"PUT",
-		"DELETE",
-		"PATCH",
-		"HEAD",
-		"OPTIONS"
-	]);
+	const { method: methods, path: paths, handler: handlers, flags } = table;
 	let hasCandidate = false;
 	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) continue;
-		if (!nativeStaticMethods.has(methods[i])) continue;
-		hasCandidate = true;
-		break;
+		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+			hasCandidate = true;
+			break;
+		}
 	}
 	if (!hasCandidate) return;
-	const ready = require_utils.nullObject();
 	const strictPath = frozenRoot["~config"]?.strictPath === true;
-	const seen = /* @__PURE__ */ new Map();
-	for (let i = 0; i < length; i++) seen.set(methods[i] + " " + paths[i], i);
-	let explicitPaths;
-	if (!strictPath) {
-		explicitPaths = /* @__PURE__ */ new Map();
-		for (let i = 0; i < length; i++) {
-			const method = methods[i];
-			const path = paths[i];
-			let set = explicitPaths.get(method);
-			if (!set) explicitPaths.set(method, set = /* @__PURE__ */ new Set());
-			set.add(path);
-			if (require_constants.needEncodeRegex.test(path)) {
-				const encoded = encodeURI(path);
-				if (encoded !== path) set.add(encoded);
-			}
+	const routeIndex = /* @__PURE__ */ new Map();
+	for (let i = 0; i < length; i++) {
+		const method = methods[i];
+		if (!isNativeStaticMethod(method) || (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0) continue;
+		const path = paths[i];
+		let pathsByMethod = routeIndex.get(method);
+		if (!pathsByMethod) routeIndex.set(method, pathsByMethod = /* @__PURE__ */ new Map());
+		pathsByMethod.set(path, i);
+		if (!strictPath && (flags[i] & require_route_table.RouteFlag.Encode) !== 0) {
+			const encoded = encodeURI(path);
+			if (encoded !== path && !pathsByMethod.has(encoded)) pathsByMethod.set(encoded, -1);
 		}
 	}
-	const add = (method, path, value) => {
-		if (require_constants.needEncodeRegex.test(path)) path = encodeURI(path);
+	const ready = require_utils.nullObject();
+	let hasReady = false;
+	const add = (method, path, value, needsEncode) => {
+		if (needsEncode) path = encodeURI(path);
 		(ready[path] ??= require_utils.nullObject())[method] = value;
+		hasReady = true;
 	};
 	for (let i = 0; i < length; i++) {
 		const method = methods[i];
-		if (method === "WS") continue;
+		const routeFlags = flags[i];
+		if (!isNativeStaticMethod(method) || (routeFlags & require_route_table.RouteFlag.Dynamic) !== 0) continue;
+		const pathsByMethod = routeIndex.get(method);
 		const path = paths[i];
-		if (seen.get(method + " " + path) !== i) continue;
-		if (!nativeStaticMethods.has(method)) continue;
-		if (require_constants.isDynamicRegex.test(path)) continue;
+		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);
 		if (!value) continue;
-		add(method, path, value);
+		const needsEncode = (routeFlags & require_route_table.RouteFlag.Encode) !== 0;
+		add(method, path, value, needsEncode);
 		if (!strictPath) {
 			const loose = require_utils.getLoosePath(path);
-			if (loose !== path && !explicitPaths?.get(method)?.has(loose)) add(method, loose, value);
+			if (loose !== path && !pathsByMethod.has(loose)) add(method, loose, value, needsEncode);
 		}
 	}
-	if (!Object.keys(ready).length) return;
+	if (!hasReady) return;
 	return ready;
 }
 const BunAdapter = require_adapter_index.createAdapter({
@@ -176,31 +167,40 @@ const BunAdapter = require_adapter_index.createAdapter({
 	response: require_adapter_web_standard_index.WebStandardAdapter.response,
 	listen(app, options, callback) {
 		if (app.server || app["~ext"]?.stop) throw new Error("[Elysia] Cannot call listen() while a server or teardown is active");
-		const _config = app["~config"]?.serve;
+		function gatedFetch(request, server) {
+			return live ? live(request, server) : Promise.resolve(ready).then(async () => {
+				if (!live) {
+					await startupShutdown;
+					throw new Error("[Elysia] Server was stopped before it was ready");
+				}
+				return live(request, server);
+			});
+		}
 		const optionsIsObject = typeof options === "object";
-		let live;
-		let cancelled = false;
-		let startupShutdown;
-		let shutdownAttempt;
-		const gatedFetch = (request, server) => live ? live(request, server) : Promise.resolve(ready).then(async () => {
-			if (!live) {
-				await startupShutdown;
-				throw new Error("[Elysia] Server was stopped before it was ready");
-			}
-			return live(request, server);
-		});
 		const _options = optionsIsObject ? { ...options } : {
 			port: +options,
 			fetch: gatedFetch
 		};
 		if (optionsIsObject) _options.fetch = gatedFetch;
+		const _config = app["~config"]?.serve;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
+		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+			...serve,
+			error: unavailableFetch,
+			routes: {}
+		} : serve);
+		let live;
+		let cancelled = false;
+		let startupShutdown;
+		let shutdownAttempt;
 		let ready;
 		let wsLifecycle;
 		let modulesReady;
+		let built;
+		let pendingSetups;
 		const build = () => {
 			const fetch = app.fetch;
 			let routes;
@@ -231,13 +231,6 @@ const BunAdapter = require_adapter_index.createAdapter({
 				websocket
 			};
 		};
-		let built;
-		let pendingSetups;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
-			...serve,
-			error: unavailableFetch,
-			routes: {}
-		} : serve);
 		let startupFailure;
 		let forceRequested = false;
 		let forceDone = false;

package/dist/adapter/bun/index.mjs

@@ -1,11 +1,10 @@
 import { createAdapter } from "../index.mjs";
-import { isDynamicRegex, needEncodeRegex } from "../../constants.mjs";
 import { 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";
 import { buildNativeStaticResponse } from "../../compile/handler/index.mjs";
-import { routeRow } from "../../route-table.mjs";
+import { RouteFlag, routeRow } from "../../route-table.mjs";
 
 //#region src/adapter/bun/index.ts
 function runLifecycle(epoch, callback, ...args) {
@@ -96,6 +95,7 @@ const withOrigin = (fetch) => (request, server) => {
 		origin.request = void 0;
 	}
 };
+const isNativeStaticMethod = (method) => method === "GET" || method === "POST" || method === "PUT" || method === "DELETE" || method === "PATCH" || method === "HEAD" || method === "OPTIONS";
 function collectStaticRoutes(app) {
 	if (app["~config"]?.nativeStaticResponse === false) return;
 	app.fetch;
@@ -105,66 +105,57 @@ function collectStaticRoutes(app) {
 	const table = app["~generation"]?.routeTable ?? app["~routeTable"];
 	const length = table?.length ?? 0;
 	if (!table || !length) return;
-	const { method: methods, path: paths, handler: handlers } = table;
-	const nativeStaticMethods = new Set([
-		"GET",
-		"POST",
-		"PUT",
-		"DELETE",
-		"PATCH",
-		"HEAD",
-		"OPTIONS"
-	]);
+	const { method: methods, path: paths, handler: handlers, flags } = table;
 	let hasCandidate = false;
 	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) continue;
-		if (!nativeStaticMethods.has(methods[i])) continue;
-		hasCandidate = true;
-		break;
+		if (typeof h !== "function" && !(h instanceof Error) && !(h instanceof Promise)) {
+			hasCandidate = true;
+			break;
+		}
 	}
 	if (!hasCandidate) return;
-	const ready = nullObject();
 	const strictPath = frozenRoot["~config"]?.strictPath === true;
-	const seen = /* @__PURE__ */ new Map();
-	for (let i = 0; i < length; i++) seen.set(methods[i] + " " + paths[i], i);
-	let explicitPaths;
-	if (!strictPath) {
-		explicitPaths = /* @__PURE__ */ new Map();
-		for (let i = 0; i < length; i++) {
-			const method = methods[i];
-			const path = paths[i];
-			let set = explicitPaths.get(method);
-			if (!set) explicitPaths.set(method, set = /* @__PURE__ */ new Set());
-			set.add(path);
-			if (needEncodeRegex.test(path)) {
-				const encoded = encodeURI(path);
-				if (encoded !== path) set.add(encoded);
-			}
+	const routeIndex = /* @__PURE__ */ new Map();
+	for (let i = 0; i < length; i++) {
+		const method = methods[i];
+		if (!isNativeStaticMethod(method) || (flags[i] & RouteFlag.Dynamic) !== 0) continue;
+		const path = paths[i];
+		let pathsByMethod = routeIndex.get(method);
+		if (!pathsByMethod) routeIndex.set(method, pathsByMethod = /* @__PURE__ */ new Map());
+		pathsByMethod.set(path, i);
+		if (!strictPath && (flags[i] & RouteFlag.Encode) !== 0) {
+			const encoded = encodeURI(path);
+			if (encoded !== path && !pathsByMethod.has(encoded)) pathsByMethod.set(encoded, -1);
 		}
 	}
-	const add = (method, path, value) => {
-		if (needEncodeRegex.test(path)) path = encodeURI(path);
+	const ready = nullObject();
+	let hasReady = false;
+	const add = (method, path, value, needsEncode) => {
+		if (needsEncode) path = encodeURI(path);
 		(ready[path] ??= nullObject())[method] = value;
+		hasReady = true;
 	};
 	for (let i = 0; i < length; i++) {
 		const method = methods[i];
-		if (method === "WS") continue;
+		const routeFlags = flags[i];
+		if (!isNativeStaticMethod(method) || (routeFlags & RouteFlag.Dynamic) !== 0) continue;
+		const pathsByMethod = routeIndex.get(method);
 		const path = paths[i];
-		if (seen.get(method + " " + path) !== i) continue;
-		if (!nativeStaticMethods.has(method)) continue;
-		if (isDynamicRegex.test(path)) continue;
+		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);
 		if (!value) continue;
-		add(method, path, value);
+		const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
+		add(method, path, value, needsEncode);
 		if (!strictPath) {
 			const loose = getLoosePath(path);
-			if (loose !== path && !explicitPaths?.get(method)?.has(loose)) add(method, loose, value);
+			if (loose !== path && !pathsByMethod.has(loose)) add(method, loose, value, needsEncode);
 		}
 	}
-	if (!Object.keys(ready).length) return;
+	if (!hasReady) return;
 	return ready;
 }
 const BunAdapter = createAdapter({
@@ -175,31 +166,40 @@ const BunAdapter = createAdapter({
 	response: WebStandardAdapter.response,
 	listen(app, options, callback) {
 		if (app.server || app["~ext"]?.stop) throw new Error("[Elysia] Cannot call listen() while a server or teardown is active");
-		const _config = app["~config"]?.serve;
+		function gatedFetch(request, server) {
+			return live ? live(request, server) : Promise.resolve(ready).then(async () => {
+				if (!live) {
+					await startupShutdown;
+					throw new Error("[Elysia] Server was stopped before it was ready");
+				}
+				return live(request, server);
+			});
+		}
 		const optionsIsObject = typeof options === "object";
-		let live;
-		let cancelled = false;
-		let startupShutdown;
-		let shutdownAttempt;
-		const gatedFetch = (request, server) => live ? live(request, server) : Promise.resolve(ready).then(async () => {
-			if (!live) {
-				await startupShutdown;
-				throw new Error("[Elysia] Server was stopped before it was ready");
-			}
-			return live(request, server);
-		});
 		const _options = optionsIsObject ? { ...options } : {
 			port: +options,
 			fetch: gatedFetch
 		};
 		if (optionsIsObject) _options.fetch = gatedFetch;
+		const _config = app["~config"]?.serve;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
+		const server = app.server = Bun.serve(serve.routes || serve.error ? {
+			...serve,
+			error: unavailableFetch,
+			routes: {}
+		} : serve);
+		let live;
+		let cancelled = false;
+		let startupShutdown;
+		let shutdownAttempt;
 		let ready;
 		let wsLifecycle;
 		let modulesReady;
+		let built;
+		let pendingSetups;
 		const build = () => {
 			const fetch = app.fetch;
 			let routes;
@@ -230,13 +230,6 @@ const BunAdapter = createAdapter({
 				websocket
 			};
 		};
-		let built;
-		let pendingSetups;
-		const server = app.server = Bun.serve(serve.routes || serve.error ? {
-			...serve,
-			error: unavailableFetch,
-			routes: {}
-		} : serve);
 		let startupFailure;
 		let forceRequested = false;
 		let forceDone = false;

package/dist/adapter/utils.js

@@ -370,7 +370,6 @@ function cancelPropagatingBody(clonedBody, orphanedBranch, preserveOrphan = fals
 		}
 	});
 }
-const warnedStreamBorrows = /* @__PURE__ */ new WeakSet();
 function createResponseHandler(handler) {
 	const handleStream = createStreamHandler(handler);
 	return (response, set, request, owned = false) => {
@@ -390,12 +389,7 @@ function createResponseHandler(handler) {
 		if (!borrowed && response.body?.locked) throw new TypeError("Cannot patch a Response whose body is locked");
 		let body = response.body;
 		if (borrowed) {
-			const bodyBefore = body;
 			const cloned = response.clone();
-			if (explicitlyBorrowed && bodyBefore && response.body !== bodyBefore && !warnedStreamBorrows.has(response)) {
-				warnedStreamBorrows.add(response);
-				console.warn("[elysia] borrow() was called on a stream-backed Response");
-			}
 			body = cloned.body && response.body ? cancelPropagatingBody(cloned.body, response.body, explicitlyBorrowed) : cloned.body;
 		}
 		const newResponse = new Response(body, set ? {

package/dist/adapter/utils.mjs

@@ -369,7 +369,6 @@ function cancelPropagatingBody(clonedBody, orphanedBranch, preserveOrphan = fals
 		}
 	});
 }
-const warnedStreamBorrows = /* @__PURE__ */ new WeakSet();
 function createResponseHandler(handler) {
 	const handleStream = createStreamHandler(handler);
 	return (response, set, request, owned = false) => {
@@ -389,12 +388,7 @@ function createResponseHandler(handler) {
 		if (!borrowed && response.body?.locked) throw new TypeError("Cannot patch a Response whose body is locked");
 		let body = response.body;
 		if (borrowed) {
-			const bodyBefore = body;
 			const cloned = response.clone();
-			if (explicitlyBorrowed && bodyBefore && response.body !== bodyBefore && !warnedStreamBorrows.has(response)) {
-				warnedStreamBorrows.add(response);
-				console.warn("[elysia] borrow() was called on a stream-backed Response");
-			}
 			body = cloned.body && response.body ? cancelPropagatingBody(cloned.body, response.body, explicitlyBorrowed) : cloned.body;
 		}
 		const newResponse = new Response(body, set ? {

package/dist/base.d.ts

@@ -28,6 +28,16 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   '~Ephemeral': Ephemeral;
   '~Volatile': Volatile;
   '~Routes': Routes;
+  private hasPlugin?;
+  private hasGlobal?;
+  private ready?;
+  private _pending;
+  private _error?;
+  private hash?;
+  private childrenHash?;
+  private scopeParent?;
+  private pluginMacros?;
+  private macroBaseline?;
   '~ext'?: {
     decorator?: Singleton['decorator'];
     store?: Singleton['store'];
@@ -55,10 +65,18 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   };
   '~hookChain'?: ChainNode;
   '~wsConfig'?: WSOptions;
+  private declaredRoutes?;
+  private routeSources?;
   server?: Server;
   get history(): readonly HistoryEntry[];
   get ['~routes'](): readonly InternalRoute[];
   ['~addRoute'](route: InternalRoute): this;
+  private compiled?;
+  private jitColdRemaining?;
+  private jitTable?;
+  private jitRoute?;
+  private jitStatic?;
+  private jitAliases?;
   '~router'?: Memoirist<CompiledHandler>;
   '~map'?: {
     [method: string]: {
@@ -528,6 +546,7 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
     parser: Metadata['parser'];
     response: Metadata['response'] & MacroContext['response'] & ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> & ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> & ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle>;
   }, {}, Ephemeral, Volatile>) => NewElysia): Elysia<BasePath, Scope, Singleton, Definitions, Metadata, Routes & NewElysia['~Routes'], Ephemeral, Volatile>;
+  private get ext();
   ['~resolvedCapability'](kind: 'trace'): TraceCapability | undefined;
   ['~resolvedCapability'](kind: 'ws'): {
     provider: WSCapability;
@@ -869,8 +888,11 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
    */
   compile(): this;
   handler(index: number, immediate?: boolean, route?: InternalRoute, precomputedStatic?: Response, aliases?: StaticMapAliases, table?: RouteTable): CompiledHandler;
+  private routerBuilt;
   ['~newGeneration'](): this;
+  private fetchFn?;
   get fetch(): (request: Request, ...rest: any[]) => MaybePromise<Response>;
+  private _handle?;
   get handle(): (url: string | Request, options?: RequestInit) => Promise<Response>;
   listen(options: string | number | Partial<Serve>, callback?: ListenCallback): this;
   /**
@@ -904,21 +926,15 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
    */
   cleanup(handler: MaybeArray<GracefulHandler<this>>): this;
   /**
-   * Stop the underlying server (if any), then run every `cleanup` handler.
-   * Omitted and `false` are the same graceful stop: new requests are gated,
-   * tracked WebSockets are settled and active HTTP is drained, then cleanup
-   * runs and the epoch is released. `true` force-closes the transport
-   * instead of draining it, and escalates a graceful stop already in flight.
+   * Stop the underlying server (if any), then run every `cleanup` handler
    *
    * Awaiting `stop()` from inside a `setup`, `cleanup` or WebSocket lifecycle
-   * callback is only supported while that callback is still synchronous; the
-   * teardown is waiting on the callback, so after an `await` it can only be
-   * issued as `void app.stop()`.
+   * callback is only supported while that callback is still synchronous
    *
    * @param closeActiveConnections Pass `true` to terminate active
    *   transports. Omit (or pass `false`) to drain safely.
    */
-  stop(closeActiveConnections?: boolean): Promise<void> | void;
+  stop(closeActiveConnections?: boolean): Promise<void> | undefined;
 }
 //#endregion
 export { AnyElysia, Elysia };