hono 4.11.7 → 4.12.7

package/dist/cjs/utils/url.js

@@ -1,4 +1,3 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -29,7 +28,8 @@ __export(url_exports, {
   mergePath: () => mergePath,
   splitPath: () => splitPath,
   splitRoutingPath: () => splitRoutingPath,
-  tryDecode: () => tryDecode
+  tryDecode: () => tryDecode,
+  tryDecodeURI: () => tryDecodeURI
 });
 module.exports = __toCommonJS(url_exports);
 const splitPath = (path) => {
@@ -106,9 +106,11 @@ const getPath = (request) => {
     const charCode = url.charCodeAt(i);
     if (charCode === 37) {
       const queryIndex = url.indexOf("?", i);
-      const path = url.slice(start, queryIndex === -1 ? void 0 : queryIndex);
+      const hashIndex = url.indexOf("#", i);
+      const end = queryIndex === -1 ? hashIndex === -1 ? void 0 : hashIndex : hashIndex === -1 ? queryIndex : Math.min(queryIndex, hashIndex);
+      const path = url.slice(start, end);
       return tryDecodeURI(path.includes("%25") ? path.replace(/%25/g, "%2525") : path);
-    } else if (charCode === 63) {
+    } else if (charCode === 63 || charCode === 35) {
       break;
     }
   }
@@ -249,5 +251,6 @@ const decodeURIComponent_ = decodeURIComponent;
   mergePath,
   splitPath,
   splitRoutingPath,
-  tryDecode
+  tryDecode,
+  tryDecodeURI
 });

package/dist/cjs/validator/index.js

@@ -1,4 +1,3 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/cjs/validator/utils.js

@@ -1,4 +1,3 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/cjs/validator/validator.js

@@ -1,4 +1,3 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -61,7 +60,7 @@ const validator = (target, validationFunc) => {
             throw new import_http_exception.HTTPException(400, { message });
           }
         }
