hono 4.13.6 → 4.13.8

package/README.md

@@ -64,7 +64,7 @@ Contributions Welcome! You can contribute in the following ways.
 
 - Create an Issue - Propose a new feature. Report a bug.
 - Pull Request - Fix a bug or typo. Refactor the code.
-- Create third-party middleware - See instructions below.
+- Create third-party middleware - See [Third-party middleware](docs/CONTRIBUTING.md#third-party-middleware).
 - Share - Share your thoughts on the Blog, X, and others.
 - Make your application - Please try to use Hono.
 

package/dist/adapter/aws-lambda/handler.js

@@ -1,4 +1,5 @@
 // src/adapter/aws-lambda/handler.ts
+import { pipeline } from "node:stream/promises";
 import { decodeBase64, encodeBase64 } from "../../utils/encode.js";
 function sanitizeHeaderValue(value) {
   const hasNonAscii = /[^\x00-\x7F]/.test(value);
@@ -10,14 +11,14 @@ function sanitizeHeaderValue(value) {
 var getRequestContext = (event) => {
   return event.requestContext;
 };
-var streamToNodeStream = async (reader, writer) => {
+async function* readWebStream(reader) {
   let readResult = await reader.read();
   while (!readResult.done) {
-    writer.write(readResult.value);
+    yield readResult.value;
     readResult = await reader.read();
   }
-  writer.end();
-};
+}
+var streamToNodeStream = (reader, writer) => pipeline(readWebStream(reader), writer);
 var streamHandle = (app) => {
   return awslambda.streamifyResponse(
     async (event, responseStream, context) => {

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -29,6 +29,7 @@ __export(handler_exports, {
   streamHandle: () => streamHandle
 });
 module.exports = __toCommonJS(handler_exports);
+var import_promises = require("node:stream/promises");
 var import_encode = require("../../utils/encode");
 function sanitizeHeaderValue(value) {
   const hasNonAscii = /[^\x00-\x7F]/.test(value);
@@ -40,14 +41,14 @@ function sanitizeHeaderValue(value) {
 const getRequestContext = (event) => {
   return event.requestContext;
 };
-const streamToNodeStream = async (reader, writer) => {
+async function* readWebStream(reader) {
   let readResult = await reader.read();
   while (!readResult.done) {
-    writer.write(readResult.value);
+    yield readResult.value;
     readResult = await reader.read();
   }
-  writer.end();
-};
+}
+const streamToNodeStream = (reader, writer) => (0, import_promises.pipeline)(readWebStream(reader), writer);
 const streamHandle = (app) => {
   return awslambda.streamifyResponse(
     async (event, responseStream, context) => {

package/dist/cjs/context.js

@@ -424,7 +424,7 @@ class Context {
     const locationString = String(location);
     this.header(
       "Location",
-      // Multibyes should be encoded
+      // Multibytes should be encoded
       // eslint-disable-next-line no-control-regex
       !/[^\x00-\xFF]/.test(locationString) ? locationString : encodeURI(locationString)
     );

package/dist/cjs/helper/accepts/accepts.js

@@ -47,7 +47,7 @@ const getSpecificity = (type) => {
 };
 const defaultMatch = (accepts2, config) => {
   const { supports, default: defaultSupport } = config;
-  const sortedAccepts = accepts2.slice().sort((a, b) => {
+  const sortedAccepts = accepts2.filter((accept) => accept.q > 0).sort((a, b) => {
     if (b.q !== a.q) {
       return b.q - a.q;
     }

package/dist/cjs/jsx/base.js

@@ -33,11 +33,14 @@ __export(base_exports, {
   booleanAttributes: () => booleanAttributes,
   cloneElement: () => cloneElement,
   getNameSpaceContext: () => getNameSpaceContext,
+  isUntrustedObject: () => isUntrustedObject,
   isValidElement: () => isValidElement,
   jsx: () => jsx,
   jsxFn: () => jsxFn,
   memo: () => memo,
   reactAPICompatVersion: () => reactAPICompatVersion,
+  renderChildren: () => renderChildren,
+  renderUntrustedObject: () => renderUntrustedObject,
   shallowEqual: () => shallowEqual
 });
 module.exports = __toCommonJS(base_exports);
@@ -101,7 +104,7 @@ const booleanAttributes = [
   "selected"
 ];
 const resolveFunctionComponentResult = (result, suspendedContext) => result.then((resolved) => {
-  if (!Array.isArray(resolved) && !(resolved instanceof JSXNode)) {
+  if (typeof resolved !== "string" && !Array.isArray(resolved) && !(resolved instanceof JSXNode)) {
     return resolved;
   }
   const children = Array.isArray(resolved) ? resolved : [resolved];
@@ -139,6 +142,17 @@ const childrenToStringToBuffer = (children, buffer) => {
     }
   }
 };
+const renderChildren = (children) => (0, import_context.runWithRenderContext)(() => {
+  const buffer = [""];
+  childrenToStringToBuffer(children, buffer);
+  return buffer.length === 1 ? (0, import_html.raw)(buffer[0], buffer.callbacks) : (0, import_html2.stringBufferToString)(buffer, buffer.callbacks);
+});
+const isUntrustedObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof JSXNode) && !(value instanceof Promise) && !value.isEscaped && typeof value.toString === "function";
+const renderUntrustedObject = (value) => {
+  const stringified = value.toString();
+  const escape = (result) => renderChildren([String(result)]);
+  return stringified instanceof Promise ? stringified.then(escape) : escape(stringified);
+};
 class JSXNode {
   tag;
   props;
@@ -369,10 +383,13 @@ const reactAPICompatVersion = "19.0.0-hono-jsx";
   booleanAttributes,
   cloneElement,
   getNameSpaceContext,
+  isUntrustedObject,
   isValidElement,
   jsx,
   jsxFn,
   memo,
   reactAPICompatVersion,
+  renderChildren,
+  renderUntrustedObject,
   shallowEqual
 });

package/dist/cjs/jsx/components.js

@@ -31,7 +31,7 @@ var import_streaming = require("./streaming");
 let errorBoundaryCounter = 0;
 const childrenToString = async (children) => {
   try {
-    return children.flat().map((c) => c == null || typeof c === "boolean" ? "" : c.toString());
+    return children.flat().map(resolveChildEarly);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = (0, import_context.captureRenderContext)();
@@ -42,18 +42,16 @@ const childrenToString = async (children) => {
     }
   }
 };
-const resolveChildEarly = (c) => {
-  if (c == null || typeof c === "boolean") {
+const resolveChildEarly = (child) => {
+  if (child == null || typeof child === "boolean") {
     return "";
-  } else if (typeof c === "string") {
-    return c;
+  } else if (typeof child === "string" || Array.isArray(child)) {
+    return (0, import_base.renderChildren)([child]);
+  } else if ((0, import_base.isUntrustedObject)(child)) {
+    return (0, import_base.renderUntrustedObject)(child);
   } else {
-    const str = c.toString();
-    if (!(str instanceof Promise)) {
-      return (0, import_html.raw)(str);
-    } else {
-      return str;
-    }
+    const str = child.toString();
+    return str instanceof Promise ? str : (0, import_html.raw)(str);
   }
 };
 const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
@@ -69,26 +67,27 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
   let fallbackStrPromise;
   const resolveFallbackStr = () => fallbackStrPromise ||= (async () => {
     const awaitedFallback = await fallback;
-    if (typeof awaitedFallback === "string") {
-      return awaitedFallback;
-    } else {
-      const fallbackResult = await getResume()(() => awaitedFallback?.toString());
-      if (typeof fallbackResult === "string") {
-        return (0, import_html.raw)(
-          fallbackResult,
-          fallbackResult.callbacks || awaitedFallback?.callbacks
-        );
-      }
+    if (awaitedFallback === null || awaitedFallback === void 0) {
+      return;
+    }
+    if (typeof awaitedFallback === "string" || Array.isArray(awaitedFallback)) {
+      return getResume()(() => (0, import_base.renderChildren)([awaitedFallback]));
+    }
+    if ((0, import_base.isUntrustedObject)(awaitedFallback)) {
+      return getResume()(() => (0, import_base.renderUntrustedObject)(awaitedFallback));
     }
+    const fallbackResult = await getResume()(() => awaitedFallback.toString());
+    return (0, import_html.raw)(
+      fallbackResult,
+      fallbackResult.callbacks || awaitedFallback.callbacks
+    );
   })();
   const renderFallback = async (error) => {
     const fallbackStr = await resolveFallbackStr();
     return getResume()(async () => {
       onError?.(error);
       const fallbackRes = fallbackStr !== void 0 ? fallbackStr : fallbackRender && (0, import_base.jsx)(import_base.Fragment, {}, fallbackRender(error)) || "";
-      const fallbackResString = await (0, import_base.Fragment)({
-        children: fallbackRes
-      }).toString();
+      const fallbackResString = await (0, import_base.Fragment)({ children: fallbackRes }).toString();
       return (0, import_html.raw)(
         fallbackResString,
         fallbackResString.callbacks || fallbackRes.callbacks
@@ -121,7 +120,7 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
       const fallbackResString = await renderFallback(error2);
       const fallbackCallbacks = fallbackResString.callbacks;
       if (buffer) {
-        buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
+        buffer[0] = buffer[0].replace(replaceRe, () => fallbackResString);
         return fallbackCallbacks?.length ? (0, import_html.raw)("", fallbackCallbacks) : "";
       }
       return (0, import_html.raw)(
@@ -160,7 +159,7 @@ d.parentElement.insertBefore(c.content,d.nextSibling)
 </script>`;
           if (htmlArray.every((html2) => !html2.callbacks?.length)) {
             if (buffer) {
-              buffer[0] = buffer[0].replace(replaceRe, content);
+              buffer[0] = buffer[0].replace(replaceRe, () => content);
             }
             return html;
           }

package/dist/cjs/jsx/context.js

@@ -155,18 +155,18 @@ const createContext = (defaultValue) => {
   const context = ((props) => {
     const contextValues = getContextValuesIn(getCurrentStore(), context);
     contextValues.push(props.value);
-    let string;
+    let rendered;
     try {
-      string = props.children ? (Array.isArray(props.children) ? new import_base.JSXFragmentNode("", {}, props.children) : props.children).toString() : "";
+      rendered = typeof props.children === "string" ? (0, import_base.renderChildren)([props.children]) : (0, import_base.isUntrustedObject)(props.children) ? (0, import_base.renderUntrustedObject)(props.children) : props.children ? (Array.isArray(props.children) ? new import_base.JSXFragmentNode("", {}, props.children) : props.children).toString() : (0, import_html.raw)("");
     } catch (e) {
       contextValues.pop();
       throw e;
     }
-    if (string instanceof Promise) {
-      return string.finally(() => contextValues.pop()).then((resString) => (0, import_html.raw)(resString, resString.callbacks));
+    if (rendered instanceof Promise) {
+      return rendered.finally(() => contextValues.pop()).then((resString) => (0, import_html.raw)(resString, resString.callbacks));
     } else {
       contextValues.pop();
-      return (0, import_html.raw)(string);
+      return (0, import_html.raw)(rendered);
     }
   });
   context.values = values;

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

@@ -355,6 +355,17 @@ const applyNodeObject = (node, container, isNew) => {
   }
 };
 const isSameContext = (oldContexts, newContexts) => !!(oldContexts && oldContexts.length === newContexts.length && oldContexts.every((ctx, i) => ctx[1] === newContexts[i][1]));
+const indexChildrenByKey = (children) => {
+  const index = /* @__PURE__ */ new Map();
+  for (const child of children) {
+    const key = child.key;
+    if (index.has(key)) {
+      return;
+    }
+    index.set(key, child);
+  }
+  return index;
+};
 const fallbackUpdateFnArrayMap = /* @__PURE__ */ new WeakMap();
 const build = (context, node, children) => {
   const buildWithPreviousChildren = !children && node.pC;
@@ -368,9 +379,11 @@ const build = (context, node, children) => {
       foundErrorHandler = children[0][import_constants.DOM_ERROR_HANDLER];
       context[5].push([context, foundErrorHandler, node]);
     }
-    const oldVChildren = buildWithPreviousChildren ? [...node.pC] : node.vC ? [...node.vC] : void 0;
+    let oldVChildren = buildWithPreviousChildren ? [...node.pC] : node.vC ? [...node.vC] : void 0;
     const vChildren = [];
     let prevNode;
+    let scanBudget = (oldVChildren?.length || 0) * 2;
+    let oldChildrenByKey;
     for (let i = 0; i < children.length; i++) {
       if (Array.isArray(children[i])) {
         children.splice(i, 1, ...children[i].flat(Infinity));
@@ -389,13 +402,35 @@ const build = (context, node, children) => {
           }
         }
         let oldChild;
-        if (oldVChildren && oldVChildren.length) {
-          const i2 = oldVChildren.findIndex(
-            isNodeString(child) ? (c) => isNodeString(c) : child.key !== void 0 ? (c) => c.key === child.key && c.tag === child.tag : (c) => c.tag === child.tag
-          );
-          if (i2 !== -1) {
-            oldChild = oldVChildren[i2];
-            oldVChildren.splice(i2, 1);
+        if (oldChildrenByKey && child.key === void 0 && !isNodeString(child)) {
+          oldVChildren = [...oldChildrenByKey.values()];
+          oldChildrenByKey = void 0;
+        }
+        if (oldChildrenByKey) {
+          const key = child.key;
+          const candidate = oldChildrenByKey.get(key);
+          if (candidate && (isNodeString(child) ? isNodeString(candidate) : candidate.tag === child.tag && candidate.key === key)) {
+            oldChild = candidate;
+            oldChildrenByKey.delete(key);
+          }
+        } else if (oldVChildren && oldVChildren.length) {
+          const first = oldVChildren[0];
+          const isMatchFirst = isNodeString(child) ? isNodeString(first) : !isNodeString(first) && (child.key !== void 0 ? first.key === child.key && first.tag === child.tag : first.tag === child.tag);
+          if (isMatchFirst) {
+            oldChild = oldVChildren.shift();
+          } else {
+            const i2 = oldVChildren.findIndex(
+              isNodeString(child) ? (c) => isNodeString(c) : child.key !== void 0 ? (c) => c.key === child.key && c.tag === child.tag : (c) => c.tag === child.tag
+            );
+            scanBudget -= i2 === -1 ? oldVChildren.length : i2;
+            if (i2 !== -1) {
+              oldChild = oldVChildren[i2];
+              oldVChildren.splice(i2, 1);
+            }
+            if (scanBudget < 0) {
+              scanBudget = Infinity;
+              oldChildrenByKey = indexChildrenByKey(oldVChildren);
+            }
           }
         }
         if (oldChild) {
@@ -441,6 +476,7 @@ const build = (context, node, children) => {
         prevNode = child;
       }
     }
+    oldVChildren = oldChildrenByKey ? [...oldChildrenByKey.values()] : oldVChildren;
     node.vR = buildWithPreviousChildren ? [...node.vC, ...oldVChildren || []] : oldVChildren || [];
     node.vC = vChildren;
     if (buildWithPreviousChildren) {

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

@@ -33,13 +33,16 @@ __export(server_exports, {
   version: () => import__.default
 });
 module.exports = __toCommonJS(server_exports);
+var import_base = require("../base");
 var import_streaming = require("../streaming");
 var import__ = __toESM(require("./"), 1);
+const prepareRoot = (element) => typeof element === "string" || Array.isArray(element) ? (0, import_base.renderChildren)([element]) : element;
 const renderToString = (element, options = {}) => {
   if (Object.keys(options).length > 0) {
     console.warn("options are not supported yet");
   }
-  const res = element?.toString() ?? "";
+  element = prepareRoot(element);
+  const res = element instanceof Promise ? element : element?.toString() ?? "";
   if (typeof res !== "string") {
     throw new Error("Async component is not supported in renderToString");
   }
@@ -49,6 +52,7 @@ const renderToReadableStream = async (element, options = {}) => {
   if (Object.keys(options).some((key) => key !== "onError")) {
     console.warn("options are not supported yet, except onError");
   }
+  element = prepareRoot(element);
   if (!element || typeof element !== "object") {
     element = element?.toString() ?? "";
   }

package/dist/cjs/jsx/intrinsic-element/components.js

@@ -85,10 +85,10 @@ const insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context }
     insertTags.forEach((tag2) => {
       buffer[0] = buffer[0].replaceAll(tag2, "");
     });
-    buffer[0] = buffer[0].replace(/(?=<\/head>)/, insertTags.join(""));
+    buffer[0] = buffer[0].replace(/(?=<\/head>)/, () => insertTags.join(""));
   }
 };
-const returnWithoutSpecialBehavior = (tag, children, props) => (0, import_html.raw)(new import_base.JSXNode(tag, props, (0, import_children.toArray)(children ?? [])).toString());
+const returnWithoutSpecialBehavior = (tag, children, props) => (0, import_base.renderChildren)([new import_base.JSXNode(tag, props, (0, import_children.toArray)(children ?? []))]);
 const documentMetadataTag = (tag, children, props, sort) => {
   if ("itemProp" in props) {
     return returnWithoutSpecialBehavior(tag, children, props);

package/dist/cjs/jsx/streaming.js

@@ -32,6 +32,7 @@ var import_components2 = require("./dom/components");
 var import_render = require("./dom/render");
 const StreamingContext = (0, import_context.createContext)(null);
 let suspenseCounter = 0;
+const serializeBoundaryChild = (child) => typeof child === "string" || Array.isArray(child) ? (0, import_base.renderChildren)([child]) : child == null || typeof child === "boolean" ? "" : (0, import_base.isUntrustedObject)(child) ? (0, import_base.renderUntrustedObject)(child) : child.toString();
 const Suspense = async ({
   children,
   fallback
@@ -48,9 +49,7 @@ const Suspense = async ({
   try {
     stackNode[import_constants.DOM_STASH][0] = 0;
     import_render.buildDataStack.push([[], stackNode]);
-    resArray = children.map(
-      (c) => c == null || typeof c === "boolean" ? "" : c.toString()
-    );
+    resArray = children.map(serializeBoundaryChild);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = (0, import_context.captureRenderContext)();
@@ -71,7 +70,7 @@ const Suspense = async ({
   }
   if (resArray.some((res) => res instanceof Promise)) {
     const index = suspenseCounter++;
-    const fallbackStr = await fallback.toString();
+    const fallbackStr = await (typeof fallback === "string" || Array.isArray(fallback) ? (0, import_base.renderChildren)([fallback]) : (0, import_base.isUntrustedObject)(fallback) ? (0, import_base.renderUntrustedObject)(fallback) : fallback.toString());
     return (0, import_html.raw)(`<template id="H:${index}"></template>${fallbackStr}<!--/$-->`, [
       ...fallbackStr.callbacks || [],
       ({ phase, buffer, context }) => {
@@ -84,7 +83,7 @@ const Suspense = async ({
           if (buffer) {
             buffer[0] = buffer[0].replace(
               new RegExp(`<template id="H:${index}"></template>.*?<!--/\\$-->`),
-              content
+              () => content
             );
           }
           let html = buffer ? "" : `<template data-hono-target="H:${index}">${content}</template><script${nonce ? ` nonce="${nonce}"` : ""}>

package/dist/cjs/middleware/language/language.js

@@ -101,7 +101,10 @@ function detectFromHeader(c, options) {
       return void 0;
     }
     const languages = parseAcceptLanguage(acceptLanguage);
-    for (const { lang } of languages) {
+    for (const { lang, q } of languages) {
+      if (q === 0) {
+        continue;
+      }
       const normalizedLang = normalizeLanguage(lang, options);
       if (normalizedLang) {
         return normalizedLang;

package/dist/cjs/request.js

@@ -116,7 +116,10 @@ class HonoRequest {
         if (anyCachedKey === "json") {
           body = JSON.stringify(body);
         }
-        return new Response(body)[key]();
+        const contentType = anyCachedKey === "formData" ? void 0 : raw.headers.get("content-type");
+        return new Response(body, {
+          headers: contentType ? { "Content-Type": contentType } : void 0
+        })[key]();
       });
     }
     return bodyCache[key] = raw[key]();

package/dist/cjs/utils/accept.js

@@ -201,7 +201,7 @@ const parseAccept = (acceptHeader) => {
     ;
     [i, accept] = getNextAcceptValue(acceptHeader, i);
     if (accept) {
-      accept.q = parseQuality(accept.params.q);
+      accept.q = parseQuality(accept.params.q ?? accept.params.Q);
       values.push(accept);
       if (lastAccept && lastAccept.q < accept.q) {
         requiresSort = true;
@@ -225,16 +225,13 @@ const parseQuality = (qVal) => {
     return 0;
   }
   const num = Number(qVal);
-  if (num === Infinity) {
+  if (Number.isNaN(num)) {
     return 1;
   }
-  if (num === -Infinity) {
+  if (num < 0) {
     return 0;
   }
-  if (Number.isNaN(num)) {
-    return 1;
-  }
-  if (num < 0 || num > 1) {
+  if (num > 1) {
     return 1;
   }
   return num;

package/dist/context.js

@@ -402,7 +402,7 @@ var Context = class {
     const locationString = String(location);
     this.header(
       "Location",
-      // Multibyes should be encoded
+      // Multibytes should be encoded
       // eslint-disable-next-line no-control-regex
       !/[^\x00-\xFF]/.test(locationString) ? locationString : encodeURI(locationString)
     );

package/dist/helper/accepts/accepts.js

@@ -25,7 +25,7 @@ var getSpecificity = (type) => {
 };
 var defaultMatch = (accepts2, config) => {
   const { supports, default: defaultSupport } = config;
-  const sortedAccepts = accepts2.slice().sort((a, b) => {
+  const sortedAccepts = accepts2.filter((accept) => accept.q > 0).sort((a, b) => {
     if (b.q !== a.q) {
       return b.q - a.q;
     }

package/dist/jsx/base.js

@@ -70,7 +70,7 @@ var booleanAttributes = [
   "selected"
 ];
 var resolveFunctionComponentResult = (result, suspendedContext) => result.then((resolved) => {
-  if (!Array.isArray(resolved) && !(resolved instanceof JSXNode)) {
+  if (typeof resolved !== "string" && !Array.isArray(resolved) && !(resolved instanceof JSXNode)) {
     return resolved;
   }
   const children = Array.isArray(resolved) ? resolved : [resolved];
@@ -108,6 +108,17 @@ var childrenToStringToBuffer = (children, buffer) => {
     }
   }
 };
+var renderChildren = (children) => runWithRenderContext(() => {
+  const buffer = [""];
+  childrenToStringToBuffer(children, buffer);
+  return buffer.length === 1 ? raw(buffer[0], buffer.callbacks) : stringBufferToString(buffer, buffer.callbacks);
+});
+var isUntrustedObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof JSXNode) && !(value instanceof Promise) && !value.isEscaped && typeof value.toString === "function";
+var renderUntrustedObject = (value) => {
+  const stringified = value.toString();
+  const escape = (result) => renderChildren([String(result)]);
+  return stringified instanceof Promise ? stringified.then(escape) : escape(stringified);
+};
 var JSXNode = class {
   tag;
   props;
@@ -337,10 +348,13 @@ export {
   booleanAttributes,
   cloneElement,
   getNameSpaceContext,
+  isUntrustedObject,
   isValidElement,
   jsx,
   jsxFn,
   memo,
   reactAPICompatVersion,
+  renderChildren,
+  renderUntrustedObject,
   shallowEqual
 };

package/dist/jsx/components.js

@@ -1,7 +1,7 @@
 // src/jsx/components.ts
 import { raw } from "../helper/html/index.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "../utils/html.js";
-import { jsx, Fragment } from "./base.js";
+import { jsx, Fragment, isUntrustedObject, renderChildren, renderUntrustedObject } from "./base.js";
 import { DOM_RENDERER } from "./constants.js";
 import { captureRenderContext, useContext } from "./context.js";
 import { ErrorBoundary as ErrorBoundaryDomRenderer } from "./dom/components.js";
@@ -9,7 +9,7 @@ import { StreamingContext } from "./streaming.js";
 var errorBoundaryCounter = 0;
 var childrenToString = async (children) => {
   try {
-    return children.flat().map((c) => c == null || typeof c === "boolean" ? "" : c.toString());
+    return children.flat().map(resolveChildEarly);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = captureRenderContext();
@@ -20,18 +20,16 @@ var childrenToString = async (children) => {
     }
   }
 };
-var resolveChildEarly = (c) => {
-  if (c == null || typeof c === "boolean") {
+var resolveChildEarly = (child) => {
+  if (child == null || typeof child === "boolean") {
     return "";
-  } else if (typeof c === "string") {
-    return c;
+  } else if (typeof child === "string" || Array.isArray(child)) {
+    return renderChildren([child]);
+  } else if (isUntrustedObject(child)) {
+    return renderUntrustedObject(child);
   } else {
-    const str = c.toString();
-    if (!(str instanceof Promise)) {
-      return raw(str);
-    } else {
-      return str;
-    }
+    const str = child.toString();
+    return str instanceof Promise ? str : raw(str);
   }
 };
 var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
@@ -47,26 +45,27 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
   let fallbackStrPromise;
   const resolveFallbackStr = () => fallbackStrPromise ||= (async () => {
     const awaitedFallback = await fallback;
-    if (typeof awaitedFallback === "string") {
-      return awaitedFallback;
-    } else {
-      const fallbackResult = await getResume()(() => awaitedFallback?.toString());
-      if (typeof fallbackResult === "string") {
-        return raw(
-          fallbackResult,
-          fallbackResult.callbacks || awaitedFallback?.callbacks
-        );
-      }
+    if (awaitedFallback === null || awaitedFallback === void 0) {
+      return;
+    }
+    if (typeof awaitedFallback === "string" || Array.isArray(awaitedFallback)) {
+      return getResume()(() => renderChildren([awaitedFallback]));
+    }
+    if (isUntrustedObject(awaitedFallback)) {
+      return getResume()(() => renderUntrustedObject(awaitedFallback));
     }
+    const fallbackResult = await getResume()(() => awaitedFallback.toString());
+    return raw(
+      fallbackResult,
+      fallbackResult.callbacks || awaitedFallback.callbacks
+    );
   })();
   const renderFallback = async (error) => {
     const fallbackStr = await resolveFallbackStr();
     return getResume()(async () => {
       onError?.(error);
       const fallbackRes = fallbackStr !== void 0 ? fallbackStr : fallbackRender && jsx(Fragment, {}, fallbackRender(error)) || "";
-      const fallbackResString = await Fragment({
-        children: fallbackRes
-      }).toString();
+      const fallbackResString = await Fragment({ children: fallbackRes }).toString();
       return raw(
         fallbackResString,
         fallbackResString.callbacks || fallbackRes.callbacks
@@ -99,7 +98,7 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
       const fallbackResString = await renderFallback(error2);
       const fallbackCallbacks = fallbackResString.callbacks;
       if (buffer) {
-        buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
+        buffer[0] = buffer[0].replace(replaceRe, () => fallbackResString);
         return fallbackCallbacks?.length ? raw("", fallbackCallbacks) : "";
       }
       return raw(
@@ -138,7 +137,7 @@ d.parentElement.insertBefore(c.content,d.nextSibling)
 </script>`;
           if (htmlArray.every((html2) => !html2.callbacks?.length)) {
             if (buffer) {
-              buffer[0] = buffer[0].replace(replaceRe, content);
+              buffer[0] = buffer[0].replace(replaceRe, () => content);
             }
             return html;
           }

package/dist/jsx/context.js

@@ -1,6 +1,6 @@
 // src/jsx/context.ts
 import { raw } from "../helper/html/index.js";
-import { JSXFragmentNode } from "./base.js";
+import { isUntrustedObject, JSXFragmentNode, renderChildren, renderUntrustedObject } from "./base.js";
 import { DOM_RENDERER } from "./constants.js";
 import { createContextProviderFunction } from "./dom/context.js";
 var globalContexts = [];
@@ -130,18 +130,18 @@ var createContext = (defaultValue) => {
   const context = ((props) => {
     const contextValues = getContextValuesIn(getCurrentStore(), context);
     contextValues.push(props.value);
-    let string;
+    let rendered;
     try {
-      string = props.children ? (Array.isArray(props.children) ? new JSXFragmentNode("", {}, props.children) : props.children).toString() : "";
+      rendered = typeof props.children === "string" ? renderChildren([props.children]) : isUntrustedObject(props.children) ? renderUntrustedObject(props.children) : props.children ? (Array.isArray(props.children) ? new JSXFragmentNode("", {}, props.children) : props.children).toString() : raw("");
     } catch (e) {
       contextValues.pop();
       throw e;
     }
-    if (string instanceof Promise) {
-      return string.finally(() => contextValues.pop()).then((resString) => raw(resString, resString.callbacks));
+    if (rendered instanceof Promise) {
+      return rendered.finally(() => contextValues.pop()).then((resString) => raw(resString, resString.callbacks));
     } else {
       contextValues.pop();
-      return raw(string);
+      return raw(rendered);
     }
   });
   context.values = values;

package/dist/jsx/dom/render.js

@@ -332,6 +332,17 @@ var applyNodeObject = (node, container, isNew) => {
   }
 };
 var isSameContext = (oldContexts, newContexts) => !!(oldContexts && oldContexts.length === newContexts.length && oldContexts.every((ctx, i) => ctx[1] === newContexts[i][1]));
+var indexChildrenByKey = (children) => {
+  const index = /* @__PURE__ */ new Map();
+  for (const child of children) {
+    const key = child.key;
+    if (index.has(key)) {
+      return;
+    }
+    index.set(key, child);
+  }
+  return index;
+};
 var fallbackUpdateFnArrayMap = /* @__PURE__ */ new WeakMap();
 var build = (context, node, children) => {
   const buildWithPreviousChildren = !children && node.pC;
@@ -345,9 +356,11 @@ var build = (context, node, children) => {
       foundErrorHandler = children[0][DOM_ERROR_HANDLER];
       context[5].push([context, foundErrorHandler, node]);
     }
-    const oldVChildren = buildWithPreviousChildren ? [...node.pC] : node.vC ? [...node.vC] : void 0;
+    let oldVChildren = buildWithPreviousChildren ? [...node.pC] : node.vC ? [...node.vC] : void 0;
     const vChildren = [];
     let prevNode;
+    let scanBudget = (oldVChildren?.length || 0) * 2;
+    let oldChildrenByKey;
     for (let i = 0; i < children.length; i++) {
       if (Array.isArray(children[i])) {
         children.splice(i, 1, ...children[i].flat(Infinity));
@@ -366,13 +379,35 @@ var build = (context, node, children) => {
           }
         }
         let oldChild;
-        if (oldVChildren && oldVChildren.length) {
-          const i2 = oldVChildren.findIndex(
-            isNodeString(child) ? (c) => isNodeString(c) : child.key !== void 0 ? (c) => c.key === child.key && c.tag === child.tag : (c) => c.tag === child.tag
-          );
-          if (i2 !== -1) {
-            oldChild = oldVChildren[i2];
-            oldVChildren.splice(i2, 1);
+        if (oldChildrenByKey && child.key === void 0 && !isNodeString(child)) {
+          oldVChildren = [...oldChildrenByKey.values()];
+          oldChildrenByKey = void 0;
+        }
+        if (oldChildrenByKey) {
+          const key = child.key;
+          const candidate = oldChildrenByKey.get(key);
+          if (candidate && (isNodeString(child) ? isNodeString(candidate) : candidate.tag === child.tag && candidate.key === key)) {
+            oldChild = candidate;
+            oldChildrenByKey.delete(key);
+          }
+        } else if (oldVChildren && oldVChildren.length) {
+          const first = oldVChildren[0];
+          const isMatchFirst = isNodeString(child) ? isNodeString(first) : !isNodeString(first) && (child.key !== void 0 ? first.key === child.key && first.tag === child.tag : first.tag === child.tag);
+          if (isMatchFirst) {
+            oldChild = oldVChildren.shift();
+          } else {
+            const i2 = oldVChildren.findIndex(
+              isNodeString(child) ? (c) => isNodeString(c) : child.key !== void 0 ? (c) => c.key === child.key && c.tag === child.tag : (c) => c.tag === child.tag
+            );
+            scanBudget -= i2 === -1 ? oldVChildren.length : i2;
+            if (i2 !== -1) {
+              oldChild = oldVChildren[i2];
+              oldVChildren.splice(i2, 1);
+            }
+            if (scanBudget < 0) {
+              scanBudget = Infinity;
+              oldChildrenByKey = indexChildrenByKey(oldVChildren);
+            }
           }
         }
         if (oldChild) {
@@ -418,6 +453,7 @@ var build = (context, node, children) => {
         prevNode = child;
       }
     }
+    oldVChildren = oldChildrenByKey ? [...oldChildrenByKey.values()] : oldVChildren;
     node.vR = buildWithPreviousChildren ? [...node.vC, ...oldVChildren || []] : oldVChildren || [];
     node.vC = vChildren;
     if (buildWithPreviousChildren) {

package/dist/jsx/dom/server.js

@@ -1,11 +1,14 @@
 // src/jsx/dom/server.ts
+import { renderChildren } from "../base.js";
 import { renderToReadableStream as renderToReadableStreamHono } from "../streaming.js";
 import version from "./index.js";
+var prepareRoot = (element) => typeof element === "string" || Array.isArray(element) ? renderChildren([element]) : element;
 var renderToString = (element, options = {}) => {
   if (Object.keys(options).length > 0) {
     console.warn("options are not supported yet");
   }
-  const res = element?.toString() ?? "";
+  element = prepareRoot(element);
+  const res = element instanceof Promise ? element : element?.toString() ?? "";
   if (typeof res !== "string") {
     throw new Error("Async component is not supported in renderToString");
   }
@@ -15,6 +18,7 @@ var renderToReadableStream = async (element, options = {}) => {
   if (Object.keys(options).some((key) => key !== "onError")) {
     console.warn("options are not supported yet, except onError");
   }
+  element = prepareRoot(element);
   if (!element || typeof element !== "object") {
     element = element?.toString() ?? "";
   }

package/dist/jsx/intrinsic-element/components.js

@@ -1,6 +1,6 @@
 // src/jsx/intrinsic-element/components.ts
 import { raw } from "../../helper/html/index.js";
-import { JSXNode, getNameSpaceContext } from "../base.js";
+import { JSXNode, getNameSpaceContext, renderChildren } from "../base.js";
 import { toArray } from "../children.js";
 import { PERMALINK } from "../constants.js";
 import { useContext } from "../context.js";
@@ -62,10 +62,10 @@ var insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context })
     insertTags.forEach((tag2) => {
       buffer[0] = buffer[0].replaceAll(tag2, "");
     });
-    buffer[0] = buffer[0].replace(/(?=<\/head>)/, insertTags.join(""));
+    buffer[0] = buffer[0].replace(/(?=<\/head>)/, () => insertTags.join(""));
   }
 };
-var returnWithoutSpecialBehavior = (tag, children, props) => raw(new JSXNode(tag, props, toArray(children ?? [])).toString());
+var returnWithoutSpecialBehavior = (tag, children, props) => renderChildren([new JSXNode(tag, props, toArray(children ?? []))]);
 var documentMetadataTag = (tag, children, props, sort) => {
   if ("itemProp" in props) {
     return returnWithoutSpecialBehavior(tag, children, props);

package/dist/jsx/streaming.js

@@ -1,7 +1,7 @@
 // src/jsx/streaming.ts
 import { raw } from "../helper/html/index.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "../utils/html.js";
-import { JSXNode } from "./base.js";
+import { isUntrustedObject, JSXNode, renderChildren, renderUntrustedObject } from "./base.js";
 import { childrenToString } from "./components.js";
 import { DOM_RENDERER, DOM_STASH } from "./constants.js";
 import { captureRenderContext, createContext, useContext } from "./context.js";
@@ -9,6 +9,7 @@ import { Suspense as SuspenseDomRenderer } from "./dom/components.js";
 import { buildDataStack } from "./dom/render.js";
 var StreamingContext = createContext(null);
 var suspenseCounter = 0;
+var serializeBoundaryChild = (child) => typeof child === "string" || Array.isArray(child) ? renderChildren([child]) : child == null || typeof child === "boolean" ? "" : isUntrustedObject(child) ? renderUntrustedObject(child) : child.toString();
 var Suspense = async ({
   children,
   fallback
@@ -25,9 +26,7 @@ var Suspense = async ({
   try {
     stackNode[DOM_STASH][0] = 0;
     buildDataStack.push([[], stackNode]);
-    resArray = children.map(
-      (c) => c == null || typeof c === "boolean" ? "" : c.toString()
-    );
+    resArray = children.map(serializeBoundaryChild);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = captureRenderContext();
@@ -48,7 +47,7 @@ var Suspense = async ({
   }
   if (resArray.some((res) => res instanceof Promise)) {
     const index = suspenseCounter++;
-    const fallbackStr = await fallback.toString();
+    const fallbackStr = await (typeof fallback === "string" || Array.isArray(fallback) ? renderChildren([fallback]) : isUntrustedObject(fallback) ? renderUntrustedObject(fallback) : fallback.toString());
     return raw(`<template id="H:${index}"></template>${fallbackStr}<!--/$-->`, [
       ...fallbackStr.callbacks || [],
       ({ phase, buffer, context }) => {
@@ -61,7 +60,7 @@ var Suspense = async ({
           if (buffer) {
             buffer[0] = buffer[0].replace(
               new RegExp(`<template id="H:${index}"></template>.*?<!--/\\$-->`),
-              content
+              () => content
             );
           }
           let html = buffer ? "" : `<template data-hono-target="H:${index}">${content}</template><script${nonce ? ` nonce="${nonce}"` : ""}>

package/dist/middleware/language/language.js

@@ -71,7 +71,10 @@ function detectFromHeader(c, options) {
       return void 0;
     }
     const languages = parseAcceptLanguage(acceptLanguage);
-    for (const { lang } of languages) {
+    for (const { lang, q } of languages) {
+      if (q === 0) {
+        continue;
+      }
       const normalizedLang = normalizeLanguage(lang, options);
       if (normalizedLang) {
         return normalizedLang;

package/dist/request.js

@@ -94,7 +94,10 @@ var HonoRequest = class {
         if (anyCachedKey === "json") {
           body = JSON.stringify(body);
         }
-        return new Response(body)[key]();
+        const contentType = anyCachedKey === "formData" ? void 0 : raw.headers.get("content-type");
+        return new Response(body, {
+          headers: contentType ? { "Content-Type": contentType } : void 0
+        })[key]();
       });
     }
     return bodyCache[key] = raw[key]();

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

@@ -27,7 +27,7 @@ interface ProxyFetch {
  * Fetch API wrapper for proxy.
  * The parameters and return value are the same as for `fetch` (except for the proxy-specific options).
  *
- * The “Accept-Encoding” header is replaced with an encoding that the current runtime can handle.
+ * The "Accept-Encoding" header is replaced with an encoding that the current runtime can handle.
  * Unnecessary response headers are deleted and a Response object is returned that can be returned
  * as is as a response from the handler.
  *

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

@@ -31,7 +31,7 @@ export declare const matchedRoutes: (c: Context) => RouterRoute[];
  * Get the route path registered within the handler
  *
  * @param {Context} c - The context object
- * @param {number} index - The index of the root from which to retrieve the path, similar to Array.prototype.at(), where a negative number is the index counted from the end of the matching root. Defaults to the current root index.
+ * @param {number} index - The index of the route from which to retrieve the path, similar to Array.prototype.at(), where a negative number is the index counted from the end of the matching route. Defaults to the current route index.
  * @returns The route path registered within the handler
  *
  * @example
@@ -54,7 +54,7 @@ export declare const routePath: (c: Context, index?: number) => string;
  * Get the basePath of the as-is route specified by routing.
  *
  * @param {Context} c - The context object
- * @param {number} index - The index of the root from which to retrieve the path, similar to Array.prototype.at(), where a negative number is the index counted from the end of the matching root. Defaults to the current root index.
+ * @param {number} index - The index of the route from which to retrieve the path, similar to Array.prototype.at(), where a negative number is the index counted from the end of the matching route. Defaults to the current route index.
  * @returns The basePath of the as-is route specified by routing.
  *
  * @example

package/dist/types/jsx/base.d.ts

@@ -26,6 +26,9 @@ export declare namespace JSX {
 export declare const getNameSpaceContext: () => Context<string> | undefined;
 export declare const booleanAttributes: string[];
 export type Child = string | Promise<string> | number | JSXNode | null | undefined | boolean | Child[];
+export declare const renderChildren: (children: Child[]) => HtmlEscapedString | Promise<HtmlEscapedString>;
+export declare const isUntrustedObject: (value: unknown) => boolean;
+export declare const renderUntrustedObject: (value: unknown) => HtmlEscapedString | Promise<HtmlEscapedString>;
 export declare class JSXNode implements HtmlEscaped {
     tag: string | Function;
     props: Props;

package/dist/types/middleware/combine/index.d.ts

@@ -66,7 +66,9 @@ export declare const every: (...middleware: (MiddlewareHandler | Condition)[]) =
  * If there are multiple targets to match any of them, they can be passed as an array.
  * If a string is passed, it will be treated as a path pattern to match.
  * If a Condition function is passed, it will be evaluated against the request context.
- * @param middleware - A composed middleware
+ * @param middleware - Middleware to run when the condition is not met.
+ * Multiple middleware can be passed, and they are applied in the order they are passed.
+ * @returns A composed middleware.
  *
  * @example
  * ```ts

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

@@ -32,7 +32,7 @@ export type JSONValue = JSONObject | JSONArray | JSONPrimitive;
  * `JSON.stringify()` throws a `TypeError` when it encounters a `bigint` value,
  * unless a custom `replacer` function or `.toJSON()` method is provided.
  *
- * This behaviour can be controlled by the `TError` generic type parameter,
+ * This behavior can be controlled by the `TError` generic type parameter,
  * which defaults to `bigint | ReadonlyArray<bigint>`.
  * You can set it to `never` to disable this check.
  */

package/dist/utils/accept.js

@@ -180,7 +180,7 @@ var parseAccept = (acceptHeader) => {
     ;
     [i, accept] = getNextAcceptValue(acceptHeader, i);
     if (accept) {
-      accept.q = parseQuality(accept.params.q);
+      accept.q = parseQuality(accept.params.q ?? accept.params.Q);
       values.push(accept);
       if (lastAccept && lastAccept.q < accept.q) {
         requiresSort = true;
@@ -204,16 +204,13 @@ var parseQuality = (qVal) => {
     return 0;
   }
   const num = Number(qVal);
-  if (num === Infinity) {
+  if (Number.isNaN(num)) {
     return 1;
   }
-  if (num === -Infinity) {
+  if (num < 0) {
     return 0;
   }
-  if (Number.isNaN(num)) {
-    return 1;
-  }
-  if (num < 0 || num > 1) {
+  if (num > 1) {
     return 1;
   }
   return num;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.13.6",
+  "version": "4.13.8",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",