elysia 2.0.0-exp.2 → 2.0.0-exp.21

package/dist/ws/route.js

@@ -5,6 +5,7 @@ const require_error = require('../error.js');
 const require_parse_query = require('../parse-query.js');
 const require_validator_route = require('../validator/route.js');
 const require_compile_handler_utils = require('../compile/handler/utils.js');
+const require_compile_handler_index = require('../compile/handler/index.js');
 const require_ws_context = require('./context.js');
 const require_ws_parser = require('./parser.js');
 
@@ -50,13 +51,22 @@ async function handleWSResponse(ws, value, mapResponses) {
 }
 function buildWSRoute(route, app) {
 	const hook = route[4] ?? {};
-	const validators = new require_validator_route.RouteValidator(hook, { models: app["~ext"]?.models });
+	const validators = new require_validator_route.RouteValidator(hook, {
+		models: app["~ext"]?.models,
+		aot: {
+			method: "WS",
+			path: route[1]
+		}
+	});
 	const responseValidator = validators.response;
 	const defaultResponseValidator = responseValidator ? responseValidator[200] ?? responseValidator[Object.keys(responseValidator)[0]] : void 0;
 	const queryChannels = require_compile_handler_utils.getQueryParseChannels(validators.query?.schema);
 	const queryArray = queryChannels?.array;
 	const queryObject = queryChannels?.object;
-	const flatAppHook = require_utils.flattenChain(app["~hookChain"]) ?? {};
+	const instance = route[3] ?? app;
+	const appHookChain = route[5];
+	const inheritedChain = route[6];
+	const flatAppHook = require_compile_handler_index.composeRouteHook(instance, void 0, appHookChain, inheritedChain, app) ?? {};
 	const parseHooks = toArray(hook.parse);
 	const transforms = concatHooks(flatAppHook.transform, hook.transform);
 	const allBeforeHandles = concatHooks(flatAppHook.beforeHandle, hook.beforeHandle);
@@ -106,22 +116,33 @@ function buildWSRoute(route, app) {
 			ws.raw.send(message);
 		} catch {}
 	}
