elysia 2.0.0-exp.55 → 2.0.0-exp.57

package/dist/adapter/bun/index.js

@@ -107,17 +107,20 @@ const BunAdapter = require_adapter_index.createAdapter({
 	listen(app, options, callback) {
 		const _config = app["~config"]?.serve;
 		const optionsIsObject = typeof options === "object";
+		let live;
+		const gatedFetch = (request, server) => live ? live(request, server) : Promise.resolve(ready).then(() => {
+			if (!live) throw new Error("[Elysia] Server was stopped before it was ready");
+			return live(request, server);
+		});
 		const _options = optionsIsObject ? { ...options } : {
 			port: +options,
-			fetch: (request, server) => app.fetch(request, server)
+			fetch: gatedFetch
 		};
-		if (optionsIsObject) _options.fetch = (request, server) => app.fetch(request, server);
+		if (optionsIsObject) _options.fetch = gatedFetch;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
-		const onSetup = app["~ext"]?.setup;
-		const needsGate = app.pending || !!onSetup?.length;
 		let ready;
 		const build = () => {
 			const fetch = app.fetch;
@@ -130,7 +133,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			let websocket;
 			if (app["~hasWS"]) {
 				const resolved = require_generation.resolvedWsOf(app);
-				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved.");
+				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved");
 				websocket = resolved.config ? Object.assign(resolved.provider.buildGlobalWSHandler(), resolved.config) : resolved.provider.buildGlobalWSHandler();
 			}
 			return {
@@ -140,9 +143,6 @@ const BunAdapter = require_adapter_index.createAdapter({
 			};
 		};
 		let built;
-		if (!needsGate) built = build();
-		if (needsGate) serve.fetch = (request, server) => ready.then(() => app.fetch(request, server));
-		else serve.fetch = withOrigin(built.fetch);
 		const server = app.server = Bun.serve(serve);
 		const reload = () => {
 			try {
@@ -190,10 +190,10 @@ const BunAdapter = require_adapter_index.createAdapter({
 		const publish = () => {
 			if (app.server !== server) return;
 			built ??= build();
-			serve.fetch = withOrigin(built.fetch);
+			live = serve.fetch = withOrigin(built.fetch);
 			if (built.websocket) serve.websocket = built.websocket;
 			if (built.routes) serve.routes = built.routes[0];
-			if (needsGate || built.websocket || built.routes) reload();
+			reload();
 			if (callback) callback(server);
 		};
 		const start = () => {
@@ -204,12 +204,11 @@ const BunAdapter = require_adapter_index.createAdapter({
 		};
 		try {
 			if (app.pending) ready = app.modules.then(start);
-			else {
-				const result = start();
-				if (result && typeof result.then === "function") ready = result;
-				else if (needsGate) ready = Promise.resolve();
-			}
-			ready?.catch(rollback);
+			else ready = Promise.resolve().then(start);
+			ready.catch((error) => {
+				console.error("[Elysia] listen() failed:", error);
+				return rollback(error);
+			});
 		} catch (error) {
 			rollback(error);
 			throw error;

package/dist/adapter/bun/index.mjs

@@ -106,17 +106,20 @@ const BunAdapter = createAdapter({
 	listen(app, options, callback) {
 		const _config = app["~config"]?.serve;
 		const optionsIsObject = typeof options === "object";
+		let live;
+		const gatedFetch = (request, server) => live ? live(request, server) : Promise.resolve(ready).then(() => {
+			if (!live) throw new Error("[Elysia] Server was stopped before it was ready");
+			return live(request, server);
+		});
 		const _options = optionsIsObject ? { ...options } : {
 			port: +options,
-			fetch: (request, server) => app.fetch(request, server)
+			fetch: gatedFetch
 		};
-		if (optionsIsObject) _options.fetch = (request, server) => app.fetch(request, server);
+		if (optionsIsObject) _options.fetch = gatedFetch;
 		const serve = _config ? {
 			..._config,
 			..._options
 		} : _options;
-		const onSetup = app["~ext"]?.setup;
-		const needsGate = app.pending || !!onSetup?.length;
 		let ready;
 		const build = () => {
 			const fetch = app.fetch;
@@ -129,7 +132,7 @@ const BunAdapter = createAdapter({
 			let websocket;
 			if (app["~hasWS"]) {
 				const resolved = resolvedWsOf(app);
-				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved.");
+				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved");
 				websocket = resolved.config ? Object.assign(resolved.provider.buildGlobalWSHandler(), resolved.config) : resolved.provider.buildGlobalWSHandler();
 			}
 			return {
@@ -139,9 +142,6 @@ const BunAdapter = createAdapter({
 			};
 		};
 		let built;
-		if (!needsGate) built = build();
-		if (needsGate) serve.fetch = (request, server) => ready.then(() => app.fetch(request, server));
-		else serve.fetch = withOrigin(built.fetch);
 		const server = app.server = Bun.serve(serve);
 		const reload = () => {
 			try {
@@ -189,10 +189,10 @@ const BunAdapter = createAdapter({
 		const publish = () => {
 			if (app.server !== server) return;
 			built ??= build();
-			serve.fetch = withOrigin(built.fetch);
+			live = serve.fetch = withOrigin(built.fetch);
 			if (built.websocket) serve.websocket = built.websocket;
 			if (built.routes) serve.routes = built.routes[0];
-			if (needsGate || built.websocket || built.routes) reload();
+			reload();
 			if (callback) callback(server);
 		};
 		const start = () => {
@@ -203,12 +203,11 @@ const BunAdapter = createAdapter({
 		};
 		try {
 			if (app.pending) ready = app.modules.then(start);
-			else {
-				const result = start();
-				if (result && typeof result.then === "function") ready = result;
-				else if (needsGate) ready = Promise.resolve();
-			}
-			ready?.catch(rollback);
+			else ready = Promise.resolve().then(start);
+			ready.catch((error) => {
+				console.error("[Elysia] listen() failed:", error);
+				return rollback(error);
+			});
 		} catch (error) {
 			rollback(error);
 			throw error;

package/dist/base.js

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('./_virtual/_rolldown/runtime.js');
 const require_universal_constants = require('./universal/constants.js');
-const require_constants = require('./constants.js');
 const require_utils = require('./utils.js');
 const require_type_bridge = require('./type/bridge.js');
 const require_universal_is_production = require('./universal/is-production.js');
@@ -1275,7 +1274,8 @@ var Elysia = class Elysia {
 	#routeMayHaveModelRef(table, i) {
 		const macroScope = table.macroScope?.get(i);
 		const owner = table.owner[i];
-		if (require_compile_handler_index.localMacroRoot(macroScope ?? owner ?? this, this)["~ext"]?.macro) return true;
+		const candidate = macroScope ?? owner ?? this;
+		if ((candidate === this ? this : require_compile_handler_index.localMacroRoot(candidate, this))["~ext"]?.macro) return true;
 		if (Elysia.#hookHasString(table.localHook[i])) return true;
 		const appHook = table.appHook[i];
 		if (appHook !== void 0 && appHook.refs) return true;
@@ -1416,25 +1416,19 @@ var Elysia = class Elysia {
 		else for (let i = 0; i < length; i++) if (this.#routeMayHaveModelRef(table, i)) this.#assertRouteModelRefs(require_route_table.routeRow(table, i), method[i]);
 		if (length) require_compile_aot.Compiled.claim(this["~programId"], this["~aotFingerprint"] = require_compile_aot.createAotFingerprint());
 		const isLoose = this["~config"]?.strictPath !== true;
-		let hasLooseCandidate = false;
-		if (isLoose) for (let i = 0; i < length; i++) {
-			const p = path[i];
-			if (canRegisterLoose(p, (flags[i] & require_route_table.RouteFlag.Dynamic) !== 0)) {
-				hasLooseCandidate = true;
-				break;
-			}
-		}
 		let explicitPaths;
-		if (hasLooseCandidate) explicitPaths = /* @__PURE__ */ new Map();
-		if (explicitPaths) for (let i = 0; i < length; i++) {
-			const m = method[i];
-			const p = path[i];
-			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);
+		if (isLoose && table.hasLoose) {
+			explicitPaths = /* @__PURE__ */ new Map();
+			for (let i = 0; i < length; i++) {
+				const m = method[i];
+				const p = path[i];
+				let set = explicitPaths.get(m);
+				if (!set) explicitPaths.set(m, set = /* @__PURE__ */ new Set());
+				set.add(p);
+				if ((flags[i] & require_route_table.RouteFlag.Encode) !== 0) {
+					const encoded = encodeURI(p);
+					if (encoded !== p) set.add(encoded);
+				}
 			}
 		}
 		for (let i = 0; i < length; i++) {
@@ -1465,7 +1459,7 @@ var Elysia = class Elysia {
 				continue;
 			}
 			const isDynamic = (routeFlags & require_route_table.RouteFlag.Dynamic) !== 0;
-			const needsEncode = require_constants.needEncodeRegex.test(routePath);
+			const needsEncode = (routeFlags & require_route_table.RouteFlag.Encode) !== 0;
 			const registerLoose = isLoose && canRegisterLoose(routePath, isDynamic);
 			const explicitMain = registerLoose ? explicitPaths?.get(routeMethod) : void 0;
 			if (!isDynamic && !needsEncode && !registerLoose) {

package/dist/base.mjs

@@ -1,5 +1,4 @@
 import { isBun } from "./universal/constants.mjs";
-import { needEncodeRegex } from "./constants.mjs";
 import { clonePlainDecorators, clonePlainDeep, coalesceStandaloneSchemas, createErrorEventHandler, eventProperties, fnOrigin, fnv1a, getLoosePath, guardNonPlainLeaves, hookToGuard, invalidateMacroEpoch, isEmpty, isNotEmpty, isRecordNumber, joinPath, macroOrigin, mapDeriveEntry, mergeDeep, mergeResponse, nullObject, pushField, schemaProperties, serializeMacroSeed } from "./utils.mjs";
 import { Ref } from "./type/bridge.mjs";
 import { isProduction } from "./universal/is-production.mjs";
@@ -1272,7 +1271,8 @@ var Elysia = class Elysia {
 	#routeMayHaveModelRef(table, i) {
 		const macroScope = table.macroScope?.get(i);
 		const owner = table.owner[i];
-		if (localMacroRoot(macroScope ?? owner ?? this, this)["~ext"]?.macro) return true;
+		const candidate = macroScope ?? owner ?? this;
+		if ((candidate === this ? this : localMacroRoot(candidate, this))["~ext"]?.macro) return true;
 		if (Elysia.#hookHasString(table.localHook[i])) return true;
 		const appHook = table.appHook[i];
 		if (appHook !== void 0 && appHook.refs) return true;
@@ -1413,25 +1413,19 @@ var Elysia = class Elysia {
 		else for (let i = 0; i < length; i++) if (this.#routeMayHaveModelRef(table, i)) this.#assertRouteModelRefs(routeRow(table, i), method[i]);
 		if (length) Compiled.claim(this["~programId"], this["~aotFingerprint"] = createAotFingerprint());
 		const isLoose = this["~config"]?.strictPath !== true;
-		let hasLooseCandidate = false;
-		if (isLoose) for (let i = 0; i < length; i++) {
-			const p = path[i];
-			if (canRegisterLoose(p, (flags[i] & RouteFlag.Dynamic) !== 0)) {
-				hasLooseCandidate = true;
-				break;
-			}
-		}
 		let explicitPaths;
-		if (hasLooseCandidate) explicitPaths = /* @__PURE__ */ new Map();
-		if (explicitPaths) for (let i = 0; i < length; i++) {
-			const m = method[i];
-			const p = path[i];
-			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);
+		if (isLoose && table.hasLoose) {
+			explicitPaths = /* @__PURE__ */ new Map();
+			for (let i = 0; i < length; i++) {
+				const m = method[i];
+				const p = path[i];
+				let set = explicitPaths.get(m);
+				if (!set) explicitPaths.set(m, set = /* @__PURE__ */ new Set());
+				set.add(p);
+				if ((flags[i] & RouteFlag.Encode) !== 0) {
+					const encoded = encodeURI(p);
+					if (encoded !== p) set.add(encoded);
+				}
 			}
 		}
 		for (let i = 0; i < length; i++) {
@@ -1462,7 +1456,7 @@ var Elysia = class Elysia {
 				continue;
 			}
 			const isDynamic = (routeFlags & RouteFlag.Dynamic) !== 0;
-			const needsEncode = needEncodeRegex.test(routePath);
+			const needsEncode = (routeFlags & RouteFlag.Encode) !== 0;
 			const registerLoose = isLoose && canRegisterLoose(routePath, isDynamic);
 			const explicitMain = registerLoose ? explicitPaths?.get(routeMethod) : void 0;
 			if (!isDynamic && !needsEncode && !registerLoose) {

package/dist/package.js

@@ -1,6 +1,6 @@
 
 //#region package.json
-var version = "2.0.0-exp.55";
+var version = "2.0.0-exp.57";
 
 //#endregion
 Object.defineProperty(exports, 'version', {

package/dist/package.mjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "2.0.0-exp.55";
+var version = "2.0.0-exp.57";
 
 //#endregion
 export { version };

package/dist/route-table.d.ts

@@ -6,6 +6,7 @@ import { AnyElysia } from "./base.js";
 declare const RouteFlag: {
   readonly WS: 1;
   readonly Dynamic: 2;
+  readonly Encode: 4;
 };
 interface RouteTable {
   readonly length: number;
@@ -17,6 +18,8 @@ interface RouteTable {
   readonly appHook: (ChainNode | undefined)[];
   readonly inheritedChain: (ChainNode | undefined)[];
   readonly flags: number[];
+  /** any static route path is '' or ends with '/' (loose-alias candidate) */
+  readonly hasLoose: boolean;
   readonly macroScope?: Map<number, AnyElysia>;
 }
 declare function buildRouteTable(declaredRoutes: readonly InternalRoute[]): RouteTable;

package/dist/route-table.js

@@ -4,18 +4,20 @@ const require_constants = require('./constants.js');
 //#region src/route-table.ts
 const RouteFlag = {
 	WS: 1,
-	Dynamic: 2
+	Dynamic: 2,
+	Encode: 4
 };
 function buildRouteTable(declaredRoutes) {
 	const length = declaredRoutes.length;
-	const method = [];
-	const path = [];
-	const handler = [];
-	const owner = [];
-	const localHook = [];
-	const appHook = [];
-	const inheritedChain = [];
-	const flags = [];
+	const method = new Array(length);
+	const path = new Array(length);
+	const handler = new Array(length);
+	const owner = new Array(length);
+	const localHook = new Array(length);
+	const appHook = new Array(length);
+	const inheritedChain = new Array(length);
+	const flags = new Array(length);
+	let hasLoose = false;
 	let macroScope;
 	for (let i = 0; i < length; i++) {
 		const route = declaredRoutes[i];
@@ -26,7 +28,9 @@ function buildRouteTable(declaredRoutes) {
 		localHook[i] = route[4];
 		appHook[i] = route[5];
 		inheritedChain[i] = route[6];
-		flags[i] = (route[0] === "WS" ? RouteFlag.WS : 0) | (require_constants.isDynamicRegex.test(p) ? RouteFlag.Dynamic : 0);
+		const isDynamic = p.indexOf(":") !== -1 || p.indexOf("*") !== -1;
+		flags[i] = (route[0] === "WS" ? RouteFlag.WS : 0) | (isDynamic ? RouteFlag.Dynamic : 0) | (require_constants.needEncodeRegex.test(p) ? RouteFlag.Encode : 0);
+		if (!isDynamic && (p.length === 0 || p.charCodeAt(p.length - 1) === 47)) hasLoose = true;
 		if (route[7]) (macroScope ??= /* @__PURE__ */ new Map()).set(i, route[7]);
 	}
 	return {
@@ -39,6 +43,7 @@ function buildRouteTable(declaredRoutes) {
 		appHook,
 		inheritedChain,
 		flags,
+		hasLoose,
 		macroScope
 	};
 }

package/dist/route-table.mjs

@@ -1,20 +1,22 @@
-import { isDynamicRegex } from "./constants.mjs";
+import { needEncodeRegex } from "./constants.mjs";
 
 //#region src/route-table.ts
 const RouteFlag = {
 	WS: 1,
-	Dynamic: 2
+	Dynamic: 2,
+	Encode: 4
 };
 function buildRouteTable(declaredRoutes) {
 	const length = declaredRoutes.length;
-	const method = [];
-	const path = [];
-	const handler = [];
-	const owner = [];
-	const localHook = [];
-	const appHook = [];
-	const inheritedChain = [];
-	const flags = [];
+	const method = new Array(length);
+	const path = new Array(length);
+	const handler = new Array(length);
+	const owner = new Array(length);
+	const localHook = new Array(length);
+	const appHook = new Array(length);
+	const inheritedChain = new Array(length);
+	const flags = new Array(length);
+	let hasLoose = false;
 	let macroScope;
 	for (let i = 0; i < length; i++) {
 		const route = declaredRoutes[i];
@@ -25,7 +27,9 @@ function buildRouteTable(declaredRoutes) {
 		localHook[i] = route[4];
 		appHook[i] = route[5];
 		inheritedChain[i] = route[6];
-		flags[i] = (route[0] === "WS" ? RouteFlag.WS : 0) | (isDynamicRegex.test(p) ? RouteFlag.Dynamic : 0);
+		const isDynamic = p.indexOf(":") !== -1 || p.indexOf("*") !== -1;
+		flags[i] = (route[0] === "WS" ? RouteFlag.WS : 0) | (isDynamic ? RouteFlag.Dynamic : 0) | (needEncodeRegex.test(p) ? RouteFlag.Encode : 0);
+		if (!isDynamic && (p.length === 0 || p.charCodeAt(p.length - 1) === 47)) hasLoose = true;
 		if (route[7]) (macroScope ??= /* @__PURE__ */ new Map()).set(i, route[7]);
 	}
 	return {
@@ -38,6 +42,7 @@ function buildRouteTable(declaredRoutes) {
 		appHook,
 		inheritedChain,
 		flags,
+		hasLoose,
 		macroScope
 	};
 }

package/dist/type/constants.d.ts

@@ -17,7 +17,7 @@ declare const ELYSIA_TYPES: {
   readonly NoValidate: 15;
 };
 type ELYSIA_TYPES = typeof ELYSIA_TYPES;
-declare const primitiveElysiaTypes: Set<6 | 1 | 2 | 3 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<1 | 2 | 6 | 3 | 10 | 11 | 13 | 14>;
 declare const noEnumerable: {
   readonly enumerable: false;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "2.0.0-exp.55",
+	"version": "2.0.0-exp.57",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",