hono 4.3.4 → 4.3.6

package/dist/cjs/helper/css/index.js

@@ -115,7 +115,9 @@ const createCssContext = ({ id }) => {
     Style: Style2
   };
 };
-const defaultContext = createCssContext({ id: import_common.DEFAULT_STYLE_ID });
+const defaultContext = createCssContext({
+  id: import_common.DEFAULT_STYLE_ID
+});
 const css = defaultContext.css;
 const cx = defaultContext.cx;
 const keyframes = defaultContext.keyframes;

package/dist/cjs/hono-base.js

@@ -220,8 +220,8 @@ class Hono extends defineDynamicClass() {
       }
     })();
   }
-  fetch = (request, Env, executionCtx) => {
-    return this.dispatch(request, executionCtx, Env, request.method);
+  fetch = (request, ...rest) => {
+    return this.dispatch(request, rest[1], rest[0], request.method);
   };
   request = (input, requestInit, Env, executionCtx) => {
     if (input instanceof Request) {

package/dist/cjs/middleware/cache/index.js

@@ -62,8 +62,12 @@ const cache = (options) => {
     }
   };
   return async function cache2(c, next) {
-    const key = c.req.url;
-    const cache3 = await caches.open(options.cacheName);
+    let key = c.req.url;
+    if (options.keyGenerator) {
+      key = await options.keyGenerator(c);
+    }
+    const cacheName = typeof options.cacheName === "function" ? await options.cacheName(c) : options.cacheName;
+    const cache3 = await caches.open(cacheName);
     const response = await cache3.match(key);
     if (response) {
       return new Response(response.body, response);

package/dist/cjs/test-utils/setup-vitest.js

@@ -33,6 +33,9 @@ class MockCache {
   async match(key) {
     return this.store.get(key) || null;
   }
+  async keys() {
+    return this.store.keys();
+  }
   async put(key, response) {
     this.store.set(key, response);
   }

package/dist/cjs/utils/body.js

@@ -51,11 +51,11 @@ function convertFormDataToBodyData(formData, options) {
 }
 const handleParsingAllValues = (form, key, value) => {
   const formKey = form[key];
-  if (form[key] && Array.isArray(form[key])) {
-    formKey.push(value);
-  } else if (form[key]) {
-    const parsedKey = [...formKey].join("").replace(",", "");
-    form[key] = [parsedKey, value];
+  if (formKey && Array.isArray(formKey)) {
+    ;
+    form[key].push(value);
+  } else if (formKey) {
+    form[key] = [formKey, value];
   } else {
     form[key] = value;
   }

package/dist/context.js

@@ -1,5 +1,5 @@
 // src/context.ts
-import { resolveCallback, HtmlEscapedCallbackPhase } from "./utils/html.js";
+import { HtmlEscapedCallbackPhase, resolveCallback } from "./utils/html.js";
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
 var setHeaders = (headers, map = {}) => {
   Object.entries(map).forEach(([key, value]) => headers.set(key, value));

package/dist/helper/css/index.js

@@ -98,7 +98,9 @@ var createCssContext = ({ id }) => {
     Style: Style2
   };
 };
-var defaultContext = createCssContext({ id: DEFAULT_STYLE_ID });
+var defaultContext = createCssContext({
+  id: DEFAULT_STYLE_ID
+});
 var css = defaultContext.css;
 var cx = defaultContext.cx;
 var keyframes = defaultContext.keyframes;

package/dist/hono-base.js

@@ -197,8 +197,8 @@ var Hono = class extends defineDynamicClass() {
       }
     })();
   }
-  fetch = (request, Env, executionCtx) => {
-    return this.dispatch(request, executionCtx, Env, request.method);
+  fetch = (request, ...rest) => {
+    return this.dispatch(request, rest[1], rest[0], request.method);
   };
   request = (input, requestInit, Env, executionCtx) => {
     if (input instanceof Request) {

package/dist/middleware/cache/index.js

@@ -40,8 +40,12 @@ var cache = (options) => {
     }
   };
   return async function cache2(c, next) {
-    const key = c.req.url;
-    const cache3 = await caches.open(options.cacheName);
+    let key = c.req.url;
+    if (options.keyGenerator) {
+      key = await options.keyGenerator(c);
+    }
+    const cacheName = typeof options.cacheName === "function" ? await options.cacheName(c) : options.cacheName;
+    const cache3 = await caches.open(cacheName);
     const response = await cache3.match(key);
     if (response) {
       return new Response(response.body, response);

package/dist/test-utils/setup-vitest.js

@@ -15,6 +15,9 @@ var MockCache = class {
   async match(key) {
     return this.store.get(key) || null;
   }
+  async keys() {
+    return this.store.keys();
+  }
   async put(key, response) {
     this.store.set(key, response);
   }

package/dist/types/context.d.ts

@@ -1,5 +1,5 @@
 import type { HonoRequest } from './request';
-import type { Env, FetchEventLike, NotFoundHandler, Input, TypedResponse } from './types';
+import type { Env, FetchEventLike, Input, NotFoundHandler, TypedResponse } from './types';
 import type { RedirectStatusCode, StatusCode } from './utils/http-status';
 import type { JSONValue, JSONParsed, IsAny, Simplify } from './utils/types';
 type HeaderRecord = Record<string, string | string[]>;
@@ -37,8 +37,8 @@ interface TextRespond {
     <T extends string, U extends StatusCode>(text: T, init?: ResponseInit): Response & TypedResponse<T, U, 'text'>;
 }
 interface JSONRespond {
-    <T extends JSONValue | Simplify<any>, U extends StatusCode>(object: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
-    <T extends JSONValue | Simplify<any>, U extends StatusCode>(object: Simplify<T> extends JSONValue ? T : Simplify<T>, init?: ResponseInit): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
+    <T extends JSONValue | Simplify<unknown>, U extends StatusCode>(object: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
+    <T extends JSONValue | Simplify<unknown>, U extends StatusCode>(object: Simplify<T> extends JSONValue ? T : Simplify<T>, init?: ResponseInit): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
 }
 interface HTMLRespond {
     (html: string | Promise<string>, status?: StatusCode, headers?: HeaderRecord): Response | Promise<Response>;
@@ -114,7 +114,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
     render: Renderer;
     setLayout: (layout: Layout<PropsForRenderer & {
         Layout: Layout;
-    }>) => Layout<{
+    }>) => Layout<PropsForRenderer & {
         Layout: Layout;
     }>;
     getLayout: () => Layout<{

package/dist/types/helper/accepts/accepts.d.ts

@@ -13,11 +13,7 @@ export interface acceptsConfig {
 export interface acceptsOptions extends acceptsConfig {
     match?: (accepts: Accept[], config: acceptsConfig) => string;
 }
-export declare const parseAccept: (acceptHeader: string) => {
-    type: string;
-    params: {};
-    q: number;
-}[];
+export declare const parseAccept: (acceptHeader: string) => Accept[];
 export declare const defaultMatch: (accepts: Accept[], config: acceptsConfig) => string;
 /**
  * Match the accept header with the given options.

package/dist/types/helper/adapter/index.d.ts

@@ -1,4 +1,4 @@
 import type { Context } from '../../context';
 export type Runtime = 'node' | 'deno' | 'bun' | 'workerd' | 'fastly' | 'edge-light' | 'other';
 export declare const env: <T extends Record<string, unknown>, C extends Context<any, any, {}> = Context<{}, any, {}>>(c: C, runtime?: Runtime) => T & C["env"];
-export declare const getRuntimeKey: () => "other" | "node" | "deno" | "bun" | "workerd" | "fastly" | "edge-light";
+export declare const getRuntimeKey: () => Runtime;

package/dist/types/helper/css/index.d.ts

@@ -2,6 +2,25 @@ import type { HtmlEscapedString } from '../../utils/html';
 import type { CssClassName as CssClassNameCommon, CssVariableType } from './common';
 export { rawCssString } from './common';
 type CssClassName = HtmlEscapedString & CssClassNameCommon;
+interface CssType {
+    (strings: TemplateStringsArray, ...values: CssVariableType[]): Promise<string>;
+}
+interface CxType {
+    (...args: (CssClassName | Promise<string> | string | boolean | null | undefined)[]): Promise<string>;
+}
+interface KeyframesType {
+    (strings: TemplateStringsArray, ...values: CssVariableType[]): CssClassNameCommon;
+}
+interface ViewTransitionType {
+    (strings: TemplateStringsArray, ...values: CssVariableType[]): Promise<string>;
+    (content: Promise<string>): Promise<string>;
+    (): Promise<string>;
+}
+interface StyleType {
+    (args?: {
+        children?: Promise<string>;
+    }): HtmlEscapedString;
+}
 /**
  * @experimental
  * `createCssContext` is an experimental feature.
@@ -9,52 +28,41 @@ type CssClassName = HtmlEscapedString & CssClassNameCommon;
  */
 export declare const createCssContext: ({ id }: {
     id: Readonly<string>;
-}) => {
-    css: (strings: TemplateStringsArray, ...values: CssVariableType[]) => Promise<string>;
-    cx: (...args: (CssClassName | Promise<string> | string | boolean | null | undefined)[]) => Promise<string>;
-    keyframes: (strings: TemplateStringsArray, ...values: CssVariableType[]) => CssClassNameCommon;
-    viewTransition: {
-        (strings: TemplateStringsArray, ...values: CssVariableType[]): Promise<string>;
-        (content: Promise<string>): Promise<string>;
-        (): Promise<string>;
-    };
-    Style: ({ children }?: {
-        children?: Promise<string> | undefined;
-    }) => HtmlEscapedString;
-};
+}) => DefaultContextType;
+interface DefaultContextType {
+    css: CssType;
+    cx: CxType;
+    keyframes: KeyframesType;
+    viewTransition: ViewTransitionType;
+    Style: StyleType;
+}
 /**
  * @experimental
  * `css` is an experimental feature.
  * The API might be changed.
  */
-export declare const css: (strings: TemplateStringsArray, ...values: CssVariableType[]) => Promise<string>;
+export declare const css: CssType;
 /**
  * @experimental
  * `cx` is an experimental feature.
  * The API might be changed.
  */
-export declare const cx: (...args: (CssClassName | Promise<string> | string | boolean | null | undefined)[]) => Promise<string>;
+export declare const cx: CxType;
 /**
  * @experimental
  * `keyframes` is an experimental feature.
  * The API might be changed.
  */
-export declare const keyframes: (strings: TemplateStringsArray, ...values: CssVariableType[]) => CssClassNameCommon;
+export declare const keyframes: KeyframesType;
 /**
  * @experimental
  * `viewTransition` is an experimental feature.
  * The API might be changed.
  */
-export declare const viewTransition: {
-    (strings: TemplateStringsArray, ...values: CssVariableType[]): Promise<string>;
-    (content: Promise<string>): Promise<string>;
-    (): Promise<string>;
-};
+export declare const viewTransition: ViewTransitionType;
 /**
  * @experimental
  * `Style` is an experimental feature.
  * The API might be changed.
  */
-export declare const Style: ({ children }?: {
-    children?: Promise<string> | undefined;
-}) => HtmlEscapedString;
+export declare const Style: StyleType;

package/dist/types/helper/factory/index.d.ts

@@ -62,7 +62,7 @@ export declare class Factory<E extends Env = any, P extends string = any> {
      * @experimental
      * `createApp` is an experimental feature.
      */
-    createApp: () => Hono<E, import("../../types").BlankSchema, "/">;
+    createApp: () => Hono<E>;
     createMiddleware: <I extends Input = {}>(middleware: MiddlewareHandler<E, P, I>) => MiddlewareHandler<E, P, I>;
     createHandlers: CreateHandlersInterface<E, P>;
 }

package/dist/types/helper/testing/index.d.ts

@@ -1,5 +1,7 @@
+import type { Client } from '../../client/types';
 import type { ExecutionContext } from '../../context';
 import type { Hono } from '../../hono';
+import type { UnionToIntersection } from '../../utils/types';
 type ExtractEnv<T> = T extends Hono<infer E, any, any> ? E : never;
-export declare const testClient: <T extends Hono<any, any, any>>(app: T, Env?: {} | ExtractEnv<T>["Bindings"] | undefined, executionCtx?: ExecutionContext) => import("../../utils/types").UnionToIntersection<import("../../client/types").Client<T>>;
+export declare const testClient: <T extends Hono<any, any, any>>(app: T, Env?: {} | ExtractEnv<T>["Bindings"] | undefined, executionCtx?: ExecutionContext) => UnionToIntersection<Client<T>>;
 export {};

package/dist/types/hono-base.d.ts

@@ -83,7 +83,7 @@ declare class Hono<E extends Env = Env, S extends Schema = {}, BasePath extends
      * })
      * ```
      */
-    onError: (handler: ErrorHandler<E>) => this;
+    onError: (handler: ErrorHandler<E>) => Hono<E, S, BasePath>;
     /**
      * `.notFound()` allows you to customize a Not Found Response.
      * ```ts
@@ -93,7 +93,7 @@ declare class Hono<E extends Env = Env, S extends Schema = {}, BasePath extends
      * ```
      * @see https://hono.dev/api/hono#not-found
      */
-    notFound: (handler: NotFoundHandler<E>) => this;
+    notFound: (handler: NotFoundHandler<E>) => Hono<E, S, BasePath>;
     mount(path: string, applicationHandler: (request: Request, ...args: any) => Response | Promise<Response>, optionHandler?: (c: Context) => unknown): Hono<E, S, BasePath>;
     private addRoute;
     private matchRoute;

package/dist/types/jsx/dom/css.d.ts

@@ -1,11 +1,17 @@
 import type { FC, PropsWithChildren } from '..';
 import type { CssClassName, CssVariableType } from '../../helper/css/common';
 export { rawCssString } from '../../helper/css/common';
-export declare const createCssJsxDomObjects: ({ id }: {
-    id: Readonly<string>;
-}) => readonly [{
-    toString(this: CssClassName): string;
-}, FC<PropsWithChildren<void>>];
+interface CreateCssJsxDomObjectsType {
+    (args: {
+        id: Readonly<string>;
+    }): readonly [
+        {
+            toString(this: CssClassName): string;
+        },
+        FC<PropsWithChildren<void>>
+    ];
+}
+export declare const createCssJsxDomObjects: CreateCssJsxDomObjectsType;
 /**
  * @experimental
  * `createCssContext` is an experimental feature.

package/dist/types/jsx/jsx-runtime.d.ts

@@ -1,6 +1,7 @@
 export { jsxDEV as jsx, Fragment } from './jsx-dev-runtime';
 export { jsxDEV as jsxs } from './jsx-dev-runtime';
 import { html } from '../helper/html';
+import type { HtmlEscapedString } from '../utils/html';
 export { html as jsxTemplate };
-export declare const jsxAttr: (name: string, value: string | Promise<string>) => import("../utils/html").HtmlEscapedString | Promise<import("../utils/html").HtmlEscapedString>;
+export declare const jsxAttr: (name: string, value: string | Promise<string>) => HtmlEscapedString | Promise<HtmlEscapedString>;
 export declare const jsxEscape: (value: string) => string;

package/dist/types/middleware/cache/index.d.ts

@@ -1,7 +1,9 @@
+import type { Context } from '../../context';
 import type { MiddlewareHandler } from '../../types';
 export declare const cache: (options: {
-    cacheName: string;
-    wait?: boolean;
-    cacheControl?: string;
-    vary?: string | string[];
+    cacheName: string | ((c: Context) => Promise<string> | string);
+    wait?: boolean | undefined;
+    cacheControl?: string | undefined;
+    vary?: string | string[] | undefined;
+    keyGenerator?: ((c: Context) => Promise<string> | string) | undefined;
 }) => MiddlewareHandler;

package/dist/types/middleware/jsx-renderer/index.d.ts

@@ -1,8 +1,9 @@
 import type { Context, PropsForRenderer } from '../../context';
 import type { FC, PropsWithChildren } from '../../jsx';
+import type { Context as JSXContext } from '../../jsx';
 import type { Env, Input, MiddlewareHandler } from '../../types';
 import type { HtmlEscapedString } from '../../utils/html';
-export declare const RequestContext: import("../../jsx").Context<Context<any, any, {}> | null>;
+export declare const RequestContext: JSXContext<Context<any, any, {}> | null>;
 type RendererOptions = {
     docType?: boolean | string;
     stream?: boolean | Record<string, string>;

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

@@ -5,8 +5,8 @@ export declare class StreamingApi {
     private abortSubscribers;
     responseReadable: ReadableStream;
     constructor(writable: WritableStream, _readable: ReadableStream);
-    write(input: Uint8Array | string): Promise<this>;
-    writeln(input: string): Promise<this>;
+    write(input: Uint8Array | string): Promise<StreamingApi>;
+    writeln(input: string): Promise<StreamingApi>;
     sleep(ms: number): Promise<unknown>;
     close(): Promise<void>;
     pipe(body: ReadableStream): Promise<void>;

package/dist/utils/body.js

@@ -29,11 +29,11 @@ function convertFormDataToBodyData(formData, options) {
 }
 var handleParsingAllValues = (form, key, value) => {
   const formKey = form[key];
-  if (form[key] && Array.isArray(form[key])) {
-    formKey.push(value);
-  } else if (form[key]) {
-    const parsedKey = [...formKey].join("").replace(",", "");
-    form[key] = [parsedKey, value];
+  if (formKey && Array.isArray(formKey)) {
+    ;
+    form[key].push(value);
+  } else if (formKey) {
+    form[key] = [formKey, value];
   } else {
     form[key] = value;
   }

package/package.json

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