hono 4.13.13 → 5.0.0-rc.1

package/dist/utils/buffer.js

@@ -1,9 +1,5 @@
 import { sha256 } from "./crypto.js";
 //#region src/utils/buffer.ts
-/**
-* @module
-* Buffer utility.
-*/
 const equal = (a, b) => {
 	if (a === b) return true;
 	if (a.byteLength !== b.byteLength) return false;
@@ -25,7 +21,7 @@ const constantTimeEqualString = (a, b) => {
 	}
 	return out === 0;
 };
-const timingSafeEqualString = async (a, b, hashFunction) => {
+const timingSafeEqual = async (a, b, hashFunction) => {
 	if (!hashFunction) hashFunction = sha256;
 	const [sa, sb] = await Promise.all([hashFunction(a), hashFunction(b)]);
 	if (sa == null || sb == null || typeof sa !== "string" || typeof sb !== "string") return false;
@@ -33,13 +29,6 @@ const timingSafeEqualString = async (a, b, hashFunction) => {
 	const originalEqual = constantTimeEqualString(a, b);
 	return hashEqual && originalEqual;
 };
-const timingSafeEqual = async (a, b, hashFunction) => {
-	if (typeof a === "string" && typeof b === "string") return timingSafeEqualString(a, b, hashFunction);
-	if (!hashFunction) hashFunction = sha256;
-	const [sa, sb] = await Promise.all([hashFunction(a), hashFunction(b)]);
-	if (!sa || !sb || typeof sa !== "string" || typeof sb !== "string") return false;
-	return timingSafeEqualString(sa, sb);
-};
 const bufferToString = (buffer) => {
 	if (buffer instanceof ArrayBuffer) return new TextDecoder("utf-8").decode(buffer);
 	return buffer;

package/dist/utils/color.d.ts

@@ -0,0 +1,16 @@
+//#region src/utils/color.d.ts
+/**
+ * @module
+ * Color utility.
+ */
+/**
+ * Get whether color change on terminal is enabled or disabled.
+ * If `NO_COLOR` is set in the provided bindings or runtime environment, this function returns `false`.
+ * Pass Cloudflare Workers bindings explicitly, for example `getColorEnabled(c.env)`.
+ * @see {@link https://no-color.org/}
+ *
+ * @param {object} [env] - Optional environment bindings to check in addition to the runtime environment.
+ * @returns {boolean}
+ */
+export declare function getColorEnabled(env?: object): boolean;
+//#endregion

package/dist/utils/color.js

@@ -1,37 +1,8 @@
 //#region src/utils/color.ts
-/**
-* @module
-* Color utility.
-*/
-/**
-* Get whether color change on terminal is enabled or disabled.
-* If `NO_COLOR` environment variable is set, this function returns `false`.
-* Unlike getColorEnabledAsync(), this cannot check Cloudflare environment variables.
-* @see {@link https://no-color.org/}
-*
-* @returns {boolean}
-*/
-function getColorEnabled() {
+function getColorEnabled(env) {
+	if (env && "NO_COLOR" in env) return false;
 	const { process, Deno } = globalThis;
-	return !(typeof Deno?.noColor === "boolean" ? Deno.noColor : process !== void 0 ? "NO_COLOR" in process?.env : false);
-}
-/**
-* Get whether color change on terminal is enabled or disabled.
-* If `NO_COLOR` environment variable is set, this function returns `false`.
-* @see {@link https://no-color.org/}
-*
-* @returns {boolean}
-*/
-async function getColorEnabledAsync() {
-	const { navigator } = globalThis;
-	const cfWorkers = "cloudflare:workers";
-	return !(navigator !== void 0 && navigator.userAgent === "Cloudflare-Workers" ? await (async () => {
-		try {
-			return "NO_COLOR" in ((await import(cfWorkers)).env ?? {});
-		} catch {
-			return false;
-		}
-	})() : !getColorEnabled());
+	return !(typeof Deno?.noColor === "boolean" ? Deno.noColor : "NO_COLOR" in (process?.env ?? {}));
 }
 //#endregion
-export { getColorEnabled, getColorEnabledAsync };
+export { getColorEnabled };

package/dist/utils/compress.js

@@ -1,11 +1,4 @@
 //#region src/utils/compress.ts
-/**
-* @module
-* Constants for compression.
-*/
-/**
-* Match for compressible content type.
-*/
 const COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/(?!event-stream(?:[;\s]|$))[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|msgpack|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|vnd\.msgpack|wasm|x-httpd-php|x-javascript|x-msgpack|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml|msgpack))(?:[;\s]|$)/i;
 //#endregion
 export { COMPRESSIBLE_CONTENT_TYPE_REGEX };

package/dist/utils/concurrent.js

@@ -1,8 +1,4 @@
 //#region src/utils/concurrent.ts
-/**
-* @module
-* Concurrent utility.
-*/
 const DEFAULT_CONCURRENCY = 1024;
 const createPool = ({ concurrency, interval } = {}) => {
 	concurrency ||= DEFAULT_CONCURRENCY;

package/dist/utils/constants.js

@@ -1,7 +1,4 @@
 //#region src/utils/constants.ts
-/**
-* Constant used to mark a composed handler.
-*/
 const COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 //#endregion
 export { COMPOSED_HANDLER };

package/dist/utils/cookie.js

@@ -1,9 +1,5 @@
 import { tryDecodeURIComponent } from "./url.js";
 //#region src/utils/cookie.ts
-/**
-* @module
-* Cookie utility.
-*/
 const algorithm = {
 	name: "HMAC",
 	hash: "SHA-256"

package/dist/utils/encode.js

@@ -1,8 +1,4 @@
 //#region src/utils/encode.ts
-/**
-* @module
-* Encode utility.
-*/
 const decodeBase64Url = (str) => {
 	return decodeBase64(str.replace(/_|-/g, (m) => ({
 		_: "/",

package/dist/utils/handler.js

@@ -1,9 +1,5 @@
 import { COMPOSED_HANDLER } from "./constants.js";
 //#region src/utils/handler.ts
-/**
-* @module
-* Handler utility.
-*/
 const isMiddleware = (handler) => handler.length > 1;
 const findTargetHandler = (handler) => {
 	return handler["__COMPOSED_HANDLER"] ? findTargetHandler(handler[COMPOSED_HANDLER]) : handler;

package/dist/utils/html.js

@@ -1,8 +1,4 @@
 //#region src/utils/html.ts
-/**
-* @module
-* HTML utility.
-*/
 const HtmlEscapedCallbackPhase = {
 	Stringify: 1,
 	BeforeStream: 2,

package/dist/{types/utils → utils}/http-status.d.ts

@@ -11,8 +11,8 @@ export type ClientErrorStatusCode = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 40
 export type ServerErrorStatusCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
 /**
  * `UnofficialStatusCode` can be used to specify an unofficial status code.
- * @example
  *
+ * @example
  * ```ts
  * app.get('/unknown', (c) => {
  *   return c.text("Unknown Error", 520 as UnofficialStatusCode)
@@ -20,14 +20,6 @@ export type ServerErrorStatusCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 50
  * ```
  */
 export type UnofficialStatusCode = -1;
-/**
- * @deprecated
- * Use `UnofficialStatusCode` instead.
- */
-export type UnOfficalStatusCode = UnofficialStatusCode;
-/**
- * If you want to use an unofficial status, use `UnofficialStatusCode`.
- */
 export type StatusCode = InfoStatusCode | SuccessStatusCode | RedirectStatusCode | ClientErrorStatusCode | ServerErrorStatusCode | UnofficialStatusCode;
 export type ContentlessStatusCode = 101 | 204 | 205 | 304;
 export type ContentfulStatusCode = Exclude<StatusCode, ContentlessStatusCode>;

package/dist/utils/ipaddr.js

@@ -1,9 +1,4 @@
 //#region src/utils/ipaddr.ts
-/**
-* Expand IPv6 Address
-* @param ipV6 Shorten IPv6 Address
-* @return expanded IPv6 Address
-*/
 const expandIPv6 = (ipV6) => {
 	const sections = ipV6.split(":");
 	const lastSection = sections.at(-1);
@@ -33,10 +28,6 @@ const CHAR_CODE_f = 102;
 const CHAR_CODE_DOT = 46;
 const CHAR_CODE_COLON = 58;
 const CHAR_CODE_PERCENT = 37;
-/**
-* Distinct Remote Addr
-* @param remoteAddr Remote Addr
-*/
 const distinctRemoteAddr = (remoteAddr) => {
 	if (IPV4_REGEX.test(remoteAddr)) return "IPv4";
 	if (remoteAddr.includes(":")) return "IPv6";
@@ -84,19 +75,9 @@ const parseIPv6HexCode = (code) => {
 	return -1;
 };
 const isIPv6LinkLocal = (ipv6binary) => ipv6binary >> 118n === 1018n;
-/**
-* Convert IPv4 to Uint8Array
-* @param ipv4 IPv4 Address
-* @returns BigInt
-*/
 const convertIPv4ToBinary = (ipv4) => {
 	return parseIPv4ToBinary(ipv4, 0, ipv4.length, () => throwInvalidIPv4Address(ipv4));
 };
-/**
-* Convert IPv6 to Uint8Array
-* @param ipv6 IPv6 Address
-* @returns BigInt
-*/
 const convertIPv6ToBinary = (ipv6) => {
 	const length = ipv6.length;
 	const sections = [];
@@ -181,33 +162,13 @@ const convertIPv6ToBinary = (ipv6) => {
 	if (hasZoneId && !isIPv6LinkLocal(result)) throwInvalidIPv6Address(ipv6);
 	return result;
 };
-/**
-* Convert a binary representation of an IPv4 address to a string.
-* @param ipV4 binary IPv4 Address
-* @return IPv4 Address in string
-*/
 const convertIPv4BinaryToString = (ipV4) => {
 	const sections = [];
 	for (let i = 0; i < 4; i++) sections.push(ipV4 >> BigInt(8 * (3 - i)) & 255n);
 	return sections.join(".");
 };
-/**
-* Check if a binary IPv6 address is an IPv4-mapped IPv6 address (::ffff:x.x.x.x)
-* @param ipv6binary binary IPv6 Address
-* @return true if the address is an IPv4-mapped IPv6 address
-*/
 const isIPv4MappedIPv6 = (ipv6binary) => ipv6binary >> 32n === 65535n;
-/**
-* Extract the IPv4 portion from an IPv4-mapped IPv6 address
-* @param ipv6binary binary IPv4-mapped IPv6 Address
-* @return binary IPv4 Address
-*/
 const convertIPv4MappedIPv6ToIPv4 = (ipv6binary) => ipv6binary & 4294967295n;
-/**
-* Convert a binary representation of an IPv6 address to a string.
-* @param ipV6 binary IPv6 Address
-* @return normalized IPv6 Address in string
-*/
 const convertIPv6BinaryToString = (ipV6) => {
 	if (ipV6 === 0n) return "::";
 	if (isIPv4MappedIPv6(ipV6)) return `::ffff:${convertIPv4BinaryToString(convertIPv4MappedIPv6ToIPv4(ipV6))}`;

package/dist/utils/jwt/index.js

@@ -1,9 +1,5 @@
 import { decode, sign, verify, verifyWithJwks } from "./jwt.js";
 //#region src/utils/jwt/index.ts
-/**
-* @module
-* JWT utility.
-*/
 const Jwt = {
 	sign,
 	verify,

package/dist/utils/jwt/jwa.js

@@ -1,9 +1,4 @@
 //#region src/utils/jwt/jwa.ts
-/**
-* @module
-* JSON Web Algorithms (JWA)
-* https://datatracker.ietf.org/doc/html/rfc7518
-*/
 let AlgorithmTypes = /* @__PURE__ */ function(AlgorithmTypes) {
 	AlgorithmTypes["HS256"] = "HS256";
 	AlgorithmTypes["HS384"] = "HS384";

package/dist/utils/jwt/jws.js

@@ -3,11 +3,6 @@ import { getRuntimeKey } from "../../helper/adapter/index.js";
 import { JwtAlgorithmNotImplemented } from "./types.js";
 import { utf8Encoder } from "./utf8.js";
 //#region src/utils/jwt/jws.ts
-/**
-* @module
-* JSON Web Signature (JWS)
-* https://datatracker.ietf.org/doc/html/rfc7515
-*/
 async function signing(privateKey, alg, data) {
 	const algorithm = getKeyAlgorithm(alg);
 	const cryptoKey = await importPrivateKey(privateKey, algorithm);

package/dist/utils/jwt/jwt.js

@@ -4,11 +4,6 @@ import { JwtAlgorithmMismatch, JwtAlgorithmNotAllowed, JwtAlgorithmRequired, Jwt
 import { utf8Decoder, utf8Encoder } from "./utf8.js";
 import { signing, verifying } from "./jws.js";
 //#region src/utils/jwt/jwt.ts
-/**
-* @module
-* JSON Web Token (JWT)
-* https://datatracker.ietf.org/doc/html/rfc7519
-*/
 const encodeJwtPart = (part) => encodeBase64Url(utf8Encoder.encode(JSON.stringify(part)).buffer).replace(/=/g, "");
 const encodeSignaturePart = (buf) => encodeBase64Url(buf).replace(/=/g, "");
 const decodeJwtPart = (part) => JSON.parse(utf8Decoder.decode(decodeBase64Url(part)));

package/dist/utils/jwt/types.js

@@ -1,8 +1,4 @@
 //#region src/utils/jwt/types.ts
-/**
-* @module
-* Type definitions for JWT utilities.
-*/
 var JwtAlgorithmNotImplemented = class extends Error {
 	constructor(alg) {
 		super(`${alg} is not an implemented algorithm`);

package/dist/utils/jwt/utf8.js

@@ -1,8 +1,4 @@
 //#region src/utils/jwt/utf8.ts
-/**
-* @module
-* Functions for encoding/decoding UTF8.
-*/
 const utf8Encoder = new TextEncoder();
 const utf8Decoder = new TextDecoder();
 //#endregion

package/dist/utils/mime.js

@@ -1,8 +1,4 @@
 //#region src/utils/mime.ts
-/**
-* @module
-* MIME utility.
-*/
 const getMimeType = (filename, mimes = baseMimes) => {
 	const match = filename.match(/\.([a-zA-Z0-9]+?)$/);
 	if (!match) return;

package/dist/utils/stream.js

@@ -1,21 +1,11 @@
 //#region src/utils/stream.ts
-/**
-* @module
-* Stream utility.
-*/
 var StreamingApi = class {
 	writer;
 	encoder;
 	writable;
 	abortSubscribers = [];
 	responseReadable;
-	/**
-	* Whether the stream has been aborted.
-	*/
 	aborted = false;
-	/**
-	* Whether the stream has been closed normally.
-	*/
 	closed = false;
 	constructor(writable, _readable) {
 		this.writable = writable;
@@ -69,10 +59,6 @@ var StreamingApi = class {
 	onAbort(listener) {
 		this.abortSubscribers.push(listener);
 	}
-	/**
-	* Abort the stream.
-	* You can call this method when stream is aborted by external event.
-	*/
 	abort() {
 		if (!this.aborted) {
 			this.aborted = true;

package/dist/{types/utils → utils}/url.d.ts

@@ -20,11 +20,6 @@ export declare const tryDecode: (str: string, decoder: Decoder) => string;
  */
 export declare const tryDecodeURI: (str: string) => string;
 export declare const getPath: (request: Request) => string;
-/**
- * @deprecated
- * Use the `URL` API instead.
- */
-export declare const getQueryStrings: (url: string) => string;
 export declare const getPathNoStrict: (request: Request) => string;
 /**
  * Merge paths.

package/dist/utils/url.js

@@ -70,15 +70,6 @@ const tryDecode = (str, decoder) => {
 		});
 	}
 };
-/**
-* Try to apply decodeURI() to given string.
-* If it fails, skip invalid percent encoding or invalid UTF-8 sequences, and apply decodeURI() to the rest as much as possible.
-* @param str The string to decode.
-* @returns The decoded string that sometimes contains undecodable percent encoding.
-* @example
-* tryDecodeURI('Hello%20World') // 'Hello World'
-* tryDecodeURI('Hello%20World/%A4%A2') // 'Hello World/%A4%A2'
-*/
 const tryDecodeURI = (str) => tryDecode(str, decodeURI);
 const getPath = (request) => {
 	const url = request.url;
@@ -96,30 +87,10 @@ const getPath = (request) => {
 	}
 	return url.slice(start, i);
 };
-/**
-* @deprecated
-* Use the `URL` API instead.
-*/
-const getQueryStrings = (url) => {
-	const queryIndex = url.indexOf("?", 8);
-	if (queryIndex === -1) return "";
-	const hashIndex = url.indexOf("#", 8);
-	return hashIndex === -1 ? url.slice(queryIndex) : queryIndex < hashIndex ? url.slice(queryIndex, hashIndex) : "";
-};
 const getPathNoStrict = (request) => {
 	const result = getPath(request);
 	return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
-/**
-* Merge paths.
-* @param {string[]} ...paths - The paths to merge.
-* @returns {string} The merged path.
-* @example
-* mergePath('/api', '/users') // '/api/users'
-* mergePath('/api/', '/users') // '/api/users'
-* mergePath('/api', '/') // '/api'
-* mergePath('/api/', '/') // '/api/'
-*/
 const mergePath = (base, sub, ...rest) => {
 	if (rest.length) sub = mergePath(sub, ...rest);
 	return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
@@ -198,4 +169,4 @@ const getQueryParams = (url, key) => {
 };
 const decodeURIComponent_ = decodeURIComponent;
 //#endregion
-export { checkOptionalParameter, decodeURIComponent_, getPath, getPathNoStrict, getPattern, getQueryParam, getQueryParams, getQueryStrings, mergePath, splitPath, splitRoutingPath, tryDecode, tryDecodeURI, tryDecodeURIComponent };
+export { checkOptionalParameter, decodeURIComponent_, getPath, getPathNoStrict, getPattern, getQueryParam, getQueryParams, mergePath, splitPath, splitRoutingPath, tryDecode, tryDecodeURI, tryDecodeURIComponent };

package/dist/{types/validator → validator}/validator.d.ts

@@ -6,6 +6,11 @@ type ValidationTargetKeysWithBody = 'form' | 'json';
 type ValidationTargetByMethod<M> = M extends 'get' | 'head' ? Exclude<keyof ValidationTargets, ValidationTargetKeysWithBody> : keyof ValidationTargets;
 export type ValidationFunction<InputType, OutputType, E extends Env = {}, P extends string = string> = (value: InputType, c: Context<E, P>) => OutputType | TypedResponse | Promise<OutputType> | Promise<TypedResponse>;
 export type ExtractValidationResponse<VF> = VF extends ((value: any, c: any) => infer R) ? R extends Promise<infer PR> ? PR extends TypedResponse<infer T, infer S, infer F> ? TypedResponse<T, S, F> : PR extends Response ? PR : PR extends undefined ? never : never : R extends TypedResponse<infer T, infer S, infer F> ? TypedResponse<T, S, F> : R extends Response ? R : R extends undefined ? never : never : never;
+/**
+ * Get the value of the validation target from the request.
+ * Returns a Promise only for `json` and `form`.
+ */
+export declare const getValidationTarget: (c: Context, target: keyof ValidationTargets) => unknown | Promise<unknown>;
 export declare const validator: <InputType, P extends string, M extends string, U extends ValidationTargetByMethod<M>, P2 extends string = P, VF extends (value: unknown extends InputType ? ValidationTargets[U] : InputType, c: Context<any, P2>) => any = (value: unknown extends InputType ? ValidationTargets[U] : InputType, c: Context<any, P2>) => any, V extends {
   in: { [K in U]: K extends "json" ? unknown extends InputType ? ExtractValidatorOutput<VF> : InputType : InferInput<ExtractValidatorOutput<VF>, K, FormValue>; };
   out: { [K in U]: ExtractValidatorOutput<VF>; };

package/dist/validator/validator.js

@@ -5,60 +5,53 @@ import { getCookie } from "../helper/cookie/index.js";
 const jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
 const multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/i;
 const urlencodedRegex = /^application\/x-www-form-urlencoded(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
+const getValidationTarget = (c, target) => {
+	const contentType = c.req.header("Content-Type");
+	switch (target) {
+		case "json":
+			if (!contentType || !jsonRegex.test(contentType)) return {};
+			return c.req.json().catch(() => {
+				throw new HTTPException(400, { message: "Malformed JSON in request body" });
+			});
+		case "form":
+			if (!contentType || !(multipartRegex.test(contentType) || urlencodedRegex.test(contentType))) return {};
+			return getForm(c, contentType);
+		case "query": return Object.fromEntries(Object.entries(c.req.queries()).map(([k, v]) => {
+			return v?.length === 1 ? [k, v[0]] : [k, v];
+		}));
+		case "param": return c.req.param();
+		case "header": return c.req.header();
+		case "cookie": return getCookie(c);
+	}
+};
+const getForm = async (c, contentType) => {
+	let formData;
+	if (c.req.bodyCache.formData) formData = await c.req.bodyCache.formData;
+	else try {
+		const arrayBuffer = await c.req.arrayBuffer();
+		formData = await bufferToFormData(arrayBuffer, contentType);
+		c.req.bodyCache.formData = formData;
+	} catch (e) {
+		let message = "Malformed FormData request.";
+		message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;
+		throw new HTTPException(400, { message });
+	}
+	const form = Object.create(null);
+	formData.forEach((value, key) => {
+		if (key.endsWith("[]")) (form[key] ??= []).push(value);
+		else if (Array.isArray(form[key])) form[key].push(value);
+		else if (Object.hasOwn(form, key)) form[key] = [form[key], value];
+		else form[key] = value;
+	});
+	return form;
+};
 const validator = (target, validationFunc) => {
 	return async (c, next) => {
-		let value = {};
-		const contentType = c.req.header("Content-Type");
-		switch (target) {
-			case "json":
-				if (!contentType || !jsonRegex.test(contentType)) break;
-				try {
-					value = await c.req.json();
-				} catch {
-					throw new HTTPException(400, { message: "Malformed JSON in request body" });
-				}
-				break;
-			case "form": {
-				if (!contentType || !(multipartRegex.test(contentType) || urlencodedRegex.test(contentType))) break;
-				let formData;
-				if (c.req.bodyCache.formData) formData = await c.req.bodyCache.formData;
-				else try {
-					const arrayBuffer = await c.req.arrayBuffer();
-					formData = await bufferToFormData(arrayBuffer, contentType);
-					c.req.bodyCache.formData = formData;
-				} catch (e) {
-					let message = "Malformed FormData request.";
-					message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;
-					throw new HTTPException(400, { message });
-				}
-				const form = Object.create(null);
-				formData.forEach((value, key) => {
-					if (key.endsWith("[]")) (form[key] ??= []).push(value);
-					else if (Array.isArray(form[key])) form[key].push(value);
-					else if (Object.hasOwn(form, key)) form[key] = [form[key], value];
-					else form[key] = value;
-				});
-				value = form;
-				break;
-			}
-			case "query":
-				value = Object.fromEntries(Object.entries(c.req.queries()).map(([k, v]) => {
-					return v.length === 1 ? [k, v[0]] : [k, v];
-				}));
-				break;
-			case "param":
-				value = c.req.param();
-				break;
-			case "header":
-				value = c.req.header();
-				break;
-			case "cookie": value = getCookie(c);
-		}
-		const res = await validationFunc(value, c);
+		const res = await validationFunc(await getValidationTarget(c, target), c);
 		if (res instanceof Response) return res;
 		c.req.addValidatedData(target, res);
 		return await next();
 	};
 };
 //#endregion
-export { validator };
+export { getValidationTarget, validator };