elysia 2.0.0-exp.27 → 2.0.0-exp.28

package/dist/base.d.ts

@@ -1,8 +1,8 @@
 import { ElysiaStatus } from "./error.js";
 import { TraceHandler } from "./trace.js";
+import { AnySchema } from "./type/types.js";
 import { ListenCallback, Serve, Server } from "./universal/server.js";
 import { AddRoute, AddWSRoute, AfterHandler, AfterResponseHandler, AnyErrorConstructor, AnyLocalHook, BodyHandler, CompiledHandler, CreateEden, DefaultEphemeral, DefaultMetadata, DefaultSingleton, DefinitionBase, DocumentDecoration, ElysiaConfig, ElysiaHandlerToResponseSchemaAmbiguous, EphemeralType, ErrorDefinitionEntry, ErrorHandler, EventScope, ExcludeElysiaResponse, ExtractErrorFromHandle, GlobalHookReturn, GracefulHandler, GuardHookSingleton, GuardLocalHook, HTTPMethod, HookContextSchema, HookContextSingleton, InlineHandler, InlineHandlerNonMacro, InputSchema, InputSchemaKey, InternalRoute, IntersectIfObjectSchema, JoinPath, LocalHook, LocalHookReturn, Macro, MacroSchemaChannel, MacroToContext, MacroToProperty, MapResponse, MaybeArray, MaybePromise, MergeElysiaInstances, MergeSchema, MergeScopedSchemas, MetadataBase, NonResolvableMacroKey, ObjectMacroDefs, OptionalHandler, PluginHookReturn, PreHandler, Prettify, PublicRoute, ResolveRouteErrors, RouteBase, SingletonBase, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
-import { AnySchema } from "./type/types.js";
 import { ChainNode } from "./utils.js";
 import { Context, ErrorContext, LifecycleContext } from "./context.js";
 import { WSHandlerResponse, WSLocalHook, WSMessageHandler } from "./ws/types.js";

package/dist/base.js

@@ -766,27 +766,29 @@ var Elysia = class Elysia {
 		this.#routerBuilt = false;
 		this.#buildRouter();
 	}
-	#add(method, path, fn, hook) {
+	#add(method, path, hookOrFn, fn, hasHook = fn !== void 0) {
 		if (this["~Prefix"]) path = require_utils.joinPath(this["~Prefix"], path);
 		else if (path && path.charCodeAt(0) !== 47) path = "/" + path;
+		const handler = hasHook ? fn : hookOrFn;
+		const hook = hasHook ? hookOrFn : void 0;
 		const appHook = this["~hookChain"];
 		(this.#history ??= []).push(appHook ? [
 			method,
 			path,
-			fn,
+			handler,
 			this,
 			hook,
 			appHook
 		] : hook ? [
 			method,
 			path,
-			fn,
+			handler,
 			this,
 			hook
 		] : [
 			method,
 			path,
-			fn,
+			handler,
 			this
 		]);
 		this.#cachedRoutes = void 0;
@@ -838,32 +840,31 @@ var Elysia = class Elysia {
 		return require_type_bridge.Ref(key);
 	}
 	get(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.GET, path, hookOrFn) : this.#add(require_constants.MethodMap.GET, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.GET, path, hookOrFn, fn);
 	}
 	post(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.POST, path, hookOrFn) : this.#add(require_constants.MethodMap.POST, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.POST, path, hookOrFn, fn);
 	}
 	put(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.PUT, path, hookOrFn) : this.#add(require_constants.MethodMap.PUT, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.PUT, path, hookOrFn, fn);
 	}
 	patch(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.PATCH, path, hookOrFn) : this.#add(require_constants.MethodMap.PATCH, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.PATCH, path, hookOrFn, fn);
 	}
 	delete(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.DELETE, path, hookOrFn) : this.#add(require_constants.MethodMap.DELETE, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.DELETE, path, hookOrFn, fn);
 	}
 	options(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.OPTIONS, path, hookOrFn) : this.#add(require_constants.MethodMap.OPTIONS, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.OPTIONS, path, hookOrFn, fn);
 	}
 	head(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(require_constants.MethodMap.HEAD, path, hookOrFn) : this.#add(require_constants.MethodMap.HEAD, path, fn, hookOrFn);
+		return this.#add(require_constants.MethodMap.HEAD, path, hookOrFn, fn);
 	}
 	method(method, path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(method, path, hookOrFn) : this.#add(method, path, fn, hookOrFn);
+		return this.#add(method, path, hookOrFn, fn);
 	}
 	all(path, hookOrFn, fn) {
-		if (fn === void 0) this.#add("*", path, hookOrFn);
-		else this.#add("*", path, fn, hookOrFn);
+		this.#add("*", path, hookOrFn, fn);
 		return this;
 	}
 	ws(path, optionsOrHandler, handler) {
@@ -879,7 +880,7 @@ var Elysia = class Elysia {
 			opts = require_utils.nullObject();
 			opts.message = optionsOrHandler;
 		} else opts = optionsOrHandler;
-		this.#add("WS", path, void 0, opts);
+		this.#add("WS", path, opts, void 0, true);
 		return this;
 	}
 	mount(path, handleOrConfig, config) {

package/dist/base.mjs

@@ -763,27 +763,29 @@ var Elysia = class Elysia {
 		this.#routerBuilt = false;
 		this.#buildRouter();
 	}
-	#add(method, path, fn, hook) {
+	#add(method, path, hookOrFn, fn, hasHook = fn !== void 0) {
 		if (this["~Prefix"]) path = joinPath(this["~Prefix"], path);
 		else if (path && path.charCodeAt(0) !== 47) path = "/" + path;
+		const handler = hasHook ? fn : hookOrFn;
+		const hook = hasHook ? hookOrFn : void 0;
 		const appHook = this["~hookChain"];
 		(this.#history ??= []).push(appHook ? [
 			method,
 			path,
-			fn,
+			handler,
 			this,
 			hook,
 			appHook
 		] : hook ? [
 			method,
 			path,
-			fn,
+			handler,
 			this,
 			hook
 		] : [
 			method,
 			path,
-			fn,
+			handler,
 			this
 		]);
 		this.#cachedRoutes = void 0;
