hono 4.0.1 → 4.0.2

package/README.md

@@ -8,7 +8,7 @@
 
 <p align="center">
 <a href="https://hono.dev"><b>Documentation :point_right: hono.dev</b></a><br />
-<i>v3 has been released!</i> <a href="docs/MIGRATION.md">Migration guide</b>
+<i>v4 has been released!</i> <a href="docs/MIGRATION.md">Migration guide</b>
 </p>
 
 <hr />
@@ -42,13 +42,13 @@ export default app
 ## Quick Start
 
 ```
-npm create hono@latest my-app
+npm create hono@latest
 ```
 
 ## Features
 
 - **Ultrafast** 🚀 - The router `RegExpRouter` is really fast. Not using linear loops. Fast.
-- **Lightweight** 🪶 - The `hono/tiny` preset is under 14kB. Hono has zero dependencies and uses only the Web Standard API.
+- **Lightweight** 🪶 - The `hono/tiny` preset is under 13kB. Hono has zero dependencies and uses only the Web Standard API.
 - **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute, Deno, Bun, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
 - **Batteries Included** 🔋 - Hono has built-in middleware, custom middleware, and third-party middleware. Batteries included.
 - **Delightful DX** 😃 - Super clean APIs. First-class TypeScript support. Now, we've got "Types".

package/dist/cjs/client/utils.js

