elysia 2.0.0-exp.56 → 2.0.0-exp.58

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');
@@ -1108,8 +1107,6 @@ var Elysia = class Elysia {
 	}
 	ws(path, optionsOrHandler, handler) {
 		this["~hasWS"] = true;
-		const adapter = this["~config"]?.adapter;
-		if (!adapter?.websocket && !require_universal_constants.isBun) throw new Error(`[Elysia] WebSocket is not supported on '${adapter?.name ?? "web-standard"}' adapter.`);
 		let opts;
 		if (handler !== void 0) {
 			opts = Object.assign(require_utils.nullObject(), optionsOrHandler);
@@ -1275,7 +1272,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 +1414,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++) {
@@ -1442,6 +1434,7 @@ var Elysia = class Elysia {
 			const routePath = path[i];
 			const routeFlags = flags[i];
 			if ((routeFlags & require_route_table.RouteFlag.WS) !== 0) {
+				if (!wsCap) throw new Error(`[Elysia] WebSocket route ${routeMethod} ${routePath} defined, but no WS capability is available. Ensure that .use(websocket()) is applied.`);
 				const ws = wsCap.provider.buildWSRoute(require_route_table.routeRow(table, i), this);
 				const handler = ws[0];
 				const options = ws[1];
@@ -1465,7 +1458,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) {
@@ -1510,7 +1503,7 @@ var Elysia = class Elysia {
 	}
 	#handle;
 	get handle() {
-		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.startsWith("/") ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
+		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
 		const listen = (this["~config"]?.adapter ?? (require_universal_constants.isBun ? require_adapter_bun_index.BunAdapter : void 0))?.listen;

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";
@@ -1105,8 +1104,6 @@ var Elysia = class Elysia {
 	}
 	ws(path, optionsOrHandler, handler) {
 		this["~hasWS"] = true;
-		const adapter = this["~config"]?.adapter;
-		if (!adapter?.websocket && !isBun) throw new Error(`[Elysia] WebSocket is not supported on '${adapter?.name ?? "web-standard"}' adapter.`);
 		let opts;
 		if (handler !== void 0) {
 			opts = Object.assign(nullObject(), optionsOrHandler);
@@ -1272,7 +1269,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 +1411,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++) {
@@ -1439,6 +1431,7 @@ var Elysia = class Elysia {
 			const routePath = path[i];
 			const routeFlags = flags[i];
 			if ((routeFlags & RouteFlag.WS) !== 0) {
+				if (!wsCap) throw new Error(`[Elysia] WebSocket route ${routeMethod} ${routePath} defined, but no WS capability is available. Ensure that .use(websocket()) is applied.`);
 				const ws = wsCap.provider.buildWSRoute(routeRow(table, i), this);
 				const handler = ws[0];
 				const options = ws[1];
@@ -1462,7 +1455,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) {
@@ -1507,7 +1500,7 @@ var Elysia = class Elysia {
 	}
 	#handle;
 	get handle() {
-		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.startsWith("/") ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
+		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.charCodeAt(0) === 47 ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
 		const listen = (this["~config"]?.adapter ?? (isBun ? BunAdapter : void 0))?.listen;

package/dist/package.js

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

package/dist/package.mjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "2.0.0-exp.56";
+var version = "2.0.0-exp.58";
 
 //#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/coerce.d.ts

@@ -34,7 +34,7 @@ declare const coerceQuery: () => CoerceOption[];
 declare const coerceBody: () => CoerceOption[];
 declare const coerceFormData: () => CoerceOption[];
 declare const coerceStringToStructure: () => CoerceOption[];
-declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): TSchema | BaseSchema;
+declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): BaseSchema | TSchema;
 declare function captureCoercePlan(original: any, coerced: any): CoercePlan | null;
 /** Full rebuild: scalar leaves + ObjectString/ArrayString sites (wired path). */
 declare const buildCoercedFromPlan: (original: any, plan: CoercePlan, seen?: Set<string>) => any;

package/package.json

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