hono 3.12.0 → 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/helper/streaming/sse.js

@@ -23,7 +23,6 @@ __export(sse_exports, {
 });
 module.exports = __toCommonJS(sse_exports);
 var import_stream = require("../../utils/stream");
-var import__ = require(".");
 class SSEStreamingApi extends import_stream.StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -43,22 +42,11 @@ const setSSEHeaders = (context) => {
   context.header("Connection", "keep-alive");
 };
 const streamSSE = (c, cb) => {
-  return (0, import__.stream)(c, async (originalStream) => {
-    const { readable, writable } = new TransformStream();
-    const stream2 = new SSEStreamingApi(writable, readable);
-    originalStream.pipe(stream2.responseReadable).catch((err) => {
-      console.error("Error in stream piping: ", err);
-      stream2.close();
-    });
-    setSSEHeaders(c);
-    try {
-      await cb(stream2);
-    } catch (err) {
-      console.error("Error during streaming: ", err);
-    } finally {
-      await stream2.close();
-    }
-  });
+  const { readable, writable } = new TransformStream();
+  const stream = new SSEStreamingApi(writable, readable);
+  cb(stream).finally(() => stream.close());
+  setSSEHeaders(c);
+  return c.newResponse(stream.responseReadable);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/jsx/jsx-dev-runtime.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(jsx_dev_runtime_exports);
 var import__ = require(".");
 var import__2 = require(".");
 function jsxDEV(tag, props) {
-  if (!props?.children) {
+  if (!props || !("children" in props)) {
     return (0, import__.jsx)(tag, props);
   }
   const children = props.children;

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/helper/streaming/sse.js

@@ -1,6 +1,5 @@
 // src/helper/streaming/sse.ts
 import { StreamingApi } from "../../utils/stream.js";
-import { stream } from "./index.js";
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -20,22 +19,11 @@ var setSSEHeaders = (context) => {
   context.header("Connection", "keep-alive");
 };
 var streamSSE = (c, cb) => {
-  return stream(c, async (originalStream) => {
-    const { readable, writable } = new TransformStream();
-    const stream2 = new SSEStreamingApi(writable, readable);
-    originalStream.pipe(stream2.responseReadable).catch((err) => {
-      console.error("Error in stream piping: ", err);
-      stream2.close();
-    });
-    setSSEHeaders(c);
-    try {
-      await cb(stream2);
-    } catch (err) {
-      console.error("Error during streaming: ", err);
-    } finally {
-      await stream2.close();
-    }
-  });
+  const { readable, writable } = new TransformStream();
+  const stream = new SSEStreamingApi(writable, readable);
+  cb(stream).finally(() => stream.close());
+  setSSEHeaders(c);
+  return c.newResponse(stream.responseReadable);
 };
 export {
   SSEStreamingApi,

package/dist/jsx/jsx-dev-runtime.js

@@ -2,7 +2,7 @@
 import { jsx } from "./index.js";
 import { Fragment } from "./index.js";
 function jsxDEV(tag, props) {
-  if (!props?.children) {
+  if (!props || !("children" in props)) {
     return jsx(tag, props);
   }
   const children = props.children;

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/types/validator/validator.d.ts

@@ -1,13 +1,14 @@
 import type { Context } from '../context';
-import type { Env, ValidationTargets, MiddlewareHandler } from '../types';
+import type { Env, ValidationTargets, MiddlewareHandler, TypedResponse } from '../types';
 type ValidationTargetKeysWithBody = 'form' | 'json';
 type ValidationTargetByMethod<M> = M extends 'get' | 'head' ? Exclude<keyof ValidationTargets, ValidationTargetKeysWithBody> : keyof ValidationTargets;
 export type ValidationFunction<InputType, OutputType, E extends Env = {}, P extends string = string> = (value: InputType, c: Context<E, P>) => OutputType | Response | Promise<OutputType> | Promise<Response>;
+type ExcludeResponseType<T> = T extends Response & TypedResponse<any> ? never : T;
 export declare const validator: <InputType, P extends string, M extends string, U extends ValidationTargetByMethod<M>, OutputType = ValidationTargets[U], P2 extends string = P, V extends {
     in: { [K in U]: unknown extends InputType ? OutputType : InputType; };
-    out: { [K_1 in U]: OutputType; };
+    out: { [K_1 in U]: ExcludeResponseType<OutputType>; };
 } = {
     in: { [K_2 in U]: unknown extends InputType ? OutputType : InputType; };
-    out: { [K_3 in U]: OutputType; };
+    out: { [K_3 in U]: ExcludeResponseType<OutputType>; };
 }, E extends Env = any>(target: U, validationFunc: ValidationFunction<unknown extends InputType ? ValidationTargets[U] : InputType, OutputType, E, P2>) => MiddlewareHandler<E, P, V>;
 export {};

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.0",
+  "version": "3.12.2",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -179,6 +179,11 @@
       "import": "./dist/validator/index.js",
       "require": "./dist/cjs/validator/index.js"
     },
+    "./router": {
+      "types": "./dist/types/router.d.ts",
+      "import": "./dist/router.js",
+      "require": "./dist/cjs/router.js"
+    },
     "./router/reg-exp-router": {
       "types": "./dist/types/router/reg-exp-router/index.d.ts",
       "import": "./dist/router/reg-exp-router/index.js",
@@ -264,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",
@@ -366,6 +376,9 @@
       "validator": [
         "./dist/types/validator/index.d.ts"
       ],
+      "router": [
+        "./dist/types/router.d.ts"
+      ],
       "router/reg-exp-router": [
         "./dist/types/router/reg-exp-router/router.d.ts"
       ],