hono 4.13.13 → 5.0.0-rc.0

package/dist/middleware/bearer-auth/index.js

@@ -16,7 +16,7 @@ const HEADER = "Authorization";
 * @param {string} [options.realm=""] - The domain name of the realm, as part of the returned WWW-Authenticate challenge header.
 * @param {string} [options.prefix="Bearer"] - The prefix (or known as `schema`) for the Authorization header value. If set to the empty string, no prefix is expected.
 * @param {string} [options.headerName=Authorization] - The header name.
-* @param {Function} [options.hashFunction] - A function to handle hashing for safe comparison of authentication tokens.
+* @param {StringHashFunction} [options.hashFunction] - A function to handle hashing for safe comparison of authentication tokens.
 * @param {string | object | MessageFunction} [options.noAuthenticationHeader.message="Unauthorized"] - The no authentication header message.
 * @param {string | object | MessageFunction} [options.noAuthenticationHeader.wwwAuthenticateHeader="Bearer realm=\"\""] - The response header value for the WWW-Authenticate header when no authentication header is provided.
 * @param {string | object | MessageFunction} [options.invalidAuthenticationHeader.message="Bad Request"] - The invalid authentication header message.
@@ -66,7 +66,7 @@ const bearerAuth = (options) => {
 	};
 	return async function bearerAuth(c, next) {
 		const headerToken = c.req.header(options.headerName || HEADER);
-		if (!headerToken) await throwHTTPException(c, 401, options.noAuthenticationHeader?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}realm="${realm}"`, options.noAuthenticationHeader?.message || options.noAuthenticationHeaderMessage || "Unauthorized");
+		if (!headerToken) await throwHTTPException(c, 401, options.noAuthenticationHeader?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}realm="${realm}"`, options.noAuthenticationHeader?.message || "Unauthorized");
 		else {
 			let tokenValue;
 			if (prefix === "") tokenValue = headerToken;
@@ -75,7 +75,7 @@ const bearerAuth = (options) => {
 				const prefixLower = prefix.toLowerCase();
 				if (headerLower.startsWith(prefixLower) && headerToken[prefix.length] === " ") tokenValue = headerToken.slice(prefix.length).trimStart();
 			}
-			if (!tokenValue || !tokenRegexp.test(tokenValue)) await throwHTTPException(c, 400, options.invalidAuthenticationHeader?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}error="invalid_request"`, options.invalidAuthenticationHeader?.message || options.invalidAuthenticationHeaderMessage || "Bad Request");
+			if (!tokenValue || !tokenRegexp.test(tokenValue)) await throwHTTPException(c, 400, options.invalidAuthenticationHeader?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}error="invalid_request"`, options.invalidAuthenticationHeader?.message || "Bad Request");
 			else {
 				let equal = false;
 				if ("verifyToken" in options) equal = await options.verifyToken(tokenValue, c);
@@ -86,7 +86,7 @@ const bearerAuth = (options) => {
 						break;
 					}
 				}
