hono 4.7.4 → 4.7.5

package/dist/adapter/aws-lambda/handler.js

@@ -93,25 +93,31 @@ var EventProcessor = class {
     const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
     const result = {
       body,
-      headers: {},
-      multiValueHeaders: event.multiValueHeaders ? {} : void 0,
       statusCode: res.status,
-      isBase64Encoded
+      isBase64Encoded,
+      ...event.multiValueHeaders ? {
+        multiValueHeaders: {}
+      } : {
+        headers: {}
+      }
     };
     this.setCookies(event, res, result);
-    res.headers.forEach((value, key) => {
-      result.headers[key] = value;
-      if (event.multiValueHeaders && result.multiValueHeaders) {
+    if (result.multiValueHeaders) {
+      res.headers.forEach((value, key) => {
         result.multiValueHeaders[key] = [value];
-      }
-    });
+      });
+    } else {
+      res.headers.forEach((value, key) => {
+        result.headers[key] = value;
+      });
+    }
     return result;
   }
   setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
       const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
       if (Array.isArray(cookies)) {
-        this.setCookiesToResult(event, result, cookies);
+        this.setCookiesToResult(result, cookies);
         res.headers.delete("set-cookie");
       }
     }
@@ -132,7 +138,7 @@ var EventV2Processor = class extends EventProcessor {
       headers.set("Cookie", event.cookies.join("; "));
     }
   }
