elysia 2.0.0-beta.24 → 2.0.0-beta.25

package/dist/compile/handler/utils.js

@@ -219,16 +219,12 @@ function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const modes = deriveModes(hooks, derive);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	let needsEs = false;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
@@ -246,9 +242,8 @@ else if(tmp){${merge};tmp=undefined}\n`;
 			}
 		} else code += "if(tmp!==undefined)_r=tmp\n";
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	if (needsEs) link(require_error.ElysiaStatus, "es");
 	return code;
 }
@@ -291,22 +286,17 @@ function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
@@ -324,18 +314,13 @@ function map(map) {
 	return function(event, rest, abortGuard, tail) {
 		if (Array.isArray(event)) {
 			let code = "";
-			let depth = 0;
 			for (let i = 0; i < event.length; i++) {
 				const guard = i > 0 && abortGuard ? `!${abortGuard}` : void 0;
 				if (tail) code += tailStage(tail, guard);
-				else if (guard) {
-					code += `if(${guard}){\n`;
-					depth++;
-				}
+				else if (guard) code += `if(${guard}){\n`;
 				code += map(i, event[i], rest);
-				if (tail) code += "}\n";
+				if (tail || guard) code += "}\n";
 			}
-			code += "}".repeat(depth);
 			return code;
 		} else if (tail) return tailStage(tail) + map(void 0, event, rest) + "}\n";
 		else return map(void 0, event, rest);

package/dist/compile/handler/utils.mjs

@@ -219,16 +219,12 @@ function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const modes = deriveModes(hooks, derive);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	let needsEs = false;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}_r===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
@@ -246,9 +242,8 @@ else if(tmp){${merge};tmp=undefined}\n`;
 			}
 		} else code += "if(tmp!==undefined)_r=tmp\n";
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	if (needsEs) link(ElysiaStatus, "es");
 	return code;
 }
@@ -291,22 +286,17 @@ function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const tail = asyncTail(mode);
 	let code = "";
-	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
 		const fn = hooks[i];
 		const guard = i > 0 ? `${abortGuard ? `!${abortGuard}&&` : ""}tmp===undefined` : void 0;
 		if (tail) code += tailStage(tail, guard);
-		else if (guard) {
-			code += `if(${guard}){\n`;
-			depth++;
-		}
+		else if (guard) code += `if(${guard}){\n`;
 		const t = traceChild(report, fn);
 		code += t.begin;
 		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
-		if (tail) code += "}\n";
+		if (tail || guard) code += "}\n";
 	}
-	code += "}".repeat(depth);
 	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
