hono 3.0.0 → 3.0.2

package/README.md

@@ -38,6 +38,12 @@ app.get('/', (c) => c.text('Hono!'))
 export default app
 ```
 
+## Quick Start
+
+```
+npm create hono@latest my-app
+```
+
 ## Features
 
 - **Ultrafast** - The routers are really fast and smart. Not using linear loops. Fast.

package/dist/cjs/client/client.js

@@ -89,7 +89,7 @@ class ClientRequestImpl {
       }
       methodUpperCase = this.method.toUpperCase();
       setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
-      return fetch(url, {
+      return (opt?.fetch || fetch)(url, {
         body: setBody ? this.rBody : void 0,
         method: methodUpperCase,
         headers
@@ -99,7 +99,7 @@ class ClientRequestImpl {
     this.method = method;
   }
 }
-const hc = (baseUrl) => createProxy(async (opts) => {
+const hc = (baseUrl, options) => createProxy(async (opts) => {
   const parts = [...opts.path];
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
@@ -112,7 +112,9 @@ const hc = (baseUrl) => createProxy(async (opts) => {
   const url = (0, import_utils.mergePath)(baseUrl, path);
   const req = new ClientRequestImpl(url, method);
   if (method) {
-    return req.fetch(opts.args[0], opts.args[1]);
+    options ?? (options = {});
+    const args = (0, import_utils.deepMerge)(options, { ...opts.args[1] ?? {} });
+    return req.fetch(opts.args[0], args);
   }
   return req;
 }, []);

package/dist/cjs/client/utils.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  deepMerge: () => deepMerge,
   mergePath: () => mergePath,
   removeIndexString: () => removeIndexString,
   replaceUrlParam: () => replaceUrlParam
@@ -44,8 +45,27 @@ const removeIndexString = (urlSting) => {
   }
   return urlSting;
 };
+function isObject(item) {
+  return typeof item === "object" && item !== null && !Array.isArray(item);
+}
+function deepMerge(target, source) {
+  if (!isObject(target) && !isObject(source)) {
+    return source;
+  }
+  const merged = { ...target };
+  for (const key in source) {
+    const value = source[key];
+    if (isObject(merged[key]) && isObject(value)) {
+      merged[key] = deepMerge(merged[key], value);
+    } else {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  deepMerge,
   mergePath,
   removeIndexString,
   replaceUrlParam

package/dist/cjs/hono.js

@@ -63,7 +63,11 @@ class Hono extends defineDynamicClass() {
       return this.dispatch(request, executionCtx, Env);
     };
     this.request = async (input, requestInit) => {
-      const req = input instanceof Request ? input : new Request(input, requestInit);
+      if (input instanceof Request) {
+        return await this.fetch(input);
+      }
+      const path = /^https?:\/\//.test(input) ? input : `http://localhost${(0, import_url.mergePath)("/", input)}`;
+      const req = new Request(path, requestInit);
       return await this.fetch(req);
     };
     const allMethods = [...import_router.METHODS, import_router.METHOD_NAME_ALL_LOWERCASE];

package/dist/cjs/utils/encode.js