@@ -32,7 +32,7 @@ const mergePath = (base, path) => {
 };
 const replaceUrlParam = (urlString, params) => {
   for (const [k, v] of Object.entries(params)) {
-    const reg = new RegExp("/:" + k + "({[^}]*})?");
+    const reg = new RegExp("/:" + k + "(?:{[^/]+})?");
     urlString = urlString.replace(reg, `/${v}`);
   }
   return urlString;

package/dist/cjs/helper/dev/index.js

@@ -23,22 +23,18 @@ __export(dev_exports, {
   showRoutes: () => showRoutes
 });
 module.exports = __toCommonJS(dev_exports);
-var import_hono_base = require("../../hono-base");
-const isMiddleware = (handler) => handler.length > 1;
+var import_handler = require("../../utils/handler");
 const handlerName = (handler) => {
-  return handler.name || (isMiddleware(handler) ? "[middleware]" : "[handler]");
-};
-const findTargetHandler = (handler) => {
-  return handler[import_hono_base.COMPOSED_HANDLER] ? findTargetHandler(handler[import_hono_base.COMPOSED_HANDLER]) : handler;
+  return handler.name || ((0, import_handler.isMiddleware)(handler) ? "[middleware]" : "[handler]");
 };
 const inspectRoutes = (hono) => {
   return hono.routes.map(({ path, method, handler }) => {
-    const targetHandler = findTargetHandler(handler);
+    const targetHandler = (0, import_handler.findTargetHandler)(handler);
     return {
       path,
       method,
       name: handlerName(targetHandler),
-      isMiddleware: isMiddleware(targetHandler)
+      isMiddleware: (0, import_handler.isMiddleware)(targetHandler)
     };
   });
 };

package/dist/cjs/helper/ssg/index.js

@@ -18,10 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ssg_exports = {};
 __export(ssg_exports, {
-  X_HONO_DISABLE_SSG_HEADER_KEY: () => X_HONO_DISABLE_SSG_HEADER_KEY,
-  X_HONO_SSG_HEADER_KEY: () => X_HONO_SSG_HEADER_KEY,
+  SSG_DISABLED_RESPONSE: () => SSG_DISABLED_RESPONSE,
   disableSSG: () => disableSSG,
   fetchRoutesContent: () => fetchRoutesContent,
+  isSSGContext: () => isSSGContext,
   onlySSG: () => onlySSG,
   saveContentToFiles: () => saveContentToFiles,
   ssgParams: () => ssgParams,
@@ -29,12 +29,11 @@ __export(ssg_exports, {
 });
 module.exports = __toCommonJS(ssg_exports);
 var import_utils = require("../../client/utils");
-var import_dev = require("../../helper/dev");
 var import_buffer = require("../../utils/buffer");
 var import_mime = require("../../utils/mime");
 var import_utils2 = require("./utils");
-const X_HONO_SSG_HEADER_KEY = "x-hono-ssg";
-const X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+const SSG_CONTEXT = "HONO_SSG_CONTEXT";
+const SSG_DISABLED_RESPONSE = new Response("SSG is disabled", { status: 404 });
 const generateFilePath = (routePath, outDir, mimeType) => {
   const extension = determineExtension(mimeType);
   if (routePath === "/") {
@@ -79,13 +78,9 @@ const ssgParams = (params) => async (c, next) => {
 const fetchRoutesContent = async (app, beforeRequestHook, afterResponseHook) => {
   const htmlMap = /* @__PURE__ */ new Map();
   const baseURL = "http://localhost";
-  for (const route of (0, import_dev.inspectRoutes)(app)) {
-    if (route.isMiddleware) {
-      continue;
-    }
+  for (const route of (0, import_utils2.filterStaticGenerateRoutes)(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    forGetInfoURLRequest.headers.set(X_HONO_SSG_HEADER_KEY, "true");
     if (beforeRequestHook) {
       const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
       if (!maybeRequest) {
@@ -106,8 +101,10 @@ const fetchRoutesContent = async (app, beforeRequestHook, afterResponseHook) =>
     };
     for (const param of forGetInfoURLRequest.ssgParams) {
       const replacedUrlParam = (0, import_utils.replaceUrlParam)(route.path, param);
-      let response = await app.request(replacedUrlParam, requestInit);
-      if (response.headers.get(X_HONO_DISABLE_SSG_HEADER_KEY)) {
+      let response = await app.request(replacedUrlParam, requestInit, {
+        [SSG_CONTEXT]: true
+      });
+      if (response === SSG_DISABLED_RESPONSE) {
         continue;
       }
       if (afterResponseHook) {
@@ -163,23 +160,25 @@ const toSSG = async (app, fs, options) => {
   await options?.afterGenerateHook?.(result);
   return result;
 };
+const isSSGContext = (c) => !!c.env?.[SSG_CONTEXT];
 const disableSSG = () => async function disableSSG2(c, next) {
+  if (isSSGContext(c)) {
+    return SSG_DISABLED_RESPONSE;
+  }
   await next();
-  c.header(X_HONO_DISABLE_SSG_HEADER_KEY, "true");
 };
 const onlySSG = () => async function onlySSG2(c, next) {
-  const headerValue = c.req.raw.headers.get(X_HONO_SSG_HEADER_KEY);
-  if (headerValue) {
-    await next();
+  if (!isSSGContext(c)) {
+    return c.notFound();
   }
-  return c.notFound();
+  await next();
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  X_HONO_DISABLE_SSG_HEADER_KEY,
-  X_HONO_SSG_HEADER_KEY,
+  SSG_DISABLED_RESPONSE,
   disableSSG,
   fetchRoutesContent,
+  isSSGContext,
   onlySSG,
   saveContentToFiles,
   ssgParams,

package/dist/cjs/helper/ssg/utils.js

@@ -19,9 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   dirname: () => dirname,
+  filterStaticGenerateRoutes: () => filterStaticGenerateRoutes,
   joinPaths: () => joinPaths
 });
 module.exports = __toCommonJS(utils_exports);
+var import_router = require("../../router");
+var import_handler = require("../../utils/handler");
 const dirname = (path) => {
   const splitedPath = path.split(/[\/\\]/);
   return splitedPath.slice(0, -1).join("/");
@@ -57,8 +60,18 @@ const joinPaths = (...paths) => {
   handleSegments(paths.join("/").split("/"), resultPaths);
   return (paths[0][0] === "/" ? "/" : "") + resultPaths.join("/");
 };
+const filterStaticGenerateRoutes = (hono) => {
+  return hono.routes.reduce((acc, { method, handler, path }) => {
+    const targetHandler = (0, import_handler.findTargetHandler)(handler);
+    if (["GET", import_router.METHOD_NAME_ALL].includes(method) && !(0, import_handler.isMiddleware)(targetHandler)) {
+      acc.push({ path });
+    }
+    return acc;
+  }, []);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dirname,
+  filterStaticGenerateRoutes,
   joinPaths
 });

package/dist/cjs/jsx/dom/render.js

@@ -193,6 +193,7 @@ const applyNodeObject = (node, container) => {
       }
     }
   }
+  const childNodes = container.childNodes;
   for (let i = 0, len = next.length; i < len; i++, offset++) {
     const child = next[i];
     let el;
@@ -206,8 +207,8 @@ const applyNodeObject = (node, container) => {
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
-    if (container.childNodes[offset] !== el) {
-      container.insertBefore(el, container.childNodes[offset] || null);
+    if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e) {
+      container.insertBefore(el, childNodes[offset] || null);
     }
   }
   remove.forEach(removeNode);

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

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(router_exports);
 var import_router = require("../../router");
 var import_url = require("../../utils/url");
 const emptyParams = {};
-const splitPathRe = /\/(:\w+(?:{[^}]+})?)|\/[^\/\?]+|(\?)/g;
+const splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
 const splitByStarRe = /\*/;
 class LinearRouter {
   constructor() {

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

@@ -32,7 +32,7 @@ class PatternRouter {
     if (endsWithWildcard) {
       path = path.slice(0, -2);
     }
-    const parts = path.match(/\/?(:\w+(?:{[^}]+})?)|\/?[^\/\?]+|(\?)/g) || [];
+    const parts = path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+|(\?)/g) || [];
     if (parts[parts.length - 1] === "?") {
       this.add(method, parts.slice(0, parts.length - 2).join(""), handler);
       parts.pop();

package/dist/cjs/utils/handler.js

@@ -0,0 +1,34 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var handler_exports = {};
+__export(handler_exports, {
+  findTargetHandler: () => findTargetHandler,
+  isMiddleware: () => isMiddleware
+});
+module.exports = __toCommonJS(handler_exports);
+var import_hono_base = require("../hono-base");
+const isMiddleware = (handler) => handler.length > 1;
+const findTargetHandler = (handler) => {
+  return handler[import_hono_base.COMPOSED_HANDLER] ? findTargetHandler(handler[import_hono_base.COMPOSED_HANDLER]) : handler;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findTargetHandler,
+  isMiddleware
+});

package/dist/client/utils.js

@@ -7,7 +7,7 @@ var mergePath = (base, path) => {
 };
 var replaceUrlParam = (urlString, params) => {
   for (const [k, v] of Object.entries(params)) {
-    const reg = new RegExp("/:" + k + "({[^}]*})?");
+    const reg = new RegExp("/:" + k + "(?:{[^/]+})?");
     urlString = urlString.replace(reg, `/${v}`);
   }
   return urlString;

package/dist/helper/dev/index.js

@@ -1,12 +1,8 @@
 // src/helper/dev/index.ts
-import { COMPOSED_HANDLER } from "../../hono-base.js";
-var isMiddleware = (handler) => handler.length > 1;
+import { findTargetHandler, isMiddleware } from "../../utils/handler.js";
 var handlerName = (handler) => {
   return handler.name || (isMiddleware(handler) ? "[middleware]" : "[handler]");
 };
-var findTargetHandler = (handler) => {
-  return handler[COMPOSED_HANDLER] ? findTargetHandler(handler[COMPOSED_HANDLER]) : handler;
-};
 var inspectRoutes = (hono) => {
   return hono.routes.map(({ path, method, handler }) => {
     const targetHandler = findTargetHandler(handler);

package/dist/helper/ssg/index.js

@@ -1,11 +1,10 @@
 // src/helper/ssg/index.ts
 import { replaceUrlParam } from "../../client/utils.js";
-import { inspectRoutes } from "../../helper/dev/index.js";
 import { bufferToString } from "../../utils/buffer.js";
 import { getExtension } from "../../utils/mime.js";
-import { joinPaths, dirname } from "./utils.js";
-var X_HONO_SSG_HEADER_KEY = "x-hono-ssg";
-var X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+import { joinPaths, dirname, filterStaticGenerateRoutes } from "./utils.js";
+var SSG_CONTEXT = "HONO_SSG_CONTEXT";
+var SSG_DISABLED_RESPONSE = new Response("SSG is disabled", { status: 404 });
 var generateFilePath = (routePath, outDir, mimeType) => {
   const extension = determineExtension(mimeType);
   if (routePath === "/") {
@@ -50,13 +49,9 @@ var ssgParams = (params) => async (c, next) => {
 var fetchRoutesContent = async (app, beforeRequestHook, afterResponseHook) => {
   const htmlMap = /* @__PURE__ */ new Map();
   const baseURL = "http://localhost";
-  for (const route of inspectRoutes(app)) {
-    if (route.isMiddleware) {
-      continue;
-    }
+  for (const route of filterStaticGenerateRoutes(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    forGetInfoURLRequest.headers.set(X_HONO_SSG_HEADER_KEY, "true");
     if (beforeRequestHook) {
       const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
       if (!maybeRequest) {
@@ -77,8 +72,10 @@ var fetchRoutesContent = async (app, beforeRequestHook, afterResponseHook) => {
     };
     for (const param of forGetInfoURLRequest.ssgParams) {
       const replacedUrlParam = replaceUrlParam(route.path, param);
-      let response = await app.request(replacedUrlParam, requestInit);
-      if (response.headers.get(X_HONO_DISABLE_SSG_HEADER_KEY)) {
+      let response = await app.request(replacedUrlParam, requestInit, {
+        [SSG_CONTEXT]: true
+      });
+      if (response === SSG_DISABLED_RESPONSE) {
         continue;
       }
       if (afterResponseHook) {
@@ -134,22 +131,24 @@ var toSSG = async (app, fs, options) => {
   await options?.afterGenerateHook?.(result);
   return result;
 };
+var isSSGContext = (c) => !!c.env?.[SSG_CONTEXT];
 var disableSSG = () => async function disableSSG2(c, next) {
+  if (isSSGContext(c)) {
+    return SSG_DISABLED_RESPONSE;
+  }
   await next();
-  c.header(X_HONO_DISABLE_SSG_HEADER_KEY, "true");
 };
 var onlySSG = () => async function onlySSG2(c, next) {
-  const headerValue = c.req.raw.headers.get(X_HONO_SSG_HEADER_KEY);
-  if (headerValue) {
-    await next();
+  if (!isSSGContext(c)) {
+    return c.notFound();
   }
-  return c.notFound();
+  await next();
 };
 export {
-  X_HONO_DISABLE_SSG_HEADER_KEY,
-  X_HONO_SSG_HEADER_KEY,
+  SSG_DISABLED_RESPONSE,
   disableSSG,
   fetchRoutesContent,
+  isSSGContext,
   onlySSG,
   saveContentToFiles,
   ssgParams,

package/dist/helper/ssg/utils.js

@@ -1,4 +1,6 @@
 // src/helper/ssg/utils.ts
+import { METHOD_NAME_ALL } from "../../router.js";
+import { findTargetHandler, isMiddleware } from "../../utils/handler.js";
 var dirname = (path) => {
   const splitedPath = path.split(/[\/\\]/);
   return splitedPath.slice(0, -1).join("/");
@@ -34,7 +36,17 @@ var joinPaths = (...paths) => {
   handleSegments(paths.join("/").split("/"), resultPaths);
   return (paths[0][0] === "/" ? "/" : "") + resultPaths.join("/");
 };
+var filterStaticGenerateRoutes = (hono) => {
+  return hono.routes.reduce((acc, { method, handler, path }) => {
+    const targetHandler = findTargetHandler(handler);
+    if (["GET", METHOD_NAME_ALL].includes(method) && !isMiddleware(targetHandler)) {
+      acc.push({ path });
+    }
+    return acc;
+  }, []);
+};
 export {
   dirname,
+  filterStaticGenerateRoutes,
   joinPaths
 };

package/dist/jsx/dom/render.js

@@ -168,6 +168,7 @@ var applyNodeObject = (node, container) => {
       }
     }
   }
+  const childNodes = container.childNodes;
   for (let i = 0, len = next.length; i < len; i++, offset++) {
     const child = next[i];
     let el;
@@ -181,8 +182,8 @@ var applyNodeObject = (node, container) => {
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
-    if (container.childNodes[offset] !== el) {
-      container.insertBefore(el, container.childNodes[offset] || null);
+    if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e) {
+      container.insertBefore(el, childNodes[offset] || null);
     }
   }
   remove.forEach(removeNode);

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

@@ -2,7 +2,7 @@
 import { METHOD_NAME_ALL, UnsupportedPathError } from "../../router.js";
 import { checkOptionalParameter } from "../../utils/url.js";
 var emptyParams = {};
-var splitPathRe = /\/(:\w+(?:{[^}]+})?)|\/[^\/\?]+|(\?)/g;
+var splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
 var splitByStarRe = /\*/;
 var LinearRouter = class {
   constructor() {

package/dist/router/pattern-router/router.js

@@ -10,7 +10,7 @@ var PatternRouter = class {
     if (endsWithWildcard) {
       path = path.slice(0, -2);
     }
-    const parts = path.match(/\/?(:\w+(?:{[^}]+})?)|\/?[^\/\?]+|(\?)/g) || [];
+    const parts = path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+|(\?)/g) || [];
     if (parts[parts.length - 1] === "?") {
       this.add(method, parts.slice(0, parts.length - 2).join(""), handler);
       parts.pop();

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

@@ -1,7 +1,7 @@
-import type { Env, Input, MiddlewareHandler, H, HandlerResponse } from '../../types';
+import type { Env, H, HandlerResponse, Input, MiddlewareHandler } from '../../types';
 export declare class Factory<E extends Env = any, P extends string = any> {
     createMiddleware: <I extends Input = {}>(middleware: MiddlewareHandler<E, P, I>) => MiddlewareHandler<E, P, I>;
-    createHandlers<I extends Input = {}>(handler1: H<E, P, I>): [H<E, P, I>];
+    createHandlers<I extends Input = {}, R extends HandlerResponse<any> = any>(handler1: H<E, P, I, R>): [H<E, P, I, R>];
     createHandlers<I extends Input = {}, I2 extends Input = I, R extends HandlerResponse<any> = any>(handler1: H<E, P, I, R>, handler2: H<E, P, I2, R>): [H<E, P, I, R>, H<E, P, I2, R>];
     createHandlers<I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, R extends HandlerResponse<any> = any>(handler1: H<E, P, I, R>, handler2: H<E, P, I2, R>, handler3: H<E, P, I3, R>): [H<E, P, I, R>, H<E, P, I2, R>, H<E, P, I3, R>];
     createHandlers<I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I & I2 & I3, R extends HandlerResponse<any> = any>(handler1: H<E, P, I, R>, handler2: H<E, P, I2, R>, handler3: H<E, P, I3, R>, handler4: H<E, P, I4, R>): [H<E, P, I, R>, H<E, P, I2, R>, H<E, P, I3, R>, H<E, P, I4, R>];

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

@@ -1,8 +1,7 @@
 import type { Context } from '../../context';
 import type { Hono } from '../../hono';
 import type { Env, MiddlewareHandler, Schema } from '../../types';
-export declare const X_HONO_SSG_HEADER_KEY = "x-hono-ssg";
-export declare const X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
+export declare const SSG_DISABLED_RESPONSE: Response;
 /**
  * @experimental
  * `FileSystemModule` is an experimental feature.
@@ -85,6 +84,12 @@ export interface ToSSGAdaptorInterface<E extends Env = Env, S extends Schema = {
  * The API might be changed.
  */
 export declare const toSSG: ToSSGInterface;
+/**
+ * @experimental
+ * `isSSGContext` is an experimental feature.
+ * The API might be changed.
+ */
+export declare const isSSGContext: (c: Context) => boolean;
 /**
  * @experimental
  * `disableSSG` is an experimental feature.

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

@@ -1,3 +1,5 @@
+import type { Hono } from '../../hono';
+import type { Env } from '../../types';
 /**
  * Get dirname
  * @param path File Path
@@ -5,3 +7,8 @@
  */
 export declare const dirname: (path: string) => string;
 export declare const joinPaths: (...paths: string[]) => string;
+interface FilterStaticGenerateRouteData {
+    path: string;
+}
+export declare const filterStaticGenerateRoutes: <E extends Env>(hono: Hono<E, import("../../types").BlankSchema, "/">) => FilterStaticGenerateRouteData[];
+export {};

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

@@ -0,0 +1,2 @@
+export declare const isMiddleware: (handler: Function) => boolean;
+export declare const findTargetHandler: (handler: Function) => Function;

package/dist/utils/handler.js

@@ -0,0 +1,10 @@
+// src/utils/handler.ts
+import { COMPOSED_HANDLER } from "../hono-base.js";
+var isMiddleware = (handler) => handler.length > 1;
+var findTargetHandler = (handler) => {
+  return handler[COMPOSED_HANDLER] ? findTargetHandler(handler[COMPOSED_HANDLER]) : handler;
+};
+export {
+  findTargetHandler,
+  isMiddleware
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",