@@ -324,18 +314,13 @@ function map(map) {
 	return function(event, rest, abortGuard, tail) {
 		if (Array.isArray(event)) {
 			let code = "";
-			let depth = 0;
 			for (let i = 0; i < event.length; i++) {
 				const guard = i > 0 && abortGuard ? `!${abortGuard}` : void 0;
 				if (tail) code += tailStage(tail, guard);
-				else if (guard) {
-					code += `if(${guard}){\n`;
-					depth++;
-				}
+				else if (guard) code += `if(${guard}){\n`;
 				code += map(i, event[i], rest);
-				if (tail) code += "}\n";
+				if (tail || guard) code += "}\n";
 			}
-			code += "}".repeat(depth);
 			return code;
 		} else if (tail) return tailStage(tail) + map(void 0, event, rest) + "}\n";
 		else return map(void 0, event, rest);

package/dist/handler/fetch.js

@@ -72,28 +72,34 @@ function dispatchResult(result, context, handleError, afterResponse) {
 function findRoute(context, request, map, router, onNotFound, handleError, afterResponse, strictPath, hasWS, hasDynamicWS, app) {
 	const path = context.path;
 	const method = request.method;
-	if (hasWS && method === "GET") {
-		const handler = map["WS"]?.[path];
-		const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
-		if (handler !== void 0 || found) {
-			const upgrade = request.headers.get("upgrade");
-			if (upgrade && upgrade.toLowerCase() === "websocket") {
-				if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
-				context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
-				return dispatchResult(found.store(context), context, handleError, afterResponse);
+	if (hasWS) {
+		const wsMap = map["WS"];
+		if (method === "GET") {
+			const handler = path.length === 1 && path === "/" ? wsMap?.["/"] : wsMap?.[path];
+			const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
+			if (handler !== void 0 || found) {
+				const upgrade = request.headers.get("upgrade");
+				if (upgrade && upgrade.toLowerCase() === "websocket") {
+					if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+					context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
+					return dispatchResult(found.store(context), context, handleError, afterResponse);
+				}
 			}
 		}
 	}
 	const methodMap = map[method];
-	let handler = methodMap?.[path];
-	if (!handler) if (!strictPath && path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
-		const loose = path.slice(0, -1);
-		handler = methodMap?.[loose];
-		if (!handler) {
-			const anyMap = map["*"];
-			handler = anyMap?.[path] ?? anyMap?.[loose];
-		}
-	} else handler = map["*"]?.[path];
+	let handler;
+	if (path.length > 1) {
+		handler = methodMap?.[path];
+		if (!handler) if (!strictPath && path.charCodeAt(path.length - 1) === 47) {
+			const loose = path.slice(0, -1);
+			handler = loose.length > 1 ? methodMap?.[loose] : methodMap?.[path[0]];
+			if (!handler) {
+				const anyMap = map["*"];
+				handler = anyMap?.[path] ?? anyMap?.[loose];
+			}
+		} else handler = map["*"]?.[path];
+	} else handler = methodMap?.[context.path] || map["*"]?.[path];
 	if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
 	const found = router?.find(method, path) ?? router?.find("*", path);
 	if (found) {

package/dist/handler/fetch.mjs

@@ -70,28 +70,34 @@ function dispatchResult(result, context, handleError, afterResponse) {
 function findRoute(context, request, map, router, onNotFound, handleError, afterResponse, strictPath, hasWS, hasDynamicWS, app) {
 	const path = context.path;
 	const method = request.method;
-	if (hasWS && method === "GET") {
-		const handler = map["WS"]?.[path];
-		const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
-		if (handler !== void 0 || found) {
-			const upgrade = request.headers.get("upgrade");
-			if (upgrade && upgrade.toLowerCase() === "websocket") {
-				if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
-				context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
-				return dispatchResult(found.store(context), context, handleError, afterResponse);
+	if (hasWS) {
+		const wsMap = map["WS"];
+		if (method === "GET") {
+			const handler = path.length === 1 && path === "/" ? wsMap?.["/"] : wsMap?.[path];
+			const found = handler === void 0 && hasDynamicWS ? router?.find("WS", path) : void 0;
+			if (handler !== void 0 || found) {
+				const upgrade = request.headers.get("upgrade");
+				if (upgrade && upgrade.toLowerCase() === "websocket") {
+					if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
+					context.params = path.indexOf("%") === -1 ? found.params : decodeParams(found.params);
+					return dispatchResult(found.store(context), context, handleError, afterResponse);
+				}
 			}
 		}
 	}
 	const methodMap = map[method];
-	let handler = methodMap?.[path];
-	if (!handler) if (!strictPath && path.length > 1 && path.charCodeAt(path.length - 1) === 47) {
-		const loose = path.slice(0, -1);
-		handler = methodMap?.[loose];
-		if (!handler) {
-			const anyMap = map["*"];
-			handler = anyMap?.[path] ?? anyMap?.[loose];
-		}
-	} else handler = map["*"]?.[path];
+	let handler;
+	if (path.length > 1) {
+		handler = methodMap?.[path];
+		if (!handler) if (!strictPath && path.charCodeAt(path.length - 1) === 47) {
+			const loose = path.slice(0, -1);
+			handler = loose.length > 1 ? methodMap?.[loose] : methodMap?.[path[0]];
+			if (!handler) {
+				const anyMap = map["*"];
+				handler = anyMap?.[path] ?? anyMap?.[loose];
+			}
+		} else handler = map["*"]?.[path];
+	} else handler = methodMap?.[context.path] || map["*"]?.[path];
 	if (handler) return dispatchResult(handler(context), context, handleError, afterResponse);
 	const found = router?.find(method, path) ?? router?.find("*", path);
 	if (found) {

package/dist/package.js

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

package/dist/package.mjs

@@ -1,6 +1,6 @@
 // @bun
 //#region package.json
-var version = "2.0.0-beta.24";
+var version = "2.0.0-beta.25";
 
 //#endregion
 export { version };

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<1 | 2 | 6 | 3 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<6 | 1 | 2 | 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-beta.24",
+	"version": "2.0.0-beta.25",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",