hono 4.1.1 → 4.1.3

package/dist/cjs/helper/ssg/ssg.js

@@ -74,15 +74,16 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
   for (const route of (0, import_utils2.filterStaticGenerateRoutes)(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    if (beforeRequestHook) {
-      const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
-      if (!maybeRequest) {
-        continue;
-      }
-      forGetInfoURLRequest = maybeRequest;
-    }
     yield new Promise(async (resolveGetInfo, rejectGetInfo) => {
       try {
+        if (beforeRequestHook) {
+          const maybeRequest = await beforeRequestHook(forGetInfoURLRequest);
+          if (!maybeRequest) {
+            resolveGetInfo(void 0);
+            return;
+          }
+          forGetInfoURLRequest = maybeRequest;
+        }
         await pool.run(() => app.fetch(forGetInfoURLRequest));
         if (!forGetInfoURLRequest.ssgParams) {
           if (isDynamicRoute(route.path)) {
@@ -111,7 +112,7 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
                     return;
                   }
                   if (afterResponseHook) {
-                    const maybeResponse = afterResponseHook(response);
+                    const maybeResponse = await afterResponseHook(response);
                     if (!maybeResponse) {
                       resolveReq(void 0);
                       return;

package/dist/cjs/helper.js

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -14,6 +18,11 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var helper_exports = {};
+__export(helper_exports, {
+  jwtDecode: () => import_jwt.decode,
+  jwtSign: () => import_jwt.sign,
+  jwtVerify: () => import_jwt.verify
+});
 module.exports = __toCommonJS(helper_exports);
 __reExport(helper_exports, require("./helper/accepts"), module.exports);
 __reExport(helper_exports, require("./helper/adapter"), module.exports);
@@ -26,3 +35,10 @@ __reExport(helper_exports, require("./helper/testing"), module.exports);
 __reExport(helper_exports, require("./helper/dev"), module.exports);
 __reExport(helper_exports, require("./adapter/deno/ssg"), module.exports);
 __reExport(helper_exports, require("./adapter/deno/websocket"), module.exports);
+var import_jwt = require("./middleware/jwt");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  jwtDecode,
+  jwtSign,
+  jwtVerify
+});

package/dist/cjs/jsx/base.js

@@ -135,7 +135,9 @@ class JSXNode {
           const property = k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
           return `${property}:${v[k]}`;
         }).join(";");
-        buffer[0] += ` style="${styles}"`;
+        buffer[0] += ' style="';
+        (0, import_html2.escapeToBuffer)(styles, buffer);
+        buffer[0] += '"';
       } else if (typeof v === "string") {
         buffer[0] += ` ${key}="`;
         (0, import_html2.escapeToBuffer)(v, buffer);
@@ -165,7 +167,7 @@ class JSXNode {
         buffer[0] += '"';
       }
     }
-    if (emptyTags.includes(tag)) {
+    if (emptyTags.includes(tag) && children.length === 0) {
       buffer[0] += "/>";
       return;
     }

package/dist/cjs/router/linear-router/router.js

@@ -23,7 +23,7 @@ __export(router_exports, {
 module.exports = __toCommonJS(router_exports);
 var import_router = require("../../router");
 var import_url = require("../../utils/url");
-const emptyParams = {};
+const emptyParams = /* @__PURE__ */ Object.create(null);
 const splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
 const splitByStarRe = /\*/;
 class LinearRouter {
@@ -78,7 +78,7 @@ class LinearRouter {
           }
           handlers.push([handler, emptyParams]);
         } else if (hasLabel && !hasStar) {
-          const params = {};
+          const params = /* @__PURE__ */ Object.create(null);
           const parts = routePath.match(splitPathRe);
           const lastIndex = parts.length - 1;
           for (let j = 0, pos = 0, len2 = parts.length; j < len2; j++) {

package/dist/cjs/router/pattern-router/router.js

@@ -30,19 +30,16 @@ class PatternRouter {
     if (endsWithWildcard) {
       path = path.slice(0, -2);
     }
-    const parts = path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+|(\?)/g) || [];
-    if (parts[parts.length - 1] === "?") {
-      this.add(method, parts.slice(0, parts.length - 2).join(""), handler);
-      parts.pop();
+    if (path.at(-1) === "?") {
+      path = path.slice(0, -1);
+      this.add(method, path.replace(/\/[^/]+$/, ""), handler);
     }
-    for (let i = 0, len = parts.length; i < len; i++) {
-      const match = parts[i].match(/^\/:([^{]+)(?:{(.*)})?/);
-      if (match) {
-        parts[i] = `/(?<${match[1]}>${match[2] || "[^/]+"})`;
-      } else if (parts[i] === "/*") {
-        parts[i] = "/[^/]+";
+    const parts = (path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+/g) || []).map(
+      (part) => {
+        const match = part.match(/^\/:([^{]+)(?:{(.*)})?/);
+        return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
       }
-    }
+    );
     let re;
     try {
       re = new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`);
@@ -57,7 +54,7 @@ class PatternRouter {
       if (routeMethod === import_router.METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
-          handlers.push([handler, match.groups || {}]);
+          handlers.push([handler, match.groups || /* @__PURE__ */ Object.create(null)]);
         }
       }
     }

package/dist/cjs/router/reg-exp-router/node.js

@@ -26,6 +26,7 @@ const LABEL_REG_EXP_STR = "[^/]+";
 const ONLY_WILDCARD_REG_EXP_STR = ".*";
 const TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
 const PATH_ERROR = Symbol();
+const regExpMetaChars = new Set(".\\+*[^]$()");
 function compareKey(a, b) {
   if (a.length === 1) {
     return b.length === 1 ? a < b ? -1 : 1 : -1;
@@ -48,7 +49,7 @@ function compareKey(a, b) {
 class Node {
   index;
   varIndex;
-  children = {};
+  children = /* @__PURE__ */ Object.create(null);
   insert(tokens, index, paramMap, context, pathErrorCheckOnly) {
     if (tokens.length === 0) {
       if (this.index !== void 0) {
@@ -110,7 +111,7 @@ class Node {
     const childKeys = Object.keys(this.children).sort(compareKey);
     const strList = childKeys.map((k) => {
       const c = this.children[k];
-      return (typeof c.varIndex === "number" ? `(${k})@${c.varIndex}` : k) + c.buildRegExpStr();
+      return (typeof c.varIndex === "number" ? `(${k})@${c.varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + c.buildRegExpStr();
     });
     if (typeof this.index === "number") {
       strList.unshift(`#${this.index}`);

package/dist/cjs/router/reg-exp-router/router.js

@@ -26,15 +26,15 @@ var import_url = require("../../utils/url");
 var import_node = require("./node");
 var import_trie = require("./trie");
 const emptyParam = [];
-const nullMatcher = [/^$/, [], {}];
-let wildcardRegExpCache = {};
+const nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
+let wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 function buildWildcardRegExp(path) {
   return wildcardRegExpCache[path] ??= new RegExp(
     path === "*" ? "" : `^${path.replace(/\/\*/, "(?:|/.*)")}$`
   );
 }
 function clearWildcardRegExpCache() {
-  wildcardRegExpCache = {};
+  wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 }
 function buildMatcherFromPreprocessedRoutes(routes) {
   const trie = new import_trie.Trie();
@@ -47,11 +47,11 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   ).sort(
     ([isStaticA, pathA], [isStaticB, pathB]) => isStaticA ? 1 : isStaticB ? -1 : pathA.length - pathB.length
   );
-  const staticMap = {};
+  const staticMap = /* @__PURE__ */ Object.create(null);
   for (let i = 0, j = -1, len = routesWithStaticPathFlag.length; i < len; i++) {
     const [pathErrorCheckOnly, path, handlers] = routesWithStaticPathFlag[i];
     if (pathErrorCheckOnly) {
-      staticMap[path] = [handlers.map(([h]) => [h, {}]), emptyParam];
+      staticMap[path] = [handlers.map(([h]) => [h, /* @__PURE__ */ Object.create(null)]), emptyParam];
     } else {
       j++;
     }
@@ -65,7 +65,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
       continue;
     }
     handlerData[j] = handlers.map(([h, paramCount]) => {
-      const paramIndexMap = {};
+      const paramIndexMap = /* @__PURE__ */ Object.create(null);
       paramCount -= 1;
       for (; paramCount >= 0; paramCount--) {
         const [key, value] = paramAssoc[paramCount];
@@ -109,8 +109,8 @@ class RegExpRouter {
   middleware;
   routes;
   constructor() {
-    this.middleware = { [import_router.METHOD_NAME_ALL]: {} };
-    this.routes = { [import_router.METHOD_NAME_ALL]: {} };
+    this.middleware = { [import_router.METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
+    this.routes = { [import_router.METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
   }
   add(method, path, handler) {
     const { middleware, routes } = this;
@@ -120,7 +120,7 @@ class RegExpRouter {
     if (!middleware[method]) {
       ;
       [middleware, routes].forEach((handlerMap) => {
-        handlerMap[method] = {};
+        handlerMap[method] = /* @__PURE__ */ Object.create(null);
         Object.keys(handlerMap[import_router.METHOD_NAME_ALL]).forEach((p) => {
           handlerMap[method][p] = [...handlerMap[import_router.METHOD_NAME_ALL][p]];
         });
@@ -187,7 +187,7 @@ class RegExpRouter {
     return this.match(method, path);
   }
   buildAllMatchers() {
-    const matchers = {};
+    const matchers = /* @__PURE__ */ Object.create(null);
     [...Object.keys(this.routes), ...Object.keys(this.middleware)].forEach((method) => {
       matchers[method] ||= this.buildMatcher(method);
     });

package/dist/cjs/router/trie-router/node.js

@@ -29,13 +29,13 @@ class Node {
   patterns;
   order = 0;
   name;
-  params = {};
+  params = /* @__PURE__ */ Object.create(null);
   constructor(method, handler, children) {
-    this.children = children || {};
+    this.children = children || /* @__PURE__ */ Object.create(null);
     this.methods = [];
     this.name = "";
     if (method && handler) {
-      const m = {};
+      const m = /* @__PURE__ */ Object.create(null);
       m[method] = { handler, possibleKeys: [], score: 0, name: this.name };
       this.methods = [m];
     }
@@ -72,7 +72,7 @@ class Node {
     if (!curNode.methods.length) {
       curNode.methods = [];
     }
-    const m = {};
+    const m = /* @__PURE__ */ Object.create(null);
     const handlerSet = {
       handler,
       possibleKeys: possibleKeys.filter((v, i, a) => a.indexOf(v) === i),
@@ -88,9 +88,9 @@ class Node {
     for (let i = 0, len = node.methods.length; i < len; i++) {
       const m = node.methods[i];
       const handlerSet = m[method] || m[import_router.METHOD_NAME_ALL];
-      const processedSet = {};
+      const processedSet = /* @__PURE__ */ Object.create(null);
       if (handlerSet !== void 0) {
-        handlerSet.params = {};
+        handlerSet.params = /* @__PURE__ */ Object.create(null);
         handlerSet.possibleKeys.forEach((key) => {
           const processed = processedSet[handlerSet.name];
           handlerSet.params[key] = params[key] && !processed ? params[key] : nodeParams[key] ?? params[key];
@@ -103,7 +103,7 @@ class Node {
   }
   search(method, path) {
     const handlerSets = [];
-    this.params = {};
+    this.params = /* @__PURE__ */ Object.create(null);
     const curNode = this;
     let curNodes = [curNode];
     const parts = (0, import_url.splitPath)(path);
@@ -118,9 +118,11 @@ class Node {
           nextNode.params = node.params;
           if (isLast === true) {
             if (nextNode.children["*"]) {
-              handlerSets.push(...this.gHSets(nextNode.children["*"], method, node.params, {}));
+              handlerSets.push(
+                ...this.gHSets(nextNode.children["*"], method, node.params, /* @__PURE__ */ Object.create(null))
+              );
             }
-            handlerSets.push(...this.gHSets(nextNode, method, node.params, {}));
+            handlerSets.push(...this.gHSets(nextNode, method, node.params, /* @__PURE__ */ Object.create(null)));
           } else {
             tempNodes.push(nextNode);
           }
@@ -131,7 +133,7 @@ class Node {
           if (pattern === "*") {
             const astNode = node.children["*"];
             if (astNode) {
-              handlerSets.push(...this.gHSets(astNode, method, node.params, {}));
+              handlerSets.push(...this.gHSets(astNode, method, node.params, /* @__PURE__ */ Object.create(null)));
               tempNodes.push(astNode);
             }
             continue;

package/dist/cjs/utils/cookie.js

@@ -144,7 +144,7 @@ const _serialize = (name, value, opt = {}) => {
   }
   return cookie;
 };
-const serialize = (name, value, opt = {}) => {
+const serialize = (name, value, opt) => {
   value = encodeURIComponent(value);
   return _serialize(name, value, opt);
 };

package/dist/cjs/utils/url.js

@@ -83,8 +83,9 @@ const getPattern = (label) => {
   return null;
 };
 const getPath = (request) => {
-  const match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
-  return match ? match[1] : "";
+  const url = request.url;
+  const queryIndex = url.indexOf("?", 8);
+  return url.slice(url.indexOf("/", 8), queryIndex === -1 ? void 0 : queryIndex);
 };
 const getQueryStrings = (url) => {
   const queryIndex = url.indexOf("?", 8);

package/dist/cjs/validator/validator.js

@@ -28,6 +28,7 @@ const validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     const contentType = c.req.header("Content-Type");
+    const bodyTypes = ["text", "arrayBuffer", "blob"];
     switch (target) {
       case "json":
         if (!contentType || !contentType.startsWith("application/json")) {
@@ -35,11 +36,19 @@ const validator = (target, validationFunc) => {
           throw new import_http_exception.HTTPException(400, { message });
         }
         if (c.req.bodyCache.json) {
-          value = await c.req.bodyCache.json;
+          value = c.req.bodyCache.json;
           break;
         }
         try {
-          const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
+          }
+          arrayBuffer ??= await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
           c.req.bodyCache.arrayBuffer = arrayBuffer;
@@ -49,23 +58,31 @@ const validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (!contentType) {
+          break;
+        }
         if (c.req.bodyCache.formData) {
           value = c.req.bodyCache.formData;
           break;
         }
         try {
-          const contentType2 = c.req.header("Content-Type");
-          if (contentType2) {
-            const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
-            const formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType2);
-            const form = {};
-            formData.forEach((value2, key) => {
-              form[key] = value2;
-            });
-            value = form;
-            c.req.bodyCache.formData = formData;
-            c.req.bodyCache.arrayBuffer = arrayBuffer;
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
           }
+          arrayBuffer ??= await c.req.arrayBuffer();
+          const formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType);
+          const form = {};
+          formData.forEach((value2, key) => {
+            form[key] = value2;
+          });
+          value = form;
+          c.req.bodyCache.formData = formData;
+          c.req.bodyCache.arrayBuffer = arrayBuffer;
         } catch (e) {
           let message = "Malformed FormData request.";
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;

package/dist/helper/ssg/ssg.js

@@ -50,15 +50,16 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
   for (const route of filterStaticGenerateRoutes(app)) {
     const thisRouteBaseURL = new URL(route.path, baseURL).toString();
     let forGetInfoURLRequest = new Request(thisRouteBaseURL);
-    if (beforeRequestHook) {
-      const maybeRequest = beforeRequestHook(forGetInfoURLRequest);
-      if (!maybeRequest) {
-        continue;
-      }
-      forGetInfoURLRequest = maybeRequest;
-    }
     yield new Promise(async (resolveGetInfo, rejectGetInfo) => {
       try {
+        if (beforeRequestHook) {
+          const maybeRequest = await beforeRequestHook(forGetInfoURLRequest);
+          if (!maybeRequest) {
+            resolveGetInfo(void 0);
+            return;
+          }
+          forGetInfoURLRequest = maybeRequest;
+        }
         await pool.run(() => app.fetch(forGetInfoURLRequest));
         if (!forGetInfoURLRequest.ssgParams) {
           if (isDynamicRoute(route.path)) {
@@ -87,7 +88,7 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
                     return;
                   }
                   if (afterResponseHook) {
-                    const maybeResponse = afterResponseHook(response);
+                    const maybeResponse = await afterResponseHook(response);
                     if (!maybeResponse) {
                       resolveReq(void 0);
                       return;

package/dist/helper.js

@@ -10,3 +10,9 @@ export * from "./helper/testing/index.js";
 export * from "./helper/dev/index.js";
 export * from "./adapter/deno/ssg.js";
 export * from "./adapter/deno/websocket.js";
+import { decode, sign, verify } from "./middleware/jwt/index.js";
+export {
+  decode as jwtDecode,
+  sign as jwtSign,
+  verify as jwtVerify
+};

package/dist/jsx/base.js

@@ -106,7 +106,9 @@ var JSXNode = class {
           const property = k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
           return `${property}:${v[k]}`;
         }).join(";");
-        buffer[0] += ` style="${styles}"`;
+        buffer[0] += ' style="';
+        escapeToBuffer(styles, buffer);
+        buffer[0] += '"';
       } else if (typeof v === "string") {
         buffer[0] += ` ${key}="`;
         escapeToBuffer(v, buffer);
@@ -136,7 +138,7 @@ var JSXNode = class {
         buffer[0] += '"';
       }
     }
-    if (emptyTags.includes(tag)) {
+    if (emptyTags.includes(tag) && children.length === 0) {
       buffer[0] += "/>";
       return;
     }

package/dist/router/linear-router/router.js

@@ -1,7 +1,7 @@
 // src/router/linear-router/router.ts
 import { METHOD_NAME_ALL, UnsupportedPathError } from "../../router.js";
 import { checkOptionalParameter } from "../../utils/url.js";
-var emptyParams = {};
+var emptyParams = /* @__PURE__ */ Object.create(null);
 var splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
 var splitByStarRe = /\*/;
 var LinearRouter = class {
@@ -56,7 +56,7 @@ var LinearRouter = class {
           }
           handlers.push([handler, emptyParams]);
         } else if (hasLabel && !hasStar) {
-          const params = {};
+          const params = /* @__PURE__ */ Object.create(null);
           const parts = routePath.match(splitPathRe);
           const lastIndex = parts.length - 1;
           for (let j = 0, pos = 0, len2 = parts.length; j < len2; j++) {

package/dist/router/pattern-router/router.js

@@ -8,19 +8,16 @@ var PatternRouter = class {
     if (endsWithWildcard) {
       path = path.slice(0, -2);
     }
-    const parts = path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+|(\?)/g) || [];
-    if (parts[parts.length - 1] === "?") {
-      this.add(method, parts.slice(0, parts.length - 2).join(""), handler);
-      parts.pop();
+    if (path.at(-1) === "?") {
+      path = path.slice(0, -1);
+      this.add(method, path.replace(/\/[^/]+$/, ""), handler);
     }
-    for (let i = 0, len = parts.length; i < len; i++) {
-      const match = parts[i].match(/^\/:([^{]+)(?:{(.*)})?/);
-      if (match) {
-        parts[i] = `/(?<${match[1]}>${match[2] || "[^/]+"})`;
-      } else if (parts[i] === "/*") {
-        parts[i] = "/[^/]+";
+    const parts = (path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+/g) || []).map(
+      (part) => {
+        const match = part.match(/^\/:([^{]+)(?:{(.*)})?/);
+        return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
       }
-    }
+    );
     let re;
     try {
       re = new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`);
@@ -35,7 +32,7 @@ var PatternRouter = class {
       if (routeMethod === METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
-          handlers.push([handler, match.groups || {}]);
+          handlers.push([handler, match.groups || /* @__PURE__ */ Object.create(null)]);
         }
       }
     }

package/dist/router/reg-exp-router/node.js

@@ -3,6 +3,7 @@ var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
 var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
 var PATH_ERROR = Symbol();
+var regExpMetaChars = new Set(".\\+*[^]$()");
 function compareKey(a, b) {
   if (a.length === 1) {
     return b.length === 1 ? a < b ? -1 : 1 : -1;
@@ -25,7 +26,7 @@ function compareKey(a, b) {
 var Node = class {
   index;
   varIndex;
-  children = {};
+  children = /* @__PURE__ */ Object.create(null);
   insert(tokens, index, paramMap, context, pathErrorCheckOnly) {
     if (tokens.length === 0) {
       if (this.index !== void 0) {
@@ -87,7 +88,7 @@ var Node = class {
     const childKeys = Object.keys(this.children).sort(compareKey);
     const strList = childKeys.map((k) => {
       const c = this.children[k];
-      return (typeof c.varIndex === "number" ? `(${k})@${c.varIndex}` : k) + c.buildRegExpStr();
+      return (typeof c.varIndex === "number" ? `(${k})@${c.varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + c.buildRegExpStr();
     });
     if (typeof this.index === "number") {
       strList.unshift(`#${this.index}`);

package/dist/router/reg-exp-router/router.js

@@ -8,15 +8,15 @@ import { checkOptionalParameter } from "../../utils/url.js";
 import { PATH_ERROR } from "./node.js";
 import { Trie } from "./trie.js";
 var emptyParam = [];
-var nullMatcher = [/^$/, [], {}];
-var wildcardRegExpCache = {};
+var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
+var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 function buildWildcardRegExp(path) {
   return wildcardRegExpCache[path] ??= new RegExp(
     path === "*" ? "" : `^${path.replace(/\/\*/, "(?:|/.*)")}$`
   );
 }
 function clearWildcardRegExpCache() {
-  wildcardRegExpCache = {};
+  wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 }
 function buildMatcherFromPreprocessedRoutes(routes) {
   const trie = new Trie();
@@ -29,11 +29,11 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   ).sort(
     ([isStaticA, pathA], [isStaticB, pathB]) => isStaticA ? 1 : isStaticB ? -1 : pathA.length - pathB.length
   );
-  const staticMap = {};
+  const staticMap = /* @__PURE__ */ Object.create(null);
   for (let i = 0, j = -1, len = routesWithStaticPathFlag.length; i < len; i++) {
     const [pathErrorCheckOnly, path, handlers] = routesWithStaticPathFlag[i];
     if (pathErrorCheckOnly) {
-      staticMap[path] = [handlers.map(([h]) => [h, {}]), emptyParam];
+      staticMap[path] = [handlers.map(([h]) => [h, /* @__PURE__ */ Object.create(null)]), emptyParam];
     } else {
       j++;
     }
@@ -47,7 +47,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
       continue;
     }
     handlerData[j] = handlers.map(([h, paramCount]) => {
-      const paramIndexMap = {};
+      const paramIndexMap = /* @__PURE__ */ Object.create(null);
       paramCount -= 1;
       for (; paramCount >= 0; paramCount--) {
         const [key, value] = paramAssoc[paramCount];
@@ -91,8 +91,8 @@ var RegExpRouter = class {
   middleware;
   routes;
   constructor() {
-    this.middleware = { [METHOD_NAME_ALL]: {} };
-    this.routes = { [METHOD_NAME_ALL]: {} };
+    this.middleware = { [METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
+    this.routes = { [METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
   }
   add(method, path, handler) {
     const { middleware, routes } = this;
@@ -102,7 +102,7 @@ var RegExpRouter = class {
     if (!middleware[method]) {
       ;
       [middleware, routes].forEach((handlerMap) => {
-        handlerMap[method] = {};
+        handlerMap[method] = /* @__PURE__ */ Object.create(null);
         Object.keys(handlerMap[METHOD_NAME_ALL]).forEach((p) => {
           handlerMap[method][p] = [...handlerMap[METHOD_NAME_ALL][p]];
         });
@@ -169,7 +169,7 @@ var RegExpRouter = class {
     return this.match(method, path);
   }
   buildAllMatchers() {
-    const matchers = {};
+    const matchers = /* @__PURE__ */ Object.create(null);
     [...Object.keys(this.routes), ...Object.keys(this.middleware)].forEach((method) => {
       matchers[method] ||= this.buildMatcher(method);
     });

package/dist/router/trie-router/node.js

@@ -7,13 +7,13 @@ var Node = class {
   patterns;
   order = 0;
   name;
-  params = {};
+  params = /* @__PURE__ */ Object.create(null);
   constructor(method, handler, children) {
-    this.children = children || {};
+    this.children = children || /* @__PURE__ */ Object.create(null);
     this.methods = [];
     this.name = "";
     if (method && handler) {
-      const m = {};
+      const m = /* @__PURE__ */ Object.create(null);
       m[method] = { handler, possibleKeys: [], score: 0, name: this.name };
       this.methods = [m];
     }
@@ -50,7 +50,7 @@ var Node = class {
     if (!curNode.methods.length) {
       curNode.methods = [];
     }
-    const m = {};
+    const m = /* @__PURE__ */ Object.create(null);
     const handlerSet = {
       handler,
       possibleKeys: possibleKeys.filter((v, i, a) => a.indexOf(v) === i),
@@ -66,9 +66,9 @@ var Node = class {
     for (let i = 0, len = node.methods.length; i < len; i++) {
       const m = node.methods[i];
       const handlerSet = m[method] || m[METHOD_NAME_ALL];
-      const processedSet = {};
+      const processedSet = /* @__PURE__ */ Object.create(null);
       if (handlerSet !== void 0) {
-        handlerSet.params = {};
+        handlerSet.params = /* @__PURE__ */ Object.create(null);
         handlerSet.possibleKeys.forEach((key) => {
           const processed = processedSet[handlerSet.name];
           handlerSet.params[key] = params[key] && !processed ? params[key] : nodeParams[key] ?? params[key];
@@ -81,7 +81,7 @@ var Node = class {
   }
   search(method, path) {
     const handlerSets = [];
-    this.params = {};
+    this.params = /* @__PURE__ */ Object.create(null);
     const curNode = this;
     let curNodes = [curNode];
     const parts = splitPath(path);
@@ -96,9 +96,11 @@ var Node = class {
           nextNode.params = node.params;
           if (isLast === true) {
             if (nextNode.children["*"]) {
-              handlerSets.push(...this.gHSets(nextNode.children["*"], method, node.params, {}));
+              handlerSets.push(
+                ...this.gHSets(nextNode.children["*"], method, node.params, /* @__PURE__ */ Object.create(null))
+              );
             }
-            handlerSets.push(...this.gHSets(nextNode, method, node.params, {}));
+            handlerSets.push(...this.gHSets(nextNode, method, node.params, /* @__PURE__ */ Object.create(null)));
           } else {
             tempNodes.push(nextNode);
           }
@@ -109,7 +111,7 @@ var Node = class {
           if (pattern === "*") {
             const astNode = node.children["*"];
             if (astNode) {
-              handlerSets.push(...this.gHSets(astNode, method, node.params, {}));
+              handlerSets.push(...this.gHSets(astNode, method, node.params, /* @__PURE__ */ Object.create(null)));
               tempNodes.push(astNode);
             }
             continue;

package/dist/types/helper/ssg/ssg.d.ts

@@ -21,8 +21,8 @@ export interface ToSSGResult {
     files: string[];
     error?: Error;
 }
-export type BeforeRequestHook = (req: Request) => Request | false;
-export type AfterResponseHook = (res: Response) => Response | false;
+export type BeforeRequestHook = (req: Request) => Request | false | Promise<Request | false>;
+export type AfterResponseHook = (res: Response) => Response | false | Promise<Response | false>;
 export type AfterGenerateHook = (result: ToSSGResult) => void | Promise<void>;
 export interface ToSSGOptions {
     dir?: string;

package/dist/types/types.d.ts

@@ -412,7 +412,7 @@ export type AddParam<I, P extends string> = ParamKeys<P> extends never ? I : I e
     param: UnionToIntersection<ParamKeyToRecord<ParamKeys<P>>>;
 };
 type AddDollar<T extends string> = `$${Lowercase<T>}`;
-export type MergePath<A extends string, B extends string> = A extends '' ? B : A extends '/' ? B : A extends `${infer P}/` ? B extends `/${infer Q}` ? `${P}/${Q}` : `${P}/${B}` : B extends `/${infer Q}` ? Q extends '' ? A : `${A}/${Q}` : `${A}/${B}`;
+export type MergePath<A extends string, B extends string> = B extends '' ? MergePath<A, '/'> : A extends '' ? B : A extends '/' ? B : A extends `${infer P}/` ? B extends `/${infer Q}` ? `${P}/${Q}` : `${P}/${B}` : B extends `/${infer Q}` ? Q extends '' ? A : `${A}/${Q}` : `${A}/${B}`;
 export type TypedResponse<T = unknown> = {
     data: T;
     format: 'json';

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

@@ -1,5 +1,20 @@
 export type Cookie = Record<string, string>;
 export type SignedCookie = Record<string, string | false>;
+type PartitionCookieConstraint = {
+    partition: true;
+    secure: true;
+} | {
+    partition?: boolean;
+    secure?: boolean;
+};
+type SecureCookieConstraint = {
+    secure: true;
+};
+type HostCookieConstraint = {
+    secure: true;
+    path: '/';
+    domain?: undefined;
+};
 export type CookieOptions = {
     domain?: string;
     expires?: Date;
@@ -11,9 +26,11 @@ export type CookieOptions = {
     sameSite?: 'Strict' | 'Lax' | 'None';
     partitioned?: boolean;
     prefix?: CookiePrefixOptions;
-};
+} & PartitionCookieConstraint;
 export type CookiePrefixOptions = 'host' | 'secure';
+export type CookieConstraint<Name> = Name extends `__Secure-${string}` ? CookieOptions & SecureCookieConstraint : Name extends `__Host-${string}` ? CookieOptions & HostCookieConstraint : CookieOptions;
 export declare const parse: (cookie: string, name?: string) => Cookie;
 export declare const parseSigned: (cookie: string, secret: string | BufferSource, name?: string) => Promise<SignedCookie>;
-export declare const serialize: (name: string, value: string, opt?: CookieOptions) => string;
+export declare const serialize: <Name extends string>(name: Name, value: string, opt?: CookieConstraint<Name> | undefined) => string;
 export declare const serializeSigned: (name: string, value: string, secret: string | BufferSource, opt?: CookieOptions) => Promise<string>;
+export {};

package/dist/utils/cookie.js

@@ -119,7 +119,7 @@ var _serialize = (name, value, opt = {}) => {
   }
   return cookie;
 };
-var serialize = (name, value, opt = {}) => {
+var serialize = (name, value, opt) => {
   value = encodeURIComponent(value);
   return _serialize(name, value, opt);
 };

package/dist/utils/url.js

@@ -51,8 +51,9 @@ var getPattern = (label) => {
   return null;
 };
 var getPath = (request) => {
-  const match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
-  return match ? match[1] : "";
+  const url = request.url;
+  const queryIndex = url.indexOf("?", 8);
+  return url.slice(url.indexOf("/", 8), queryIndex === -1 ? void 0 : queryIndex);
 };
 var getQueryStrings = (url) => {
   const queryIndex = url.indexOf("?", 8);

package/dist/validator/validator.js

@@ -6,6 +6,7 @@ var validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     const contentType = c.req.header("Content-Type");
+    const bodyTypes = ["text", "arrayBuffer", "blob"];
     switch (target) {
       case "json":
         if (!contentType || !contentType.startsWith("application/json")) {
@@ -13,11 +14,19 @@ var validator = (target, validationFunc) => {
           throw new HTTPException(400, { message });
         }
         if (c.req.bodyCache.json) {
-          value = await c.req.bodyCache.json;
+          value = c.req.bodyCache.json;
           break;
         }
         try {
-          const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
+          }
+          arrayBuffer ??= await c.req.raw.arrayBuffer();
           value = await new Response(arrayBuffer).json();
           c.req.bodyCache.json = value;
           c.req.bodyCache.arrayBuffer = arrayBuffer;
@@ -27,23 +36,31 @@ var validator = (target, validationFunc) => {
         }
         break;
       case "form": {
+        if (!contentType) {
+          break;
+        }
         if (c.req.bodyCache.formData) {
           value = c.req.bodyCache.formData;
           break;
         }
         try {
-          const contentType2 = c.req.header("Content-Type");
-          if (contentType2) {
-            const arrayBuffer = c.req.bodyCache.arrayBuffer ?? await c.req.raw.arrayBuffer();
-            const formData = await bufferToFormData(arrayBuffer, contentType2);
-            const form = {};
-            formData.forEach((value2, key) => {
-              form[key] = value2;
-            });
-            value = form;
-            c.req.bodyCache.formData = formData;
-            c.req.bodyCache.arrayBuffer = arrayBuffer;
+          let arrayBuffer = void 0;
+          for (const type of bodyTypes) {
+            const body = c.req.bodyCache[type];
+            if (body) {
+              arrayBuffer = await new Response(await body).arrayBuffer();
+              break;
+            }
           }
+          arrayBuffer ??= await c.req.arrayBuffer();
+          const formData = await bufferToFormData(arrayBuffer, contentType);
+          const form = {};
+          formData.forEach((value2, key) => {
+            form[key] = value2;
+          });
+          value = form;
+          c.req.bodyCache.formData = formData;
+          c.req.bodyCache.arrayBuffer = arrayBuffer;
         } catch (e) {
           let message = "Malformed FormData request.";
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",