hono 3.12.1 → 3.12.2

package/dist/adapter/netlify/index.js

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

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/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/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/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/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/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.2",
   "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",