@@ -835,32 +837,31 @@ var Elysia = class Elysia {
 		return Ref(key);
 	}
 	get(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.GET, path, hookOrFn) : this.#add(MethodMap.GET, path, fn, hookOrFn);
+		return this.#add(MethodMap.GET, path, hookOrFn, fn);
 	}
 	post(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.POST, path, hookOrFn) : this.#add(MethodMap.POST, path, fn, hookOrFn);
+		return this.#add(MethodMap.POST, path, hookOrFn, fn);
 	}
 	put(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.PUT, path, hookOrFn) : this.#add(MethodMap.PUT, path, fn, hookOrFn);
+		return this.#add(MethodMap.PUT, path, hookOrFn, fn);
 	}
 	patch(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.PATCH, path, hookOrFn) : this.#add(MethodMap.PATCH, path, fn, hookOrFn);
+		return this.#add(MethodMap.PATCH, path, hookOrFn, fn);
 	}
 	delete(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.DELETE, path, hookOrFn) : this.#add(MethodMap.DELETE, path, fn, hookOrFn);
+		return this.#add(MethodMap.DELETE, path, hookOrFn, fn);
 	}
 	options(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.OPTIONS, path, hookOrFn) : this.#add(MethodMap.OPTIONS, path, fn, hookOrFn);
