hono 4.0.3 → 4.0.5

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

@@ -36,6 +36,9 @@ 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.endsWith(`.${extension}`)) {
+    return (0, import_utils2.joinPaths)(outDir, routePath);
+  }
   if (routePath === "/") {
     return (0, import_utils2.joinPaths)(outDir, `index.${extension}`);
   }

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

@@ -27,11 +27,17 @@ module.exports = __toCommonJS(render_exports);
 var import_constants = require("../constants");
 var import_context = require("../context");
 var import_hooks = require("../hooks");
+var import__ = require(".");
 const eventAliasMap = {
   Change: "Input",
   DoubleClick: "DblClick"
 };
+const nameSpaceMap = {
+  svg: "http://www.w3.org/2000/svg",
+  math: "http://www.w3.org/1998/Math/MathML"
+};
 const buildDataStack = [];
+let nameSpaceContext = void 0;
 const isNodeString = (node) => Array.isArray(node);
 const getEventSpec = (key) => {
   const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
@@ -178,22 +184,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;
@@ -203,7 +211,7 @@ const applyNodeObject = (node, container) => {
       }
       el = child.e || (child.e = document.createTextNode(child[0]));
     } else {
-      el = child.e || (child.e = document.createElement(child.tag));
+      el = child.e || (child.e = child.n ? document.createElementNS(child.n, child.tag) : document.createElement(child.tag));
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
@@ -264,6 +272,11 @@ const build = (context, node, topLevelErrorHandlerNode, children) => {
             oldChild.children = child.children;
             child = oldChild;
           }
+        } else if (!isNodeString(child) && nameSpaceContext) {
+          const ns = (0, import__.useContext)(nameSpaceContext);
+          if (ns) {
+            child.n = ns;
+          }
         }
         if (!isNodeString(child)) {
           build(context, child, topLevelErrorHandlerNode);
@@ -301,6 +314,22 @@ const buildNode = (node) => {
     if (typeof node.tag === "function") {
       ;
       node[import_constants.DOM_STASH] = [0, []];
+    } else {
+      const ns = nameSpaceMap[node.tag];
+      if (ns) {
+        ;
+        node.n = ns;
+        nameSpaceContext || (nameSpaceContext = (0, import__.createContext)(""));
+        node.children = [
+          {
+            tag: nameSpaceContext.Provider,
+            props: {
+              value: ns
+            },
+            children: node.children
+          }
+        ];
+      }
     }
     return node;
   }

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/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/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

@@ -7,6 +7,9 @@ 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.endsWith(`.${extension}`)) {
+    return joinPaths(outDir, routePath);
+  }
   if (routePath === "/") {
     return joinPaths(outDir, `index.${extension}`);
   }

package/dist/jsx/dom/render.js

@@ -2,11 +2,17 @@
 import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH } from "../constants.js";
 import { globalContexts as globalJSXContexts } from "../context.js";
 import { STASH_EFFECT } from "../hooks/index.js";
+import { useContext, createContext } from "./index.js";
 var eventAliasMap = {
   Change: "Input",
   DoubleClick: "DblClick"
 };
+var nameSpaceMap = {
+  svg: "http://www.w3.org/2000/svg",
+  math: "http://www.w3.org/1998/Math/MathML"
+};
 var buildDataStack = [];
+var nameSpaceContext = void 0;
 var isNodeString = (node) => Array.isArray(node);
 var getEventSpec = (key) => {
   const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
@@ -153,22 +159,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;
@@ -178,7 +186,7 @@ var applyNodeObject = (node, container) => {
       }
       el = child.e || (child.e = document.createTextNode(child[0]));
     } else {
-      el = child.e || (child.e = document.createElement(child.tag));
+      el = child.e || (child.e = child.n ? document.createElementNS(child.n, child.tag) : document.createElement(child.tag));
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
@@ -239,6 +247,11 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
             oldChild.children = child.children;
             child = oldChild;
           }
