hono 4.10.3 → 4.10.5

package/dist/cjs/jsx/base.js

@@ -206,10 +206,11 @@ class JSXNode {
 class JSXFunctionNode extends JSXNode {
   toStringToBuffer(buffer) {
     const { children } = this;
-    const res = this.tag.call(null, {
-      ...this.props,
-      children: children.length <= 1 ? children[0] : children
-    });
+    const props = { ...this.props };
+    if (children.length) {
+      props.children = children.length === 1 ? children[0] : children;
+    }
+    const res = this.tag.call(null, props);
     if (typeof res === "boolean" || res == null) {
       return;
     } else if (res instanceof Promise) {

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

@@ -22,6 +22,10 @@ __export(cache_exports, {
 });
 module.exports = __toCommonJS(cache_exports);
 const defaultCacheableStatusCodes = [200];
+const shouldSkipCache = (res) => {
+  const vary = res.headers.get("Vary");
+  return vary && vary.includes("*");
+};
 const cache = (options) => {
   if (!globalThis.caches) {
     console.log("Cache Middleware is not enabled because caches is not defined.");
@@ -81,6 +85,9 @@ const cache = (options) => {
       return;
     }
     addHeader(c);
+    if (shouldSkipCache(c.res)) {
+      return;
+    }
     const res = c.res.clone();
     if (options.wait) {
       await cache3.put(key, res);

package/dist/cjs/utils/url.js

@@ -167,9 +167,12 @@ const _decodeURI = (value) => {
 const _getQueryParam = (url, key, multiple) => {
   let encoded;
   if (!multiple && key && !/[%+]/.test(key)) {
-    let keyIndex2 = url.indexOf(`?${key}`, 8);
+    let keyIndex2 = url.indexOf("?", 8);
     if (keyIndex2 === -1) {
-      keyIndex2 = url.indexOf(`&${key}`, 8);
+      return void 0;
+    }
+    if (!url.startsWith(key, keyIndex2 + 1)) {
+      keyIndex2 = url.indexOf(`&${key}`, keyIndex2 + 1);
     }
     while (keyIndex2 !== -1) {
       const trailingKeyCode = url.charCodeAt(keyIndex2 + key.length + 1);

package/dist/jsx/base.js

@@ -167,10 +167,11 @@ var JSXNode = class {
 var JSXFunctionNode = class extends JSXNode {
   toStringToBuffer(buffer) {
     const { children } = this;
-    const res = this.tag.call(null, {
-      ...this.props,
-      children: children.length <= 1 ? children[0] : children
-    });
+    const props = { ...this.props };
+    if (children.length) {
+      props.children = children.length === 1 ? children[0] : children;
+    }
+    const res = this.tag.call(null, props);
     if (typeof res === "boolean" || res == null) {
       return;
     } else if (res instanceof Promise) {

package/dist/middleware/cache/index.js

@@ -1,5 +1,9 @@
 // src/middleware/cache/index.ts
 var defaultCacheableStatusCodes = [200];
+var shouldSkipCache = (res) => {
+  const vary = res.headers.get("Vary");
+  return vary && vary.includes("*");
+};
 var cache = (options) => {
   if (!globalThis.caches) {
     console.log("Cache Middleware is not enabled because caches is not defined.");
@@ -59,6 +63,9 @@ var cache = (options) => {
       return;
     }
     addHeader(c);
+    if (shouldSkipCache(c.res)) {
+      return;
+    }
     const res = c.res.clone();
     if (options.wait) {
       await cache3.put(key, res);

package/dist/types/adapter/aws-lambda/handler.d.ts

@@ -125,7 +125,7 @@ export declare abstract class EventProcessor<E extends LambdaEvent> {
     protected abstract getCookies(event: E, headers: Headers): void;
     protected abstract setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
     createRequest(event: E): Request;
-    createResult(event: E, res: Response, options: Pick<HandleOptions, "isContentTypeBinary">): Promise<APIGatewayProxyResult>;
+    createResult(event: E, res: Response, options: Pick<HandleOptions, 'isContentTypeBinary'>): Promise<APIGatewayProxyResult>;
     setCookies(event: E, res: Response, result: APIGatewayProxyResult): void;
 }
 export declare class EventV2Processor extends EventProcessor<APIGatewayProxyEventV2> {

package/dist/types/adapter/cloudflare-pages/handler.d.ts

@@ -22,7 +22,7 @@ export declare function handleMiddleware<E extends Env = {}, P extends string =
     Bindings: {
         eventContext: EventContext;
     };
-}, P, I>): PagesFunction<E["Bindings"]>;
+}, P, I>): PagesFunction<E['Bindings']>;
 /**
  *
  * @description `serveStatic()` is for advanced mode:

package/dist/types/adapter/cloudflare-workers/websocket.d.ts

@@ -1,2 +1,2 @@
 import type { UpgradeWebSocket, WSEvents } from '../../helper/websocket';
-export declare const upgradeWebSocket: UpgradeWebSocket<WebSocket, any, Omit<WSEvents<WebSocket>, "onOpen">>;
+export declare const upgradeWebSocket: UpgradeWebSocket<WebSocket, any, Omit<WSEvents<WebSocket>, 'onOpen'>>;

package/dist/types/adapter/lambda-edge/handler.d.ts

@@ -17,7 +17,7 @@ interface CloudFrontCustomOrigin {
     sslProtocols: string[];
 }
 interface CloudFrontS3Origin {
-    authMethod: "origin-access-identity" | "none";
+    authMethod: 'origin-access-identity' | 'none';
     customHeaders: CloudFrontHeaders;
     domainName: string;
     path: string;
@@ -79,7 +79,7 @@ interface CloudFrontResult {
         }[];
     };
     body?: string;
-    bodyEncoding?: "text" | "base64";
+    bodyEncoding?: 'text' | 'base64';
 }
 export declare const handle: (app: Hono<any>) => ((event: CloudFrontEdgeEvent, context?: CloudFrontContext, callback?: Callback) => Promise<CloudFrontResult>);
 export declare const createBody: (method: string, requestBody: CloudFrontRequest["body"]) => string | Uint8Array<ArrayBuffer> | undefined;

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

@@ -3,7 +3,7 @@ import type { HonoBase } from '../hono-base';
 import type { Endpoint, ResponseFormat, Schema } from '../types';
 import type { StatusCode, SuccessStatusCode } from '../utils/http-status';
 import type { HasRequiredKeys } from '../utils/types';
-type HonoRequest = (typeof Hono.prototype)["request"];
+type HonoRequest = (typeof Hono.prototype)['request'];
 export type ClientRequestOptions<T = unknown> = {
     fetch?: typeof fetch | HonoRequest;
     webSocket?: (...args: ConstructorParameters<typeof WebSocket>) => WebSocket;
@@ -40,9 +40,9 @@ export type ClientRequest<S extends Schema> = {
     } ? {
         query: Q;
     } : {} : {}) => URL;
-} & (S["$get"] extends {
-    outputFormat: "ws";
-} ? S["$get"] extends {
+} & (S['$get'] extends {
+    outputFormat: 'ws';
+} ? S['$get'] extends {
     input: infer I;
 } ? {
     $ws: (args?: I) => WebSocket;
@@ -62,8 +62,8 @@ export interface ClientResponse<T, U extends number = StatusCode, F extends Resp
     url: string;
     redirect(url: string, status: number): Response;
     clone(): Response;
-    json(): F extends "text" ? Promise<never> : F extends "json" ? Promise<T> : Promise<unknown>;
-    text(): F extends "text" ? (T extends string ? Promise<T> : Promise<never>) : Promise<string>;
+    json(): F extends 'text' ? Promise<never> : F extends 'json' ? Promise<T> : Promise<unknown>;
+    text(): F extends 'text' ? (T extends string ? Promise<T> : Promise<never>) : Promise<string>;
     blob(): Promise<Blob>;
     formData(): Promise<FormData>;
     arrayBuffer(): Promise<ArrayBuffer>;
@@ -96,7 +96,7 @@ export type FilterClientResponseByStatusCode<T extends ClientResponse<any, any,
 type PathToChain<Path extends string, E extends Schema, Original extends string = Path> = Path extends `/${infer P}` ? PathToChain<P, E, Path> : Path extends `${infer P}/${infer R}` ? {
     [K in P]: PathToChain<R, E, Original>;
 } : {
-    [K in Path extends "" ? "index" : Path]: ClientRequest<E extends Record<string, unknown> ? E[Original] : never>;
+    [K in Path extends '' ? 'index' : Path]: ClientRequest<E extends Record<string, unknown> ? E[Original] : never>;
 };
 export type Client<T> = T extends HonoBase<any, infer S, any> ? S extends Record<infer K, Schema> ? K extends string ? PathToChain<K, S> : never : never : never;
 export type Callback = (opts: CallbackOptions) => unknown;

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

@@ -15,4 +15,4 @@ export declare function deepMerge<T>(target: T, source: Record<string, unknown>)
  *
  * @example const result = await parseResponse(client.posts.$get())
  */
-export declare function parseResponse<T extends ClientResponse<any>>(fetchRes: T | Promise<T>): Promise<FilterClientResponseByStatusCode<T, Exclude<ContentfulStatusCode, ClientErrorStatusCode | ServerErrorStatusCode>> extends never ? undefined : FilterClientResponseByStatusCode<T, Exclude<ContentfulStatusCode, ClientErrorStatusCode | ServerErrorStatusCode>> extends ClientResponse<infer RT, infer _, infer RF> ? RF extends "json" ? RT : RT extends string ? RT : string : undefined>;
+export declare function parseResponse<T extends ClientResponse<any>>(fetchRes: T | Promise<T>): Promise<FilterClientResponseByStatusCode<T, Exclude<ContentfulStatusCode, ClientErrorStatusCode | ServerErrorStatusCode>> extends never ? undefined : FilterClientResponseByStatusCode<T, Exclude<ContentfulStatusCode, ClientErrorStatusCode | ServerErrorStatusCode>> extends ClientResponse<infer RT, infer _, infer RF> ? RF extends 'json' ? RT : RT extends string ? RT : string : undefined>;

package/dist/types/compose.d.ts

@@ -11,14 +11,4 @@ import type { Env, ErrorHandler, Next, NotFoundHandler } from './types';
  *
  * @returns {(context: Context, next?: Next) => Promise<Context>} - A composed middleware function.
  */
-export declare const compose: <E extends Env = Env>(middleware: [
-    [
-        Function,
-        unknown
-    ],
-    unknown
-][] | [
-    [
-        Function
-    ]
-][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: Context, next?: Next) => Promise<Context>);
+export declare const compose: <E extends Env = Env>(middleware: [[Function, unknown], unknown][] | [[Function]][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: Context, next?: Next) => Promise<Context>);

package/dist/types/context.d.ts

@@ -5,7 +5,7 @@ import type { ResponseHeader } from './utils/headers';
 import type { ContentfulStatusCode, RedirectStatusCode, StatusCode } from './utils/http-status';
 import type { BaseMime } from './utils/mime';
 import type { InvalidJSONValue, IsAny, JSONParsed, JSONValue } from './utils/types';
-type HeaderRecord = Record<"Content-Type", BaseMime> | Record<ResponseHeader, string | string[]> | Record<string, string | string[]>;
+type HeaderRecord = Record<'Content-Type', BaseMime> | Record<ResponseHeader, string | string[]> | Record<string, string | string[]>;
 /**
  * Data type can be a string, ArrayBuffer, Uint8Array (buffer), or ReadableStream.
  */
@@ -56,12 +56,7 @@ export type Renderer = ContextRenderer extends Function ? ContextRenderer : Defa
 /**
  * Extracts the props for the renderer.
  */
-export type PropsForRenderer = [
-    ...Required<Parameters<Renderer>>
-] extends [
-    unknown,
-    infer Props
-] ? Props : unknown;
+export type PropsForRenderer = [...Required<Parameters<Renderer>>] extends [unknown, infer Props] ? Props : unknown;
 export type Layout<T = Record<string, any>> = (props: T) => any;
 /**
  * Interface for getting context variables.
@@ -69,7 +64,7 @@ export type Layout<T = Record<string, any>> = (props: T) => any;
  * @template E - Environment type.
  */
 interface Get<E extends Env> {
-    <Key extends keyof E["Variables"]>(key: Key): E["Variables"][Key];
+    <Key extends keyof E['Variables']>(key: Key): E['Variables'][Key];
     <Key extends keyof ContextVariableMap>(key: Key): ContextVariableMap[Key];
 }
 /**
@@ -78,7 +73,7 @@ interface Get<E extends Env> {
  * @template E - Environment type.
  */
 interface Set<E extends Env> {
-    <Key extends keyof E["Variables"]>(key: Key, value: E["Variables"][Key]): void;
+    <Key extends keyof E['Variables']>(key: Key, value: E['Variables'][Key]): void;
     <Key extends keyof ContextVariableMap>(key: Key, value: ContextVariableMap[Key]): void;
 }
 /**
@@ -92,10 +87,10 @@ interface NewResponse {
  * Interface for responding with a body.
  */
 interface BodyRespond {
-    <T extends Data, U extends ContentfulStatusCode>(data: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, "body">;
-    <T extends Data, U extends ContentfulStatusCode>(data: T, init?: ResponseOrInit<U>): Response & TypedResponse<T, U, "body">;
-    <T extends null, U extends StatusCode>(data: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<null, U, "body">;
-    <T extends null, U extends StatusCode>(data: T, init?: ResponseOrInit<U>): Response & TypedResponse<null, U, "body">;
+    <T extends Data, U extends ContentfulStatusCode>(data: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'body'>;
+    <T extends Data, U extends ContentfulStatusCode>(data: T, init?: ResponseOrInit<U>): Response & TypedResponse<T, U, 'body'>;
+    <T extends null, U extends StatusCode>(data: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<null, U, 'body'>;
+    <T extends null, U extends StatusCode>(data: T, init?: ResponseOrInit<U>): Response & TypedResponse<null, U, 'body'>;
 }
 /**
  * Interface for responding with text.
@@ -111,8 +106,8 @@ interface BodyRespond {
  * @returns {Response & TypedResponse<T, U, 'text'>} - The response after rendering the text content, typed with the provided text and status code types.
  */
 interface TextRespond {
-    <T extends string, U extends ContentfulStatusCode = ContentfulStatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, "text">;
-    <T extends string, U extends ContentfulStatusCode = ContentfulStatusCode>(text: T, init?: ResponseOrInit<U>): Response & TypedResponse<T, U, "text">;
+    <T extends string, U extends ContentfulStatusCode = ContentfulStatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'text'>;
+    <T extends string, U extends ContentfulStatusCode = ContentfulStatusCode>(text: T, init?: ResponseOrInit<U>): Response & TypedResponse<T, U, 'text'>;
 }
 /**
  * Interface for responding with JSON.
@@ -137,7 +132,7 @@ interface JSONRespond {
  *
  * @returns {Response & TypedResponse<JSONParsed<T>, U, 'json'>} - The response after rendering the JSON object, typed with the provided object and status code types.
  */
-type JSONRespondReturn<T extends JSONValue | {} | InvalidJSONValue, U extends ContentfulStatusCode> = Response & TypedResponse<JSONParsed<T>, U, "json">;
+type JSONRespondReturn<T extends JSONValue | {} | InvalidJSONValue, U extends ContentfulStatusCode> = Response & TypedResponse<JSONParsed<T>, U, 'json'>;
 /**
  * Interface representing a function that responds with HTML content.
  *
@@ -161,7 +156,7 @@ type ContextOptions<E extends Env> = {
     /**
      * Bindings for the environment.
      */
-    env: E["Bindings"];
+    env: E['Bindings'];
     /**
      * Execution context for the request.
      */
@@ -170,24 +165,18 @@ type ContextOptions<E extends Env> = {
      * Handler for not found responses.
      */
     notFoundHandler?: NotFoundHandler<E>;
-    matchResult?: Result<[
-        H,
-        RouterRoute
-    ]>;
+    matchResult?: Result<[H, RouterRoute]>;
     path?: string;
 };
 interface SetHeadersOptions {
     append?: boolean;
 }
 interface SetHeaders {
-    (name: "Content-Type", value?: BaseMime, options?: SetHeadersOptions): void;
+    (name: 'Content-Type', value?: BaseMime, options?: SetHeadersOptions): void;
     (name: ResponseHeader, value?: string, options?: SetHeadersOptions): void;
     (name: string, value?: string, options?: SetHeadersOptions): void;
 }
-type ResponseHeadersInit = [
-    string,
-    string
-][] | Record<"Content-Type", BaseMime> | Record<ResponseHeader, string> | Record<string, string> | Headers;
+type ResponseHeadersInit = [string, string][] | Record<'Content-Type', BaseMime> | Record<ResponseHeader, string> | Record<string, string> | Headers;
 interface ResponseInit<T extends StatusCode = StatusCode> {
     headers?: ResponseHeadersInit;
     status?: T;
@@ -196,6 +185,7 @@ interface ResponseInit<T extends StatusCode = StatusCode> {
 type ResponseOrInit<T extends StatusCode = StatusCode> = ResponseInit<T> | Response;
 export declare const TEXT_PLAIN = "text/plain; charset=UTF-8";
 export declare class Context<E extends Env = any, P extends string = any, I extends Input = {}> {
+             
     /**
      * `.env` can get bindings (environment variables, secrets, KV namespaces, D1 database, R2 bucket etc.) in Cloudflare Workers.
      *
@@ -209,7 +199,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * })
      * ```
      */
-    env: E["Bindings"];
+    env: E['Bindings'];
     finalized: boolean;
     /**
      * `.error` can get the error object from the middleware if the Handler throws an error.
@@ -237,7 +227,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
     /**
      * `.req` is the instance of {@link HonoRequest}.
      */
-    get req(): HonoRequest<P, I["out"]>;
+    get req(): HonoRequest<P, I['out']>;
     /**
      * @see {@link https://hono.dev/docs/api/context#event}
      * The FetchEvent associated with the current request.
@@ -377,7 +367,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * const result = c.var.client.oneMethod()
      * ```
      */
-    get var(): Readonly<ContextVariableMap & (IsAny<E["Variables"]> extends true ? Record<string, any> : E["Variables"])>;
+    get var(): Readonly<ContextVariableMap & (IsAny<E['Variables']> extends true ? Record<string, any> : E['Variables'])>;
     newResponse: NewResponse;
     /**
      * `.body()` can return the HTTP response.

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

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

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

@@ -1,10 +1,10 @@
 import type { Context } from '../../context';
-export type AddressType = "IPv6" | "IPv4" | undefined;
+export type AddressType = 'IPv6' | 'IPv4' | undefined;
 export type NetAddrInfo = {
     /**
      * Transport protocol type
      */
-    transport?: "tcp" | "udp";
+    transport?: 'tcp' | 'udp';
     /**
      * Transport port number
      */

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

@@ -29,12 +29,7 @@ type CssVariableBasicType = CssClassName | CssEscapedString | string | number |
 type CssVariableAsyncType = Promise<CssVariableBasicType>;
 type CssVariableArrayType = (CssVariableBasicType | CssVariableAsyncType)[];
 export type CssVariableType = CssVariableBasicType | CssVariableAsyncType | CssVariableArrayType;
-export declare const buildStyleString: (strings: TemplateStringsArray, values: CssVariableType[]) => [
-    string,
-    string,
-    CssClassName[],
-    string[]
-];
+export declare const buildStyleString: (strings: TemplateStringsArray, values: CssVariableType[]) => [string, string, CssClassName[], string[]];
 export declare const cssCommon: (strings: TemplateStringsArray, values: CssVariableType[]) => CssClassName;
 export declare const cxCommon: (args: (string | boolean | null | undefined | CssClassName)[]) => (string | boolean | null | undefined | CssClassName)[];
 export declare const keyframesCommon: (strings: TemplateStringsArray, ...values: CssVariableType[]) => CssClassName;