hono 3.12.1 → 3.12.3

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

@@ -30,7 +30,8 @@ var createResult = async (res) => {
   return {
     status: res.status.toString(),
     headers: convertHeaders(res.headers),
-    body
+    body,
+    ...isBase64Encoded ? { bodyEncoding: "base64" } : {}
   };
 };
 var createRequest = (event) => {

package/dist/adapter/netlify/index.js

@@ -0,0 +1,2 @@
+// src/adapter/netlify/index.ts
+export * from "./mod.js";

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

@@ -59,7 +59,8 @@ const createResult = async (res) => {
   return {
     status: res.status.toString(),
     headers: convertHeaders(res.headers),
-    body
+    body,
+    ...isBase64Encoded ? { bodyEncoding: "base64" } : {}
   };
 };
 const createRequest = (event) => {

package/dist/cjs/adapter/netlify/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var netlify_exports = {};
+module.exports = __toCommonJS(netlify_exports);
+__reExport(netlify_exports, require("./mod"), module.exports);

package/dist/cjs/client/client.js

@@ -27,7 +27,7 @@ const createProxy = (callback, path) => {
   const proxy = new Proxy(() => {
   }, {
     get(_obj, key) {
-      if (typeof key !== "string")
+      if (typeof key !== "string" || key === "then")
         return void 0;
       return createProxy(callback, [...path, key]);
     },

package/dist/cjs/context.js

@@ -241,9 +241,17 @@ class Context {
     __privateSet(this, _isFresh, false);
     if (__privateGet(this, _res) && _res2) {
       __privateGet(this, _res).headers.delete("content-type");
-      __privateGet(this, _res).headers.forEach((v, k) => {
-        _res2.headers.set(k, v);
-      });
+      for (const [k, v] of __privateGet(this, _res).headers.entries()) {
+        if (k === "set-cookie") {
+          const cookies = __privateGet(this, _res).headers.getSetCookie();
+          _res2.headers.delete("set-cookie");
+          for (const cookie of cookies) {
+            _res2.headers.append("set-cookie", cookie);
+          }
+        } else {
+          _res2.headers.set(k, v);
+        }
+      }
     }
     __privateSet(this, _res, _res2);
     this.finalized = true;

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

@@ -25,9 +25,18 @@ const cache = (options) => {
   if (options.wait === void 0) {
     options.wait = false;
   }
-  const addHeader = (response) => {
-    if (options.cacheControl)
-      response.headers.set("Cache-Control", options.cacheControl);
+  const directives = options.cacheControl?.split(",").map((directive) => directive.toLowerCase());
+  const addHeader = (c) => {
+    if (directives) {
+      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0]) ?? [];
+      for (const directive of directives) {
+        let [name, value] = directive.trim().split("=", 2);
+        name = name.toLowerCase();
+        if (!existingDirectives.includes(name)) {
+          c.header("Cache-Control", `${name}${value ? `=${value}` : ""}`, { append: true });
+        }
+      }
+    }
   };
   return async function cache2(c, next) {
     const key = c.req.url;
@@ -38,7 +47,7 @@ const cache = (options) => {
       if (!c.res.ok) {
         return;
       }
-      addHeader(c.res);
+      addHeader(c);
       const response2 = c.res.clone();
       if (options.wait) {
         await cache3.put(key, response2);

package/dist/cjs/router/linear-router/router.js

@@ -22,6 +22,7 @@ __export(router_exports, {
 });
 module.exports = __toCommonJS(router_exports);
 var import_router = require("../../router");
+var import_url = require("../../utils/url");
 const emptyParams = {};
 const splitPathRe = /\/(:\w+(?:{[^}]+})?)|\/[^\/\?]+|(\?)/g;
 const splitByStarRe = /\*/;
@@ -31,12 +32,10 @@ class LinearRouter {
     this.routes = [];
   }
   add(method, path, handler) {
-    if (path.charCodeAt(path.length - 1) === 63) {
-      this.routes.push([method, path.slice(0, -1), handler]);
-      this.routes.push([method, path.replace(/\/[^/]+$/, ""), handler]);
-    } else {
-      this.routes.push([method, path, handler]);
-    }
+    ;
+    ((0, import_url.checkOptionalParameter)(path) || [path]).forEach((p) => {
+      this.routes.push([method, p, handler]);
+    });
   }
   match(method, path) {
     const handlers = [];

package/dist/cjs/router/reg-exp-router/router.js

@@ -167,10 +167,7 @@ class RegExpRouter {
           (_a2 = routes[m])[path2] || (_a2[path2] = [
             ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[import_router.METHOD_NAME_ALL], path2) || []
           ]);
-          routes[m][path2].push([
-            handler,
-            paths.length === 2 && i === 0 ? paramCount - 1 : paramCount
-          ]);
+          routes[m][path2].push([handler, paramCount - len + i + 1]);
         }
       });
     }

package/dist/cjs/utils/url.js

@@ -121,12 +121,30 @@ const mergePath = (...paths) => {
   return p;
 };
 const checkOptionalParameter = (path) => {
-  const match = path.match(/^(.+|)(\/\:[^\/]+)\?$/);
-  if (!match)
+  if (!path.match(/\:.+\?$/))
     return null;
-  const base = match[1];
-  const optional = base + match[2];
-  return [base === "" ? "/" : base.replace(/\/$/, ""), optional];
+  const segments = path.split("/");
+  const results = [];
+  let basePath = "";
+  segments.forEach((segment) => {
+    if (segment !== "" && !/\:/.test(segment)) {
+      basePath += "/" + segment;
+    } else if (/\:/.test(segment)) {
+      if (/\?/.test(segment)) {
+        if (results.length === 0 && basePath === "") {
+          results.push("/");
+        } else {
+          results.push(basePath);
+        }
+        const optionalSegment = segment.replace("?", "");
+        basePath += "/" + optionalSegment;
+        results.push(basePath);
+      } else {
+        basePath += "/" + segment;
+      }
+    }
+  });
+  return results.filter((v, i, a) => a.indexOf(v) === i);
 };
 const _decodeURI = (value) => {
   if (!/[%+]/.test(value)) {

package/dist/client/client.js

@@ -5,7 +5,7 @@ var createProxy = (callback, path) => {
   const proxy = new Proxy(() => {
   }, {
     get(_obj, key) {
-      if (typeof key !== "string")
+      if (typeof key !== "string" || key === "then")
         return void 0;
       return createProxy(callback, [...path, key]);
     },

package/dist/context.js

@@ -219,9 +219,17 @@ var Context = class {
     __privateSet(this, _isFresh, false);
     if (__privateGet(this, _res) && _res2) {
       __privateGet(this, _res).headers.delete("content-type");
-      __privateGet(this, _res).headers.forEach((v, k) => {
-        _res2.headers.set(k, v);
-      });
+      for (const [k, v] of __privateGet(this, _res).headers.entries()) {
+        if (k === "set-cookie") {
+          const cookies = __privateGet(this, _res).headers.getSetCookie();
+          _res2.headers.delete("set-cookie");
+          for (const cookie of cookies) {
+            _res2.headers.append("set-cookie", cookie);
+          }
+        } else {
+          _res2.headers.set(k, v);
+        }
+      }
     }
     __privateSet(this, _res, _res2);
     this.finalized = true;

package/dist/middleware/cache/index.js

@@ -3,9 +3,18 @@ var cache = (options) => {
   if (options.wait === void 0) {
     options.wait = false;
   }
-  const addHeader = (response) => {
-    if (options.cacheControl)
-      response.headers.set("Cache-Control", options.cacheControl);
+  const directives = options.cacheControl?.split(",").map((directive) => directive.toLowerCase());
+  const addHeader = (c) => {
+    if (directives) {
+      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0]) ?? [];
+      for (const directive of directives) {
+        let [name, value] = directive.trim().split("=", 2);
+        name = name.toLowerCase();
+        if (!existingDirectives.includes(name)) {
+          c.header("Cache-Control", `${name}${value ? `=${value}` : ""}`, { append: true });
+        }
+      }
+    }
   };
   return async function cache2(c, next) {
     const key = c.req.url;
@@ -16,7 +25,7 @@ var cache = (options) => {
       if (!c.res.ok) {
         return;
       }
-      addHeader(c.res);
+      addHeader(c);
       const response2 = c.res.clone();
       if (options.wait) {
         await cache3.put(key, response2);

package/dist/router/linear-router/router.js

@@ -1,5 +1,6 @@
 // src/router/linear-router/router.ts
 import { METHOD_NAME_ALL, UnsupportedPathError } from "../../router.js";
+import { checkOptionalParameter } from "../../utils/url.js";
 var emptyParams = {};
 var splitPathRe = /\/(:\w+(?:{[^}]+})?)|\/[^\/\?]+|(\?)/g;
 var splitByStarRe = /\*/;
@@ -9,12 +10,10 @@ var LinearRouter = class {
     this.routes = [];
   }
   add(method, path, handler) {
-    if (path.charCodeAt(path.length - 1) === 63) {
-      this.routes.push([method, path.slice(0, -1), handler]);
-      this.routes.push([method, path.replace(/\/[^/]+$/, ""), handler]);
-    } else {
-      this.routes.push([method, path, handler]);
-    }
+    ;
+    (checkOptionalParameter(path) || [path]).forEach((p) => {
+      this.routes.push([method, p, handler]);
+    });
   }
   match(method, path) {
     const handlers = [];

package/dist/router/reg-exp-router/router.js

@@ -150,10 +150,7 @@ var RegExpRouter = class {
           (_a2 = routes[m])[path2] || (_a2[path2] = [
             ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[METHOD_NAME_ALL], path2) || []
           ]);
-          routes[m][path2].push([
-            handler,
-            paths.length === 2 && i === 0 ? paramCount - 1 : paramCount
-          ]);
+          routes[m][path2].push([handler, paramCount - len + i + 1]);
         }
       });
     }

package/dist/types/adapter/netlify/handler.d.ts

@@ -1,5 +1,5 @@
 import type { Context } from 'https://edge.netlify.com/';
-import type { Hono } from '../../';
+import type { Hono } from '../../hono';
 export type Env = {
     Bindings: {
         context: Context;

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

@@ -0,0 +1 @@
+export * from './mod';

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

@@ -1,2 +1,2 @@
 export { hc } from './client';
-export type { InferResponseType, InferRequestType, Fetch, ClientRequestOptions } from './types';
+export type { InferResponseType, InferRequestType, Fetch, ClientRequestOptions, ClientRequest, ClientResponse, } from './types';

package/dist/utils/url.js

@@ -89,12 +89,30 @@ var mergePath = (...paths) => {
   return p;
 };
 var checkOptionalParameter = (path) => {
-  const match = path.match(/^(.+|)(\/\:[^\/]+)\?$/);
-  if (!match)
+  if (!path.match(/\:.+\?$/))
     return null;
-  const base = match[1];
-  const optional = base + match[2];
-  return [base === "" ? "/" : base.replace(/\/$/, ""), optional];
+  const segments = path.split("/");
+  const results = [];
+  let basePath = "";
+  segments.forEach((segment) => {
+    if (segment !== "" && !/\:/.test(segment)) {
+      basePath += "/" + segment;
+    } else if (/\:/.test(segment)) {
+      if (/\?/.test(segment)) {
+        if (results.length === 0 && basePath === "") {
+          results.push("/");
+        } else {
+          results.push(basePath);
+        }
+        const optionalSegment = segment.replace("?", "");
+        basePath += "/" + optionalSegment;
+        results.push(basePath);
+      } else {
+        basePath += "/" + segment;
+      }
+    }
+  });
+  return results.filter((v, i, a) => a.indexOf(v) === i);
 };
 var _decodeURI = (value) => {
   if (!/[%+]/.test(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.12.1",
+  "version": "3.12.3",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -269,6 +269,11 @@
       "import": "./dist/adapter/vercel/index.js",
       "require": "./dist/cjs/adapter/vercel/index.js"
     },
+    "./netlify": {
+      "types": "./dist/types/adapter/netlify/index.d.ts",
+      "import": "./dist/adapter/netlify/index.js",
+      "require": "./dist/cjs/adapter/netlify/index.js"
+    },
     "./lambda-edge": {
       "types": "./dist/types/adapter/lambda-edge/index.d.ts",
       "import": "./dist/adapter/lambda-edge/index.js",