+        } else if (!isNodeString(child) && nameSpaceContext) {
+          const ns = useContext(nameSpaceContext);
+          if (ns) {
+            child.n = ns;
+          }
         }
         if (!isNodeString(child)) {
           build(context, child, topLevelErrorHandlerNode);
@@ -276,6 +289,22 @@ var buildNode = (node) => {
     if (typeof node.tag === "function") {
       ;
       node[DOM_STASH] = [0, []];
+    } else {
+      const ns = nameSpaceMap[node.tag];
+      if (ns) {
+        ;
+        node.n = ns;
+        nameSpaceContext || (nameSpaceContext = createContext(""));
+        node.children = [
+          {
+            tag: nameSpaceContext.Provider,
+            props: {
+              value: ns
+            },
+            children: node.children
+          }
+        ];
+      }
     }
     return node;
   }

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

@@ -1,5 +1,3 @@
-import type { FC } from './jsx';
-import type { PropsForRenderer } from './middleware/jsx-renderer';
 import type { HonoRequest } from './request';
 import type { Env, FetchEventLike, NotFoundHandler, Input, TypedResponse } from './types';
 import type { RedirectStatusCode, StatusCode } from './utils/http-status';
@@ -18,6 +16,8 @@ interface DefaultRenderer {
     (content: string | Promise<string>): Response | Promise<Response>;
 }
 export type Renderer = ContextRenderer extends Function ? ContextRenderer : DefaultRenderer;
+export type PropsForRenderer = [...Required<Parameters<Renderer>>] extends [unknown, infer Props] ? Props : unknown;
+export type Layout<T = Record<string, any>> = (props: T) => any;
 interface Get<E extends Env> {
     <Key extends keyof ContextVariableMap>(key: Key): ContextVariableMap[Key];
     <Key extends keyof E['Variables']>(key: Key): E['Variables'][Key];
@@ -112,13 +112,13 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * @see https://hono.dev/api/context#render-setrenderer
      */
     render: Renderer;
-    setLayout: (layout: FC<PropsForRenderer & {
-        Layout: FC;
-    }>) => FC<{
-        Layout: FC;
+    setLayout: (layout: Layout<PropsForRenderer & {
+        Layout: Layout;
+    }>) => Layout<{
+        Layout: Layout;
     }>;
-    getLayout: () => FC<{
-        Layout: FC;
+    getLayout: () => Layout<{
+        Layout: Layout;
     }> | undefined;
     /**
      * `.setRenderer()` can set the layout in the custom middleware.

package/dist/types/jsx/dom/render.d.ts

@@ -8,14 +8,16 @@ export type HasRenderToDom = FC<any> & {
 export type ErrorHandler = (error: any, retry: () => void) => Child | undefined;
 type Container = HTMLElement | DocumentFragment;
 type LocalJSXContexts = [JSXContext<unknown>, unknown][] | undefined;
+type SupportedElement = HTMLElement | SVGElement | MathMLElement;
 export type NodeObject = {
     pP: Props | undefined;
     nN: Node | undefined;
     vC: Node[];
     vR: Node[];
     s?: Node[];
+    n?: string;
     c: Container | undefined;
-    e: HTMLElement | Text | undefined;
+    e: SupportedElement | Text | undefined;
     [DOM_STASH]: [
         number,
         any[][],

package/dist/types/middleware/jsx-renderer/index.d.ts

@@ -1,8 +1,7 @@
-import type { Context, Renderer } from '../../context';
+import type { Context, PropsForRenderer } from '../../context';
 import type { FC, PropsWithChildren } from '../../jsx';
 import type { Env, Input, MiddlewareHandler } from '../../types';
 export declare const RequestContext: import("../../jsx").Context<Context<any, any, {}> | null>;
-export type PropsForRenderer = [...Required<Parameters<Renderer>>] extends [unknown, infer Props] ? Props : unknown;
 type RendererOptions = {
     docType?: boolean | string;
     stream?: boolean | Record<string, string>;

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.3",
+  "version": "4.0.5",
   "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';