+	const bodyValidator = validators.body;
+	function validateMessageBody(message) {
+		if (!bodyValidator) return message;
+		if (bodyValidator.hasCodec) return bodyValidator.From(message, "body");
+		if (!bodyValidator.Check(message)) throw new require_error.ValidationError("body", message, bodyValidator.Errors?.(message) ?? []);
+		return message;
+	}
+	function onMessageValidationError(ws, error) {
+		if (errorHandlers.length === 0) {
+			try {
+				ws.raw.send(error instanceof Error ? error.message : error + "");
+			} catch {}
+			return;
+		}
+		return handleError(ws, error);
+	}
 	const messageTakesBody = !!hook.message && hook.message.length >= 2;
 	async function dispatchMessage(connection, rawMessage) {
 		const ws = Object.create(connection);
 		try {
 			const p = parseMessage(ws.raw, rawMessage);
-			const message = p instanceof Promise ? await p : p;
-			if (validators.body) {
-				const v = validators.body;
-				if (!v.Check(message)) {
-					const err = new require_error.ValidationError("body", message, v.Errors?.(message) ?? []);
-					if (errorHandlers.length === 0) {
-						ws.raw.send(err.message);
-						return;
-					}
-					return handleError(ws, err);
-				}
+			let message = p instanceof Promise ? await p : p;
+			if (bodyValidator) try {
+				const decoded = validateMessageBody(message);
+				message = decoded instanceof Promise ? await decoded : decoded;
+			} catch (err) {
+				return onMessageValidationError(ws, err);
 			}
 			ws.body = message;
 			for (let i = 0; i < transforms.length; i++) {
@@ -164,18 +185,20 @@ function buildWSRoute(route, app) {
 		}
 	}
 	function dispatchParsedSync(ws, message) {
-		try {
-			if (validators.body) {
-				const v = validators.body;
-				if (!v.Check(message)) {
-					const err = new require_error.ValidationError("body", message, v.Errors?.(message) ?? []);
-					if (errorHandlers.length === 0) {
-						ws.raw.send(err.message);
-						return;
-					}
-					return handleError(ws, err);
-				}
+		if (bodyValidator) {
+			let decoded;
+			try {
+				decoded = validateMessageBody(message);
+			} catch (error) {
+				return onMessageValidationError(ws, error);
 			}
+			if (decoded instanceof Promise) return decoded.then((m) => runMessageSync(ws, m), (error) => onMessageValidationError(ws, error));
+			message = decoded;
+		}
+		return runMessageSync(ws, message);
+	}
+	function runMessageSync(ws, message) {
+		try {
 			ws.body = message;
 			const result = messageTakesBody ? hook.message(ws, message) : hook.message(ws);
 			if (result instanceof Promise) return result.then((resolved) => finishMessageResult(ws, resolved), (error) => handleError(ws, error));

package/dist/ws/route.mjs

@@ -1,9 +1,10 @@
 import { isBun } from "../universal/constants.mjs";
-import { flattenChain, nullObject } from "../utils.mjs";
+import { nullObject } from "../utils.mjs";
 import { ValidationError } from "../error.mjs";
 import { parseQueryFromURL } from "../parse-query.mjs";
 import { RouteValidator } from "../validator/route.mjs";
 import { getQueryParseChannels } from "../compile/handler/utils.mjs";
+import { composeRouteHook } from "../compile/handler/index.mjs";
 import { ElysiaWS, isGeneratorObject } from "./context.mjs";
 import { createMessageParser } from "./parser.mjs";
 
@@ -49,13 +50,22 @@ async function handleWSResponse(ws, value, mapResponses) {
 }
 function buildWSRoute(route, app) {
 	const hook = route[4] ?? {};
-	const validators = new RouteValidator(hook, { models: app["~ext"]?.models });
+	const validators = new RouteValidator(hook, {
+		models: app["~ext"]?.models,
+		aot: {
+			method: "WS",
+			path: route[1]
+		}
+	});
 	const responseValidator = validators.response;
 	const defaultResponseValidator = responseValidator ? responseValidator[200] ?? responseValidator[Object.keys(responseValidator)[0]] : void 0;
 	const queryChannels = getQueryParseChannels(validators.query?.schema);
 	const queryArray = queryChannels?.array;
 	const queryObject = queryChannels?.object;
-	const flatAppHook = flattenChain(app["~hookChain"]) ?? {};
+	const instance = route[3] ?? app;
+	const appHookChain = route[5];
+	const inheritedChain = route[6];
+	const flatAppHook = composeRouteHook(instance, void 0, appHookChain, inheritedChain, app) ?? {};
 	const parseHooks = toArray(hook.parse);
 	const transforms = concatHooks(flatAppHook.transform, hook.transform);
 	const allBeforeHandles = concatHooks(flatAppHook.beforeHandle, hook.beforeHandle);
@@ -105,22 +115,33 @@ function buildWSRoute(route, app) {
 			ws.raw.send(message);
 		} catch {}
 	}
+	const bodyValidator = validators.body;
+	function validateMessageBody(message) {
+		if (!bodyValidator) return message;
+		if (bodyValidator.hasCodec) return bodyValidator.From(message, "body");
+		if (!bodyValidator.Check(message)) throw new ValidationError("body", message, bodyValidator.Errors?.(message) ?? []);
+		return message;
+	}
+	function onMessageValidationError(ws, error) {
+		if (errorHandlers.length === 0) {
+			try {
+				ws.raw.send(error instanceof Error ? error.message : error + "");
+			} catch {}
+			return;
+		}
+		return handleError(ws, error);
+	}
 	const messageTakesBody = !!hook.message && hook.message.length >= 2;
 	async function dispatchMessage(connection, rawMessage) {
 		const ws = Object.create(connection);
 		try {
 			const p = parseMessage(ws.raw, rawMessage);
-			const message = p instanceof Promise ? await p : p;
-			if (validators.body) {
-				const v = validators.body;
-				if (!v.Check(message)) {
-					const err = new ValidationError("body", message, v.Errors?.(message) ?? []);
-					if (errorHandlers.length === 0) {
-						ws.raw.send(err.message);
-						return;
-					}
-					return handleError(ws, err);
-				}
+			let message = p instanceof Promise ? await p : p;
+			if (bodyValidator) try {
+				const decoded = validateMessageBody(message);
+				message = decoded instanceof Promise ? await decoded : decoded;
+			} catch (err) {
+				return onMessageValidationError(ws, err);
 			}
 			ws.body = message;
 			for (let i = 0; i < transforms.length; i++) {
@@ -163,18 +184,20 @@ function buildWSRoute(route, app) {
 		}
 	}
 	function dispatchParsedSync(ws, message) {
-		try {
-			if (validators.body) {
-				const v = validators.body;
-				if (!v.Check(message)) {
-					const err = new ValidationError("body", message, v.Errors?.(message) ?? []);
-					if (errorHandlers.length === 0) {
-						ws.raw.send(err.message);
-						return;
-					}
-					return handleError(ws, err);
-				}
+		if (bodyValidator) {
+			let decoded;
+			try {
+				decoded = validateMessageBody(message);
+			} catch (error) {
+				return onMessageValidationError(ws, error);
 			}
+			if (decoded instanceof Promise) return decoded.then((m) => runMessageSync(ws, m), (error) => onMessageValidationError(ws, error));
+			message = decoded;
+		}
+		return runMessageSync(ws, message);
+	}
+	function runMessageSync(ws, message) {
+		try {
 			ws.body = message;
 			const result = messageTakesBody ? hook.message(ws, message) : hook.message(ws);
 			if (result instanceof Promise) return result.then((resolved) => finishMessageResult(ws, resolved), (error) => handleError(ws, error));

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "2.0.0-exp.2",
+	"version": "2.0.0-exp.21",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",
@@ -50,6 +50,11 @@
 			"import": "./dist/base.mjs",
 			"require": "./dist/base.js"
 		},
+		"./compiled": {
+			"types": "./dist/compiled.d.ts",
+			"import": "./dist/compiled.mjs",
+			"require": "./dist/compiled.js"
+		},
 		"./constants": {
 			"types": "./dist/constants.d.ts",
 			"import": "./dist/constants.mjs",
@@ -198,7 +203,7 @@
 	"dependencies": {
 		"deuri": "^2.0.1",
 		"exact-mirror": "1.2.2",
-		"memoirist": "^1.0.3"
+		"memoirist": "1.1.0"
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.5",
@@ -220,15 +225,16 @@
 		"prettier": "^3.5.3",
 		"rolldown-plugin-dts": "^0.24.0",
 		"tsdown": "^0.21.10",
-		"typebox": "^1.2.16",
+		"typebox": "1.3",
 		"typescript": "^6.0.2",
+		"unplugin-macros": "^0.20.2",
 		"valibot": "^1.1.0",
 		"zod": "^4.1.5"
 	},
 	"peerDependencies": {
 		"@types/bun": ">= 1.3.0",
 		"openapi-types": ">= 12.0.0",
-		"typebox": ">= 1.2.16",
+		"typebox": ">= 1.3.0",
 		"typescript": ">= 5.7.0"
 	},
 	"peerDependenciesMeta": {