hono 4.2.9 → 4.3.1

package/dist/jsx/dom/render.js

@@ -1,8 +1,11 @@
 // src/jsx/dom/render.ts
-import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH } from "../constants.js";
+import { toArray } from "../children.js";
+import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH, DOM_INTERNAL_TAG } from "../constants.js";
 import { globalContexts as globalJSXContexts, useContext } from "../context.js";
 import { STASH_EFFECT } from "../hooks/index.js";
+import { styleObjectForEach } from "../utils.js";
 import { createContext } from "./context.js";
+var HONO_PORTAL_ELEMENT = "_hp";
 var eventAliasMap = {
   Change: "Input",
   DoubleClick: "DblClick"
@@ -11,9 +14,10 @@ var nameSpaceMap = {
   svg: "http://www.w3.org/2000/svg",
   math: "http://www.w3.org/1998/Math/MathML"
 };
+var skipProps = /* @__PURE__ */ new Set(["children"]);
 var buildDataStack = [];
 var nameSpaceContext = void 0;
-var isNodeString = (node) => Array.isArray(node);
+var isNodeString = (node) => "t" in node;
 var getEventSpec = (key) => {
   const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/);
   if (match) {
@@ -25,30 +29,35 @@ var getEventSpec = (key) => {
 var applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
   for (const [key, value] of Object.entries(attributes)) {
-    if (!oldAttributes || oldAttributes[key] !== value) {
+    if (!skipProps.has(key) && (!oldAttributes || oldAttributes[key] !== value)) {
       const eventSpec = getEventSpec(key);
       if (eventSpec) {
-        if (typeof value !== "function") {
-          throw new Error(`Event handler for "${key}" is not a function`);
-        }
         if (oldAttributes) {
           container.removeEventListener(eventSpec[0], oldAttributes[key], eventSpec[1]);
         }
-        container.addEventListener(eventSpec[0], value, eventSpec[1]);
+        if (value != null) {
+          if (typeof value !== "function") {
+            throw new Error(`Event handler for "${key}" is not a function`);
+          }
+          container.addEventListener(eventSpec[0], value, eventSpec[1]);
+        }
       } else if (key === "dangerouslySetInnerHTML" && value) {
         container.innerHTML = value.__html;
       } else if (key === "ref") {
         if (typeof value === "function") {
           value(container);
-        } else if ("current" in value) {
+        } else if (value && "current" in value) {
           value.current = container;
         }
       } else if (key === "style") {
+        const style = container.style;
         if (typeof value === "string") {
-          container.style.cssText = value;
+          style.cssText = value;
         } else {
-          container.style.cssText = "";
-          Object.assign(container.style, value);
+          style.cssText = "";
+          if (value != null) {
+            styleObjectForEach(value, style.setProperty.bind(style));
+          }
         }
       } else {
         const nodeName = container.nodeName;
@@ -85,7 +94,7 @@ var applyProps = (container, attributes, oldAttributes) => {
   }
   if (oldAttributes) {
     for (const [key, value] of Object.entries(oldAttributes)) {
-      if (!(key in attributes)) {
+      if (!skipProps.has(key) && !(key in attributes)) {
         const eventSpec = getEventSpec(key);
         if (eventSpec) {
           container.removeEventListener(eventSpec[0], value, eventSpec[1]);
@@ -114,8 +123,8 @@ var invokeTag = (context, node) => {
   try {
     return [
       func.call(null, {
-        ...node.props,
-        children: node.children
+        ...func.defaultProps || {},
+        ...node.props
       })
     ];
   } finally {
@@ -160,21 +169,30 @@ var findInsertBefore = (node) => {
 var removeNode = (node) => {
   if (!isNodeString(node)) {
     node[DOM_STASH]?.[1][STASH_EFFECT]?.forEach((data) => data[2]?.());
+    if (node.e && node.props?.ref) {
+      if (typeof node.props.ref === "function") {
+        node.props.ref(null);
+      } else {
+        node.props.ref.current = null;
+      }
+    }
     node.vC?.forEach(removeNode);
   }
-  node.e?.remove();
-  node.tag = void 0;
+  if (node.tag !== HONO_PORTAL_ELEMENT) {
+    node.e?.remove();
+  }
+  if (typeof node.tag === "function") {
+    updateMap.delete(node);
+    fallbackUpdateFnArrayMap.delete(node);
+  }
 };
 var apply = (node, container) => {
-  if (node.tag === void 0) {
-    return;
-  }
   node.c = container;
   applyNodeObject(node, container);
 };
 var applyNode = (node, container) => {
   if (isNodeString(node)) {
-    container.textContent = node[0];
+    container.textContent = node.t;
   } else {
     applyNodeObject(node, container);
   }
@@ -201,17 +219,17 @@ var applyNodeObject = (node, container) => {
     const child = next[i];
     let el;
     if (isNodeString(child)) {
-      if (child.e && child[1]) {
-        child.e.textContent = child[0];
+      if (child.e && child.d) {
+        child.e.textContent = child.t;
       }
-      child[1] = false;
-      el = child.e ||= document.createTextNode(child[0]);
+      child.d = false;
+      el = child.e ||= document.createTextNode(child.t);
     } else {
       el = child.e ||= child.n ? document.createElementNS(child.n, child.tag) : document.createElement(child.tag);
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
-    if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e) {
+    if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e && child.tag !== HONO_PORTAL_ELEMENT) {
       container.insertBefore(el, childNodes[offset] || null);
     }
   }
@@ -221,12 +239,10 @@ var applyNodeObject = (node, container) => {
     callbacks.forEach(([, , , cb]) => cb?.());
   });
 };
+var fallbackUpdateFnArrayMap = /* @__PURE__ */ new WeakMap();
 var build = (context, node, topLevelErrorHandlerNode, children) => {
-  if (node.tag === void 0) {
-    return;
-  }
   let errorHandler;
-  children ||= typeof node.tag == "function" ? invokeTag(context, node) : node.children;
+  children ||= typeof node.tag == "function" ? invokeTag(context, node) : toArray(node.props.children);
   if (children[0]?.tag === "") {
     errorHandler = children[0][DOM_ERROR_HANDLER];
     topLevelErrorHandlerNode ||= node;
@@ -243,7 +259,7 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
           prevNode.nN = child;
         }
         prevNode = child;
-        if (typeof child.tag === "function" && globalJSXContexts.length > 0) {
+        if (typeof child.tag === "function" && !child.tag[DOM_INTERNAL_TAG] && globalJSXContexts.length > 0) {
           child[DOM_STASH][2] = globalJSXContexts.map((c2) => [c2, c2.values.at(-1)]);
         }
         let oldChild;
@@ -257,9 +273,9 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
             if (!isNodeString(oldChild)) {
               vChildrenToRemove.push(oldChild);
             } else {
-              if (oldChild[0] !== child[0]) {
-                oldChild[0] = child[0];
-                oldChild[1] = true;
+              if (oldChild.t !== child.t) {
+                oldChild.t = child.t;
+                oldChild.d = true;
               }
               child = oldChild;
             }
@@ -268,7 +284,9 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
           } else {
             oldChild.pP = oldChild.props;
             oldChild.props = child.props;
-            oldChild.children = child.children;
+            if (typeof child.tag === "function") {
+              oldChild[DOM_STASH][2] = child[DOM_STASH][2] || [];
+            }
             child = oldChild;
           }
         } else if (!isNodeString(child) && nameSpaceContext) {
@@ -288,10 +306,20 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
     node.vR = vChildrenToRemove;
   } catch (e) {
     if (errorHandler) {
-      const fallback = errorHandler(
-        e,
-        () => update([0, false, context[2]], topLevelErrorHandlerNode)
-      );
+      const fallbackUpdateFn = () => update([0, false, context[2]], topLevelErrorHandlerNode);
+      const fallbackUpdateFnArray = fallbackUpdateFnArrayMap.get(topLevelErrorHandlerNode) || [];
+      fallbackUpdateFnArray.push(fallbackUpdateFn);
+      fallbackUpdateFnArrayMap.set(topLevelErrorHandlerNode, fallbackUpdateFnArray);
+      const fallback = errorHandler(e, () => {
+        const fnArray = fallbackUpdateFnArrayMap.get(topLevelErrorHandlerNode);
+        if (fnArray) {
+          const i = fnArray.indexOf(fallbackUpdateFn);
+          if (i !== -1) {
+            fnArray.splice(i, 1);
+            return fallbackUpdateFn();
+          }
+        }
+      });
       if (fallback) {
         if (context[0] === 1) {
           context[1] = true;
@@ -308,9 +336,12 @@ var buildNode = (node) => {
   if (node === void 0 || node === null || typeof node === "boolean") {
     return void 0;
   } else if (typeof node === "string" || typeof node === "number") {
-    return [node.toString(), true];
+    return { t: node.toString(), d: true };
   } else {
     if (typeof node.tag === "function") {
+      if (node[DOM_STASH]) {
+        node = { ...node };
+      }
       ;
       node[DOM_STASH] = [0, []];
     } else {
@@ -319,13 +350,13 @@ var buildNode = (node) => {
         ;
         node.n = ns;
         nameSpaceContext ||= createContext("");
-        node.children = [
+        node.props.children = [
           {
             tag: nameSpaceContext.Provider,
             props: {
-              value: ns
-            },
-            children: node.children
+              value: ns,
+              children: node.props.children
+            }
           }
         ];
       }
@@ -352,6 +383,7 @@ var updateSync = (context, node) => {
   }
 };
 var updateMap = /* @__PURE__ */ new WeakMap();
+var currentUpdateSets = [];
 var update = async (context, node) => {
   const existing = updateMap.get(node);
   if (existing) {
@@ -372,25 +404,53 @@ var update = async (context, node) => {
       }
     }
   ]);
-  await Promise.resolve();
-  const latest = updateMap.get(node);
-  if (latest) {
-    updateMap.delete(node);
-    latest[1]();
+  if (currentUpdateSets.length) {
+    ;
+    currentUpdateSets.at(-1).add(node);
+  } else {
+    await Promise.resolve();
+    const latest = updateMap.get(node);
+    if (latest) {
+      updateMap.delete(node);
+      latest[1]();
+    }
   }
   return promise;
 };
 var render = (jsxNode, container) => {
-  const node = buildNode({ tag: "", children: [jsxNode] });
+  const node = buildNode({ tag: "", props: { children: jsxNode } });
   build([], node, void 0);
   const fragment = document.createDocumentFragment();
   apply(node, fragment);
   replaceContainer(node, fragment, container);
   container.replaceChildren(fragment);
 };
+var flushSync = (callback) => {
+  const set = /* @__PURE__ */ new Set();
+  currentUpdateSets.push(set);
+  callback();
+  set.forEach((node) => {
+    const latest = updateMap.get(node);
+    if (latest) {
+      updateMap.delete(node);
+      latest[1]();
+    }
+  });
+  currentUpdateSets.pop();
+};
+var createPortal = (children, container, key) => ({
+  tag: HONO_PORTAL_ELEMENT,
+  props: {
+    children
+  },
+  key,
+  e: container
+});
 export {
   build,
   buildDataStack,
+  createPortal,
+  flushSync,
   render,
   update
 };

package/dist/jsx/dom/utils.js

@@ -0,0 +1,10 @@
+// src/jsx/dom/utils.ts
+import { DOM_INTERNAL_TAG } from "../constants.js";
+var setInternalTagFlag = (fn) => {
+  ;
+  fn[DOM_INTERNAL_TAG] = true;
+  return fn;
+};
+export {
+  setInternalTagFlag
+};

package/dist/jsx/hooks/index.js

@@ -114,7 +114,7 @@ var useState = (initialState) => {
       if (typeof newState === "function") {
         newState = newState(stateData[0]);
       }
-      if (newState !== stateData[0]) {
+      if (!Object.is(newState, stateData[0])) {
         stateData[0] = newState;
         if (pendingStack.length) {
           const pendingType = pendingStack.at(-1);
@@ -262,8 +262,42 @@ var idCounter = 0;
 var useId = () => useMemo(() => `:r${(idCounter++).toString(32)}:`, []);
 var useDebugValue = (_value, _formatter) => {
 };
+var createRef = () => {
+  return { current: null };
+};
+var forwardRef = (Component) => {
+  return (props) => {
+    const { ref, ...rest } = props;
+    return Component(rest, ref);
+  };
+};
+var useImperativeHandle = (ref, createHandle, deps) => {
+  useEffect(() => {
+    ref.current = createHandle();
+    return () => {
+      ref.current = null;
+    };
+  }, deps);
+};
+var useSyncExternalStoreGetServerSnapshotNotified = false;
+var useSyncExternalStore = (subscribe, getSnapshot, getServerSnapshot) => {
+  const [state, setState] = useState(getSnapshot());
+  useEffect(
+    () => subscribe(() => {
+      setState(getSnapshot());
+    }),
+    []
+  );
+  if (getServerSnapshot && !useSyncExternalStoreGetServerSnapshotNotified) {
+    useSyncExternalStoreGetServerSnapshotNotified = true;
+    console.info("`getServerSnapshot` is not supported yet.");
+  }
+  return state;
+};
 export {
   STASH_EFFECT,
+  createRef,
+  forwardRef,
   startTransition,
   startViewTransition,
   use,
@@ -272,11 +306,13 @@ export {
   useDeferredValue,
   useEffect,
   useId,
+  useImperativeHandle,
   useLayoutEffect,
   useMemo,
   useReducer,
   useRef,
   useState,
+  useSyncExternalStore,
   useTransition,
   useViewTransition
 };

package/dist/jsx/index.js

@@ -1,5 +1,6 @@
 // src/jsx/index.ts
 import { jsx, memo, Fragment, isValidElement, cloneElement } from "./base.js";
+import { Children } from "./children.js";
 import { ErrorBoundary } from "./components.js";
 import { createContext, useContext } from "./context.js";
 import {
@@ -17,7 +18,11 @@ import {
   useLayoutEffect,
   useReducer,
   useId,
-  useDebugValue
+  useDebugValue,
+  createRef,
+  forwardRef,
+  useImperativeHandle,
+  useSyncExternalStore
 } from "./hooks/index.js";
 import { Suspense } from "./streaming.js";
 export * from "./types.js";
@@ -45,16 +50,24 @@ var jsx_default = {
   useViewTransition,
   useMemo,
   useLayoutEffect,
-  Suspense
+  createRef,
+  forwardRef,
+  useImperativeHandle,
+  useSyncExternalStore,
+  Suspense,
+  Children
 };
 export {
+  Children,
   ErrorBoundary,
   Fragment,
   Suspense,
   cloneElement,
   createContext,
   jsx as createElement,
+  createRef,
   jsx_default as default,
+  forwardRef,
   isValidElement,
   jsx,
   memo,
@@ -67,11 +80,13 @@ export {
   useDeferredValue,
   useEffect,
   useId,
+  useImperativeHandle,
   useLayoutEffect,
   useMemo,
   useReducer,
   useRef,
   useState,
+  useSyncExternalStore,
   useTransition,
   useViewTransition
 };

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

@@ -7,7 +7,6 @@ function jsxDEV(tag, props, key) {
     node = jsxFn(tag, props, []);
   } else {
     const children = props.children;
-    delete props["children"];
     node = Array.isArray(children) ? jsxFn(tag, props, children) : jsxFn(tag, props, [children]);
   }
   node.key = key;

package/dist/jsx/utils.js

@@ -5,6 +5,15 @@ var normalizeIntrinsicElementProps = (props) => {
     delete props["className"];
   }
 };
+var styleObjectForEach = (style, fn) => {
+  for (const [k, v] of Object.entries(style)) {
+    fn(
+      k[0] === "-" ? k : k.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`),
+      v == null ? null : typeof v === "number" ? v + "px" : v
+    );
+  }
+};
 export {
-  normalizeIntrinsicElementProps
+  normalizeIntrinsicElementProps,
+  styleObjectForEach
 };

package/dist/middleware/bearer-auth/index.js

@@ -3,6 +3,7 @@ import { HTTPException } from "../../http-exception.js";
 import { timingSafeEqual } from "../../utils/buffer.js";
 var TOKEN_STRINGS = "[A-Za-z0-9._~+/-]+=*";
 var PREFIX = "Bearer";
+var HEADER = "Authorization";
 var bearerAuth = (options) => {
   if (!("token" in options || "verifyToken" in options)) {
     throw new Error('bearer auth middleware requires options for "token"');
@@ -15,7 +16,7 @@ var bearerAuth = (options) => {
   }
   const realm = options.realm?.replace(/"/g, '\\"');
   return async function bearerAuth2(c, next) {
-    const headerToken = c.req.header("Authorization");
+    const headerToken = c.req.header(options.headerName || HEADER);
     if (!headerToken) {
       const res = new Response("Unauthorized", {
         status: 401,

package/dist/middleware/secure-headers/index.js

@@ -27,11 +27,29 @@ var DEFAULT_OPTIONS = {
   xPermittedCrossDomainPolicies: true,
   xXssProtection: true
 };
+var generateNonce = () => {
+  const buffer = new Uint8Array(16);
+  crypto.getRandomValues(buffer);
+  return Buffer.from(buffer).toString("base64");
+};
+var NONCE = (ctx) => {
+  const nonce = ctx.get("secureHeadersNonce") || (() => {
+    const newNonce = generateNonce();
+    ctx.set("secureHeadersNonce", newNonce);
+    return newNonce;
+  })();
+  return `'nonce-${nonce}'`;
+};
 var secureHeaders = (customOptions) => {
   const options = { ...DEFAULT_OPTIONS, ...customOptions };
   const headersToSet = getFilteredHeaders(options);
+  const callbacks = [];
   if (options.contentSecurityPolicy) {
-    headersToSet.push(["Content-Security-Policy", getCSPDirectives(options.contentSecurityPolicy)]);
+    const [callback, value] = getCSPDirectives(options.contentSecurityPolicy);
+    if (callback) {
+      callbacks.push(callback);
+    }
+    headersToSet.push(["Content-Security-Policy", value]);
   }
   if (options.reportingEndpoints) {
     headersToSet.push(["Reporting-Endpoints", getReportingEndpoints(options.reportingEndpoints)]);
@@ -40,8 +58,9 @@ var secureHeaders = (customOptions) => {
     headersToSet.push(["Report-To", getReportToOptions(options.reportTo)]);
   }
   return async function secureHeaders2(ctx, next) {
+    const headersToSetForReq = callbacks.length === 0 ? headersToSet : callbacks.reduce((acc, cb) => cb(ctx, acc), headersToSet);
     await next();
-    setHeaders(ctx, headersToSet);
+    setHeaders(ctx, headersToSetForReq);
     ctx.res.headers.delete("X-Powered-By");
   };
 };
@@ -52,13 +71,42 @@ function getFilteredHeaders(options) {
   });
 }
 function getCSPDirectives(contentSecurityPolicy) {
-  return Object.entries(contentSecurityPolicy || []).map(([directive, value]) => {
-    const kebabCaseDirective = directive.replace(
-      /[A-Z]+(?![a-z])|[A-Z]/g,
-      (match, offset) => offset ? "-" + match.toLowerCase() : match.toLowerCase()
+  const callbacks = [];
+  const resultValues = [];
+  for (const [directive, value] of Object.entries(contentSecurityPolicy)) {
+    const valueArray = Array.isArray(value) ? value : [value];
+    valueArray.forEach((value2, i) => {
+      if (typeof value2 === "function") {
+        const index = i * 2 + 2 + resultValues.length;
+        callbacks.push((ctx, values) => {
+          values[index] = value2(ctx, directive);
+        });
+      }
+    });
+    resultValues.push(
+      directive.replace(
+        /[A-Z]+(?![a-z])|[A-Z]/g,
+        (match, offset) => offset ? "-" + match.toLowerCase() : match.toLowerCase()
+      ),
+      ...valueArray.flatMap((value2) => [" ", value2]),
+      "; "
     );
-    return `${kebabCaseDirective} ${Array.isArray(value) ? value.join(" ") : value}`;
-  }).join("; ");
+  }
+  resultValues.pop();
+  return callbacks.length === 0 ? [void 0, resultValues.join("")] : [
+    (ctx, headersToSet) => headersToSet.map((values) => {
+      if (values[0] === "Content-Security-Policy") {
+        const clone = values[1].slice();
+        callbacks.forEach((cb) => {
+          cb(ctx, clone);
+        });
+        return [values[0], clone.join("")];
+      } else {
+        return values;
+      }
+    }),
+    resultValues
+  ];
 }
 function getReportingEndpoints(reportingEndpoints = []) {
   return reportingEndpoints.map((endpoint) => `${endpoint.name}="${endpoint.url}"`).join(", ");
@@ -72,5 +120,6 @@ function setHeaders(ctx, headersToSet) {
   });
 }
 export {
+  NONCE,
   secureHeaders
 };

package/dist/middleware/serve-static/index.js

@@ -23,7 +23,7 @@ var serveStatic = (options) => {
     const getContent = options.getContent;
     const pathResolve = options.pathResolve ?? defaultPathResolve;
     path = pathResolve(path);
-    let content = await getContent(path);
+    let content = await getContent(path, c);
     if (!content) {
       let pathWithOutDefaultDocument = getFilePathWithoutDefaultDocument({
         filename,
@@ -33,11 +33,14 @@ var serveStatic = (options) => {
         return await next();
       }
       pathWithOutDefaultDocument = pathResolve(pathWithOutDefaultDocument);
-      content = await getContent(pathWithOutDefaultDocument);
+      content = await getContent(pathWithOutDefaultDocument, c);
       if (content) {
         path = pathWithOutDefaultDocument;
       }
     }
+    if (content instanceof Response) {
+      return c.newResponse(content.body, content);
+    }
     if (content) {
       let mimeType;
       if (options.mimes) {

package/dist/middleware/timing/index.js

@@ -35,10 +35,11 @@ var timing = (config) => {
     const enabled = typeof options.enabled === "function" ? options.enabled(c) : options.enabled;
     if (enabled) {
       c.res.headers.append("Server-Timing", headers.join(","));
-      if (options.crossOrigin) {
+      const crossOrigin = typeof options.crossOrigin === "function" ? options.crossOrigin(c) : options.crossOrigin;
+      if (crossOrigin) {
         c.res.headers.append(
           "Timing-Allow-Origin",
-          typeof options.crossOrigin === "string" ? options.crossOrigin : "*"
+          typeof crossOrigin === "string" ? crossOrigin : "*"
         );
       }
     }

package/dist/types/adapter/cloudflare-workers/serve-static.d.ts

@@ -5,4 +5,10 @@ export type ServeStaticOptions<E extends Env = Env> = BaseServeStaticOptions<E>
     namespace?: KVNamespace;
     manifest: object | string;
 };
+/**
+ * @deprecated
+ * `serveStatic` in the Cloudflare Workers adapter is deprecated.
+ * If you want to create an application serving static assets, please consider using Cloudflare Pages.
+ * You can start to create the Cloudflare Pages application with the `npm create hono@latest` command.
+ */
 export declare const serveStatic: <E extends Env = Env>(options: ServeStaticOptions<E>) => MiddlewareHandler;