elysia 2.0.0-exp.61 → 2.0.0-exp.62

package/dist/adapter/utils.d.ts

@@ -1,6 +1,6 @@
 import { BaseCookie } from "../cookie/types.js";
-import { StatusMap } from "../constants.js";
 import { ElysiaFile } from "../universal/file.js";
+import { StatusMap } from "../constants.js";
 import { HTTPHeaders } from "../types.js";
 import { Context } from "../context.js";
 //#region src/adapter/utils.d.ts

package/dist/adapter/web-standard/handler.js

@@ -21,16 +21,20 @@ function handleElysiaFile(file, set = { headers: require_utils.nullObject() }, r
 	});
 	return require_adapter_utils.handleFile(file.value, set, request);
 }
+function responseTag(response) {
+	if (response == null) return;
+	return Object.getPrototypeOf(response)?.constructor?.name;
+}
 function mapResponseWithSet(response, set, request, owned) {
 	require_adapter_utils.handleSet(set);
 	const headers = set.headers;
-	switch (response?.constructor?.name) {
+	switch (responseTag(response)) {
 		case "String":
 			if (!require_universal_constants.isBun && !headers["content-type"]) require_adapter_utils.materializeSetHeaders(set)["content-type"] = "text/plain";
 			return new Response(response, set);
 		case "Array": return Response.json(response, set);
+		case "ElysiaForm": return new Response(require_utils.formToFormData(response), set);
 		case "Object":
-			if (response["~ely-form"]) return new Response(require_utils.formToFormData(response), set);
 			if (typeof response?.next === "function") return handleStream(response, set, request, void 0, owned);
 			return Response.json(response, set);
 		case "Number":
@@ -66,12 +70,11 @@ function mapResponse(response, set, request, owned) {
 }
 const textHeaders = require_universal_constants.isBun ? void 0 : textPlainInit;
 function mapCompactResponse(response, request, owned) {
-	switch (response?.constructor?.name) {
+	switch (responseTag(response)) {
 		case "String": return new Response(response, textHeaders);
 		case "Array": return Response.json(response);
-		case "Object":
-			if (response["~ely-form"]) return new Response(require_utils.formToFormData(response));
-			return Response.json(response);
+		case "ElysiaForm": return new Response(require_utils.formToFormData(response));
+		case "Object": return Response.json(response);
 		case "Number":
 		case "Boolean": return new Response(typeof response === "boolean" ? response ? "true" : "false" : response.toString());
 		case "ElysiaFile": return handleElysiaFile(response, void 0, request);
@@ -126,11 +129,12 @@ function mapFallback(response, set, request, owned = false) {
 		headers: response.headers ? { ...response.headers } : {}
 	}, request, owned);
 	if (response instanceof require_universal_file.ElysiaFile) return handleElysiaFile(response, void 0, request);
+	if (require_utils.isElysiaForm(response)) return new Response(require_utils.formToFormData(response), set);
 	if (typeof response?.next === "function" || response instanceof ReadableStream) return handleStream(response, set, request, void 0, owned);
 	if (typeof response?.then === "function") return response.then((x) => set ? mapResponse(x, set, request, owned) : mapCompactResponse(x, request, owned));
 	if (Array.isArray(response)) return Response.json(response);
 	if (typeof response?.toResponse === "function") return set ? mapResponse(response.toResponse(), set, request, owned) : mapCompactResponse(response.toResponse(), request, owned);
-	if (response?.constructor?.name === "Cookie" && response.jar) return new Response(response.value, set);
+	if (responseTag(response) === "Cookie") return set ? mapResponse(response.value, set, request, owned) : mapCompactResponse(response.value, request, owned);
 	return new Response(response, set);
 }
 const handleResponse = require_adapter_utils.createResponseHandler({

package/dist/adapter/web-standard/handler.mjs

@@ -1,6 +1,6 @@
 import { isBun } from "../../universal/constants.mjs";
 import { ElysiaFile, mime } from "../../universal/file.mjs";
-import { formToFormData, isNotEmpty, nullObject } from "../../utils.mjs";
+import { formToFormData, isElysiaForm, isNotEmpty, nullObject } from "../../utils.mjs";
 import { ElysiaStatus, PROBLEM_JSON, internalServerErrorBody } from "../../error.mjs";
 import { defaultHeaders } from "../default-headers.mjs";
 import { createResponseHandler, createStreamHandler, handleFile, handleSet, materializeSetHeaders } from "../utils.mjs";
@@ -20,16 +20,20 @@ function handleElysiaFile(file, set = { headers: nullObject() }, request) {
 	});
 	return handleFile(file.value, set, request);
 }
+function responseTag(response) {
+	if (response == null) return;
+	return Object.getPrototypeOf(response)?.constructor?.name;
+}
 function mapResponseWithSet(response, set, request, owned) {
 	handleSet(set);
 	const headers = set.headers;
-	switch (response?.constructor?.name) {
+	switch (responseTag(response)) {
 		case "String":
 			if (!isBun && !headers["content-type"]) materializeSetHeaders(set)["content-type"] = "text/plain";
 			return new Response(response, set);
 		case "Array": return Response.json(response, set);
+		case "ElysiaForm": return new Response(formToFormData(response), set);
 		case "Object":
-			if (response["~ely-form"]) return new Response(formToFormData(response), set);
 			if (typeof response?.next === "function") return handleStream(response, set, request, void 0, owned);
 			return Response.json(response, set);
 		case "Number":
@@ -65,12 +69,11 @@ function mapResponse(response, set, request, owned) {
 }
 const textHeaders = isBun ? void 0 : textPlainInit;
 function mapCompactResponse(response, request, owned) {
-	switch (response?.constructor?.name) {
+	switch (responseTag(response)) {
 		case "String": return new Response(response, textHeaders);
 		case "Array": return Response.json(response);
-		case "Object":
-			if (response["~ely-form"]) return new Response(formToFormData(response));
-			return Response.json(response);
+		case "ElysiaForm": return new Response(formToFormData(response));
+		case "Object": return Response.json(response);
 		case "Number":
 		case "Boolean": return new Response(typeof response === "boolean" ? response ? "true" : "false" : response.toString());
 		case "ElysiaFile": return handleElysiaFile(response, void 0, request);
@@ -125,11 +128,12 @@ function mapFallback(response, set, request, owned = false) {
 		headers: response.headers ? { ...response.headers } : {}
 	}, request, owned);
 	if (response instanceof ElysiaFile) return handleElysiaFile(response, void 0, request);
+	if (isElysiaForm(response)) return new Response(formToFormData(response), set);
 	if (typeof response?.next === "function" || response instanceof ReadableStream) return handleStream(response, set, request, void 0, owned);
 	if (typeof response?.then === "function") return response.then((x) => set ? mapResponse(x, set, request, owned) : mapCompactResponse(x, request, owned));
 	if (Array.isArray(response)) return Response.json(response);
 	if (typeof response?.toResponse === "function") return set ? mapResponse(response.toResponse(), set, request, owned) : mapCompactResponse(response.toResponse(), request, owned);
-	if (response?.constructor?.name === "Cookie" && response.jar) return new Response(response.value, set);
+	if (responseTag(response) === "Cookie") return set ? mapResponse(response.value, set, request, owned) : mapCompactResponse(response.value, request, owned);
 	return new Response(response, set);
 }
 const handleResponse = createResponseHandler({

package/dist/base.d.ts

@@ -1,8 +1,8 @@
-import { ElysiaStatus } from "./error.js";
 import { TraceCapability, TraceHandler } from "./trace.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, HistoryEntry, 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, ScopedHookReturn, ScopedMapDeriveReturn, SingletonBase, StaticMapAliases, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
 import { ChainNode } from "./utils.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, HistoryEntry, 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, ScopedHookReturn, ScopedMapDeriveReturn, SingletonBase, StaticMapAliases, TransformHandler, UnionResponseStatus, UnwrapRoute, WrapFn } from "./types.js";
+import { ElysiaStatus } from "./error.js";
 import { Context, ErrorContext, LifecycleContext } from "./context.js";
 import { AnySchema } from "./type/types.js";
 import { AotFingerprint, CompilerSession, ProgramId } from "./compile/aot.js";
@@ -559,7 +559,7 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
     parser: Metadata['parser'];
     response: Metadata['response'];
   }, Routes, Ephemeral, Volatile>;
-  '~applyMacro'(input: Partial<AnyLocalHook>, toApply?: Partial<AnyLocalHook>, iteration?: number, seen?: Set<string | Partial<any>>): Partial<AnyLocalHook>;
+  '~applyMacro'(input: Partial<AnyLocalHook>, toApply?: Partial<AnyLocalHook>, iteration?: number, seen?: Set<string | Partial<any>>, insertions?: Map<string, number>): Partial<AnyLocalHook>;
   /**
    * Merge a plugin instance
    */
@@ -869,6 +869,21 @@ declare class Elysia<const in out BasePath extends string = '', const in out Sco
   get fetch(): (request: Request, ...rest: any[]) => MaybePromise<Response>;
   get handle(): (url: string | Request, options?: RequestInit) => Promise<Response>;
   listen(options: string | number | Partial<Serve>, callback?: ListenCallback): this;
+  /**
+   * Add a higher order function over Elysia.fetch
+   *
+   * @example
+   * ```ts
+   * const ctx = new AsyncLocalStorage<{ counter: number }>()
+   *
+   * new Elysia()
+   *	.wrap(
+   *		(fetch) => (request) =>
+   *			ctx.run({ counter: 0 }, () => fetch(request))
+   *	)
+   *	.get('/', () => ctx.getStore())
+   * ```
+   */
   wrap<T extends (...params: any) => MaybePromise<Response> = (request: Request, ...rest: any[]) => MaybePromise<Response>>(callback: WrapFn<T>): this;
   /**
    * ### cleanup | Life cycle event

package/dist/base.js

@@ -502,7 +502,7 @@ var Elysia = class Elysia {
 		require_utils.invalidateMacroEpoch();
 		return this;
 	}
-	"~applyMacro"(input, toApply = input, iteration = 0, seen = /* @__PURE__ */ new Set()) {
+	"~applyMacro"(input, toApply = input, iteration = 0, seen = /* @__PURE__ */ new Set(), insertions = /* @__PURE__ */ new Map()) {
 		if (iteration >= 16) return input;
 		const macro = this["~ext"]?.macro;
 		if (!macro) return input;
@@ -547,7 +547,7 @@ var Elysia = class Elysia {
 					continue;
 				}
 				if (k in macro) {
-					this["~applyMacro"](input, { [k]: v }, iteration + 1, seen);
+					this["~applyMacro"](input, { [k]: v }, iteration + 1, seen, insertions);
 					delete input[key];
 					continue;
 				}
@@ -568,19 +568,20 @@ var Elysia = class Elysia {
 					delete input[key];
 					continue;
 				}
-				if (k in input) {
-					if (require_utils.eventProperties.has(k) || k === "derive") {
-						const macroFns = Array.isArray(v) ? v : [v];
-						const existing = Array.isArray(input[k]) ? input[k] : [input[k]];
-						const merged = [];
-						const seen = /* @__PURE__ */ new Set();
-						for (const fn of macroFns) if (!existing.includes(fn) && !seen.has(fn)) {
-							seen.add(fn);
-							merged.push(fn);
-						}
-						for (const fn of existing) if (!seen.has(fn)) merged.push(fn);
-						input[k] = merged;
-					} else if (Array.isArray(input[k])) {
+				if (require_utils.eventProperties.has(k) || k === "derive") {
+					const incoming = Array.isArray(v) ? v : [v];
+					const existing = k in input ? Array.isArray(input[k]) ? input[k] : [input[k]] : [];
+					const added = [];
+					for (const fn of incoming) if (!existing.includes(fn) && !added.includes(fn)) added.push(fn);
+					const at = insertions.get(k) ?? 0;
+					input[k] = [
+						...existing.slice(0, at),
+						...added,
+						...existing.slice(at)
+					];
+					insertions.set(k, at + added.length);
+				} else if (k in input) {
+					if (Array.isArray(input[k])) {
 						if (Array.isArray(v)) {
 							for (const item of v) if (!input[k].some((e) => e === item)) input[k].unshift(item);
 						} else if (!input[k].some((item) => item === v)) input[k].unshift(v);
@@ -1511,6 +1512,21 @@ var Elysia = class Elysia {
 		if (!require_compile_aot.Capture.isAotBuildEnv()) listen(this, options, callback);
 		return this;
 	}
+	/**
+	* Add a higher order function over Elysia.fetch
+	*
+	* @example
+	* ```ts
+	* const ctx = new AsyncLocalStorage<{ counter: number }>()
+	*
+	* new Elysia()
+	*	.wrap(
+	*		(fetch) => (request) =>
+	*			ctx.run({ counter: 0 }, () => fetch(request))
+	*	)
+	*	.get('/', () => ctx.getStore())
+	* ```
+	*/
 	wrap(callback) {
 		this.#assertMutable("wrap");
 		if (this.#fetchFn && !this.#pending) console.warn("[Elysia] .wrap() was called after the fetch handler was built");

package/dist/base.mjs

@@ -499,7 +499,7 @@ var Elysia = class Elysia {
 		invalidateMacroEpoch();
 		return this;
 	}
-	"~applyMacro"(input, toApply = input, iteration = 0, seen = /* @__PURE__ */ new Set()) {
+	"~applyMacro"(input, toApply = input, iteration = 0, seen = /* @__PURE__ */ new Set(), insertions = /* @__PURE__ */ new Map()) {
 		if (iteration >= 16) return input;
 		const macro = this["~ext"]?.macro;
 		if (!macro) return input;
@@ -544,7 +544,7 @@ var Elysia = class Elysia {
 					continue;
 				}
 				if (k in macro) {
-					this["~applyMacro"](input, { [k]: v }, iteration + 1, seen);
+					this["~applyMacro"](input, { [k]: v }, iteration + 1, seen, insertions);
 					delete input[key];
 					continue;
 				}
@@ -565,19 +565,20 @@ var Elysia = class Elysia {
 					delete input[key];
 					continue;
 				}
-				if (k in input) {
-					if (eventProperties.has(k) || k === "derive") {
-						const macroFns = Array.isArray(v) ? v : [v];
-						const existing = Array.isArray(input[k]) ? input[k] : [input[k]];
-						const merged = [];
-						const seen = /* @__PURE__ */ new Set();
-						for (const fn of macroFns) if (!existing.includes(fn) && !seen.has(fn)) {
-							seen.add(fn);
-							merged.push(fn);
-						}
-						for (const fn of existing) if (!seen.has(fn)) merged.push(fn);
-						input[k] = merged;
-					} else if (Array.isArray(input[k])) {
+				if (eventProperties.has(k) || k === "derive") {
+					const incoming = Array.isArray(v) ? v : [v];
+					const existing = k in input ? Array.isArray(input[k]) ? input[k] : [input[k]] : [];
+					const added = [];
+					for (const fn of incoming) if (!existing.includes(fn) && !added.includes(fn)) added.push(fn);
+					const at = insertions.get(k) ?? 0;
+					input[k] = [
+						...existing.slice(0, at),
+						...added,
+						...existing.slice(at)
+					];
+					insertions.set(k, at + added.length);
+				} else if (k in input) {
+					if (Array.isArray(input[k])) {
 						if (Array.isArray(v)) {
 							for (const item of v) if (!input[k].some((e) => e === item)) input[k].unshift(item);
 						} else if (!input[k].some((item) => item === v)) input[k].unshift(v);
@@ -1508,6 +1509,21 @@ var Elysia = class Elysia {
 		if (!Capture.isAotBuildEnv()) listen(this, options, callback);
 		return this;
 	}
+	/**
+	* Add a higher order function over Elysia.fetch
+	*
+	* @example
+	* ```ts
+	* const ctx = new AsyncLocalStorage<{ counter: number }>()
+	*
+	* new Elysia()
+	*	.wrap(
+	*		(fetch) => (request) =>
+	*			ctx.run({ counter: 0 }, () => fetch(request))
+	*	)
+	*	.get('/', () => ctx.getStore())
+	* ```
+	*/
 	wrap(callback) {
 		this.#assertMutable("wrap");
 		if (this.#fetchFn && !this.#pending) console.warn("[Elysia] .wrap() was called after the fetch handler was built");

package/dist/compile/aot-capture.js

@@ -282,7 +282,7 @@ function captureBridgeFree(aot, slot, rawSchema) {
 			path: aot.path,
 			slot
 		}, { bridgeFree });
-		if (bridgeFree && !require_compile_handler_frozen_validator.isCompactDiagnosable(coerced)) warnCompactErrorLoss(aot, slot);
+		if (bridgeFree && !require_compile_handler_frozen_validator.isCompactWalkable(coerced)) warnCompactErrorLoss(aot, slot);
 	}
 }
 function beginValidatorCapture() {

package/dist/compile/aot-capture.mjs

@@ -2,7 +2,7 @@ import { nullObject } from "../utils.mjs";
 import { env } from "../universal/env.mjs";
 import { Capture, CompilerState, aotActivationError, captureImpl, setCaptureImpl } from "./aot.mjs";
 import { isAsyncPredicate } from "../type/elysia/file-type.mjs";
-import { isCapturedBridgeFree, isCompactDiagnosable } from "./handler/frozen-validator.mjs";
+import { isCapturedBridgeFree, isCompactWalkable } from "./handler/frozen-validator.mjs";
 import { buildCoercedFromPlan, captureCoercePlan } from "../type/coerce.mjs";
 import { applyPrecomputed, buildDefaultClonerSource, buildObjectDefaultMergeSource, canonical, createMergerFromSource, setDefaultProbeImpl, verifyPreallocatableDefault } from "../type/validator/default-precompute.mjs";
 import { collectExternals } from "./aot-reconstruct.mjs";
@@ -280,7 +280,7 @@ function captureBridgeFree(aot, slot, rawSchema) {
 			path: aot.path,
 			slot
 		}, { bridgeFree });
-		if (bridgeFree && !isCompactDiagnosable(coerced)) warnCompactErrorLoss(aot, slot);
+		if (bridgeFree && !isCompactWalkable(coerced)) warnCompactErrorLoss(aot, slot);
 	}
 }
 function beginValidatorCapture() {

package/dist/compile/handler/descriptor.d.ts

@@ -1,6 +1,6 @@
 import { TraceEvent } from "../../trace.js";
-import { AnyLocalHook, MaybeArray } from "../../types.js";
 import { CompactBeforeHandlePrefix } from "../../utils.js";
+import { AnyLocalHook, MaybeArray } from "../../types.js";
 import { CompiledCookieConfig } from "../../cookie/config.js";
 import { AnyElysia } from "../../base.js";
 import { ElysiaAdapter } from "../../adapter/index.js";

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

@@ -11,6 +11,7 @@ interface SlotCheckClean {
   decode?: (value: unknown) => unknown;
 }
 declare function isCompactDiagnosable(schema: any): boolean;
+declare function isCompactWalkable(schema: any): boolean;
 declare class FrozenSlotValidator {
   #private;
   isAsync: boolean;
@@ -36,4 +37,4 @@ declare function mergeSchemasAllStandard(schemas: Array<Record<string, unknown>>
 declare function buildFrozenRouteValidator(hook: AnyLocalHook, root: AnyElysia, method: HTTPMethod, path: string): FrozenRouteValidatorShape | undefined;
 declare function isCapturedBridgeFree(c: CapturedValidator, schema: unknown, coerced?: unknown): boolean;
 //#endregion
-export { buildFrozenRouteValidator, isBridgeNotInitialized, isCapturedBridgeFree, isCompactDiagnosable, isStandardSchema, mergeSchemasAllStandard };
+export { buildFrozenRouteValidator, isBridgeNotInitialized, isCapturedBridgeFree, isCompactDiagnosable, isCompactWalkable, isStandardSchema, mergeSchemasAllStandard };

package/dist/compile/handler/frozen-validator.js

@@ -55,17 +55,30 @@ const typeError = (schema, instancePath, schemaPath) => ({
 **/
 function walkCompactError(schema, value, instancePath, schemaPath) {
 	if (!schema || typeof schema !== "object") return;
+	const elyTyp = schema["~elyTyp"];
+	if (schema.anyOf && (elyTyp === require_type_constants.ELYSIA_TYPES.ObjectString || elyTyp === require_type_constants.ELYSIA_TYPES.ArrayString)) {
+		let decoded = value;
+		if (typeof value === "string") try {
+			decoded = JSON.parse(value);
+		} catch {
+			return;
+		}
+		else if (value === void 0) return;
+		return walkCompactError(schema.anyOf[0], decoded, instancePath, `${schemaPath}/anyOf/0`);
+	}
 	const type = schema.type;
 	if (type === "object") {
 		if (typeof value !== "object" || value === null || Array.isArray(value)) return typeError(schema, instancePath, schemaPath);
 		const required = schema.required;
 		if (Array.isArray(required)) {
-			for (const key of required) if (!(key in value)) return {
+			let missing;
+			for (const key of required) if (!(key in value)) (missing ??= []).push(key);
+			if (missing) return {
 				keyword: "required",
 				schemaPath,
 				instancePath,
-				params: { requiredProperties: [key] },
-				message: `must have required properties ${key}`
+				params: { requiredProperties: missing },
+				message: `must have required properties ${missing.join(", ")}`
 			};
 		}
 		const properties = schema.properties;
@@ -121,6 +134,22 @@ function isCompactDiagnosable(schema) {
 	if (type === "array") return isCompactDiagnosable(schema.items);
 	return type === "string" || type === "number" || type === "integer" || type === "boolean" || type === "null";
 }
+function isCompactWalkable(schema) {
+	if (!schema || typeof schema !== "object") return false;
+	const elyTyp = schema["~elyTyp"];
+	if (schema.anyOf && (elyTyp === require_type_constants.ELYSIA_TYPES.ObjectString || elyTyp === require_type_constants.ELYSIA_TYPES.ArrayString)) return isCompactWalkable(schema.anyOf[0]);
+	if (schema.anyOf || schema.oneOf || schema.allOf) return false;
+	const type = schema.type;
+	if (type === "object") {
+		const properties = schema.properties;
+		if (properties) {
+			for (const key in properties) if (!isCompactWalkable(properties[key])) return false;
+		}
+		return true;
+	}
+	if (type === "array") return isCompactWalkable(schema.items);
+	return type === "string" || type === "number" || type === "integer" || type === "boolean" || type === "null";
+}
 var FrozenSlotValidator = class {
 	#check;
 	#clean;
@@ -315,5 +344,6 @@ exports.buildFrozenRouteValidator = buildFrozenRouteValidator;
 exports.isBridgeNotInitialized = isBridgeNotInitialized;
 exports.isCapturedBridgeFree = isCapturedBridgeFree;
 exports.isCompactDiagnosable = isCompactDiagnosable;
+exports.isCompactWalkable = isCompactWalkable;
 exports.isStandardSchema = isStandardSchema;
 exports.mergeSchemasAllStandard = mergeSchemasAllStandard;

package/dist/compile/handler/frozen-validator.mjs

@@ -54,17 +54,30 @@ const typeError = (schema, instancePath, schemaPath) => ({
 **/
 function walkCompactError(schema, value, instancePath, schemaPath) {
 	if (!schema || typeof schema !== "object") return;
+	const elyTyp = schema["~elyTyp"];
+	if (schema.anyOf && (elyTyp === ELYSIA_TYPES.ObjectString || elyTyp === ELYSIA_TYPES.ArrayString)) {
+		let decoded = value;
+		if (typeof value === "string") try {
+			decoded = JSON.parse(value);
+		} catch {
+			return;
+		}
+		else if (value === void 0) return;
+		return walkCompactError(schema.anyOf[0], decoded, instancePath, `${schemaPath}/anyOf/0`);
+	}
 	const type = schema.type;
 	if (type === "object") {
 		if (typeof value !== "object" || value === null || Array.isArray(value)) return typeError(schema, instancePath, schemaPath);
 		const required = schema.required;
 		if (Array.isArray(required)) {
-			for (const key of required) if (!(key in value)) return {
+			let missing;
+			for (const key of required) if (!(key in value)) (missing ??= []).push(key);
+			if (missing) return {
 				keyword: "required",
 				schemaPath,
 				instancePath,
-				params: { requiredProperties: [key] },
-				message: `must have required properties ${key}`
+				params: { requiredProperties: missing },
+				message: `must have required properties ${missing.join(", ")}`
 			};
 		}
 		const properties = schema.properties;
@@ -120,6 +133,22 @@ function isCompactDiagnosable(schema) {
 	if (type === "array") return isCompactDiagnosable(schema.items);
 	return type === "string" || type === "number" || type === "integer" || type === "boolean" || type === "null";
 }
+function isCompactWalkable(schema) {
+	if (!schema || typeof schema !== "object") return false;
+	const elyTyp = schema["~elyTyp"];
+	if (schema.anyOf && (elyTyp === ELYSIA_TYPES.ObjectString || elyTyp === ELYSIA_TYPES.ArrayString)) return isCompactWalkable(schema.anyOf[0]);
+	if (schema.anyOf || schema.oneOf || schema.allOf) return false;
+	const type = schema.type;
+	if (type === "object") {
+		const properties = schema.properties;
+		if (properties) {
+			for (const key in properties) if (!isCompactWalkable(properties[key])) return false;
+		}
+		return true;
+	}
+	if (type === "array") return isCompactWalkable(schema.items);
+	return type === "string" || type === "number" || type === "integer" || type === "boolean" || type === "null";
+}
 var FrozenSlotValidator = class {
 	#check;
 	#clean;
@@ -310,4 +339,4 @@ function isCapturedBridgeFree(c, schema, coerced = schema) {
 }
 
 //#endregion
-export { buildFrozenRouteValidator, isBridgeNotInitialized, isCapturedBridgeFree, isCompactDiagnosable, isStandardSchema, mergeSchemasAllStandard };
+export { buildFrozenRouteValidator, isBridgeNotInitialized, isCapturedBridgeFree, isCompactDiagnosable, isCompactWalkable, isStandardSchema, mergeSchemasAllStandard };

package/dist/compile/handler/index.d.ts

@@ -1,5 +1,5 @@
-import { AnyLocalHook, CompiledHandler, InternalRoute } from "../../types.js";
 import { ChainNode } from "../../utils.js";
+import { AnyLocalHook, CompiledHandler, InternalRoute } from "../../types.js";
 import { AnyElysia } from "../../base.js";
 import { setCaptureHeaderShorthand } from "./jit.js";
 

package/dist/compile/handler/jit.js

@@ -12,6 +12,7 @@ const require_generation = require('../../generation.js');
 const require_cookie_utils = require('../../cookie/utils.js');
 const require_compile_utils = require('../utils.js');
 const require_handler_utils = require('../../handler/utils.js');
+const require_handler_error = require('../../handler/error.js');
 const require_compile_handler_utils = require('./utils.js');
 const require_compile_jit_probe = require('../jit-probe.js');
 
@@ -360,7 +361,7 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		return s;
 	})() : "";
 	const traceNeedsSchedule = traceHandleOn || phaseOn("afterResponse");
-	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? require_compile_handler_utils.mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? `if(c['~afterResponse'])for(let i=0;i<c['~afterResponse'].length;i++){try{await c['~afterResponse'][i](c)}catch{}}\n` : "") + endTrace("afterResponse") + `})\n` : "";
+	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? require_compile_handler_utils.mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch{}}\n" + (!require_universal_is_production.isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + endTrace("afterResponse") + `})\n` : "";
 	const dedupSchedule = !!scheduleAfterResponse && (hasErrorHook || hasTrace) && !syncAfterResponse && !syncErrorHook;
 	const scheduleDecl = dedupSchedule ? `function _sc(){\n${scheduleAfterResponse}}\n` : "";
 	const schedule = dedupSchedule ? `_sc()\n` : scheduleAfterResponse;
@@ -482,12 +483,10 @@ if(_vr)_r.response=${awaitStr}${responseValiAsync ? `(_vr.mayReturnPromise?_vr.F
 		}
 		if (hasErrorHook) {
 			link(hook.error, "er");
-			link(require_error.ElysiaStatus, "es");
-			link(require_error.internalServerErrorResponse, "ise");
-			link(require_universal_is_production.isProduction, "isprod");
+			link(require_handler_error.fallbackResponse, "fbr");
 			const allowUnsafeDetail = !!root["~config"]?.allowUnsafeValidationDetails;
 			if (allowUnsafeDetail) link(require_error.ValidationError, "verr");
-			factoryHelpers += `function _em(c,_r){return typeof _r?.then==='function'?Promise.resolve(_r).catch((_e)=>fre(rt,c,_e)):_r}\n${asyncCookieSign ? "async " : ""}function _efb(e,c){\n` + (asyncCookieSign ? `let _sg\n` : ``) + `if(e instanceof es){${signPrefix}return _em(c,${map}(e,c.set,c.request,true))}\nif(e?.status){${signPrefix}return _em(c,${map}(e?.response!==undefined?e.response:(isprod()&&e.status>=500?'Internal Server Error':(e?.message??'')),c.set,c.request,true))}\nc.set.status=500\n` + signPrefix + `return _em(c,${map}(ise(e),c.set,c.request,true))\n}\n`;
+			factoryHelpers += `function _em(c,_r){return typeof _r?.then==='function'?Promise.resolve(_r).catch((_e)=>fre(rt,c,_e)):_r}\nfunction _fbm(_r,_s,_c){return ${map}(_r,_s,_c.request,true)}\n${asyncCookieSign ? "async " : ""}function _efb(e,c){\n` + (asyncCookieSign ? `let _sg\n` : ``) + signPrefix + "return _em(c,fbr(c,e,_fbm))\n}\n";
 			body += `c.error=e\n` + (allowUnsafeDetail ? `if(e instanceof verr)e.allowUnsafeValidationDetails=true\n` : ``) + `if(e?.status)c.set.status=e.status
 else if(c.set.status===undefined||c.set.status===200)c.set.status=500
 let _r${hasMapResponse ? ",tmp" : ""}\n` + require_compile_handler_utils.mapError(hook.error, [
@@ -497,9 +496,7 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + require_compile_handler_utils.mapErro
 				(hasMapResponse ? `c.responseValue=_r\n` + require_compile_handler_utils.mapMapResponse(hook.mapResponse, isAsync, void 0, abortOn ? abortArm : void 0) : "") + endTrace("error") + abortCatch + schedule,
 				signPrefix,
 				isAsync
-			], abortOn ? abortArm : void 0) + endTrace("error") + abortCatch + schedule + `if(typeof e?.toResponse==='function')try{
-const _er=e.toResponse()
-if(typeof _er?.then==='function')return Promise.resolve(_er).then(${asyncCookieSign ? "async " : ""}(_v)=>{if(_v instanceof Response){${signPrefix}return _em(c,${map}(_v,c.set,c.request,true))}return _efb(e,c)},()=>_efb(e,c)).catch((_e)=>fre(rt,c,_e))\nif(_er instanceof Response){${signPrefix}return _em(c,${map}(_er,c.set,c.request,true))}\n}catch{}\nreturn _efb(e,c)\n`;
+			], abortOn ? abortArm : void 0) + endTrace("error") + abortCatch + schedule + `return _efb(e,c)\n`;
 		} else {
 			body += endTrace("error") + schedule;
 			body += `return fre(rt,c,e)\n`;

package/dist/compile/handler/jit.mjs

@@ -3,7 +3,7 @@ import { isDynamicRegex, traceEventIndex } from "../../constants.mjs";
 import { requestId } from "../../utils.mjs";
 import { isProduction } from "../../universal/is-production.mjs";
 import { ELYSIA_TYPES } from "../../type/constants.mjs";
-import { ElysiaStatus, ParseError, ValidationError, internalServerErrorResponse } from "../../error.mjs";
+import { ElysiaStatus, ParseError, ValidationError } from "../../error.mjs";
 import { materializeSetHeaders, normalizeContentType, tee } from "../../adapter/utils.mjs";
 import { parseQueryFromURL } from "../../parse-query.mjs";
 import { Capture } from "../aot.mjs";
@@ -11,6 +11,7 @@ import { resolvedTraceOf, traceCapabilityRequired } from "../../generation.mjs";
 import { buildCookieJar, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues } from "../../cookie/utils.mjs";
 import { isAsyncFunction } from "../utils.mjs";
 import { emptyResponse, finalizeRouteError, forwardError } from "../../handler/utils.mjs";
+import { fallbackResponse } from "../../handler/error.mjs";
 import { armEntryAbort, cloneResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, runBeforeHandlePrefix, runBeforeHandlePrefixAsync } from "./utils.mjs";
 import { JITProbe } from "../jit-probe.mjs";
 
@@ -359,7 +360,7 @@ function compileHandlerJit({ method, path, handler, root, errorRoot, hook, adapt
 		return s;
 	})() : "";
 	const traceNeedsSchedule = traceHandleOn || phaseOn("afterResponse");
-	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? `if(c['~afterResponse'])for(let i=0;i<c['~afterResponse'].length;i++){try{await c['~afterResponse'][i](c)}catch{}}\n` : "") + endTrace("afterResponse") + `})\n` : "";
+	const scheduleAfterResponse = hasAfterResponse || traceNeedsSchedule ? "c._arf=true\nqueueMicrotask(async()=>{if(_stl){try{for await(const v of _stl){}}catch{}}\n" + drainTraceStream + resolveHandlePostDrain + beginTrace("afterResponse", hook?.afterResponse?.length ?? 0) + (hasStaticAfterResponse ? mapAfterResponse(hook.afterResponse, [buildReport("afterResponse")]) : "") + (hasDynamicAfterResponse ? "let _q=c['~afterResponse']\nif(_q){let _l=_q.length\nfor(let _i=0;_i<_l;_i++){try{await _q[_i](c)}catch{}}\n" + (!isProduction() ? `if(_q.length!==_l)console.warn('[elysia] defer() called from inside the afterResponse drain is ignored')\n` : "") + `}\n` : "") + endTrace("afterResponse") + `})\n` : "";
 	const dedupSchedule = !!scheduleAfterResponse && (hasErrorHook || hasTrace) && !syncAfterResponse && !syncErrorHook;
 	const scheduleDecl = dedupSchedule ? `function _sc(){\n${scheduleAfterResponse}}\n` : "";
 	const schedule = dedupSchedule ? `_sc()\n` : scheduleAfterResponse;
@@ -481,12 +482,10 @@ if(_vr)_r.response=${awaitStr}${responseValiAsync ? `(_vr.mayReturnPromise?_vr.F
 		}
 		if (hasErrorHook) {
 			link(hook.error, "er");
-			link(ElysiaStatus, "es");
-			link(internalServerErrorResponse, "ise");
-			link(isProduction, "isprod");
+			link(fallbackResponse, "fbr");
 			const allowUnsafeDetail = !!root["~config"]?.allowUnsafeValidationDetails;
 			if (allowUnsafeDetail) link(ValidationError, "verr");
-			factoryHelpers += `function _em(c,_r){return typeof _r?.then==='function'?Promise.resolve(_r).catch((_e)=>fre(rt,c,_e)):_r}\n${asyncCookieSign ? "async " : ""}function _efb(e,c){\n` + (asyncCookieSign ? `let _sg\n` : ``) + `if(e instanceof es){${signPrefix}return _em(c,${map}(e,c.set,c.request,true))}\nif(e?.status){${signPrefix}return _em(c,${map}(e?.response!==undefined?e.response:(isprod()&&e.status>=500?'Internal Server Error':(e?.message??'')),c.set,c.request,true))}\nc.set.status=500\n` + signPrefix + `return _em(c,${map}(ise(e),c.set,c.request,true))\n}\n`;
+			factoryHelpers += `function _em(c,_r){return typeof _r?.then==='function'?Promise.resolve(_r).catch((_e)=>fre(rt,c,_e)):_r}\nfunction _fbm(_r,_s,_c){return ${map}(_r,_s,_c.request,true)}\n${asyncCookieSign ? "async " : ""}function _efb(e,c){\n` + (asyncCookieSign ? `let _sg\n` : ``) + signPrefix + "return _em(c,fbr(c,e,_fbm))\n}\n";
 			body += `c.error=e\n` + (allowUnsafeDetail ? `if(e instanceof verr)e.allowUnsafeValidationDetails=true\n` : ``) + `if(e?.status)c.set.status=e.status
 else if(c.set.status===undefined||c.set.status===200)c.set.status=500
 let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
@@ -496,9 +495,7 @@ let _r${hasMapResponse ? ",tmp" : ""}\n` + mapError(hook.error, [
 				(hasMapResponse ? `c.responseValue=_r\n` + mapMapResponse(hook.mapResponse, isAsync, void 0, abortOn ? abortArm : void 0) : "") + endTrace("error") + abortCatch + schedule,
 				signPrefix,
 				isAsync
-			], abortOn ? abortArm : void 0) + endTrace("error") + abortCatch + schedule + `if(typeof e?.toResponse==='function')try{
-const _er=e.toResponse()
-if(typeof _er?.then==='function')return Promise.resolve(_er).then(${asyncCookieSign ? "async " : ""}(_v)=>{if(_v instanceof Response){${signPrefix}return _em(c,${map}(_v,c.set,c.request,true))}return _efb(e,c)},()=>_efb(e,c)).catch((_e)=>fre(rt,c,_e))\nif(_er instanceof Response){${signPrefix}return _em(c,${map}(_er,c.set,c.request,true))}\n}catch{}\nreturn _efb(e,c)\n`;
+			], abortOn ? abortArm : void 0) + endTrace("error") + abortCatch + schedule + `return _efb(e,c)\n`;
 		} else {
 			body += endTrace("error") + schedule;
 			body += `return fre(rt,c,e)\n`;