hono 3.8.2 → 3.8.4

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

@@ -13,10 +13,10 @@ var handle = (app) => {
       requestContext,
       lambdaContext
     });
-    return createResult(res);
+    return createResult(event, res);
   };
 };
-var createResult = async (res) => {
+var createResult = async (event, res) => {
   const contentType = res.headers.get("content-type");
   let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
   if (!isBase64Encoded) {
@@ -36,6 +36,7 @@ var createResult = async (res) => {
     statusCode: res.status,
     isBase64Encoded
   };
+  setCookies(event, res, result);
   res.headers.forEach((value, key) => {
     result.headers[key] = value;
   });
@@ -46,6 +47,7 @@ var createRequest = (event) => {
   const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
+  getCookies(event, headers);
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
@@ -66,6 +68,26 @@ var extractQueryString = (event) => {
   }
   return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
 };
+var getCookies = (event, headers) => {
+  if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
+    headers.set("Cookie", event.cookies.join("; "));
+  }
+};
+var setCookies = (event, res, result) => {
+  if (res.headers.has("set-cookie")) {
+    const cookies = res.headers.get("set-cookie")?.split(", ");
+    if (Array.isArray(cookies)) {
+      if (isProxyEventV2(event)) {
+        result.cookies = cookies;
+      } else {
+        result.multiValueHeaders = {
+          "set-cookie": cookies
+        };
+      }
+      res.headers.delete("set-cookie");
+    }
+  }
+};
 var isProxyEvent = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "path");
 };

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

@@ -43,10 +43,10 @@ const handle = (app) => {
       requestContext,
       lambdaContext
     });
-    return createResult(res);
+    return createResult(event, res);
   };
 };
-const createResult = async (res) => {
+const createResult = async (event, res) => {
   const contentType = res.headers.get("content-type");
   let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
   if (!isBase64Encoded) {
@@ -66,6 +66,7 @@ const createResult = async (res) => {
     statusCode: res.status,
     isBase64Encoded
   };
+  setCookies(event, res, result);
   res.headers.forEach((value, key) => {
     result.headers[key] = value;
   });
@@ -76,6 +77,7 @@ const createRequest = (event) => {
   const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
+  getCookies(event, headers);
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
@@ -96,6 +98,26 @@ const extractQueryString = (event) => {
   }
   return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
 };
+const getCookies = (event, headers) => {
+  if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
+    headers.set("Cookie", event.cookies.join("; "));
+  }
+};
+const setCookies = (event, res, result) => {
+  if (res.headers.has("set-cookie")) {
+    const cookies = res.headers.get("set-cookie")?.split(", ");
+    if (Array.isArray(cookies)) {
+      if (isProxyEventV2(event)) {
+        result.cookies = cookies;
+      } else {
+        result.multiValueHeaders = {
+          "set-cookie": cookies
+        };
+      }
+      res.headers.delete("set-cookie");
+    }
+  }
+};
 const isProxyEvent = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "path");
 };

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

@@ -5,6 +5,7 @@ import type { LambdaContext } from './types';
 interface APIGatewayProxyEventV2 {
     httpMethod: string;
     headers: Record<string, string | undefined>;
+    cookies?: string[];
     rawPath: string;
     rawQueryString: string;
     body: string | null;
@@ -14,6 +15,9 @@ interface APIGatewayProxyEventV2 {
 interface APIGatewayProxyEvent {
     httpMethod: string;
     headers: Record<string, string | undefined>;
+    multiValueHeaders?: {
+        [headerKey: string]: string[];
+    };
     path: string;
     body: string | null;
     isBase64Encoded: boolean;
@@ -32,6 +36,10 @@ interface APIGatewayProxyResult {
     statusCode: number;
     body: string;
     headers: Record<string, string>;
+    cookies?: string[];
+    multiValueHeaders?: {
+        [headerKey: string]: string[];
+    };
     isBase64Encoded: boolean;
 }
 /**

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

@@ -1,6 +1,6 @@
 import type { Hono } from '../hono';
 import type { Schema } from '../types';
-import type { RemoveBlankRecord } from '../utils/types';
+import type { HasRequiredKeys } from '../utils/types';
 declare type HonoRequest = typeof Hono.prototype['request'];
 export declare type ClientRequestOptions<T = unknown> = keyof T extends never ? {
     headers?: Record<string, string>;
@@ -13,7 +13,7 @@ declare type ClientRequest<S extends Schema> = {
     [M in keyof S]: S[M] extends {
         input: infer R;
         output: infer O;
-    } ? RemoveBlankRecord<R> extends never ? (args?: {}, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : (args: R, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : never;
+    } ? R extends object ? HasRequiredKeys<R> extends true ? (args: R, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : (args?: R, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : never : never;
 } & {
     $url: () => URL;
 };

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

@@ -2,7 +2,7 @@ import type { Context, Renderer } from '../../context';
 import type { FC } from '../../jsx';
 import type { Env, Input, MiddlewareHandler } from '../../types';
 export declare const RequestContext: import("../../jsx").Context<Context<any, any, {}> | null>;
-declare type PropsForRenderer = [...Parameters<Renderer>] extends [unknown, infer Props] ? Props : unknown;
+declare type PropsForRenderer = [...Required<Parameters<Renderer>>] extends [unknown, infer Props] ? Props : unknown;
 export declare const jsxRenderer: (component?: FC<PropsForRenderer>) => MiddlewareHandler;
 export declare const useRequestContext: <E extends Env = any, P extends string = any, I extends Input = {}>() => Context<E, P, I>;
 export {};

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

@@ -14,3 +14,7 @@ export declare type JSONValue = JSONObject | JSONArray | JSONPrimitive;
 export declare type InterfaceToType<T> = T extends Function ? T : {
     [K in keyof T]: InterfaceToType<T[K]>;
 };
+export declare type RequiredKeysOf<BaseType extends object> = Exclude<{
+    [Key in keyof BaseType]: BaseType extends Record<Key, BaseType[Key]> ? Key : never;
+}[keyof BaseType], undefined>;
+export declare type HasRequiredKeys<BaseType extends object> = RequiredKeysOf<BaseType> extends never ? false : true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -39,6 +39,11 @@
       "import": "./dist/index.js",
       "require": "./dist/cjs/index.js"
     },
+    "./types": {
+      "types": "./dist/types/types.d.ts",
+      "import": "./dist/types.js",
+      "require": "./dist/cjs/types.js"
+    },
     "./hono-base": {
       "types": "./dist/types/hono-base.d.ts",
       "import": "./dist/hono-base.js",