elysia 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/handler/error.js

@@ -8,6 +8,12 @@ const require_parse_query = require('../parse-query.js');
 const require_handler_utils = require('./utils.js');
 
 //#region src/handler/error.ts
+const defineQuery = (context, value) => Object.defineProperty(context, "query", {
+	value,
+	writable: true,
+	enumerable: true,
+	configurable: true
+});
 function parseQuery(context) {
 	const c = context;
 	if (c.query !== void 0 || c.qi === void 0) return;
@@ -16,42 +22,23 @@ function parseQuery(context) {
 		enumerable: true,
 		get() {
 			const value = require_parse_query.parseQueryFromURL(c.request.url, c.qi);
-			Object.defineProperty(context, "query", {
-				value,
-				writable: true,
-				enumerable: true,
-				configurable: true
-			});
+			defineQuery(context, value);
 			return value;
 		},
 		set(value) {
-			Object.defineProperty(context, "query", {
-				value,
-				writable: true,
-				enumerable: true,
-				configurable: true
-			});
+			defineQuery(context, value);
 		}
 	});
 }
 const isPristineNotFound = (context, error) => error instanceof require_error.NotFound && error.response === "Not Found" && !context.set.cookie && !require_utils.isNotEmpty(context.set.headers);
-/**
-* Adopt the intercepted error's `type` into a problem the hook produced
-* without one.
-*
-* `'about:blank'` is RFC 9457's "unspecified" default, so it's the only value
-* worth replacing — an explicit type the handler set always wins.
-*
-* The result is copied rather than mutated: `.error(Class, value)` wraps a
-* non-function into `() => value`, so the very same `ElysiaStatus` is replayed
-* on every request and an in-place write would leak across requests
-*/
+const claimsProblemType = (error) => typeof error?.type === "string" ? !(error instanceof require_error.ValidationError) && error.constructor?.name !== "ValidationError" : error instanceof require_error.HTTPError;
 function adoptErrorType(result, error) {
 	const body = result?.response;
-	if (typeof error?.type !== "string" || body?.type !== "about:blank" || result.headers?.["content-type"] !== "application/problem+json") return result;
-	return new require_error.ElysiaStatus(result.code, {
+	if (typeof error?.type !== "string" || !claimsProblemType(error) || body?.type !== "about:blank" || result.headers?.["content-type"] !== "application/problem+json") return result;
+	return new require_error.ElysiaStatus(result.status, {
 		...body,
-		type: error.type
+		type: error.type,
+		...typeof error.code === "string" ? { code: error.code } : {}
 	}, result.headers);
 }
 /**
@@ -60,13 +47,13 @@ function adoptErrorType(result, error) {
 * Exported for the JIT: a route with error hooks emits its own catch block,
 * which must land on *this* function rather than re-implementing it
 */
-function fallbackResponse(context, error, mapResponse, defaultError) {
+function fallbackResponse(context, error, mapResponse) {
 	if (typeof error?.toResponse === "function") try {
 		const r = error.toResponse();
-		if (r instanceof Promise) return r.then((resolved) => resolved instanceof Response ? mapResponse(resolved, context.set, context) : fallbackErrorResponse(context, error, mapResponse, defaultError), () => fallbackErrorResponse(context, error, mapResponse, defaultError));
+		if (r instanceof Promise) return r.then((resolved) => resolved instanceof Response ? mapResponse(resolved, context.set, context) : fallbackErrorResponse(context, error, mapResponse), () => fallbackErrorResponse(context, error, mapResponse));
 		if (r instanceof Response) return mapResponse(r, context.set, context);
 	} catch {}
-	return fallbackErrorResponse(context, error, mapResponse, defaultError);
+	return fallbackErrorResponse(context, error, mapResponse);
 }
 /**
 * Numeric form of an annotated status, which may be written as a name.
@@ -78,16 +65,17 @@ const resolveStatus = (status) => typeof status === "string" ? require_constants
 * Body served by an error that carries a status but no usable body:
 * its declared `response`, otherwise its message
 */
-const statusFallbackBody = (error, status) => error.response !== void 0 ? error.response : require_universal_is_production.isProduction() && status >= 500 ? "Internal Server Error" : error.message ?? "";
+function statusFallbackBody(error, status) {
+	const masked = require_universal_is_production.isProduction() && status >= 500;
+	const declared = error.response;
+	return declared !== void 0 && !(masked && typeof declared === "object") ? declared : masked ? "Internal Server Error" : error.message ?? "";
+}
 /**
 * RFC 9457 problem document carrying `detail` verbatim, mirroring `problem()`.
-*
-* `detail` is served exactly as annotated — objects included — it is never
-* spread into the envelope. `problemBody` only defaults `type` when the key is
-* *absent*, so an error without one has to supply `'about:blank'` itself
 */
-const problemOf = (self, detail, status) => new require_error.ElysiaStatus(status, require_error.problemBody({
+const problemOf = (self, detail, status, claimsProblem) => new require_error.ElysiaStatus(status, require_error.problemBody({
 	type: self.type ?? "about:blank",
+	...claimsProblem && typeof self.code === "string" ? { code: self.code } : {},
 	detail,
 	status
 }), { "content-type": require_error.PROBLEM_JSON });
@@ -104,114 +92,107 @@ const readAnnotation = (self, key, claimsProblem) => {
 	const annotation = self[key];
 	return typeof annotation === "function" ? claimsProblem ? annotation.call(self) : void 0 : annotation;
 };
-function fallbackErrorResponse(context, error, mapResponse, defaultError) {
+function fallbackErrorResponse(context, error, mapResponse) {
 	if (error instanceof require_error.ElysiaStatus) return mapResponse(error, context.set, context);
-	const self = error;
+	if (error instanceof Response) return mapResponse(error, context.set, context);
+	const self = error ?? {};
 	const status = resolveStatus(self.status);
 	const owned = error instanceof require_error.HTTPError;
-	const claimsProblem = owned || typeof self.type === "string";
+	const claimsProblem = claimsProblemType(error);
 	const served = typeof status === "number" ? status : resolveStatus(context.set.status);
 	const failed = (cause) => {
 		context.set.status = 500;
 		return mapResponse(require_error.internalServerErrorResponse(cause), context.set, context);
 	};
-	const mergeHeaders = () => {
+	function mergeHeaders() {
 		if (self.headers) Object.assign(require_adapter_utils.materializeSetHeaders(context.set), self.headers);
-	};
+	}
 	const legacy = () => {
 		if (error?.status) return mapResponse(statusFallbackBody(error, status), context.set, context);
 		if (error?.message != null) {
 			if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
 			return mapResponse(require_error.internalServerErrorResponse(error), context.set, context);
 		}
-		return defaultError ? defaultError.clone() : require_error.internalServerErrorResponse(error);
+		return mapResponse(require_error.internalServerErrorResponse(error), context.set, context);
 	};
-	const serveMessage = () => claimsProblem ? mapResponse(problemOf(self, statusFallbackBody(error, served), served), context.set, context) : legacy();
-	const serveDetail = () => {
-		let detail;
-		try {
-			detail = readAnnotation(self, "detail", claimsProblem);
-		} catch (cause) {
-			return failed(cause);
-		}
-		if (detail === void 0) return serveMessage();
-		if (detail instanceof Promise) return detail.then((resolved) => {
-			if (resolved === void 0) return serveMessage();
-			mergeHeaders();
-			return mapResponse(problemOf(self, resolved, served), context.set, context);
-		}, failed);
+	const serveMessage = () => {
+		if (!claimsProblem) return legacy();
 		mergeHeaders();
-		return mapResponse(problemOf(self, detail, served), context.set, context);
+		return mapResponse(problemOf(self, statusFallbackBody(error, served), served, claimsProblem), context.set, context);
 	};
-	if (owned || error instanceof Error && typeof status === "number" && status >= 100 && !(require_universal_is_production.isProduction() && status >= 500)) {
-		let value;
+	const tier = (key) => {
+		let annotation;
 		try {
-			value = readAnnotation(self, "value", claimsProblem);
+			annotation = readAnnotation(self, key, claimsProblem);
 		} catch (cause) {
 			return failed(cause);
 		}
-		if (value === void 0) return serveDetail();
-		if (value instanceof Promise) return value.then((resolved) => {
-			if (resolved === void 0) return serveDetail();
+		if (annotation === void 0) return key === "value" ? tier("detail") : serveMessage();
+		if (annotation instanceof Promise) return annotation.then((resolved) => {
+			if (resolved === void 0) return key === "value" ? tier("detail") : serveMessage();
 			mergeHeaders();
-			return mapResponse(resolved, context.set, context);
+			return mapResponse(key === "value" ? resolved : problemOf(self, resolved, served, claimsProblem), context.set, context);
 		}, failed);
 		mergeHeaders();
-		return mapResponse(value, context.set, context);
-	}
+		return mapResponse(key === "value" ? annotation : problemOf(self, annotation, served, claimsProblem), context.set, context);
+	};
+	if (error instanceof require_error.ValidationError) return mapResponse(error.type === "response" ? require_error.internalServerErrorResponse(void 0) : new require_error.ElysiaStatus(422, require_error.problemBody({
+		type: "validation",
+		code: "validation",
+		title: "Validation Error",
+		status: 422
+	}), { "content-type": require_error.PROBLEM_JSON }), context.set, context);
+	if (owned || error instanceof Error && typeof status === "number" && status >= 100 && !(require_universal_is_production.isProduction() && status >= 500)) return tier("value");
 	return legacy();
 }
 function applyErrorStatus(context, error) {
 	if (error?.status) context.set.status = error.status;
 	else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
 }
-function createErrorHandler(onErrors, mapResponse, defaultError, allowUnsafe = false) {
-	if (!onErrors) return (context, error) => {
+function createErrorHandler(onErrors, mapResponse, allowUnsafe = false) {
+	const enter = (context, error) => {
 		context.error = error;
 		if (allowUnsafe && error instanceof require_error.ValidationError) error.allowUnsafeValidationDetails = true;
 		applyErrorStatus(context, error);
 		parseQuery(context);
-		return fallbackResponse(context, error, mapResponse, defaultError);
 	};
-	const asyncIndexes = require_handler_utils.getAsyncIndexes(onErrors);
-	if (asyncIndexes) return async (context, error) => {
+	const mapWith = (sign) => sign ? (response, set, context) => mapResponse(response, set, context, sign) : mapResponse;
+	if (!onErrors) return (context, error, sign) => {
+		enter(context, error);
+		return fallbackResponse(context, error, mapWith(sign));
+	};
+	const respond = (context, error, result, sign) => {
+		if (result instanceof require_error.ElysiaStatus || result instanceof Response) context.set.status = result.status;
+		else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
+		return mapWith(sign)(adoptErrorType(result, error), context.set, context);
+	};
+	const settle = (context, error, sign) => isPristineNotFound(context, error) ? require_handler_utils.getNotFound() : fallbackResponse(context, error, mapWith(sign));
+	if (require_handler_utils.hasAsync(onErrors)) return async (context, error, sign) => {
 		require_adapter_utils.materializeSetHeaders(context.set);
-		context.error = error;
-		if (allowUnsafe && error instanceof require_error.ValidationError) error.allowUnsafeValidationDetails = true;
-		applyErrorStatus(context, error);
-		parseQuery(context);
+		enter(context, error);
 		for (let i = 0; i < onErrors.length; i++) {
-			let result = asyncIndexes?.[i] ? await onErrors[i](context) : onErrors[i](context);
-			if (result instanceof Promise) result = await result;
-			if (result !== void 0) {
-				if (result instanceof require_error.ElysiaStatus || result instanceof Response) context.set.status = result.status;
-				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-				return mapResponse(adoptErrorType(result, error), context.set, context);
-			}
+			let result = onErrors[i](context);
+			if (typeof result?.then === "function") result = await result;
+			if (result !== void 0) return respond(context, error, result, sign);
 		}
-		if (isPristineNotFound(context, error)) return require_handler_utils.getNotFound();
-		return fallbackResponse(context, error, mapResponse, defaultError);
+		return settle(context, error, sign);
 	};
-	return (context, error) => {
+	return (context, error, sign) => {
 		require_adapter_utils.materializeSetHeaders(context.set);
-		context.error = error;
-		if (allowUnsafe && error instanceof require_error.ValidationError) error.allowUnsafeValidationDetails = true;
-		applyErrorStatus(context, error);
-		parseQuery(context);
+		enter(context, error);
 		for (let i = 0; i < onErrors.length; i++) {
 			const result = onErrors[i](context);
-			if (result !== void 0) {
-				if (result instanceof require_error.ElysiaStatus || result instanceof Response) context.set.status = result.status;
-				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-				return mapResponse(adoptErrorType(result, error), context.set, context);
-			}
+			if (result !== void 0) return respond(context, error, result, sign);
 		}
-		if (isPristineNotFound(context, error)) return require_handler_utils.getNotFound();
-		return fallbackResponse(context, error, mapResponse, defaultError);
+		return settle(context, error, sign);
 	};
 }
 
 //#endregion
 exports.adoptErrorType = adoptErrorType;
+exports.claimsProblemType = claimsProblemType;
 exports.createErrorHandler = createErrorHandler;
-exports.fallbackResponse = fallbackResponse;
+exports.fallbackResponse = fallbackResponse;
+exports.readAnnotation = readAnnotation;
+exports.resolveStatus = resolveStatus;
+exports.statusFallbackBody = statusFallbackBody;

package/dist/handler/error.mjs

@@ -4,9 +4,15 @@ import { isProduction } from "../universal/is-production.mjs";
 import { ElysiaStatus, HTTPError, NotFound, PROBLEM_JSON, ValidationError, internalServerErrorResponse, problemBody } from "../error.mjs";
 import { materializeSetHeaders } from "../adapter/utils.mjs";
 import { parseQueryFromURL } from "../parse-query.mjs";
-import { getAsyncIndexes, getNotFound } from "./utils.mjs";
+import { getNotFound, hasAsync } from "./utils.mjs";
 
 //#region src/handler/error.ts
+const defineQuery = (context, value) => Object.defineProperty(context, "query", {
+	value,
+	writable: true,
+	enumerable: true,
+	configurable: true
+});
 function parseQuery(context) {
 	const c = context;
 	if (c.query !== void 0 || c.qi === void 0) return;
@@ -15,42 +21,23 @@ function parseQuery(context) {
 		enumerable: true,
 		get() {
 			const value = parseQueryFromURL(c.request.url, c.qi);
-			Object.defineProperty(context, "query", {
-				value,
-				writable: true,
-				enumerable: true,
-				configurable: true
-			});
+			defineQuery(context, value);
 			return value;
 		},
 		set(value) {
-			Object.defineProperty(context, "query", {
-				value,
-				writable: true,
-				enumerable: true,
-				configurable: true
-			});
+			defineQuery(context, value);
 		}
 	});
 }
 const isPristineNotFound = (context, error) => error instanceof NotFound && error.response === "Not Found" && !context.set.cookie && !isNotEmpty(context.set.headers);
-/**
-* Adopt the intercepted error's `type` into a problem the hook produced
-* without one.
-*
-* `'about:blank'` is RFC 9457's "unspecified" default, so it's the only value
-* worth replacing — an explicit type the handler set always wins.
-*
-* The result is copied rather than mutated: `.error(Class, value)` wraps a
-* non-function into `() => value`, so the very same `ElysiaStatus` is replayed
-* on every request and an in-place write would leak across requests
-*/
+const claimsProblemType = (error) => typeof error?.type === "string" ? !(error instanceof ValidationError) && error.constructor?.name !== "ValidationError" : error instanceof HTTPError;
 function adoptErrorType(result, error) {
 	const body = result?.response;
-	if (typeof error?.type !== "string" || body?.type !== "about:blank" || result.headers?.["content-type"] !== "application/problem+json") return result;
-	return new ElysiaStatus(result.code, {
+	if (typeof error?.type !== "string" || !claimsProblemType(error) || body?.type !== "about:blank" || result.headers?.["content-type"] !== "application/problem+json") return result;
+	return new ElysiaStatus(result.status, {
 		...body,
-		type: error.type
+		type: error.type,
+		...typeof error.code === "string" ? { code: error.code } : {}
 	}, result.headers);
 }
 /**
@@ -59,13 +46,13 @@ function adoptErrorType(result, error) {
 * Exported for the JIT: a route with error hooks emits its own catch block,
 * which must land on *this* function rather than re-implementing it
 */
-function fallbackResponse(context, error, mapResponse, defaultError) {
+function fallbackResponse(context, error, mapResponse) {
 	if (typeof error?.toResponse === "function") try {
 		const r = error.toResponse();
-		if (r instanceof Promise) return r.then((resolved) => resolved instanceof Response ? mapResponse(resolved, context.set, context) : fallbackErrorResponse(context, error, mapResponse, defaultError), () => fallbackErrorResponse(context, error, mapResponse, defaultError));
+		if (r instanceof Promise) return r.then((resolved) => resolved instanceof Response ? mapResponse(resolved, context.set, context) : fallbackErrorResponse(context, error, mapResponse), () => fallbackErrorResponse(context, error, mapResponse));
 		if (r instanceof Response) return mapResponse(r, context.set, context);
 	} catch {}
-	return fallbackErrorResponse(context, error, mapResponse, defaultError);
+	return fallbackErrorResponse(context, error, mapResponse);
 }
 /**
 * Numeric form of an annotated status, which may be written as a name.
@@ -77,16 +64,17 @@ const resolveStatus = (status) => typeof status === "string" ? StatusMap[status]
 * Body served by an error that carries a status but no usable body:
 * its declared `response`, otherwise its message
 */
-const statusFallbackBody = (error, status) => error.response !== void 0 ? error.response : isProduction() && status >= 500 ? "Internal Server Error" : error.message ?? "";
+function statusFallbackBody(error, status) {
+	const masked = isProduction() && status >= 500;
+	const declared = error.response;
+	return declared !== void 0 && !(masked && typeof declared === "object") ? declared : masked ? "Internal Server Error" : error.message ?? "";
+}
 /**
 * RFC 9457 problem document carrying `detail` verbatim, mirroring `problem()`.
-*
-* `detail` is served exactly as annotated — objects included — it is never
-* spread into the envelope. `problemBody` only defaults `type` when the key is
-* *absent*, so an error without one has to supply `'about:blank'` itself
 */
-const problemOf = (self, detail, status) => new ElysiaStatus(status, problemBody({
+const problemOf = (self, detail, status, claimsProblem) => new ElysiaStatus(status, problemBody({
 	type: self.type ?? "about:blank",
+	...claimsProblem && typeof self.code === "string" ? { code: self.code } : {},
 	detail,
 	status
 }), { "content-type": PROBLEM_JSON });
@@ -103,112 +91,101 @@ const readAnnotation = (self, key, claimsProblem) => {
 	const annotation = self[key];
 	return typeof annotation === "function" ? claimsProblem ? annotation.call(self) : void 0 : annotation;
 };
-function fallbackErrorResponse(context, error, mapResponse, defaultError) {
+function fallbackErrorResponse(context, error, mapResponse) {
 	if (error instanceof ElysiaStatus) return mapResponse(error, context.set, context);
-	const self = error;
+	if (error instanceof Response) return mapResponse(error, context.set, context);
+	const self = error ?? {};
 	const status = resolveStatus(self.status);
 	const owned = error instanceof HTTPError;
-	const claimsProblem = owned || typeof self.type === "string";
+	const claimsProblem = claimsProblemType(error);
 	const served = typeof status === "number" ? status : resolveStatus(context.set.status);
 	const failed = (cause) => {
 		context.set.status = 500;
 		return mapResponse(internalServerErrorResponse(cause), context.set, context);
 	};
-	const mergeHeaders = () => {
+	function mergeHeaders() {
 		if (self.headers) Object.assign(materializeSetHeaders(context.set), self.headers);
-	};
+	}
 	const legacy = () => {
 		if (error?.status) return mapResponse(statusFallbackBody(error, status), context.set, context);
 		if (error?.message != null) {
 			if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
 			return mapResponse(internalServerErrorResponse(error), context.set, context);
 		}
-		return defaultError ? defaultError.clone() : internalServerErrorResponse(error);
+		return mapResponse(internalServerErrorResponse(error), context.set, context);
 	};
-	const serveMessage = () => claimsProblem ? mapResponse(problemOf(self, statusFallbackBody(error, served), served), context.set, context) : legacy();
-	const serveDetail = () => {
-		let detail;
-		try {
-			detail = readAnnotation(self, "detail", claimsProblem);
-		} catch (cause) {
-			return failed(cause);
-		}
-		if (detail === void 0) return serveMessage();
-		if (detail instanceof Promise) return detail.then((resolved) => {
-			if (resolved === void 0) return serveMessage();
-			mergeHeaders();
-			return mapResponse(problemOf(self, resolved, served), context.set, context);
-		}, failed);
+	const serveMessage = () => {
+		if (!claimsProblem) return legacy();
 		mergeHeaders();
-		return mapResponse(problemOf(self, detail, served), context.set, context);
+		return mapResponse(problemOf(self, statusFallbackBody(error, served), served, claimsProblem), context.set, context);
 	};
-	if (owned || error instanceof Error && typeof status === "number" && status >= 100 && !(isProduction() && status >= 500)) {
-		let value;
+	const tier = (key) => {
+		let annotation;
 		try {
-			value = readAnnotation(self, "value", claimsProblem);
+			annotation = readAnnotation(self, key, claimsProblem);
 		} catch (cause) {
 			return failed(cause);
 		}
-		if (value === void 0) return serveDetail();
-		if (value instanceof Promise) return value.then((resolved) => {
-			if (resolved === void 0) return serveDetail();
+		if (annotation === void 0) return key === "value" ? tier("detail") : serveMessage();
+		if (annotation instanceof Promise) return annotation.then((resolved) => {
+			if (resolved === void 0) return key === "value" ? tier("detail") : serveMessage();
 			mergeHeaders();
-			return mapResponse(resolved, context.set, context);
+			return mapResponse(key === "value" ? resolved : problemOf(self, resolved, served, claimsProblem), context.set, context);
 		}, failed);
 		mergeHeaders();
-		return mapResponse(value, context.set, context);
-	}
+		return mapResponse(key === "value" ? annotation : problemOf(self, annotation, served, claimsProblem), context.set, context);
+	};
+	if (error instanceof ValidationError) return mapResponse(error.type === "response" ? internalServerErrorResponse(void 0) : new ElysiaStatus(422, problemBody({
+		type: "validation",
+		code: "validation",
+		title: "Validation Error",
+		status: 422
+	}), { "content-type": PROBLEM_JSON }), context.set, context);
+	if (owned || error instanceof Error && typeof status === "number" && status >= 100 && !(isProduction() && status >= 500)) return tier("value");
 	return legacy();
 }
 function applyErrorStatus(context, error) {
 	if (error?.status) context.set.status = error.status;
 	else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
 }
-function createErrorHandler(onErrors, mapResponse, defaultError, allowUnsafe = false) {
-	if (!onErrors) return (context, error) => {
+function createErrorHandler(onErrors, mapResponse, allowUnsafe = false) {
+	const enter = (context, error) => {
 		context.error = error;
 		if (allowUnsafe && error instanceof ValidationError) error.allowUnsafeValidationDetails = true;
 		applyErrorStatus(context, error);
 		parseQuery(context);
-		return fallbackResponse(context, error, mapResponse, defaultError);
 	};
-	const asyncIndexes = getAsyncIndexes(onErrors);
-	if (asyncIndexes) return async (context, error) => {
+	const mapWith = (sign) => sign ? (response, set, context) => mapResponse(response, set, context, sign) : mapResponse;
+	if (!onErrors) return (context, error, sign) => {
+		enter(context, error);
+		return fallbackResponse(context, error, mapWith(sign));
+	};
+	const respond = (context, error, result, sign) => {
+		if (result instanceof ElysiaStatus || result instanceof Response) context.set.status = result.status;
+		else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
+		return mapWith(sign)(adoptErrorType(result, error), context.set, context);
+	};
+	const settle = (context, error, sign) => isPristineNotFound(context, error) ? getNotFound() : fallbackResponse(context, error, mapWith(sign));
+	if (hasAsync(onErrors)) return async (context, error, sign) => {
 		materializeSetHeaders(context.set);
-		context.error = error;
-		if (allowUnsafe && error instanceof ValidationError) error.allowUnsafeValidationDetails = true;
-		applyErrorStatus(context, error);
-		parseQuery(context);
+		enter(context, error);
 		for (let i = 0; i < onErrors.length; i++) {
-			let result = asyncIndexes?.[i] ? await onErrors[i](context) : onErrors[i](context);
-			if (result instanceof Promise) result = await result;
-			if (result !== void 0) {
-				if (result instanceof ElysiaStatus || result instanceof Response) context.set.status = result.status;
-				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-				return mapResponse(adoptErrorType(result, error), context.set, context);
-			}
+			let result = onErrors[i](context);
+			if (typeof result?.then === "function") result = await result;
+			if (result !== void 0) return respond(context, error, result, sign);
 		}
-		if (isPristineNotFound(context, error)) return getNotFound();
-		return fallbackResponse(context, error, mapResponse, defaultError);
+		return settle(context, error, sign);
 	};
-	return (context, error) => {
+	return (context, error, sign) => {
 		materializeSetHeaders(context.set);
-		context.error = error;
-		if (allowUnsafe && error instanceof ValidationError) error.allowUnsafeValidationDetails = true;
-		applyErrorStatus(context, error);
-		parseQuery(context);
+		enter(context, error);
 		for (let i = 0; i < onErrors.length; i++) {
 			const result = onErrors[i](context);
-			if (result !== void 0) {
-				if (result instanceof ElysiaStatus || result instanceof Response) context.set.status = result.status;
-				else if (context.set.status === void 0 || context.set.status === 200) context.set.status = 500;
-				return mapResponse(adoptErrorType(result, error), context.set, context);
-			}
+			if (result !== void 0) return respond(context, error, result, sign);
 		}
-		if (isPristineNotFound(context, error)) return getNotFound();
-		return fallbackResponse(context, error, mapResponse, defaultError);
+		return settle(context, error, sign);
 	};
 }
 
 //#endregion
-export { adoptErrorType, createErrorHandler, fallbackResponse };
+export { adoptErrorType, claimsProblemType, createErrorHandler, fallbackResponse, readAnnotation, resolveStatus, statusFallbackBody };