hono 4.3.11 → 4.4.0

package/dist/jsx/dom/render.js

@@ -1,10 +1,11 @@
 // src/jsx/dom/render.ts
 import { toArray } from "../children.js";
-import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH, DOM_INTERNAL_TAG } from "../constants.js";
+import { DOM_ERROR_HANDLER, DOM_INTERNAL_TAG, DOM_RENDERER, DOM_STASH } 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";
+import { newJSXNode } from "./utils.js";
 var HONO_PORTAL_ELEMENT = "_hp";
 var eventAliasMap = {
   Change: "Input",
@@ -26,6 +27,7 @@ var getEventSpec = (key) => {
   }
   return void 0;
 };
+var toAttributeName = (element, key) => element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 var applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
   for (const [key, value] of Object.entries(attributes)) {
@@ -80,14 +82,15 @@ var applyProps = (container, attributes, oldAttributes) => {
           ;
           container[key] = value;
         }
+        const k = toAttributeName(container, key);
         if (value === null || value === void 0 || value === false) {
-          container.removeAttribute(key);
+          container.removeAttribute(k);
         } else if (value === true) {
-          container.setAttribute(key, "");
+          container.setAttribute(k, "");
         } else if (typeof value === "string" || typeof value === "number") {
-          container.setAttribute(key, value);
+          container.setAttribute(k, value);
         } else {
-          container.setAttribute(key, value.toString());
+          container.setAttribute(k, value.toString());
         }
       }
     }
@@ -105,7 +108,7 @@ var applyProps = (container, attributes, oldAttributes) => {
             value.current = null;
           }
         } else {
-          container.removeAttribute(key);
+          container.removeAttribute(toAttributeName(container, key));
         }
       }
     }