+		return this.#add(MethodMap.OPTIONS, path, hookOrFn, fn);
 	}
 	head(path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(MethodMap.HEAD, path, hookOrFn) : this.#add(MethodMap.HEAD, path, fn, hookOrFn);
+		return this.#add(MethodMap.HEAD, path, hookOrFn, fn);
 	}
 	method(method, path, hookOrFn, fn) {
-		return fn === void 0 ? this.#add(method, path, hookOrFn) : this.#add(method, path, fn, hookOrFn);
+		return this.#add(method, path, hookOrFn, fn);
 	}
 	all(path, hookOrFn, fn) {
-		if (fn === void 0) this.#add("*", path, hookOrFn);
-		else this.#add("*", path, fn, hookOrFn);
+		this.#add("*", path, hookOrFn, fn);
 		return this;
 	}
 	ws(path, optionsOrHandler, handler) {
@@ -876,7 +877,7 @@ var Elysia = class Elysia {
 			opts = nullObject();
 			opts.message = optionsOrHandler;
 		} else opts = optionsOrHandler;
-		this.#add("WS", path, void 0, opts);
+		this.#add("WS", path, opts, void 0, true);
 		return this;
 	}
 	mount(path, handleOrConfig, config) {

package/dist/compile/handler/frozen-validator.d.ts

@@ -1,5 +1,5 @@
-import { AnyLocalHook, HTTPMethod } from "../../types.js";
 import { CapturedValidator, FrozenValidator } from "../aot.js";
+import { AnyLocalHook, HTTPMethod } from "../../types.js";
 import { AnyElysia } from "../../base.js";
 
 //#region src/compile/handler/frozen-validator.d.ts

package/dist/index.d.ts

@@ -1,12 +1,9 @@
 import { StatusMap, StatusMapBack } from "./constants.js";
 import { ElysiaError, ElysiaStatus, InternalServerError, NotFound, ParseError, Problem, SelectiveStatus, ValidationError, problem, status, validationDetail } from "./error.js";
+import { ElysiaFile, file } from "./universal/file.js";
 import { BaseCookie, CookieOptions } from "./cookie/types.js";
 import { Cookie } from "./cookie/cookie.js";
 import { InvalidCookie } from "./cookie/error.js";
-import { ElysiaFile, file } from "./universal/file.js";
-import { env } from "./universal/env.js";
-import { Server } from "./universal/server.js";
-import { HTTPHeaders, InputSchema, Macro, MacroToContext, MacroToProperty, RouteSchema, SSEPayload, UnwrapRoute, UnwrapSchema } from "./types.js";
 import { AnySchema, BaseSchema, StandardJSONSchemaV1Like, StandardSchemaV1Like } from "./type/types.js";
 import { TCookieField, TCookieObject } from "./type/elysia/cookie.js";
 import { FileTypeDetector, fileType, setFileTypeDetector } from "./type/elysia/file-type.js";
@@ -16,6 +13,9 @@ import { Capture, Compiled } from "./compile/aot.js";
 import { MultiValidator, StandardValidator, Validator } from "./validator/index.js";
 import { TypeBoxValidator } from "./type/validator/index.js";
 import { TypeSystem, t } from "./type/index.js";
+import { env } from "./universal/env.js";
+import { Server } from "./universal/server.js";
+import { HTTPHeaders, InputSchema, Macro, MacroToContext, MacroToProperty, RouteSchema, SSEPayload, UnwrapRoute, UnwrapSchema } from "./types.js";
 import { form, prefix, redirect, sse } from "./utils.js";
 import { Context, ErrorContext, createBaseContext, createContext } from "./context.js";
 import { AnyElysia, Elysia } from "./base.js";

package/dist/type/elysia/file-type.d.ts

@@ -1,5 +1,5 @@
-import { MaybeArray, MaybePromise } from "../../types.js";
 import { FileType, FileUnit } from "../types.js";
+import { MaybeArray, MaybePromise } from "../../types.js";
 
 //#region src/type/elysia/file-type.d.ts
 type FileTypeDetector = (file: File) => MaybePromise<string | {

package/dist/type/validator/index.d.ts

@@ -1,6 +1,6 @@
-import { MaybePromise } from "../../types.js";
 import { Validator as Validator$1, ValidatorOptions } from "../../validator/index.js";
 import { TypeBoxValidatorCache } from "./validator-cache.js";
+import { MaybePromise } from "../../types.js";
 import { Static, StaticDecode, StaticEncode, TAny, TSchema } from "typebox/type";
 import { Validator } from "typebox/schema";
 import { TLocalizedValidationError } from "typebox/error";

package/dist/types.d.ts

@@ -1,10 +1,10 @@
 import { MethodMap, StatusMapBack } from "./constants.js";
 import { ElysiaError, ElysiaStatus } from "./error.js";
-import { CookieOptions } from "./cookie/types.js";
 import { ElysiaFile } from "./universal/file.js";
 import { TraceEvent, TraceListener } from "./trace.js";
-import { Serve } from "./universal/server.js";
+import { CookieOptions } from "./cookie/types.js";
 import { AnySchema, StandardSchemaV1Like, TypeBoxSchema } from "./type/types.js";
+import { Serve } from "./universal/server.js";
 import { ChainNode } from "./utils.js";
 import { Context, ErrorContext, LifecycleContext, PreContext } from "./context.js";
 import { WebSocketHandler } from "./ws/types.js";

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import { MethodMap } from "./constants.js";
-import { AnyLocalHook, AppHook, ElysiaFormData, EventFn, EventScope, GuardSchemaType, InputSchema, Macro, MaybeArray, Prettify, SSEPayload } from "./types.js";
 import { AnySchema, StandardSchemaV1Like } from "./type/types.js";
+import { AnyLocalHook, AppHook, ElysiaFormData, EventFn, EventScope, GuardSchemaType, InputSchema, Macro, MaybeArray, Prettify, SSEPayload } from "./types.js";
 import { Context } from "./context.js";
 
 //#region src/utils.d.ts

package/dist/validator/index.d.ts

@@ -1,8 +1,8 @@
-import { ElysiaConfig, MaybePromise } from "../types.js";
 import { AnySchema, StandardSchemaV1Like } from "../type/types.js";
 import { CoerceOption } from "../type/coerce.js";
 import { ValidatorSlot } from "../compile/aot.js";
 import { TypeBoxValidator } from "../type/bridge.js";
+import { ElysiaConfig, MaybePromise } from "../types.js";
 import { TSchema } from "typebox/type";
 import { TLocalizedValidationError } from "typebox/error";
 

package/package.json

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