-  setCookiesToResult(_, result, cookies) {
+  setCookiesToResult(result, cookies) {
     result.cookies = cookies;
   }
   getHeaders(event) {
@@ -185,7 +191,7 @@ var EventV1Processor = class extends EventProcessor {
     }
     return headers;
   }
-  setCookiesToResult(_, result, cookies) {
+  setCookiesToResult(result, cookies) {
     result.multiValueHeaders = {
       "set-cookie": cookies
     };
@@ -234,8 +240,8 @@ var ALBProcessor = class extends EventProcessor {
       headers.append("Cookie", cookie);
     }
   }
-  setCookiesToResult(event, result, cookies) {
-    if (event.multiValueHeaders && result.multiValueHeaders) {
+  setCookiesToResult(result, cookies) {
+    if (result.multiValueHeaders) {
       result.multiValueHeaders["set-cookie"] = cookies;
     } else {
       result.headers["set-cookie"] = cookies.join(", ");

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -123,25 +123,31 @@ class EventProcessor {
     const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
     const result = {
       body,
-      headers: {},
-      multiValueHeaders: event.multiValueHeaders ? {} : void 0,
       statusCode: res.status,
-      isBase64Encoded
+      isBase64Encoded,
+      ...event.multiValueHeaders ? {
+        multiValueHeaders: {}
+      } : {
+        headers: {}
+      }
     };
     this.setCookies(event, res, result);
-    res.headers.forEach((value, key) => {
-      result.headers[key] = value;
-      if (event.multiValueHeaders && result.multiValueHeaders) {
+    if (result.multiValueHeaders) {
+      res.headers.forEach((value, key) => {
         result.multiValueHeaders[key] = [value];
-      }
-    });
+      });
+    } else {
+      res.headers.forEach((value, key) => {
+        result.headers[key] = value;
+      });
+    }
     return result;
   }
   setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
       const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
       if (Array.isArray(cookies)) {
-        this.setCookiesToResult(event, result, cookies);
+        this.setCookiesToResult(result, cookies);
         res.headers.delete("set-cookie");
       }
     }
@@ -162,7 +168,7 @@ class EventV2Processor extends EventProcessor {
       headers.set("Cookie", event.cookies.join("; "));
     }
   }
-  setCookiesToResult(_, result, cookies) {
+  setCookiesToResult(result, cookies) {
     result.cookies = cookies;
   }
   getHeaders(event) {
@@ -215,7 +221,7 @@ class EventV1Processor extends EventProcessor {
     }
     return headers;
   }
-  setCookiesToResult(_, result, cookies) {
+  setCookiesToResult(result, cookies) {
     result.multiValueHeaders = {
       "set-cookie": cookies
     };
@@ -264,8 +270,8 @@ class ALBProcessor extends EventProcessor {
       headers.append("Cookie", cookie);
     }
   }
-  setCookiesToResult(event, result, cookies) {
-    if (event.multiValueHeaders && result.multiValueHeaders) {
+  setCookiesToResult(result, cookies) {
+    if (result.multiValueHeaders) {
       result.multiValueHeaders["set-cookie"] = cookies;
     } else {
       result.headers["set-cookie"] = cookies.join(", ");

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

@@ -55,29 +55,35 @@ export interface ALBProxyEvent {
     };
     requestContext: ALBRequestContext;
 }
-export interface APIGatewayProxyResult {
+type WithHeaders = {
+    headers: Record<string, string>;
+    multiValueHeaders?: undefined;
+};
+type WithMultiValueHeaders = {
+    headers?: undefined;
+    multiValueHeaders: Record<string, string[]>;
+};
+export type APIGatewayProxyResult = {
     statusCode: number;
     statusDescription?: string;
     body: string;
-    headers: Record<string, string>;
     cookies?: string[];
-    multiValueHeaders?: {
-        [headerKey: string]: string[];
-    };
     isBase64Encoded: boolean;
-}
+} & (WithHeaders | WithMultiValueHeaders);
 export declare const streamHandle: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => Handler;
 /**
  * Accepts events from API Gateway/ELB(`APIGatewayProxyEvent`) and directly through Function Url(`APIGatewayProxyEventV2`)
  */
-export declare const handle: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => ((event: LambdaEvent, lambdaContext?: LambdaContext) => Promise<APIGatewayProxyResult>);
+export declare const handle: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => (<L extends LambdaEvent>(event: L, lambdaContext?: LambdaContext) => Promise<APIGatewayProxyResult & (L extends {
+    multiValueHeaders: Record<string, string[]>;
+} ? WithMultiValueHeaders : WithHeaders)>);
 export declare abstract class EventProcessor<E extends LambdaEvent> {
     protected abstract getPath(event: E): string;
     protected abstract getMethod(event: E): string;
     protected abstract getQueryString(event: E): string;
     protected abstract getHeaders(event: E): Headers;
     protected abstract getCookies(event: E, headers: Headers): void;
-    protected abstract setCookiesToResult(event: E, result: APIGatewayProxyResult, cookies: string[]): void;
+    protected abstract setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
     createRequest(event: E): Request;
     createResult(event: E, res: Response): Promise<APIGatewayProxyResult>;
     setCookies(event: E, res: Response, result: APIGatewayProxyResult): void;
@@ -87,7 +93,7 @@ export declare class EventV2Processor extends EventProcessor<APIGatewayProxyEven
     protected getMethod(event: APIGatewayProxyEventV2): string;
     protected getQueryString(event: APIGatewayProxyEventV2): string;
     protected getCookies(event: APIGatewayProxyEventV2, headers: Headers): void;
-    protected setCookiesToResult(_: APIGatewayProxyEventV2, result: APIGatewayProxyResult, cookies: string[]): void;
+    protected setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
     protected getHeaders(event: APIGatewayProxyEventV2): Headers;
 }
 export declare class EventV1Processor extends EventProcessor<Exclude<LambdaEvent, APIGatewayProxyEventV2>> {
@@ -96,7 +102,7 @@ export declare class EventV1Processor extends EventProcessor<Exclude<LambdaEvent
     protected getQueryString(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>): string;
     protected getCookies(event: Exclude<LambdaEvent, APIGatewayProxyEventV2>, headers: Headers): void;
     protected getHeaders(event: APIGatewayProxyEvent): Headers;
-    protected setCookiesToResult(_: APIGatewayProxyEvent, result: APIGatewayProxyResult, cookies: string[]): void;
+    protected setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
 }
 export declare class ALBProcessor extends EventProcessor<ALBProxyEvent> {
     protected getHeaders(event: ALBProxyEvent): Headers;
@@ -104,8 +110,9 @@ export declare class ALBProcessor extends EventProcessor<ALBProxyEvent> {
     protected getMethod(event: ALBProxyEvent): string;
     protected getQueryString(event: ALBProxyEvent): string;
     protected getCookies(event: ALBProxyEvent, headers: Headers): void;
-    protected setCookiesToResult(event: ALBProxyEvent, result: APIGatewayProxyResult, cookies: string[]): void;
+    protected setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
 }
 export declare const getProcessor: (event: LambdaEvent) => EventProcessor<LambdaEvent>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export declare const isContentEncodingBinary: (contentEncoding: string | null) => boolean;
+export {};

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

@@ -5,4 +5,5 @@
 export { serveStatic } from './serve-static';
 export { bunFileSystemModule, toSSG } from './ssg';
 export { createBunWebSocket } from './websocket';
+export type { BunWebSocketData, BunWebSocketHandler } from './websocket';
 export { getConnInfo } from './conninfo';

package/dist/types/compose.d.ts

@@ -1,15 +1,15 @@
 import type { Context } from './context';
-import type { Env, ErrorHandler, NotFoundHandler } from './types';
+import type { Env, ErrorHandler, Next, NotFoundHandler } from './types';
 /**
  * Compose middleware functions into a single function based on `koa-compose` package.
  *
  * @template E - The environment type.
  *
- * @param {[[Function, unknown], ParamIndexMap | Params][]} middleware - An array of middleware functions and their corresponding parameters.
+ * @param {[[Function, unknown], unknown][] | [[Function]][]} middleware - An array of middleware functions and their corresponding parameters.
  * @param {ErrorHandler<E>} [onError] - An optional error handler function.
  * @param {NotFoundHandler<E>} [onNotFound] - An optional not-found handler function.
  *
- * @returns {(context: Context, next?: Function) => Promise<>} - A composed middleware function.
+ * @returns {(context: Context, next?: Next) => Promise<Context>} - A composed middleware function.
  */
 export declare const compose: <E extends Env = Env>(middleware: [
     [
@@ -21,4 +21,4 @@ export declare const compose: <E extends Env = Env>(middleware: [
     [
         Function
     ]
-][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: Context, next?: Function) => Promise<Context>);
+][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: Context, next?: Next) => Promise<Context>);

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

@@ -6,7 +6,7 @@ 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 = Context<{
     Bindings: T;
-}>>(c: T extends Record<string, unknown> ? Context : C, runtime?: Runtime) => T & C["env"];
+}, any, {}>>(c: T extends Record<string, unknown> ? Context : C, runtime?: Runtime) => T & C["env"];
 export declare const knownUserAgents: Partial<Record<Runtime, string>>;
 export declare const getRuntimeKey: () => Runtime;
 export declare const checkUserAgentEquals: (platform: string) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",