@@ -153,6 +156,8 @@ var getNextChildren = (node, container, nextChildren, childrenToRemove, callback
 var findInsertBefore = (node) => {
   if (!node) {
     return null;
+  } else if (node.tag === HONO_PORTAL_ELEMENT) {
+    return findInsertBefore(node.nN);
   } else if (node.e) {
     return node.e;
   }
@@ -214,7 +219,7 @@ var applyNodeObject = (node, container) => {
   const callbacks = [];
   getNextChildren(node, container, next, remove, callbacks);
   const childNodes = container.childNodes;
-  let offset = findChildNodeIndex(childNodes, findInsertBefore(node.nN)) ?? findChildNodeIndex(childNodes, next.find((n) => n.e)?.e) ?? childNodes.length;
+  let offset = findChildNodeIndex(childNodes, findInsertBefore(node.nN)) ?? findChildNodeIndex(childNodes, next.find((n) => n.tag !== HONO_PORTAL_ELEMENT && n.e)?.e) ?? childNodes.length;
   for (let i = 0, len = next.length; i < len; i++, offset++) {
     const child = next[i];
     let el;
@@ -229,11 +234,14 @@ var applyNodeObject = (node, container) => {
       applyProps(el, child.props, child.pP);
       applyNode(child, el);
     }
-    if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e && child.tag !== HONO_PORTAL_ELEMENT) {
+    if (child.tag === HONO_PORTAL_ELEMENT) {
+      offset--;
+    } else if (childNodes[offset] !== el && childNodes[offset - 1] !== child.e) {
       container.insertBefore(el, childNodes[offset] || null);
     }
   }
   remove.forEach(removeNode);
+  callbacks.forEach(([, , , , cb]) => cb?.());
   callbacks.forEach(([, cb]) => cb?.());
   requestAnimationFrame(() => {
     callbacks.forEach(([, , , cb]) => cb?.());
@@ -249,7 +257,7 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
   }
   const oldVChildren = node.vC ? [...node.vC] : [];
   const vChildren = [];
-  const vChildrenToRemove = [];
+  node.vR = [];
   let prevNode;
   try {
     children.flat().forEach((c) => {
@@ -263,24 +271,23 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
           child[DOM_STASH][2] = globalJSXContexts.map((c2) => [c2, c2.values.at(-1)]);
         }
         let oldChild;
-        const i = oldVChildren.findIndex((c2) => c2.key === child.key);
+        const i = oldVChildren.findIndex(
+          isNodeString(child) ? (c2) => isNodeString(c2) : child.key !== void 0 ? (c2) => c2.key === child.key : (c2) => c2.tag === child.tag
+        );
         if (i !== -1) {
           oldChild = oldVChildren[i];
           oldVChildren.splice(i, 1);
         }
         if (oldChild) {
           if (isNodeString(child)) {
-            if (!isNodeString(oldChild)) {
-              vChildrenToRemove.push(oldChild);
-            } else {
-              if (oldChild.t !== child.t) {
-                oldChild.t = child.t;
-                oldChild.d = true;
-              }
-              child = oldChild;
+            if (oldChild.t !== child.t) {
+              ;
+              oldChild.t = child.t;
+              oldChild.d = true;
             }
+            child = oldChild;
           } else if (oldChild.tag !== child.tag) {
-            vChildrenToRemove.push(oldChild);
+            node.vR.push(oldChild);
           } else {
             oldChild.pP = oldChild.props;
             oldChild.props = child.props;
@@ -302,8 +309,7 @@ var build = (context, node, topLevelErrorHandlerNode, children) => {
       }
     });
     node.vC = vChildren;
-    vChildrenToRemove.push(...oldVChildren);
-    node.vR = vChildrenToRemove;
+    node.vR.push(...oldVChildren);
   } catch (e) {
     if (errorHandler) {
       const fallbackUpdateFn = () => update([0, false, context[2]], topLevelErrorHandlerNode);
@@ -338,10 +344,14 @@ var buildNode = (node) => {
   } else if (typeof node === "string" || typeof node === "number") {
     return { t: node.toString(), d: true };
   } else {
+    if ("vR" in node) {
+      node = newJSXNode({
+        tag: node.tag,
+        props: node.props,
+        key: node.key
+      });
+    }
     if (typeof node.tag === "function") {
-      if (node[DOM_STASH]) {
-        node = { ...node };
-      }
       ;
       node[DOM_STASH] = [0, []];
     } else {
@@ -417,8 +427,7 @@ var update = async (context, node) => {
   }
   return promise;
 };
-var render = (jsxNode, container) => {
-  const node = buildNode({ tag: "", props: { children: jsxNode } });
+var renderNode = (node, container) => {
   const context = [];
   context[4] = true;
   build(context, node, void 0);
@@ -428,6 +437,9 @@ var render = (jsxNode, container) => {
   replaceContainer(node, fragment, container);
   container.replaceChildren(fragment);
 };
+var render = (jsxNode, container) => {
+  renderNode(buildNode({ tag: "", props: { children: jsxNode } }), container);
+};
 var flushSync = (callback) => {
   const set = /* @__PURE__ */ new Set();
   currentUpdateSets.push(set);
@@ -452,8 +464,10 @@ var createPortal = (children, container, key) => ({
 export {
   build,
   buildDataStack,
+  buildNode,
   createPortal,
   flushSync,
   render,
+  renderNode,
   update
 };

package/dist/jsx/dom/utils.js

@@ -5,6 +5,20 @@ var setInternalTagFlag = (fn) => {
   fn[DOM_INTERNAL_TAG] = true;
   return fn;
 };
+var JSXNodeCompatPrototype = {
+  type: {
+    get() {
+      return this.tag;
+    }
+  },
+  ref: {
+    get() {
+      return this.props?.ref;
+    }
+  }
+};
+var newJSXNode = (obj) => Object.defineProperties(obj, JSXNodeCompatPrototype);
 export {
+  newJSXNode,
   setInternalTagFlag
 };

package/dist/jsx/hooks/index.js

@@ -1,6 +1,6 @@
 // src/jsx/hooks/index.ts
 import { DOM_STASH } from "../constants.js";
-import { buildDataStack, update, build } from "../dom/render.js";
+import { build, buildDataStack, update } from "../dom/render.js";
 var STASH_SATE = 0;
 var STASH_EFFECT = 1;
 var STASH_CALLBACK = 2;
@@ -175,13 +175,14 @@ var useEffectCommon = (index, effect, deps) => {
       data[index] = void 0;
       data[2] = effect();
     };
-    const data = [deps, void 0, void 0, void 0];
+    const data = [deps, void 0, void 0, void 0, void 0];
     data[index] = runner;
     effectDepsArray[hookIndex] = data;
   }
 };
 var useEffect = (effect, deps) => useEffectCommon(3, effect, deps);
 var useLayoutEffect = (effect, deps) => useEffectCommon(1, effect, deps);
+var useInsertionEffect = (effect, deps) => useEffectCommon(4, effect, deps);
 var useCallback = (callback, deps) => {
   const buildData = buildDataStack.at(-1);
   if (!buildData) {
@@ -314,6 +315,7 @@ export {
   useEffect,
   useId,
   useImperativeHandle,
+  useInsertionEffect,
   useLayoutEffect,
   useMemo,
   useReducer,

package/dist/jsx/index.js

@@ -1,32 +1,33 @@
 // src/jsx/index.ts
-import { jsx, memo, Fragment, isValidElement, cloneElement } from "./base.js";
+import { Fragment, cloneElement, isValidElement, jsx, memo, reactAPICompatVersion } from "./base.js";
 import { Children } from "./children.js";
 import { ErrorBoundary } from "./components.js";
 import { createContext, useContext } from "./context.js";
 import {
-  useState,
-  useEffect,
-  useRef,
-  useCallback,
-  use,
+  createRef,
+  forwardRef,
   startTransition,
-  useTransition,
-  useDeferredValue,
   startViewTransition,
-  useViewTransition,
-  useMemo,
-  useLayoutEffect,
-  useReducer,
-  useId,
+  use,
+  useCallback,
   useDebugValue,
-  createRef,
-  forwardRef,
+  useDeferredValue,
+  useEffect,
+  useId,
   useImperativeHandle,
-  useSyncExternalStore
+  useInsertionEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+  useSyncExternalStore,
+  useTransition,
+  useViewTransition
 } from "./hooks/index.js";
 import { Suspense } from "./streaming.js";
-export * from "./types.js";
 var jsx_default = {
+  version: reactAPICompatVersion,
   memo,
   Fragment,
   isValidElement,
@@ -50,6 +51,7 @@ var jsx_default = {
   useViewTransition,
   useMemo,
   useLayoutEffect,
+  useInsertionEffect,
   createRef,
   forwardRef,
   useImperativeHandle,
@@ -81,6 +83,7 @@ export {
   useEffect,
   useId,
   useImperativeHandle,
+  useInsertionEffect,
   useLayoutEffect,
   useMemo,
   useReducer,
@@ -88,5 +91,6 @@ export {
   useState,
   useSyncExternalStore,
   useTransition,
-  useViewTransition
+  useViewTransition,
+  reactAPICompatVersion as version
 };

package/dist/jsx/jsx-runtime.js

@@ -1,7 +1,7 @@
 // src/jsx/jsx-runtime.ts
 import { jsxDEV, Fragment } from "./jsx-dev-runtime.js";
 import { jsxDEV as jsxDEV2 } from "./jsx-dev-runtime.js";
-import { raw, html } from "../helper/html/index.js";
+import { html, raw } from "../helper/html/index.js";
 var jsxAttr = (name, value) => typeof value === "string" ? raw(name + '="' + html`${value}` + '"') : html`${name}="${value}"`;
 var jsxEscape = (value) => value;
 export {

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

@@ -1,6 +1,6 @@
 // src/middleware/jsx-renderer/index.ts
 import { html, raw } from "../../helper/html/index.js";
-import { jsx, createContext, useContext, Fragment } from "../../jsx/index.js";
+import { Fragment, createContext, jsx, useContext } from "../../jsx/index.js";
 import { renderToReadableStream } from "../../jsx/streaming.js";
 var RequestContext = createContext(null);
 var createRenderer = (c, Layout, component, options) => (children, props) => {

package/dist/middleware/jwt/index.js

@@ -1,82 +1,5 @@
 // src/middleware/jwt/index.ts
-import { getCookie } from "../../helper/cookie/index.js";
-import { HTTPException } from "../../http-exception.js";
-import { Jwt } from "../../utils/jwt/index.js";
-import "../../context.js";
-var jwt = (options) => {
-  if (!options || !options.secret) {
-    throw new Error('JWT auth middleware requires options for "secret');
-  }
-  if (!crypto.subtle || !crypto.subtle.importKey) {
-    throw new Error("`crypto.subtle.importKey` is undefined. JWT auth middleware requires it.");
-  }
-  return async function jwt2(ctx, next) {
-    const credentials = ctx.req.raw.headers.get("Authorization");
-    let token;
-    if (credentials) {
-      const parts = credentials.split(/\s+/);
-      if (parts.length !== 2) {
-        const errDescription = "invalid credentials structure";
-        throw new HTTPException(401, {
-          message: errDescription,
-          res: unauthorizedResponse({
-            ctx,
-            error: "invalid_request",
-            errDescription
-          })
-        });
-      } else {
-        token = parts[1];
-      }
-    } else if (options.cookie) {
-      token = getCookie(ctx)[options.cookie];
-    }
-    if (!token) {
-      const errDescription = "no authorization included in request";
-      throw new HTTPException(401, {
-        message: errDescription,
-        res: unauthorizedResponse({
-          ctx,
-          error: "invalid_request",
-          errDescription
-        })
-      });
-    }
-    let payload;
-    let cause;
-    try {
-      payload = await Jwt.verify(token, options.secret, options.alg);
-    } catch (e) {
-      cause = e;
-    }
-    if (!payload) {
-      throw new HTTPException(401, {
-        message: "Unauthorized",
-        res: unauthorizedResponse({
-          ctx,
-          error: "invalid_token",
-          statusText: "Unauthorized",
-          errDescription: "token verification failure"
-        }),
-        cause
-      });
-    }
-    ctx.set("jwtPayload", payload);
-    await next();
-  };
-};
-function unauthorizedResponse(opts) {
-  return new Response("Unauthorized", {
-    status: 401,
-    statusText: opts.statusText,
-    headers: {
-      "WWW-Authenticate": `Bearer realm="${opts.ctx.req.url}",error="${opts.error}",error_description="${opts.errDescription}"`
-    }
-  });
-}
-var verify = Jwt.verify;
-var decode = Jwt.decode;
-var sign = Jwt.sign;
+import { jwt, verify, decode, sign } from "./jwt.js";
 export {
   decode,
   jwt,

package/dist/middleware/jwt/jwt.js

@@ -0,0 +1,85 @@
+// src/middleware/jwt/jwt.ts
+import { getCookie } from "../../helper/cookie/index.js";
+import { HTTPException } from "../../http-exception.js";
+import { Jwt } from "../../utils/jwt/index.js";
+import "../../context.js";
+var jwt = (options) => {
+  if (!options || !options.secret) {
+    throw new Error('JWT auth middleware requires options for "secret"');
+  }
+  if (!crypto.subtle || !crypto.subtle.importKey) {
+    throw new Error("`crypto.subtle.importKey` is undefined. JWT auth middleware requires it.");
+  }
+  return async function jwt2(ctx, next) {
+    const credentials = ctx.req.raw.headers.get("Authorization");
+    let token;
+    if (credentials) {
+      const parts = credentials.split(/\s+/);
+      if (parts.length !== 2) {
+        const errDescription = "invalid credentials structure";
+        throw new HTTPException(401, {
+          message: errDescription,
+          res: unauthorizedResponse({
+            ctx,
+            error: "invalid_request",
+            errDescription
+          })
+        });
+      } else {
+        token = parts[1];
+      }
+    } else if (options.cookie) {
+      token = getCookie(ctx)[options.cookie];
+    }
+    if (!token) {
+      const errDescription = "no authorization included in request";
+      throw new HTTPException(401, {
+        message: errDescription,
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_request",
+          errDescription
+        })
+      });
+    }
+    let payload;
+    let cause;
+    try {
+      payload = await Jwt.verify(token, options.secret, options.alg);
+    } catch (e) {
+      cause = e;
+    }
+    if (!payload) {
+      throw new HTTPException(401, {
+        message: "Unauthorized",
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_token",
+          statusText: "Unauthorized",
+          errDescription: "token verification failure"
+        }),
+        cause
+      });
+    }
+    ctx.set("jwtPayload", payload);
+    await next();
+  };
+};
+function unauthorizedResponse(opts) {
+  return new Response("Unauthorized", {
+    status: 401,
+    statusText: opts.statusText,
+    headers: {
+      "WWW-Authenticate": `Bearer realm="${opts.ctx.req.url}",error="${opts.error}",error_description="${opts.errDescription}"`
+    }
+  });
+}
+var verify = Jwt.verify;
+var decode = Jwt.decode;
+var sign = Jwt.sign;
+export {
+  decode,
+  jwt,
+  sign,
+  verify
+};

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

@@ -1,125 +1,5 @@
 // src/middleware/secure-headers/index.ts
-import { encodeBase64 } from "../../utils/encode.js";
-var HEADERS_MAP = {
-  crossOriginEmbedderPolicy: ["Cross-Origin-Embedder-Policy", "require-corp"],
-  crossOriginResourcePolicy: ["Cross-Origin-Resource-Policy", "same-origin"],
-  crossOriginOpenerPolicy: ["Cross-Origin-Opener-Policy", "same-origin"],
-  originAgentCluster: ["Origin-Agent-Cluster", "?1"],
-  referrerPolicy: ["Referrer-Policy", "no-referrer"],
-  strictTransportSecurity: ["Strict-Transport-Security", "max-age=15552000; includeSubDomains"],
-  xContentTypeOptions: ["X-Content-Type-Options", "nosniff"],
-  xDnsPrefetchControl: ["X-DNS-Prefetch-Control", "off"],
-  xDownloadOptions: ["X-Download-Options", "noopen"],
-  xFrameOptions: ["X-Frame-Options", "SAMEORIGIN"],
-  xPermittedCrossDomainPolicies: ["X-Permitted-Cross-Domain-Policies", "none"],
-  xXssProtection: ["X-XSS-Protection", "0"]
-};
-var DEFAULT_OPTIONS = {
-  crossOriginEmbedderPolicy: false,
-  crossOriginResourcePolicy: true,
-  crossOriginOpenerPolicy: true,
-  originAgentCluster: true,
-  referrerPolicy: true,
-  strictTransportSecurity: true,
-  xContentTypeOptions: true,
-  xDnsPrefetchControl: true,
-  xDownloadOptions: true,
-  xFrameOptions: true,
-  xPermittedCrossDomainPolicies: true,
-  xXssProtection: true
-};
-var generateNonce = () => {
-  const buffer = new Uint8Array(16);
-  crypto.getRandomValues(buffer);
-  return encodeBase64(buffer);
-};
-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) {
-    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)]);
-  }
-  if (options.reportTo) {
-    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, headersToSetForReq);
-    ctx.res.headers.delete("X-Powered-By");
-  };
-};
-function getFilteredHeaders(options) {
-  return Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([key, defaultValue]) => {
-    const overrideValue = options[key];
-    return typeof overrideValue === "string" ? [defaultValue[0], overrideValue] : defaultValue;
-  });
-}
-function getCSPDirectives(contentSecurityPolicy) {
-  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]),
-      "; "
-    );
-  }
-  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(", ");
-}
-function getReportToOptions(reportTo = []) {
-  return reportTo.map((option) => JSON.stringify(option)).join(", ");
-}
-function setHeaders(ctx, headersToSet) {
-  headersToSet.forEach(([header, value]) => {
-    ctx.res.headers.set(header, value);
-  });
-}
+import { NONCE, secureHeaders } from "./secure-headers.js";
 export {
   NONCE,
   secureHeaders