@@ -31,36 +31,18 @@ const encodeBase64 = (str) => {
   if (str === null) {
     throw new TypeError('1st argument of "encodeBase64" should not be null.');
   }
-  try {
-    const encoder = new TextEncoder();
-    const bytes = encoder.encode(str);
-    return btoa(String.fromCharCode(...bytes));
-  } catch {
-  }
-  try {
-    return Buffer.from(str).toString("base64");
-  } catch (e) {
-    console.error('Error: If you want to do "encodeBase64", polyfill "buffer" module.');
-    throw e;
-  }
+  const encoder = new TextEncoder();
+  const bytes = encoder.encode(str);
+  return btoa(String.fromCharCode(...bytes));
 };
 const decodeBase64 = (str) => {
   if (str === null) {
     throw new TypeError('1st argument of "decodeBase64" should not be null.');
   }
-  try {
-    const text = atob(str);
-    const bytes = new Uint8Array(text.split("").map((c) => c.charCodeAt(0)));
-    const decoder = new TextDecoder();
-    return decoder.decode(bytes);
-  } catch {
-  }
-  try {
-    return Buffer.from(str, "base64").toString();
-  } catch (e) {
-    console.error('Error: If you want to do "decodeBase64", polyfill "buffer" module.');
-    throw e;
-  }
+  const text = atob(str);
+  const bytes = new Uint8Array(text.split("").map((c) => c.charCodeAt(0)));
+  const decoder = new TextDecoder();
+  return decoder.decode(bytes);
 };
 const encodeBase64URL = (str) => {
   return encodeBase64(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
@@ -83,14 +65,7 @@ const utf8ToUint8Array = (str) => {
   return encoder.encode(str);
 };
 const arrayBufferToBase64 = async (buf) => {
-  if (typeof btoa === "function") {
-    return btoa(String.fromCharCode(...new Uint8Array(buf)));
-  }
-  try {
-    return Buffer.from(String.fromCharCode(...new Uint8Array(buf))).toString("base64");
-  } catch (e) {
-  }
-  return "";
+  return btoa(String.fromCharCode(...new Uint8Array(buf)));
 };
 const arrayBufferToBase64URL = async (buf) => {
   return (await arrayBufferToBase64(buf)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");

package/dist/cjs/validator/validator.js

@@ -21,13 +21,14 @@ __export(validator_exports, {
   validator: () => validator
 });
 module.exports = __toCommonJS(validator_exports);
+var import_body = require("../utils/body");
 const validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     switch (target) {
       case "json":
         try {
-          value = await c.req.json();
+          value = await c.req.raw.clone().json();
         } catch {
           console.error("Error: Malformed JSON in request body");
           return c.json(
@@ -40,7 +41,7 @@ const validator = (target, validationFunc) => {
         }
         break;
       case "form":
-        value = await c.req.parseBody();
+        value = await (0, import_body.parseBody)(c.req.raw.clone());
         break;
       case "query":
         value = c.req.query();

package/dist/client/client.js

@@ -1,5 +1,5 @@
 // src/client/client.ts
-import { replaceUrlParam, mergePath, removeIndexString } from "./utils.js";
+import { replaceUrlParam, mergePath, removeIndexString, deepMerge } from "./utils.js";
 var createProxy = (callback, path) => {
   const proxy = new Proxy(() => {
   }, {
@@ -67,7 +67,7 @@ var ClientRequestImpl = class {
       }
       methodUpperCase = this.method.toUpperCase();
       setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
-      return fetch(url, {
+      return (opt?.fetch || fetch)(url, {
         body: setBody ? this.rBody : void 0,
         method: methodUpperCase,
         headers
@@ -77,7 +77,7 @@ var ClientRequestImpl = class {
     this.method = method;
   }
 };
-var hc = (baseUrl) => createProxy(async (opts) => {
+var hc = (baseUrl, options) => createProxy(async (opts) => {
   const parts = [...opts.path];
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
@@ -90,7 +90,9 @@ var hc = (baseUrl) => createProxy(async (opts) => {
   const url = mergePath(baseUrl, path);
   const req = new ClientRequestImpl(url, method);
   if (method) {
-    return req.fetch(opts.args[0], opts.args[1]);
+    options ?? (options = {});
+    const args = deepMerge(options, { ...opts.args[1] ?? {} });
+    return req.fetch(opts.args[0], args);
   }
   return req;
 }, []);

package/dist/client/utils.js

@@ -20,7 +20,26 @@ var removeIndexString = (urlSting) => {
   }
   return urlSting;
 };
+function isObject(item) {
+  return typeof item === "object" && item !== null && !Array.isArray(item);
+}
+function deepMerge(target, source) {
+  if (!isObject(target) && !isObject(source)) {
+    return source;
+  }
+  const merged = { ...target };
+  for (const key in source) {
+    const value = source[key];
+    if (isObject(merged[key]) && isObject(value)) {
+      merged[key] = deepMerge(merged[key], value);
+    } else {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 export {
+  deepMerge,
   mergePath,
   removeIndexString,
   replaceUrlParam

package/dist/hono.js

@@ -41,7 +41,11 @@ var Hono = class extends defineDynamicClass() {
       return this.dispatch(request, executionCtx, Env);
     };
     this.request = async (input, requestInit) => {
-      const req = input instanceof Request ? input : new Request(input, requestInit);
+      if (input instanceof Request) {
+        return await this.fetch(input);
+      }
+      const path = /^https?:\/\//.test(input) ? input : `http://localhost${mergePath("/", input)}`;
+      const req = new Request(path, requestInit);
       return await this.fetch(req);
     };
     const allMethods = [...METHODS, METHOD_NAME_ALL_LOWERCASE];

package/dist/types/client/client.d.ts

@@ -1,4 +1,4 @@
 import type { Hono } from '../hono';
 import type { UnionToIntersection } from '../utils/types';
-import type { Client } from './types';
-export declare const hc: <T extends Hono<import("../types").Env, {}>>(baseUrl: string) => UnionToIntersection<Client<T>>;
+import type { Client, RequestOptions } from './types';
+export declare const hc: <T extends Hono<any, {}>>(baseUrl: string, options?: RequestOptions) => UnionToIntersection<Client<T>>;

package/dist/types/client/types.d.ts

@@ -1,5 +1,5 @@
 import type { Hono } from '../hono';
-import type { ValidationTargets, Env } from '../types';
+import type { ValidationTargets } from '../types';
 declare type MethodName = `$${string}`;
 declare type Endpoint = Record<MethodName, Data>;
 declare type Data = {
@@ -8,19 +8,20 @@ declare type Data = {
     };
     output: {};
 };
-export declare type RequestOption = {
+export declare type RequestOptions = {
     headers?: Record<string, string>;
+    fetch?: typeof fetch;
 };
 declare type ClientRequest<S extends Data> = {
     [M in keyof S]: S[M] extends {
         input: infer R;
         output: infer O;
-    } ? (args?: R, options?: RequestOption) => Promise<ClientResponse<O>> : never;
+    } ? (args?: R, options?: RequestOptions) => Promise<ClientResponse<O>> : never;
 };
 export interface ClientResponse<T> extends Response {
     json(): Promise<T>;
 }
-export declare type Fetch<T> = (args?: InferRequestType<T>, opt?: RequestOption) => Promise<ClientResponse<InferResponseType<T>>>;
+export declare type Fetch<T> = (args?: InferRequestType<T>, opt?: RequestOptions) => Promise<ClientResponse<InferResponseType<T>>>;
 export declare type InferResponseType<T> = T extends () => Promise<ClientResponse<infer O>> ? O : never;
 export declare type InferRequestType<T> = T extends (args: infer R) => Promise<ClientResponse<unknown>> ? NonNullable<R> : never;
 declare type PathToChain<Path extends string, E extends Endpoint, Original extends string = ''> = Path extends `/${infer P}` ? PathToChain<P, E, Path> : Path extends `${infer P}/${infer R}` ? {
@@ -28,10 +29,13 @@ declare type PathToChain<Path extends string, E extends Endpoint, Original exten
 } : {
     [K in Path extends '' ? 'index' : Path]: ClientRequest<E extends Record<string, unknown> ? E[Original] : never>;
 };
-export declare type Client<T> = T extends Hono<Env, infer S> ? S extends Record<infer K, Endpoint> ? K extends string ? PathToChain<K, S> : never : never : never;
+export declare type Client<T> = T extends Hono<any, infer S> ? S extends Record<infer K, Endpoint> ? K extends string ? PathToChain<K, S> : never : never : never;
 export declare type Callback = (opts: CallbackOptions) => unknown;
 interface CallbackOptions {
     path: string[];
     args: any[];
 }
+export declare type ObjectType<T = unknown> = {
+    [key: string]: T;
+};
 export {};

package/dist/types/client/utils.d.ts

@@ -1,3 +1,4 @@
 export declare const mergePath: (base: string, path: string) => string;
 export declare const replaceUrlParam: (urlString: string, params: Record<string, string>) => string;
 export declare const removeIndexString: (urlSting: string) => string;
+export declare function deepMerge<T>(target: T, source: Record<string, unknown>): T;

package/dist/types/hono.d.ts

@@ -1,6 +1,6 @@
 import type { ExecutionContext } from './context';
 import type { Router } from './router';
-import type { Env, ErrorHandler, H, HandlerInterface, MiddlewareHandlerInterface, NotFoundHandler, OnHandlerInterface } from './types';
+import type { Env, ErrorHandler, H, HandlerInterface, MiddlewareHandlerInterface, NotFoundHandler, OnHandlerInterface, MergeSchemaPath, RemoveBlankRecord } from './types';
 interface RouterRoute {
     path: string;
     method: string;
@@ -29,7 +29,7 @@ export declare class Hono<E extends Env = Env, S = {}> extends Hono_base<E, S> {
     constructor(init?: Partial<Pick<Hono, 'router' | 'strict'>>);
     private notFoundHandler;
     private errorHandler;
-    route(path: string, app?: Hono<any, any>): this;
+    route<SubPath extends string, SubEnv extends Env, SubSchema>(path: SubPath, app?: Hono<SubEnv, SubSchema>): Hono<E, RemoveBlankRecord<MergeSchemaPath<SubSchema, SubPath> | S>>;
     onError(handler: ErrorHandler<E>): this;
     notFound(handler: NotFoundHandler<E>): this;
     showRoutes(): void;

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import { Hono } from './hono';
 export type { Env, ErrorHandler, Handler, MiddlewareHandler, Next, NotFoundHandler, ValidationTargets, } from './types';
 export type { Context, ContextVariableMap } from './context';
+export type { HonoRequest } from './request';
 declare module './hono' {
     interface Hono {
         fire(): void;

package/dist/types/types.d.ts

@@ -15,39 +15,39 @@ export declare type H<E extends Env = any, P extends string = any, I extends Inp
 export declare type NotFoundHandler<E extends Env = any> = (c: Context<E>) => Response | Promise<Response>;
 export declare type ErrorHandler<E extends Env = any> = (err: Error, c: Context<E>) => Response;
 export interface HandlerInterface<E extends Env = Env, M extends string = any, S = {}> {
-    <I = {}, O = {}>(...handlers: [H<E, ExtractKey<S>, I, O>, H<E, ExtractKey<S>, I, O>]): Hono<E, S & Schema<M, ExtractKey<S>, I, O>>;
-    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(...handlers: [H<E, ExtractKey<S>, I, O>, H<E, ExtractKey<S>, I2, O>, H<E, ExtractKey<S>, I3, O>]): Hono<E, S & Schema<M, ExtractKey<S>, I3, O>>;
+    <I = {}, O = {}>(...handlers: [H<E, ExtractKey<S>, I, O>, H<E, ExtractKey<S>, I, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, ExtractKey<S>, I, O>>>;
+    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(...handlers: [H<E, ExtractKey<S>, I, O>, H<E, ExtractKey<S>, I2, O>, H<E, ExtractKey<S>, I3, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, ExtractKey<S>, I3, O>>>;
     <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3>(...handlers: [
         H<E, ExtractKey<S>, I, O>,
         H<E, ExtractKey<S>, I2, O>,
         H<E, ExtractKey<S>, I3, O>,
         H<E, ExtractKey<S>, I4, O>
-    ]): Hono<E, S & Schema<M, ExtractKey<S>, I4, O>>;
+    ]): Hono<E, RemoveBlankRecord<S | Schema<M, ExtractKey<S>, I4, O>>>;
     <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3, I5 = I3 & I4>(...handlers: [
         H<E, ExtractKey<S>, I, O>,
         H<E, ExtractKey<S>, I2, O>,
         H<E, ExtractKey<S>, I3, O>,
         H<E, ExtractKey<S>, I4, O>,
         H<E, ExtractKey<S>, I5, O>
-    ]): Hono<E, S & Schema<M, ExtractKey<S>, I5, O>>;
-    <I = {}, O = {}>(...handlers: Handler<E, ExtractKey<S>, I, O>[]): Hono<E, S & Schema<M, ExtractKey<S>, I, O>>;
-    <P extends string, O = {}, I = {}>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I, O>]): Hono<E, S & Schema<M, P, I, O>>;
-    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>]): Hono<E, S & Schema<M, P, I3, O>>;
-    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, S & Schema<M, P, I4, O>>;
-    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3, I5 = I3 & I4>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, S & Schema<M, P, I5, O>>;
-    <P extends string, I = {}, O = {}>(path: P, ...handlers: H<E, P, I, O>[]): Hono<E, S & Schema<M, P, I, O>>;
+    ]): Hono<E, RemoveBlankRecord<S | Schema<M, ExtractKey<S>, I5, O>>>;
+    <I = {}, O = {}>(...handlers: Handler<E, ExtractKey<S>, I, O>[]): Hono<E, RemoveBlankRecord<S | Schema<M, ExtractKey<S>, I, O>>>;
+    <P extends string, O = {}, I = {}>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I, O>>>;
+    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I3, O>>>;
+    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I4, O>>>;
+    <P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3, I5 = I3 & I4>(path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I5, O>>>;
+    <P extends string, I = {}, O = {}>(path: P, ...handlers: H<E, P, I, O>[]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I, O>>>;
 }
 export interface MiddlewareHandlerInterface<E extends Env = Env, S = {}> {
     (...handlers: MiddlewareHandler<E, ExtractKey<S>>[]): Hono<E, S>;
     <P extends string>(path: P, ...handlers: MiddlewareHandler<E, P>[]): Hono<E, S>;
 }
 export interface OnHandlerInterface<E extends Env = Env, S = {}> {
-    <M extends string, P extends string, O = {}, I = {}>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I, O>]): Hono<E, S & Schema<M, P, I, O>>;
-    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>]): Hono<E, S & Schema<M, P, I3, O>>;
-    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, S & Schema<M, P, I4, O>>;
-    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3, I5 = I3 & I4>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, S & Schema<M, P, I5, O>>;
-    <M extends string, P extends string, O extends {} = {}, I = {}>(method: M, path: P, ...handlers: H<E, P, I, O>[]): Hono<E, S & Schema<M, P, I, O>>;
-    <P extends string, O extends {} = {}, I = {}>(methods: string[], path: P, ...handlers: H<E, P, I, O>[]): Hono<E, S & Schema<string, P, I, O>>;
+    <M extends string, P extends string, O = {}, I = {}>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I, O>>>;
+    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I3, O>>>;
+    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I4, O>>>;
+    <M extends string, P extends string, O = {}, I = {}, I2 = I, I3 = I & I2, I4 = I2 & I3, I5 = I3 & I4>(method: M, path: P, ...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, S | Schema<M, P, I5, O>>;
+    <M extends string, P extends string, O extends {} = {}, I = {}>(method: M, path: P, ...handlers: H<E, P, I, O>[]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I, O>>>;
+    <P extends string, O extends {} = {}, I = {}>(methods: string[], path: P, ...handlers: H<E, P, I, O>[]): Hono<E, RemoveBlankRecord<S | Schema<string, P, I, O>>>;
 }
 declare type ExtractKey<S> = S extends Record<infer Key, unknown> ? Key extends string ? Key : never : string;
 export declare type Schema<M extends string, P extends string, I extends Input, O> = {
@@ -64,6 +64,8 @@ export declare type AddParam<I, P extends string> = ParamKeys<P> extends never ?
 export declare type AddDollar<T> = T extends Record<infer K, infer R> ? K extends string ? {
     [MethodName in `$${Lowercase<K>}`]: R;
 } : never : never;
+export declare type MergeSchemaPath<S, P extends string> = S extends Record<infer Key, infer T> ? Key extends string ? Record<MergePath<P, Key>, T> : never : never;
+export declare type MergePath<A extends string, B extends string> = A extends `${infer P}/` ? `${P}${B}` : `${A}${B}`;
 export declare type TypedResponse<T = unknown> = {
     response: Response | Promise<Response>;
     data: T;
@@ -87,4 +89,5 @@ export declare type InputToDataByTarget<T extends Input, Target extends keyof Va
 export declare type RemoveQuestion<T> = T extends `${infer R}?` ? R : T;
 export declare type UndefinedIfHavingQuestion<T> = T extends `${infer _}?` ? string | undefined : string;
 export declare type ExtractSchema<T> = T extends Hono<infer _, infer S> ? S : never;
+export declare type RemoveBlankRecord<T> = T extends Record<infer K, unknown> ? K extends string ? T : never : never;
 export {};

package/dist/utils/encode.js

@@ -3,36 +3,18 @@ var encodeBase64 = (str) => {
   if (str === null) {
     throw new TypeError('1st argument of "encodeBase64" should not be null.');
   }
-  try {
-    const encoder = new TextEncoder();
-    const bytes = encoder.encode(str);
-    return btoa(String.fromCharCode(...bytes));
-  } catch {
-  }
-  try {
-    return Buffer.from(str).toString("base64");
-  } catch (e) {
-    console.error('Error: If you want to do "encodeBase64", polyfill "buffer" module.');
-    throw e;
-  }
+  const encoder = new TextEncoder();
+  const bytes = encoder.encode(str);
+  return btoa(String.fromCharCode(...bytes));
 };
 var decodeBase64 = (str) => {
   if (str === null) {
     throw new TypeError('1st argument of "decodeBase64" should not be null.');
   }
-  try {
-    const text = atob(str);
-    const bytes = new Uint8Array(text.split("").map((c) => c.charCodeAt(0)));
-    const decoder = new TextDecoder();
-    return decoder.decode(bytes);
-  } catch {
-  }
-  try {
-    return Buffer.from(str, "base64").toString();
-  } catch (e) {
-    console.error('Error: If you want to do "decodeBase64", polyfill "buffer" module.');
-    throw e;
-  }
+  const text = atob(str);
+  const bytes = new Uint8Array(text.split("").map((c) => c.charCodeAt(0)));
+  const decoder = new TextDecoder();
+  return decoder.decode(bytes);
 };
 var encodeBase64URL = (str) => {
   return encodeBase64(str).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
@@ -55,14 +37,7 @@ var utf8ToUint8Array = (str) => {
   return encoder.encode(str);
 };
 var arrayBufferToBase64 = async (buf) => {
-  if (typeof btoa === "function") {
-    return btoa(String.fromCharCode(...new Uint8Array(buf)));
-  }
-  try {
-    return Buffer.from(String.fromCharCode(...new Uint8Array(buf))).toString("base64");
-  } catch (e) {
-  }
-  return "";
+  return btoa(String.fromCharCode(...new Uint8Array(buf)));
 };
 var arrayBufferToBase64URL = async (buf) => {
   return (await arrayBufferToBase64(buf)).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");

package/dist/validator/validator.js

@@ -1,11 +1,12 @@
 // src/validator/validator.ts
+import { parseBody } from "../utils/body.js";
 var validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     switch (target) {
       case "json":
         try {
-          value = await c.req.json();
+          value = await c.req.raw.clone().json();
         } catch {
           console.error("Error: Malformed JSON in request body");
           return c.json(
@@ -18,7 +19,7 @@ var validator = (target, validationFunc) => {
         }
         break;
       case "form":
-        value = await c.req.parseBody();
+        value = await parseBody(c.req.raw.clone());
         break;
       case "query":
         value = c.req.query();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Ultrafast web framework for the Edge",
   "main": "dist/cjs/index.js",
   "type": "module",