-        const form = {};
+        const form = /* @__PURE__ */ Object.create(null);
         formData.forEach((value2, key) => {
           if (key.endsWith("[]")) {
             ;
@@ -69,7 +68,7 @@ const validator = (target, validationFunc) => {
           } else if (Array.isArray(form[key])) {
             ;
             form[key].push(value2);
-          } else if (key in form) {
+          } else if (Object.hasOwn(form, key)) {
             form[key] = [form[key], value2];
           } else {
             form[key] = value2;

package/dist/client/client.js

@@ -47,6 +47,9 @@ var ClientRequestImpl = class {
       if (args.form) {
         const form = new FormData();
         for (const [k, v] of Object.entries(args.form)) {
+          if (v === void 0) {
+            continue;
+          }
           if (Array.isArray(v)) {
             for (const v2 of v) {
               form.append(k, v2);
@@ -122,7 +125,7 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   }
   const path = parts.join("/");
   const url = mergePath(baseUrl, path);
-  if (method === "url") {
+  if (method === "url" || method === "path") {
     let result = url;
     if (opts.args[0]) {
       if (opts.args[0].param) {
@@ -133,7 +136,10 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
       }
     }
     result = removeIndexString(result);
-    return new URL(result);
+    if (method === "url") {
+      return new URL(result);
+    }
+    return result.slice(baseUrl.replace(/\/+$/, "").length).replace(/^\/?/, "/");
   }
   if (method === "ws") {
     const webSocketUrl = replaceUrlProtocol(

package/dist/context.js

@@ -8,6 +8,7 @@ var setDefaultContentType = (contentType, headers) => {
     ...headers
   };
 };
+var createResponseInstance = (body, init) => new Response(body, init);
 var Context = class {
   #rawRequest;
   #req;
@@ -106,7 +107,7 @@ var Context = class {
    * The Response object for the current request.
    */
   get res() {
-    return this.#res ||= new Response(null, {
+    return this.#res ||= createResponseInstance(null, {
       headers: this.#preparedHeaders ??= new Headers()
     });
   }
@@ -117,7 +118,7 @@ var Context = class {
    */
   set res(_res) {
     if (this.#res && _res) {
-      _res = new Response(_res.body, _res);
+      _res = createResponseInstance(_res.body, _res);
       for (const [k, v] of this.#res.headers.entries()) {
         if (k === "content-type") {
           continue;
@@ -207,7 +208,7 @@ var Context = class {
    */
   header = (name, value, options) => {
     if (this.finalized) {
-      this.#res = new Response(this.#res.body, this.#res);
+      this.#res = createResponseInstance(this.#res.body, this.#res);
     }
     const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
     if (value === void 0) {
@@ -296,7 +297,7 @@ var Context = class {
       }
     }
     const status = typeof arg === "number" ? arg : arg?.status ?? this.#status;
-    return new Response(data, { status, headers: responseHeaders });
+    return createResponseInstance(data, { status, headers: responseHeaders });
   }
   newResponse = (...args) => this.#newResponse(...args);
   /**
@@ -401,7 +402,7 @@ var Context = class {
    * ```
    */
   notFound = () => {
-    this.#notFoundHandler ??= () => new Response();
+    this.#notFoundHandler ??= () => createResponseInstance();
     return this.#notFoundHandler(this);
   };
 };

package/dist/helper/ssg/index.js

@@ -7,10 +7,13 @@ import {
   disableSSG,
   onlySSG
 } from "./middleware.js";
+import { defaultPlugin, redirectPlugin } from "./plugins.js";
 export {
   X_HONO_DISABLE_SSG_HEADER_KEY,
+  defaultPlugin,
   disableSSG,
   isSSGContext,
   onlySSG,
+  redirectPlugin,
   ssgParams
 };

package/dist/helper/ssg/plugins.js

@@ -0,0 +1,47 @@
+// src/helper/ssg/plugins.ts
+import { html } from "../html/index.js";
+var defaultPlugin = () => {
+  return {
+    afterResponseHook: (res) => {
+      if (res.status !== 200) {
+        return false;
+      }
+      return res;
+    }
+  };
+};
+var REDIRECT_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+var generateRedirectHtml = (location) => {
+  const content = html`<!DOCTYPE html>
+<title>Redirecting to: ${location}</title>
+<meta http-equiv="refresh" content="0;url=${location}" />
+<meta name="robots" content="noindex" />
+<link rel="canonical" href="${location}" />
+<body>
+<a href="${location}">Redirecting to <code>${location}</code></a>
+</body>
+`;
+  return content.toString().replace(/\n/g, "");
+};
+var redirectPlugin = () => {
+  return {
+    afterResponseHook: (res) => {
+      if (REDIRECT_STATUS_CODES.has(res.status)) {
+        const location = res.headers.get("Location");
+        if (!location) {
+          return false;
+        }
+        const htmlBody = generateRedirectHtml(location);
+        return new Response(htmlBody, {
+          status: 200,
+          headers: { "Content-Type": "text/html; charset=utf-8" }
+        });
+      }
+      return res;
+    }
+  };
+};
+export {
+  defaultPlugin,
+  redirectPlugin
+};

package/dist/helper/ssg/ssg.js

@@ -3,6 +3,7 @@ import { replaceUrlParam } from "../../client/utils.js";
 import { createPool } from "../../utils/concurrent.js";
 import { getExtension } from "../../utils/mime.js";
 import { SSG_CONTEXT, X_HONO_DISABLE_SSG_HEADER_KEY } from "./middleware.js";
+import { defaultPlugin } from "./plugins.js";
 import { dirname, filterStaticGenerateRoutes, isDynamicRoute, joinPaths } from "./utils.js";
 var DEFAULT_CONCURRENCY = 2;
 var DEFAULT_CONTENT_TYPE = "text/plain";
@@ -184,19 +185,11 @@ var saveContentToFile = async (data, fsModule, outDir, extensionMap) => {
   }
   return filePath;
 };
-var defaultPlugin = {
-  afterResponseHook: (res) => {
-    if (res.status !== 200) {
-      return false;
-    }
-    return res;
-  }
-};
 var toSSG = async (app, fs, options) => {
   let result;
   const getInfoPromises = [];
   const savePromises = [];
-  const plugins = options?.plugins || [defaultPlugin];
+  const plugins = options?.plugins || [defaultPlugin()];
   const beforeRequestHooks = [];
   const afterResponseHooks = [];
   const afterGenerateHooks = [];
@@ -288,7 +281,6 @@ export {
   combineAfterResponseHooks,
   combineBeforeRequestHooks,
   defaultExtensionMap,
-  defaultPlugin,
   fetchRoutesContent,
   saveContentToFile,
   toSSG

package/dist/helper/streaming/sse.js

@@ -11,6 +11,11 @@ var SSEStreamingApi = class extends StreamingApi {
     const dataLines = data.split(/\r\n|\r|\n/).map((line) => {
       return `data: ${line}`;
     }).join("\n");
+    for (const key of ["event", "id", "retry"]) {
+      if (message[key] && /[\r\n]/.test(message[key])) {
+        throw new Error(`${key} must not contain "\\r" or "\\n"`);
+      }
+    }
     const sseData = [
       message.event && `event: ${message.event}`,
       dataLines,

package/dist/jsx/context.js

@@ -11,12 +11,14 @@ var createContext = (defaultValue) => {
     let string;
     try {
       string = props.children ? (Array.isArray(props.children) ? new JSXFragmentNode("", {}, props.children) : props.children).toString() : "";
-    } finally {
+    } catch (e) {
       values.pop();
+      throw e;
     }
     if (string instanceof Promise) {
-      return string.then((resString) => raw(resString, resString.callbacks));
+      return string.finally(() => values.pop()).then((resString) => raw(resString, resString.callbacks));
     } else {
+      values.pop();
       return raw(string);
     }
   });

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

@@ -1,7 +1,13 @@
 // src/jsx/dom/intrinsic-element/components.ts
 import { useContext } from "../../context.js";
 import { use, useCallback, useMemo, useState } from "../../hooks/index.js";
-import { dataPrecedenceAttr, deDupeKeyMap, domRenderers } from "../../intrinsic-element/common.js";
+import {
+  dataPrecedenceAttr,
+  deDupeKeyMap,
+  domRenderers,
+  isStylesheetLinkWithPrecedence,
+  shouldDeDupeByKey
+} from "../../intrinsic-element/common.js";
 import { FormContext, registerAction } from "../hooks/index.js";
 import { createPortal, getNameSpaceContext } from "../render.js";
 var clearCache = () => {
@@ -49,11 +55,16 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
   let element = null;
   let created = false;
   const deDupeKeys = deDupeKeyMap[tag];
+  const deDupeByKey = shouldDeDupeByKey(tag, supportSort);
+  const isDeDupeCandidateLink = (e) => e.getAttribute("rel") === "stylesheet" && e.getAttribute(dataPrecedenceAttr) !== null;
   let existingElements = void 0;
-  if (deDupeKeys.length > 0) {
+  if (deDupeByKey) {
     const tags = head.querySelectorAll(tag);
     LOOP: for (const e of tags) {
-      for (const key of deDupeKeyMap[tag]) {
+      if (tag === "link" && !isDeDupeCandidateLink(e)) {
+        continue;
+      }
+      for (const key of deDupeKeys) {
         if (e.getAttribute(key) === props[key]) {
           element = e;
           break LOOP;
@@ -72,9 +83,9 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
           if (props[key] !== void 0) {
             e.setAttribute(key, props[key]);
           }
-          if (props.rel) {
-            e.setAttribute("rel", props.rel);
-          }
+        }
+        if (props.rel) {
+          e.setAttribute("rel", props.rel);
         }
         return e;
       })();
@@ -88,7 +99,26 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
   }
   const insert = useCallback(
     (e) => {
-      if (deDupeKeys.length > 0) {
+      if (deDupeByKey) {
+        if (tag === "link" && precedence !== void 0) {
+          let found2 = false;
+          for (const existingElement of head.querySelectorAll(tag)) {
+            const existingPrecedence = existingElement.getAttribute(dataPrecedenceAttr);
+            if (existingPrecedence === null) {
+              head.insertBefore(e, existingElement);
+              return;
+            }
+            if (found2 && existingPrecedence !== precedence) {
+              head.insertBefore(e, existingElement);
+              return;
+            }
+            if (existingPrecedence === precedence) {
+              found2 = true;
+            }
+          }
+          head.appendChild(e);
+          return;
+        }
         let found = false;
         for (const existingElement of head.querySelectorAll(tag)) {
           if (found && existingElement.getAttribute(dataPrecedenceAttr) !== precedence) {
@@ -100,6 +130,10 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
           }
         }
         head.appendChild(e);
+      } else if (tag === "link") {
+        if (!head.contains(e)) {
+          head.appendChild(e);
+        }
       } else if (existingElements) {
         let found = false;
         for (const existingElement of existingElements) {
@@ -117,7 +151,7 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
         existingElements = void 0;
       }
     },
-    [precedence]
+    [deDupeByKey, precedence, tag]
   );
   const ref = composeRef(props.ref, (e) => {
     const key = deDupeKeys[0];
@@ -130,6 +164,9 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
     if (!onError && !onLoad) {
       return;
     }
+    if (!key) {
+      return;
+    }
     let promise = blockingPromiseMap[e.getAttribute(key)] ||= new Promise(
       (resolve, reject) => {
         e.addEventListener("load", resolve);
@@ -147,7 +184,7 @@ var documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportBlo
   });
   if (supportBlocking && blocking === "render") {
     const key = deDupeKeyMap[tag][0];
-    if (props[key]) {
+    if (key && props[key]) {
       const value = props[key];
       const promise = blockingPromiseMap[value] ||= new Promise((resolve, reject) => {
         insert(element);
@@ -223,7 +260,7 @@ var link = (props) => {
       ref: props.ref
     };
   }
-  return documentMetadataTag("link", props, 1, "precedence" in props, true);
+  return documentMetadataTag("link", props, 1, isStylesheetLinkWithPrecedence(props), true);
 };
 var meta = (props) => {
   return documentMetadataTag("meta", props, void 0, false, false);

package/dist/jsx/dom/render.js

@@ -184,14 +184,10 @@ var getNextChildren = (node, container, nextChildren, childrenToRemove, callback
   });
 };
 var findInsertBefore = (node) => {
-  for (; ; node = node.tag === HONO_PORTAL_ELEMENT || !node.vC || !node.pP ? node.nN : node.vC[0]) {
-    if (!node) {
-      return null;
-    }
-    if (node.tag !== HONO_PORTAL_ELEMENT && node.e) {
-      return node.e;
-    }
+  while (node && (node.tag === HONO_PORTAL_ELEMENT || !node.e)) {
+    node = node.tag === HONO_PORTAL_ELEMENT || !node.vC?.[0] ? node.nN : node.vC[0];
   }
+  return node?.e;
 };
 var removeNode = (node) => {
   if (!isNodeString(node)) {
@@ -289,7 +285,7 @@ var applyNodeObject = (node, container, isNew) => {
     }
   }
   if (node.pP) {
-    delete node.pP;
+    node.pP = void 0;
   }
   if (callbacks.length) {
     const useLayoutEffectCbs = [];
@@ -330,7 +326,9 @@ var build = (context, node, children) => {
     let prevNode;
     for (let i = 0; i < children.length; i++) {
       if (Array.isArray(children[i])) {
-        children.splice(i, 1, ...children[i].flat());
+        children.splice(i, 1, ...children[i].flat(Infinity));
+        i--;
+        continue;
       }
       let child = buildNode(children[i]);
       if (child) {

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

@@ -8,8 +8,17 @@ var deDupeKeyMap = {
 };
 var domRenderers = {};
 var dataPrecedenceAttr = "data-precedence";
+var isStylesheetLinkWithPrecedence = (props) => props.rel === "stylesheet" && "precedence" in props;
+var shouldDeDupeByKey = (tagName, supportSort) => {
+  if (tagName === "link") {
+    return supportSort;
+  }
+  return deDupeKeyMap[tagName].length > 0;
+};
 export {
   dataPrecedenceAttr,
   deDupeKeyMap,
-  domRenderers
+  domRenderers,
+  isStylesheetLinkWithPrecedence,
+  shouldDeDupeByKey
 };

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

@@ -4,7 +4,12 @@ import { JSXNode, getNameSpaceContext } from "../base.js";
 import { toArray } from "../children.js";
 import { PERMALINK } from "../constants.js";
 import { useContext } from "../context.js";
-import { dataPrecedenceAttr, deDupeKeyMap } from "./common.js";
+import {
+  dataPrecedenceAttr,
+  deDupeKeyMap,
+  isStylesheetLinkWithPrecedence,
+  shouldDeDupeByKey
+} from "./common.js";
 var metaTagMap = /* @__PURE__ */ new WeakMap();
 var insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context }) => {
   if (!buffer) {
@@ -15,8 +20,12 @@ var insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context })
   const tags = map[tagName] ||= [];
   let duped = false;
   const deDupeKeys = deDupeKeyMap[tagName];
-  if (deDupeKeys.length > 0) {
+  const deDupeByKey = shouldDeDupeByKey(tagName, precedence !== void 0);
+  if (deDupeByKey) {
     LOOP: for (const [, tagProps] of tags) {
+      if (tagName === "link" && !(tagProps.rel === "stylesheet" && tagProps[dataPrecedenceAttr] !== void 0)) {
+        continue;
+      }
       for (const key of deDupeKeys) {
         if ((tagProps?.[key] ?? null) === props?.[key]) {
           duped = true;
@@ -27,25 +36,28 @@ var insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context })
   }
   if (duped) {
     buffer[0] = buffer[0].replaceAll(tag, "");
-  } else if (deDupeKeys.length > 0) {
+  } else if (deDupeByKey || tagName === "link") {
     tags.push([tag, props, precedence]);
   } else {
     tags.unshift([tag, props, precedence]);
   }
   if (buffer[0].indexOf("</head>") !== -1) {
     let insertTags;
-    if (precedence === void 0) {
-      insertTags = tags.map(([tag2]) => tag2);
-    } else {
+    if (tagName === "link" || precedence !== void 0) {
       const precedences = [];
-      insertTags = tags.map(([tag2, , precedence2]) => {
-        let order = precedences.indexOf(precedence2);
+      insertTags = tags.map(([tag2, , tagPrecedence], index) => {
+        if (tagPrecedence === void 0) {
+          return [tag2, Number.MAX_SAFE_INTEGER, index];
+        }
+        let order = precedences.indexOf(tagPrecedence);
         if (order === -1) {
-          precedences.push(precedence2);
+          precedences.push(tagPrecedence);
           order = precedences.length - 1;
         }
-        return [tag2, order];
-      }).sort((a, b) => a[1] - b[1]).map(([tag2]) => tag2);
+        return [tag2, order, index];
+      }).sort((a, b) => a[1] - b[1] || a[2] - b[2]).map(([tag2]) => tag2);
+    } else {
+      insertTags = tags.map(([tag2]) => tag2);
     }
     insertTags.forEach((tag2) => {
       buffer[0] = buffer[0].replaceAll(tag2, "");
@@ -114,7 +126,7 @@ var link = ({ children, ...props }) => {
   if (["onLoad", "onError"].some((k) => k in props) || props.rel === "stylesheet" && (!("precedence" in props) || "disabled" in props)) {
     return returnWithoutSpecialBehavior("link", children, props);
   }
-  return documentMetadataTag("link", children, props, "precedence" in props);
+  return documentMetadataTag("link", children, props, isStylesheetLinkWithPrecedence(props));
 };
 var meta = ({ children, ...props }) => {
   const nameSpaceContext = getNameSpaceContext();

package/dist/jsx/streaming.js

@@ -89,6 +89,7 @@ d.replaceWith(c.content)
 Suspense[DOM_RENDERER] = SuspenseDomRenderer;
 var textEncoder = new TextEncoder();
 var renderToReadableStream = (content, onError = console.trace) => {
+  let cancelled = false;
   const reader = new ReadableStream({
     async start(controller) {
       try {
@@ -102,7 +103,9 @@ var renderToReadableStream = (content, onError = console.trace) => {
           true,
           context
         );
-        controller.enqueue(textEncoder.encode(resolved));
+        if (!cancelled) {
+          controller.enqueue(textEncoder.encode(resolved));
+        }
         let resolvedCount = 0;
         const callbacks = [];
         const then = (promise) => {
@@ -120,7 +123,9 @@ var renderToReadableStream = (content, onError = console.trace) => {
               );
               res.callbacks?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
               resolvedCount++;
-              controller.enqueue(textEncoder.encode(res));
+              if (!cancelled) {
+                controller.enqueue(textEncoder.encode(res));
+              }
             })
           );
         };
@@ -131,7 +136,12 @@ var renderToReadableStream = (content, onError = console.trace) => {
       } catch (e) {
         onError(e);
       }
-      controller.close();
+      if (!cancelled) {
+        controller.close();
+      }
+    },
+    cancel() {
+      cancelled = true;
     }
   });
   return reader;

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

@@ -24,6 +24,9 @@ var basicAuth = (options, ...users) => {
     if (requestUser) {
       if (verifyUserInOptions) {
         if (await options.verifyUser(requestUser.username, requestUser.password, ctx)) {
+          if (options.onAuthSuccess) {
+            await options.onAuthSuccess(ctx, requestUser.username);
+          }
           await next();
           return;
         }
@@ -34,6 +37,9 @@ var basicAuth = (options, ...users) => {
             timingSafeEqual(user.password, requestUser.password, options.hashFunction)
           ]);
           if (usernameEqual && passwordEqual) {
+            if (options.onAuthSuccess) {
+              await options.onAuthSuccess(ctx, requestUser.username);
+            }
             await next();
             return;
           }

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

@@ -16,7 +16,7 @@ var bearerAuth = (options) => {
   }
   const realm = options.realm?.replace(/"/g, '\\"');
   const prefixRegexStr = options.prefix === "" ? "" : `${options.prefix} +`;
-  const regexp = new RegExp(`^${prefixRegexStr}(${TOKEN_STRINGS}) *$`);
+  const regexp = new RegExp(`^${prefixRegexStr}(${TOKEN_STRINGS}) *$`, "i");
   const wwwAuthenticatePrefix = options.prefix === "" ? "" : `${options.prefix} `;
   const throwHTTPException = async (c, status, wwwAuthenticateHeader, messageOption) => {
     const wwwAuthenticateHeaderValue = typeof wwwAuthenticateHeader === "function" ? await wwwAuthenticateHeader(c) : wwwAuthenticateHeader;

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

@@ -4,6 +4,7 @@ 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) => {
+  options = typeof options === "function" ? options(c) : options;
   const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
   const currentLayout = component ? jsx(
     (props2) => component(props2, c),

package/dist/middleware/language/language.js

@@ -35,8 +35,19 @@ var normalizeLanguage = (lang, options) => {
     const compSupported = options.supportedLanguages.map(
       (l) => options.ignoreCase ? l.toLowerCase() : l
     );
-    const matchedLang = compSupported.find((l) => l === compLang);
-    return matchedLang ? options.supportedLanguages[compSupported.indexOf(matchedLang)] : void 0;
+    const exactIndex = compSupported.indexOf(compLang);
+    if (exactIndex !== -1) {
+      return options.supportedLanguages[exactIndex];
+    }
+    const parts = compLang.split("-");
+    for (let i = parts.length - 1; i > 0; i--) {
+      const candidate = parts.slice(0, i).join("-");
+      const prefixIndex = compSupported.indexOf(candidate);
+      if (prefixIndex !== -1) {
+        return options.supportedLanguages[prefixIndex];
+      }
+    }
+    return void 0;
   } catch {
     return void 0;
   }

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

@@ -1,6 +1,7 @@
 // src/middleware/serve-static/index.ts
 import { COMPRESSIBLE_CONTENT_TYPE_REGEX } from "../../utils/compress.js";
 import { getMimeType } from "../../utils/mime.js";
+import { tryDecodeURI } from "../../utils/url.js";
 import { defaultJoin } from "./path.js";
 var ENCODINGS = {
   br: ".br",
@@ -22,7 +23,7 @@ var serveStatic = (options) => {
       filename = options.path;
     } else {
       try {
-        filename = decodeURIComponent(c.req.path);
+        filename = tryDecodeURI(c.req.path);
         if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
           throw new Error();
         }