-				if (!equal) await throwHTTPException(c, 401, options.invalidToken?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}error="invalid_token"`, options.invalidToken?.message || options.invalidTokenMessage || "Unauthorized");
+				if (!equal) await throwHTTPException(c, 401, options.invalidToken?.wwwAuthenticateHeader || `${wwwAuthenticatePrefix}error="invalid_token"`, options.invalidToken?.message || "Unauthorized");
 			}
 		}
 		await next();

package/dist/middleware/language/language.js

@@ -1,5 +1,5 @@
-import { getCookie, setCookie } from "../../helper/cookie/index.js";
 import { parseAccept } from "../../utils/accept.js";
+import { getCookie, setCookie } from "../../helper/cookie/index.js";
 //#region src/middleware/language/language.ts
 const DEFAULT_OPTIONS = {
 	order: [

package/dist/middleware/logger/index.js

@@ -1,4 +1,4 @@
-import { getColorEnabledAsync } from "../../utils/color.js";
+import { getColorEnabled } from "../../utils/color.js";
 //#region src/middleware/logger/index.ts
 const humanize = (times) => {
 	const [delimiter, separator] = [",", "."];
@@ -8,8 +8,8 @@ const time = (start) => {
 	const delta = Date.now() - start;
 	return humanize([delta < 1e3 ? delta + "ms" : Math.round(delta / 1e3) + "s"]);
 };
-const colorStatus = async (status) => {
-	if (await getColorEnabledAsync()) switch (status / 100 | 0) {
+const colorStatus = (status, colorEnabled) => {
+	if (colorEnabled) switch (status / 100 | 0) {
 		case 5: return `\x1b[31m${status}\x1b[0m`;
 		case 4: return `\x1b[33m${status}\x1b[0m`;
 		case 3: return `\x1b[36m${status}\x1b[0m`;
@@ -17,9 +17,6 @@ const colorStatus = async (status) => {
 	}
 	return `${status}`;
 };
-async function log(fn, prefix, method, path, status = 0, elapsed) {
-	fn(prefix === "<--" ? `${prefix} ${method} ${path}` : `${prefix} ${method} ${path} ${await colorStatus(status)} ${elapsed}`);
-}
 /**
 * Logger Middleware for Hono.
 *
@@ -40,10 +37,11 @@ const logger = (fn = console.log) => {
 	return async function logger(c, next) {
 		const { method, url } = c.req;
 		const path = url.slice(url.indexOf("/", 8));
-		await log(fn, "<--", method, path);
+		fn(`<-- ${method} ${path}`);
 		const start = Date.now();
 		await next();
-		await log(fn, "-->", method, path, c.res.status, time(start));
+		const elapsed = time(start);
+		fn(`--> ${method} ${path} ${colorStatus(c.res.status, getColorEnabled(c.env))} ${elapsed}`);
 	};
 };
 //#endregion

package/dist/{types/middleware → middleware}/serve-static/index.d.ts

@@ -22,10 +22,6 @@ export declare const serveStatic: <E extends Env = Env>(options: ServeStaticOpti
    * `join` option according to the runtime. Example `import { join } from 'node:path`. If not specified, it will fall back to the default join function.`
    */
   join?: (...paths: string[]) => string;
-  /**
-   * @deprecated Currently, `pathResolve` is no longer used.
-   */
-  pathResolve?: (path: string) => string;
   isDir?: (path: string) => boolean | undefined | Promise<boolean | undefined>;
 }) => MiddlewareHandler;
 //#endregion

package/dist/{types/preset → preset}/quick.d.ts

@@ -1,5 +1,5 @@
-import { HonoBase as Hono$1, HonoOptions } from "../hono-base.js";
 import { BlankEnv, BlankSchema, Env, Schema } from "../types.js";
+import { HonoBase as Hono$1, HonoOptions } from "../hono-base.js";
 //#region src/preset/quick.d.ts
 export declare class Hono<E extends Env = BlankEnv, S extends Schema = BlankSchema, BasePath extends string = '/'> extends Hono$1<E, S, BasePath> {
   constructor(options?: HonoOptions<E>);

package/dist/{types/preset → preset}/tiny.d.ts

@@ -1,5 +1,5 @@
-import { HonoBase as Hono$1, HonoOptions } from "../hono-base.js";
 import { BlankEnv, BlankSchema, Env, Schema } from "../types.js";
+import { HonoBase as Hono$1, HonoOptions } from "../hono-base.js";
 //#region src/preset/tiny.d.ts
 export declare class Hono<E extends Env = BlankEnv, S extends Schema = BlankSchema, BasePath extends string = '/'> extends Hono$1<E, S, BasePath> {
   constructor(options?: HonoOptions<E>);

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

@@ -81,7 +81,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    * ```
    */
   query(key: string): string | undefined;
-  query(): Record<string, string>;
+  query(): Record<string, string | undefined>;
   /**
    * `.queries()` can get multiple querystring parameter values, e.g. /search?tags=A&tags=B
    *
@@ -96,7 +96,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    * ```
    */
   queries(key: string): string[] | undefined;
-  queries(): Record<string, string[]>;
+  queries(): Record<string, string[] | undefined>;
   /**
    * `.header()` can get the request header value.
    *
@@ -138,7 +138,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    * })
    * ```
    */
-  json<T = any>(): Promise<T>;
+  json<T = unknown>(): Promise<T>;
   /**
    * `.text()` can parse Request body of type `text/plain`
    *
@@ -244,51 +244,6 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
    */
   get method(): string;
   get [GET_MATCH_RESULT](): Result<[unknown, RouterRoute]>;
-  /**
-   * `.matchedRoutes` can return a matched route in the handler
-   *
-   * @deprecated
-   *
-   * Use matchedRoutes helper defined in "hono/route" instead.
-   *
-   * @see {@link https://hono.dev/docs/api/request#matchedroutes}
-   *
-   * @example
-   * ```ts
-   * app.use('*', async function logger(c, next) {
-   *   await next()
-   *   c.req.matchedRoutes.forEach(({ handler, method, path }, i) => {
-   *     const name = handler.name || (handler.length < 2 ? '[handler]' : '[middleware]')
-   *     console.log(
-   *       method,
-   *       ' ',
-   *       path,
-   *       ' '.repeat(Math.max(10 - path.length, 0)),
-   *       name,
-   *       i === c.req.routeIndex ? '<- respond from here' : ''
-   *     )
-   *   })
-   * })
-   * ```
-   */
-  get matchedRoutes(): RouterRoute[];
-  /**
-   * `.routePath` can retrieve the path registered within the handler
-   *
-   * @deprecated
-   *
-   * Use routePath helper defined in "hono/route" instead.
-   *
-   * @see {@link https://hono.dev/docs/api/request#routepath}
-   *
-   * @example
-   * ```ts
-   * app.get('/posts/:id', (c) => {
-   *   return c.json({ path: c.req.routePath })
-   * })
-   * ```
-   */
-  get routePath(): string;
 }
 /**
  * Clones a HonoRequest's underlying raw Request object.

package/dist/request.js

@@ -221,55 +221,6 @@ var HonoRequest = class {
 	get [GET_MATCH_RESULT]() {
 		return this.#matchResult;
 	}
-	/**
-	* `.matchedRoutes` can return a matched route in the handler
-	*
-	* @deprecated
-	*
-	* Use matchedRoutes helper defined in "hono/route" instead.
-	*
-	* @see {@link https://hono.dev/docs/api/request#matchedroutes}
-	*
-	* @example
-	* ```ts
-	* app.use('*', async function logger(c, next) {
-	*   await next()
-	*   c.req.matchedRoutes.forEach(({ handler, method, path }, i) => {
-	*     const name = handler.name || (handler.length < 2 ? '[handler]' : '[middleware]')
-	*     console.log(
-	*       method,
-	*       ' ',
-	*       path,
-	*       ' '.repeat(Math.max(10 - path.length, 0)),
-	*       name,
-	*       i === c.req.routeIndex ? '<- respond from here' : ''
-	*     )
-	*   })
-	* })
-	* ```
-	*/
-	get matchedRoutes() {
-		return this.#matchResult[0].map(([[, route]]) => route);
-	}
-	/**
-	* `.routePath` can retrieve the path registered within the handler
-	*
-	* @deprecated
-	*
-	* Use routePath helper defined in "hono/route" instead.
-	*
-	* @see {@link https://hono.dev/docs/api/request#routepath}
-	*
-	* @example
-	* ```ts
-	* app.get('/posts/:id', (c) => {
-	*   return c.json({ path: c.req.routePath })
-	* })
-	* ```
-	*/
-	get routePath() {
-		return this.#matchResult[0].map(([[, route]]) => route)[this.routeIndex].path;
-	}
 };
 /**
 * Clones a HonoRequest's underlying raw Request object.

package/dist/router/linear-router/router.js

@@ -2,7 +2,7 @@ import { checkOptionalParameter } from "../../utils/url.js";
 import { UnsupportedPathError } from "../../router.js";
 //#region src/router/linear-router/router.ts
 const emptyParams = Object.create(null);
-const splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
+const splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|\/$|(\?)/g;
 const splitByStarRe = /\*/;
 var LinearRouter = class {
 	name = "LinearRouter";
@@ -26,7 +26,7 @@ var LinearRouter = class {
 				const hasStar = routePath.indexOf("*") !== -1;
 				const hasLabel = routePath.indexOf(":") !== -1;
 				if (!hasStar && !hasLabel) {
-					if (routePath === path || routePath + "/" === path) handlers.push([handler, emptyParams]);
+					if (routePath === path) handlers.push([handler, emptyParams]);
 				} else if (hasStar && !hasLabel) {
 					const endsWithStar = routePath.charCodeAt(routePath.length - 1) === 42;
 					const endsWithSlashStar = routePath.endsWith("/*");
@@ -39,7 +39,7 @@ var LinearRouter = class {
 						if (j === lastIndex) {
 							if (endsWithSlashStar) {
 								if (pos !== path.length && path.charCodeAt(pos) !== 47) continue ROUTES_LOOP;
-							} else if (!endsWithStar && pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) continue ROUTES_LOOP;
+							} else if (!endsWithStar && pos !== path.length) continue ROUTES_LOOP;
 						} else {
 							const index = path.indexOf("/", pos);
 							if (index === -1) continue ROUTES_LOOP;
@@ -81,9 +81,7 @@ var LinearRouter = class {
 							if (path.indexOf(part, pos) !== pos) continue ROUTES_LOOP;
 							pos += part.length;
 						}
-						if (j === lastIndex) {
-							if (pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) continue ROUTES_LOOP;
-						}
+						if (j === lastIndex && pos !== path.length) continue ROUTES_LOOP;
 					}
 					handlers.push([handler, params]);
 				} else if (hasLabel && hasStar) throw new UnsupportedPathError();

package/dist/router/pattern-router/router.js

@@ -5,11 +5,11 @@ var PatternRouter = class {
 	name = "PatternRouter";
 	#routes = [];
 	add(method, path, handler) {
-		const suffix = path.endsWith("/*") ? "(?:$|/)" : path.endsWith("*") ? "" : "/?$";
+		const suffix = path.endsWith("/*") ? "(?:$|/)" : path.endsWith("*") ? "" : path.endsWith("/") ? "/$" : "$";
 		path = path.replace(/\*$/, "");
 		if (path.at(-1) === "?") {
 			path = path.slice(0, -1);
-			this.add(method, path.replace(/\/[^/]+$/, ""), handler);
+			this.add(method, path.replace(/\/[^/]+$/, "") || "/", handler);
 		}
 		const parts = (path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+/g) || []).map((part) => {
 			const match = part.match(/^\/:([^{]+)(?:{(.*)})?/);

package/dist/router/reg-exp-router/node.js

@@ -47,7 +47,7 @@ var Node = class Node {
 				const name = pattern[1];
 				let regexpStr = pattern[2] || "[^/]+";
 				if (name && pattern[2]) {
-					if (regexpStr === ".*") throw PATH_ERROR;
+					if (new RegExp(regexpStr).test("")) throw PATH_ERROR;
 					regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
 					if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
 					if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;

package/dist/router/trie-router/node.js

@@ -66,9 +66,9 @@ var Node = class Node {
 				if (nextNode) {
 					nextNode.#params = node.#params;
 					if (isLast) {
-						if (nextNode.#children["*"]) this.#pushHandlerSets(handlerSets, nextNode.#children["*"], method, node.#params);
-						this.#pushHandlerSets(handlerSets, nextNode, method, node.#params);
-					} else tempNodes.push(nextNode);
+						if (nextNode.#children["*"] && !Array.isArray(nextNode.#pattern)) this.#pushHandlerSets(handlerSets, nextNode.#children["*"], method, node.#params);
+						if (nextNode.#pattern === void 0) this.#pushHandlerSets(handlerSets, nextNode, method, node.#params);
+					} else if (nextNode.#pattern !== "*" && !Array.isArray(nextNode.#pattern)) tempNodes.push(nextNode);
 				}
 				for (const child of node.#patterns) {
 					const pattern = child.#pattern;

package/dist/utils/buffer.d.ts

@@ -0,0 +1,11 @@
+//#region src/utils/buffer.d.ts
+/**
+ * @module
+ * Buffer utility.
+ */
+export declare const equal: (a: ArrayBuffer, b: ArrayBuffer) => boolean;
+export type StringHashFunction = (input: string) => string | null | Promise<string | null>;
+export declare const timingSafeEqual: (a: string, b: string, hashFunction?: StringHashFunction) => Promise<boolean>;
+export declare const bufferToString: (buffer: ArrayBuffer) => string;
+export declare const bufferToFormData: (arrayBuffer: ArrayBuffer, contentType: string) => Promise<FormData>;
+//#endregion

package/dist/utils/buffer.js

@@ -25,7 +25,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 +33,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

@@ -5,33 +5,17 @@
 */
 /**
 * 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.
+* 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}
 */
-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/{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/{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

@@ -96,16 +96,6 @@ 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;
@@ -198,4 +188,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,57 @@ 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;
+/**
+* Get the value of the validation target from the request.
+* Returns a Promise only for `json` and `form`.
+*/
+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 };