hono 4.0.2 → 4.0.4

package/dist/cjs/context.js

@@ -124,7 +124,7 @@ class Context {
         const headers2 = setHeaders(new Headers(arg.headers), __privateGet(this, _preparedHeaders));
         return new Response(data, {
           headers: headers2,
-          status: arg.status
+          status: arg.status ?? __privateGet(this, _status)
         });
       }
       const status = typeof arg === "number" ? arg : __privateGet(this, _status);

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

@@ -32,14 +32,21 @@ const html = (strings, ...values) => {
       const child = children[i2];
       if (typeof child === "string") {
         (0, import_html.escapeToBuffer)(child, buffer);
+      } else if (typeof child === "number") {
+        ;
+        buffer[0] += child;
       } else if (typeof child === "boolean" || child === null || child === void 0) {
         continue;
-      } else if (typeof child === "object" && child.isEscaped || typeof child === "number") {
-        const tmp = child.toString();
-        if (tmp instanceof Promise) {
-          buffer.unshift("", tmp);
+      } else if (typeof child === "object" && child.isEscaped) {
+        if (child.callbacks) {
+          buffer.unshift("", child);
         } else {
-          buffer[0] += tmp;
+          const tmp = child.toString();
+          if (tmp instanceof Promise) {
+            buffer.unshift("", tmp);
+          } else {
+            buffer[0] += tmp;
+          }
         }
       } else if (child instanceof Promise) {
         buffer.unshift("", child);

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

@@ -35,6 +35,10 @@ var import_utils2 = require("./utils");
 const SSG_CONTEXT = "HONO_SSG_CONTEXT";
 const SSG_DISABLED_RESPONSE = new Response("SSG is disabled", { status: 404 });
 const generateFilePath = (routePath, outDir, mimeType) => {
+  const hasExtension = /\.[^\/]+$/.test(routePath);
+  if (hasExtension) {
+    return (0, import_utils2.joinPaths)(outDir, routePath);
+  }
   const extension = determineExtension(mimeType);
   if (routePath === "/") {
     return (0, import_utils2.joinPaths)(outDir, `index.${extension}`);

package/dist/cjs/hono-base.js

@@ -233,10 +233,8 @@ const _Hono = class extends defineDynamicClass() {
       let res;
       try {
         res = matchResult[0][0][0][0](c, async () => {
+          c.res = await this.notFoundHandler(c);
         });
-        if (!res) {
-          return this.notFoundHandler(c);
-        }
       } catch (err) {
         return this.handleError(err, c);
       }

package/dist/cjs/jsx/components.js

@@ -77,7 +77,7 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
       if (buffer) {
         buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
       }
-      return buffer ? "" : `<template>${fallbackResString}</template><script>
+      return buffer ? "" : `<template data-hono-target="E:${index}">${fallbackResString}</template><script>
 ((d,c,n) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('E:${index}')
@@ -95,7 +95,7 @@ d.replaceWith(c.content)
         return Promise.all(resArray).then(async (htmlArray) => {
           htmlArray = htmlArray.flat();
           const content = htmlArray.join("");
-          let html = buffer ? "" : `<template>${content}</template><script>
+          let html = buffer ? "" : `<template data-hono-target="E:${index}">${content}</template><script>
 ((d,c) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('E:${index}')
@@ -141,7 +141,7 @@ d.parentElement.insertBefore(c.content,d.nextSibling)
 d=d.getElementById('E:${index}')
 if(!d)return
 n=d.nextSibling
-do{n=n.nextSibling}while(n.nodeType!=8||n.nodeValue!='E:${index}')
+while(n.nodeType!=8||n.nodeValue!='E:${index}'){n=n.nextSibling}
 n.remove()
 d.remove()
 })(document)

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

@@ -178,22 +178,24 @@ const applyNode = (node, container) => {
     applyNodeObject(node, container);
   }
 };
+const findChildNodeIndex = (childNodes, child) => {
+  if (!child) {
+    return;
+  }
+  for (let i = 0, len = childNodes.length; i < len; i++) {
+    if (childNodes[i] === child) {
+      return i;
+    }
+  }
+  return;
+};
 const applyNodeObject = (node, container) => {
   const next = [];
   const remove = [];
   const callbacks = [];
   getNextChildren(node, container, next, remove, callbacks);
-  let offset = container.childNodes.length;
-  const insertBefore = findInsertBefore(node.nN) || next.find((n) => n.e)?.e;
-  if (insertBefore) {
-    for (let i = 0; i < offset; i++) {
-      if (container.childNodes[i] === insertBefore) {
-        offset = i;
-        break;
-      }
-    }
-  }
   const childNodes = container.childNodes;
+  let offset = findChildNodeIndex(childNodes, findInsertBefore(node.nN)) ?? findChildNodeIndex(childNodes, next.find((n) => n.e)?.e) ?? childNodes.length;
   for (let i = 0, len = next.length; i < len; i++, offset++) {
     const child = next[i];
     let el;

package/dist/cjs/jsx/hooks/index.js

@@ -237,7 +237,10 @@ const use = (promise) => {
     }
     return cachedRes[0];
   }
-  promise.then((res2) => resolvedPromiseValueMap.set(promise, [res2])).catch((e) => resolvedPromiseValueMap.set(promise, [void 0, e]));
+  promise.then(
+    (res2) => resolvedPromiseValueMap.set(promise, [res2]),
+    (e) => resolvedPromiseValueMap.set(promise, [void 0, e])
+  );
   const buildData = import_render.buildDataStack.at(-1);
   if (!buildData) {
     throw promise;
@@ -245,11 +248,14 @@ const use = (promise) => {
   const [, node] = buildData;
   const promiseArray = (_a = node[import_constants.DOM_STASH][1])[STASH_USE] || (_a[STASH_USE] = []);
   const hookIndex = node[import_constants.DOM_STASH][0]++;
-  promise.then((res2) => {
-    promiseArray[hookIndex] = [res2];
-  }).catch((e) => {
-    promiseArray[hookIndex] = [void 0, e];
-  });
+  promise.then(
+    (res2) => {
+      promiseArray[hookIndex] = [res2];
+    },
+    (e) => {
+      promiseArray[hookIndex] = [void 0, e];
+    }
+  );
   const res = promiseArray[hookIndex];
   if (res) {
     if (res.length === 2) {

package/dist/cjs/jsx/streaming.js

@@ -82,7 +82,7 @@ const Suspense = async ({
               content
             );
           }
-          let html = buffer ? "" : `<template>${content}</template><script>
+          let html = buffer ? "" : `<template data-hono-target="H:${index}">${content}</template><script>
 ((d,c,n) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('H:${index}')

package/dist/cjs/middleware/jsx-renderer/index.js

@@ -29,10 +29,13 @@ var import_streaming = require("../../jsx/streaming");
 const RequestContext = (0, import_jsx.createContext)(null);
 const createRenderer = (c, Layout, component, options) => (children, props) => {
   const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
-  const currentLayout = component ? component({
-    children,
-    ...{ Layout, ...props }
-  }) : children;
+  const currentLayout = component ? (0, import_jsx.jsx)(
+    component,
+    {
+      ...{ Layout, ...props }
+    },
+    children
+  ) : children;
   const body = import_html.html`${(0, import_html.raw)(docType)}${(0, import_jsx.jsx)(
     RequestContext.Provider,
     { value: c },

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

@@ -24,7 +24,7 @@ __export(jwt_exports, {
   verify: () => verify
 });
 module.exports = __toCommonJS(jwt_exports);
-var import_helper = require("../../helper");
+var import_cookie = require("../../helper/cookie");
 var import_http_exception = require("../../http-exception");
 var import_jwt = require("../../utils/jwt");
 var import_context = require("../../context");
@@ -52,7 +52,7 @@ const jwt = (options) => {
         token = parts[1];
       }
     } else if (options.cookie) {
-      token = (0, import_helper.getCookie)(ctx)[options.cookie];
+      token = (0, import_cookie.getCookie)(ctx)[options.cookie];
     }
     if (!token) {
       throw new import_http_exception.HTTPException(401, {

package/dist/cjs/validator/validator.js

@@ -34,6 +34,10 @@ const validator = (target, validationFunc) => {
           const message = `Invalid HTTP header: Content-Type=${contentType}`;
           throw new import_http_exception.HTTPException(400, { message });
         }
+        if (c.req.bodyCache.json) {
+          value = await c.req.bodyCache.json;
+          break;
+        }
         try {
           const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
@@ -45,6 +49,10 @@ const validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (c.req.bodyCache.formData) {
+          value = c.req.bodyCache.formData;
+          break;
+        }
         try {
           const contentType2 = c.req.header("Content-Type");
           if (contentType2) {

package/dist/context.js

@@ -102,7 +102,7 @@ var Context = class {
         const headers2 = setHeaders(new Headers(arg.headers), __privateGet(this, _preparedHeaders));
         return new Response(data, {
           headers: headers2,
-          status: arg.status
+          status: arg.status ?? __privateGet(this, _status)
         });
       }
       const status = typeof arg === "number" ? arg : __privateGet(this, _status);

package/dist/helper/html/index.js

@@ -9,14 +9,21 @@ var html = (strings, ...values) => {
       const child = children[i2];
       if (typeof child === "string") {
         escapeToBuffer(child, buffer);
+      } else if (typeof child === "number") {
+        ;
+        buffer[0] += child;
       } else if (typeof child === "boolean" || child === null || child === void 0) {
         continue;
-      } else if (typeof child === "object" && child.isEscaped || typeof child === "number") {
-        const tmp = child.toString();
-        if (tmp instanceof Promise) {
-          buffer.unshift("", tmp);
+      } else if (typeof child === "object" && child.isEscaped) {
+        if (child.callbacks) {
+          buffer.unshift("", child);
         } else {
-          buffer[0] += tmp;
+          const tmp = child.toString();
+          if (tmp instanceof Promise) {
+            buffer.unshift("", tmp);
+          } else {
+            buffer[0] += tmp;
+          }
         }
       } else if (child instanceof Promise) {
         buffer.unshift("", child);

package/dist/helper/ssg/index.js

@@ -6,6 +6,10 @@ 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 hasExtension = /\.[^\/]+$/.test(routePath);
+  if (hasExtension) {
+    return joinPaths(outDir, routePath);
+  }
   const extension = determineExtension(mimeType);
   if (routePath === "/") {
     return joinPaths(outDir, `index.${extension}`);

package/dist/hono-base.js

@@ -211,10 +211,8 @@ var _Hono = class extends defineDynamicClass() {
       let res;
       try {
         res = matchResult[0][0][0][0](c, async () => {
+          c.res = await this.notFoundHandler(c);
         });
-        if (!res) {
-          return this.notFoundHandler(c);
-        }
       } catch (err) {
         return this.handleError(err, c);
       }

package/dist/jsx/components.js

@@ -54,7 +54,7 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
       if (buffer) {
         buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
       }
-      return buffer ? "" : `<template>${fallbackResString}</template><script>
+      return buffer ? "" : `<template data-hono-target="E:${index}">${fallbackResString}</template><script>
 ((d,c,n) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('E:${index}')
@@ -72,7 +72,7 @@ d.replaceWith(c.content)
         return Promise.all(resArray).then(async (htmlArray) => {
           htmlArray = htmlArray.flat();
           const content = htmlArray.join("");
-          let html = buffer ? "" : `<template>${content}</template><script>
+          let html = buffer ? "" : `<template data-hono-target="E:${index}">${content}</template><script>
 ((d,c) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('E:${index}')
@@ -118,7 +118,7 @@ d.parentElement.insertBefore(c.content,d.nextSibling)
 d=d.getElementById('E:${index}')
 if(!d)return
 n=d.nextSibling
-do{n=n.nextSibling}while(n.nodeType!=8||n.nodeValue!='E:${index}')
+while(n.nodeType!=8||n.nodeValue!='E:${index}'){n=n.nextSibling}
 n.remove()
 d.remove()
 })(document)

package/dist/jsx/dom/render.js

@@ -153,22 +153,24 @@ var applyNode = (node, container) => {
     applyNodeObject(node, container);
   }
 };
+var findChildNodeIndex = (childNodes, child) => {
+  if (!child) {
+    return;
+  }
+  for (let i = 0, len = childNodes.length; i < len; i++) {
+    if (childNodes[i] === child) {
+      return i;
+    }
+  }
+  return;
+};
 var applyNodeObject = (node, container) => {
   const next = [];
   const remove = [];
   const callbacks = [];
   getNextChildren(node, container, next, remove, callbacks);
-  let offset = container.childNodes.length;
-  const insertBefore = findInsertBefore(node.nN) || next.find((n) => n.e)?.e;
-  if (insertBefore) {
-    for (let i = 0; i < offset; i++) {
-      if (container.childNodes[i] === insertBefore) {
-        offset = i;
-        break;
-      }
-    }
-  }
   const childNodes = container.childNodes;
+  let offset = findChildNodeIndex(childNodes, findInsertBefore(node.nN)) ?? findChildNodeIndex(childNodes, next.find((n) => n.e)?.e) ?? childNodes.length;
   for (let i = 0, len = next.length; i < len; i++, offset++) {
     const child = next[i];
     let el;

package/dist/jsx/hooks/index.js

@@ -203,7 +203,10 @@ var use = (promise) => {
     }
     return cachedRes[0];
   }
-  promise.then((res2) => resolvedPromiseValueMap.set(promise, [res2])).catch((e) => resolvedPromiseValueMap.set(promise, [void 0, e]));
+  promise.then(
+    (res2) => resolvedPromiseValueMap.set(promise, [res2]),
+    (e) => resolvedPromiseValueMap.set(promise, [void 0, e])
+  );
   const buildData = buildDataStack.at(-1);
   if (!buildData) {
     throw promise;
@@ -211,11 +214,14 @@ var use = (promise) => {
   const [, node] = buildData;
   const promiseArray = (_a = node[DOM_STASH][1])[STASH_USE] || (_a[STASH_USE] = []);
   const hookIndex = node[DOM_STASH][0]++;
-  promise.then((res2) => {
-    promiseArray[hookIndex] = [res2];
-  }).catch((e) => {
-    promiseArray[hookIndex] = [void 0, e];
-  });
+  promise.then(
+    (res2) => {
+      promiseArray[hookIndex] = [res2];
+    },
+    (e) => {
+      promiseArray[hookIndex] = [void 0, e];
+    }
+  );
   const res = promiseArray[hookIndex];
   if (res) {
     if (res.length === 2) {

package/dist/jsx/streaming.js

@@ -59,7 +59,7 @@ var Suspense = async ({
               content
             );
           }
-          let html = buffer ? "" : `<template>${content}</template><script>
+          let html = buffer ? "" : `<template data-hono-target="H:${index}">${content}</template><script>
 ((d,c,n) => {
 c=d.currentScript.previousSibling
 d=d.getElementById('H:${index}')

package/dist/middleware/jsx-renderer/index.js

@@ -5,10 +5,13 @@ import { renderToReadableStream } from "../../jsx/streaming.js";
 var RequestContext = createContext(null);
 var createRenderer = (c, Layout, component, options) => (children, props) => {
   const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
-  const currentLayout = component ? component({
-    children,
-    ...{ Layout, ...props }
-  }) : children;
+  const currentLayout = component ? jsx(
+    component,
+    {
+      ...{ Layout, ...props }
+    },
+    children
+  ) : children;
   const body = html`${raw(docType)}${jsx(
     RequestContext.Provider,
     { value: c },

package/dist/middleware/jwt/index.js

@@ -1,5 +1,5 @@
 // src/middleware/jwt/index.ts
-import { getCookie } from "../../helper.js";
+import { getCookie } from "../../helper/cookie/index.js";
 import { HTTPException } from "../../http-exception.js";
 import { Jwt } from "../../utils/jwt/index.js";
 import "../../context.js";

package/dist/validator/validator.js

@@ -12,6 +12,10 @@ var validator = (target, validationFunc) => {
           const message = `Invalid HTTP header: Content-Type=${contentType}`;
           throw new HTTPException(400, { message });
         }
+        if (c.req.bodyCache.json) {
+          value = await c.req.bodyCache.json;
+          break;
+        }
         try {
           const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
@@ -23,6 +27,10 @@ var validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (c.req.bodyCache.formData) {
+          value = c.req.bodyCache.formData;
+          break;
+        }
         try {
           const contentType2 = c.req.header("Content-Type");
           if (contentType2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -499,7 +499,7 @@
     "cloudflare",
     "workers",
     "fastly",
-    "compute@edge",
+    "compute",
     "deno",
     "bun",
     "lambda",

package/dist/types/helper.d.ts

@@ -1,10 +0,0 @@
-export * from './helper/accepts';
-export * from './helper/adapter';
-export * from './helper/cookie';
-export * from './helper/css';
-export * from './helper/factory';
-export * from './helper/html';
-export * from './helper/streaming';
-export * from './helper/testing';
-export * from './helper/dev';
-export * from './adapter/deno/ssg';