hono 4.6.8 → 4.6.10

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

@@ -24,63 +24,60 @@ module.exports = __toCommonJS(node_exports);
 var import_router = require("../../router");
 var import_url = require("../../utils/url");
 class Node {
-  methods;
-  children;
-  patterns;
-  order = 0;
-  params = /* @__PURE__ */ Object.create(null);
+  #methods;
+  #children;
+  #patterns;
+  #order = 0;
+  #params = /* @__PURE__ */ Object.create(null);
   constructor(method, handler, children) {
-    this.children = children || /* @__PURE__ */ Object.create(null);
-    this.methods = [];
+    this.#children = children || /* @__PURE__ */ Object.create(null);
+    this.#methods = [];
     if (method && handler) {
       const m = /* @__PURE__ */ Object.create(null);
       m[method] = { handler, possibleKeys: [], score: 0 };
-      this.methods = [m];
+      this.#methods = [m];
     }
-    this.patterns = [];
+    this.#patterns = [];
   }
   insert(method, path, handler) {
-    this.order = ++this.order;
+    this.#order = ++this.#order;
     let curNode = this;
     const parts = (0, import_url.splitRoutingPath)(path);
     const possibleKeys = [];
     for (let i = 0, len = parts.length; i < len; i++) {
       const p = parts[i];
-      if (Object.keys(curNode.children).includes(p)) {
-        curNode = curNode.children[p];
+      if (Object.keys(curNode.#children).includes(p)) {
+        curNode = curNode.#children[p];
         const pattern2 = (0, import_url.getPattern)(p);
         if (pattern2) {
           possibleKeys.push(pattern2[1]);
         }
         continue;
       }
-      curNode.children[p] = new Node();
+      curNode.#children[p] = new Node();
       const pattern = (0, import_url.getPattern)(p);
       if (pattern) {
-        curNode.patterns.push(pattern);
+        curNode.#patterns.push(pattern);
         possibleKeys.push(pattern[1]);
       }
-      curNode = curNode.children[p];
-    }
-    if (!curNode.methods.length) {
-      curNode.methods = [];
+      curNode = curNode.#children[p];
     }
     const m = /* @__PURE__ */ Object.create(null);
     const handlerSet = {
       handler,
       possibleKeys: possibleKeys.filter((v, i, a) => a.indexOf(v) === i),
-      score: this.order
+      score: this.#order
     };
     m[method] = handlerSet;
-    curNode.methods.push(m);
+    curNode.#methods.push(m);
     return curNode;
   }
-  gHSets(node, method, nodeParams, params) {
+  #getHandlerSets(node, method, nodeParams, params) {
     const handlerSets = [];
-    for (let i = 0, len = node.methods.length; i < len; i++) {
-      const m = node.methods[i];
+    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 = /* @__PURE__ */ Object.create(null);
+      const processedSet = {};
       if (handlerSet !== void 0) {
         handlerSet.params = /* @__PURE__ */ Object.create(null);
         for (let i2 = 0, len2 = handlerSet.possibleKeys.length; i2 < len2; i2++) {
@@ -96,7 +93,7 @@ class Node {
   }
   search(method, path) {
     const handlerSets = [];
-    this.params = /* @__PURE__ */ Object.create(null);
+    this.#params = /* @__PURE__ */ Object.create(null);
     const curNode = this;
     let curNodes = [curNode];
     const parts = (0, import_url.splitPath)(path);
@@ -106,27 +103,36 @@ class Node {
       const tempNodes = [];
       for (let j = 0, len2 = curNodes.length; j < len2; j++) {
         const node = curNodes[j];
-        const nextNode = node.children[part];
+        const nextNode = node.#children[part];
         if (nextNode) {
-          nextNode.params = node.params;
+          nextNode.#params = node.#params;
           if (isLast) {
-            if (nextNode.children["*"]) {
+            if (nextNode.#children["*"]) {
               handlerSets.push(
-                ...this.gHSets(nextNode.children["*"], method, node.params, /* @__PURE__ */ Object.create(null))
+                ...this.#getHandlerSets(
+                  nextNode.#children["*"],
+                  method,
+                  node.#params,
+                  /* @__PURE__ */ Object.create(null)
+                )
               );
             }
-            handlerSets.push(...this.gHSets(nextNode, method, node.params, /* @__PURE__ */ Object.create(null)));
+            handlerSets.push(
+              ...this.#getHandlerSets(nextNode, method, node.#params, /* @__PURE__ */ Object.create(null))
+            );
           } else {
             tempNodes.push(nextNode);
           }
         }
-        for (let k = 0, len3 = node.patterns.length; k < len3; k++) {
-          const pattern = node.patterns[k];
-          const params = { ...node.params };
+        for (let k = 0, len3 = node.#patterns.length; k < len3; k++) {
+          const pattern = node.#patterns[k];
+          const params = { ...node.#params };
           if (pattern === "*") {
-            const astNode = node.children["*"];
+            const astNode = node.#children["*"];
             if (astNode) {
-              handlerSets.push(...this.gHSets(astNode, method, node.params, /* @__PURE__ */ Object.create(null)));
+              handlerSets.push(
+                ...this.#getHandlerSets(astNode, method, node.#params, /* @__PURE__ */ Object.create(null))
+              );
               tempNodes.push(astNode);
             }
             continue;
@@ -135,25 +141,25 @@ class Node {
             continue;
           }
           const [key, name, matcher] = pattern;
-          const child = node.children[key];
+          const child = node.#children[key];
           const restPathString = parts.slice(i).join("/");
           if (matcher instanceof RegExp && matcher.test(restPathString)) {
             params[name] = restPathString;
-            handlerSets.push(...this.gHSets(child, method, node.params, params));
+            handlerSets.push(...this.#getHandlerSets(child, method, node.#params, params));
             continue;
           }
           if (matcher === true || matcher.test(part)) {
-            if (typeof key === "string") {
-              params[name] = part;
-              if (isLast) {
-                handlerSets.push(...this.gHSets(child, method, params, node.params));
-                if (child.children["*"]) {
-                  handlerSets.push(...this.gHSets(child.children["*"], method, params, node.params));
-                }
-              } else {
-                child.params = params;
-                tempNodes.push(child);
+            params[name] = part;
+            if (isLast) {
+              handlerSets.push(...this.#getHandlerSets(child, method, params, node.#params));
+              if (child.#children["*"]) {
+                handlerSets.push(
+                  ...this.#getHandlerSets(child.#children["*"], method, params, node.#params)
+                );
               }
+            } else {
+              child.#params = params;
+              tempNodes.push(child);
             }
           }
         }

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

@@ -25,22 +25,22 @@ var import_url = require("../../utils/url");
 var import_node = require("./node");
 class TrieRouter {
   name = "TrieRouter";
-  node;
+  #node;
   constructor() {
-    this.node = new import_node.Node();
+    this.#node = new import_node.Node();
   }
   add(method, path, handler) {
     const results = (0, import_url.checkOptionalParameter)(path);
     if (results) {
       for (let i = 0, len = results.length; i < len; i++) {
-        this.node.insert(method, results[i], handler);
+        this.#node.insert(method, results[i], handler);
       }
       return;
     }
-    this.node.insert(method, path, handler);
+    this.#node.insert(method, path, handler);
   }
   match(method, path) {
-    return this.node.search(method, path);
+    return this.#node.search(method, path);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/color.js

@@ -23,7 +23,7 @@ __export(color_exports, {
 module.exports = __toCommonJS(color_exports);
 function getColorEnabled() {
   const { process, Deno } = globalThis;
-  const isNoColor = typeof Deno?.noColor === "boolean" ? Deno.noColor : typeof process !== "undefined" ? "NO_COLOR" in process?.env : false;
+  const isNoColor = typeof Deno?.noColor === "boolean" ? Deno.noColor : process !== void 0 ? "NO_COLOR" in process?.env : false;
   return !isNoColor;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/cookie.js

@@ -50,16 +50,20 @@ const verifySignature = async (base64Signature, value, secret) => {
 const validCookieNameRegEx = /^[\w!#$%&'*.^`|~+-]+$/;
 const validCookieValueRegEx = /^[ !#-:<-[\]-~]*$/;
 const parse = (cookie, name) => {
+  if (name && cookie.indexOf(name) === -1) {
+    return {};
+  }
   const pairs = cookie.trim().split(";");
-  return pairs.reduce((parsedCookie, pairStr) => {
+  const parsedCookie = {};
+  for (let pairStr of pairs) {
     pairStr = pairStr.trim();
     const valueStartPos = pairStr.indexOf("=");
     if (valueStartPos === -1) {
-      return parsedCookie;
+      continue;
     }
     const cookieName = pairStr.substring(0, valueStartPos).trim();
     if (name && name !== cookieName || !validCookieNameRegEx.test(cookieName)) {
-      return parsedCookie;
+      continue;
     }
     let cookieValue = pairStr.substring(valueStartPos + 1).trim();
     if (cookieValue.startsWith('"') && cookieValue.endsWith('"')) {
@@ -67,9 +71,12 @@ const parse = (cookie, name) => {
     }
     if (validCookieValueRegEx.test(cookieValue)) {
       parsedCookie[cookieName] = (0, import_url.decodeURIComponent_)(cookieValue);
+      if (name) {
+        break;
+      }
     }
-    return parsedCookie;
-  }, {});
+  }
+  return parsedCookie;
 };
 const parseSigned = async (cookie, secret, name) => {
   const parsedCookie = {};
@@ -111,7 +118,7 @@ const _serialize = (name, value, opt = {}) => {
         "Cookies Max-Age SHOULD NOT be greater than 400 days (34560000 seconds) in duration."
       );
     }
-    cookie += `; Max-Age=${Math.floor(opt.maxAge)}`;
+    cookie += `; Max-Age=${opt.maxAge | 0}`;
   }
   if (opt.domain && opt.prefix !== "host") {
     cookie += `; Domain=${opt.domain}`;

package/dist/cjs/utils/crypto.js

@@ -41,15 +41,6 @@ const md5 = async (data) => {
 };
 const createHash = async (data, algorithm) => {
   let sourceBuffer;
-  if (data instanceof ReadableStream) {
-    let body = "";
-    const reader = data.getReader();
-    await reader?.read().then(async (chuck) => {
-      const value = await createHash(chuck.value || "", algorithm);
-      body += value;
-    });
-    return body;
-  }
   if (ArrayBuffer.isView(data) || data instanceof ArrayBuffer) {
     sourceBuffer = data;
   } else {

package/dist/cjs/utils/jwt/jwt.js

@@ -56,7 +56,7 @@ const verify = async (token, publicKey, alg = "HS256") => {
   if (!isTokenHeader(header)) {
     throw new import_types.JwtHeaderInvalid(header);
   }
-  const now = Math.floor(Date.now() / 1e3);
+  const now = Date.now() / 1e3 | 0;
   if (payload.nbf && payload.nbf > now) {
     throw new import_types.JwtTokenNotBefore(token);
   }

package/dist/cjs/utils/mime.js

@@ -42,7 +42,7 @@ const getExtension = (mimeType) => {
     }
   }
 };
-const baseMimes = {
+const _baseMimes = {
   aac: "audio/aac",
   avi: "video/x-msvideo",
   avif: "image/avif",
@@ -99,6 +99,7 @@ const baseMimes = {
   gltf: "model/gltf+json",
   glb: "model/gltf-binary"
 };
+const baseMimes = _baseMimes;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getExtension,

package/dist/cjs/utils/url.js

@@ -28,7 +28,8 @@ __export(url_exports, {
   getQueryStrings: () => getQueryStrings,
   mergePath: () => mergePath,
   splitPath: () => splitPath,
-  splitRoutingPath: () => splitRoutingPath
+  splitRoutingPath: () => splitRoutingPath,
+  tryDecode: () => tryDecode
 });
 module.exports = __toCommonJS(url_exports);
 const splitPath = (path) => {
@@ -82,19 +83,20 @@ const getPattern = (label) => {
   }
   return null;
 };
-const tryDecodeURI = (str) => {
+const tryDecode = (str, decoder) => {
   try {
-    return decodeURI(str);
+    return decoder(str);
   } catch {
     return str.replace(/(?:%[0-9A-Fa-f]{2})+/g, (match) => {
       try {
-        return decodeURI(match);
+        return decoder(match);
       } catch {
         return match;
       }
     });
   }
 };
+const tryDecodeURI = (str) => tryDecode(str, decodeURI);
 const getPath = (request) => {
   const url = request.url;
   const start = url.indexOf("/", 8);
@@ -175,7 +177,7 @@ const _decodeURI = (value) => {
   if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return /%/.test(value) ? decodeURIComponent_(value) : value;
+  return value.indexOf("%") !== -1 ? decodeURIComponent_(value) : value;
 };
 const _getQueryParam = (url, key, multiple) => {
   let encoded;
@@ -258,5 +260,6 @@ const decodeURIComponent_ = decodeURIComponent;
   getQueryStrings,
   mergePath,
   splitPath,
-  splitRoutingPath
+  splitRoutingPath,
+  tryDecode
 });

package/dist/client/client.js

@@ -65,8 +65,8 @@ var ClientRequestImpl = class {
     }
     let methodUpperCase = this.method.toUpperCase();
     const headerValues = {
-      ...args?.header ?? {},
-      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
+      ...args?.header,
+      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers
     };
     if (args?.cookie) {
       const cookies = [];
@@ -157,7 +157,7 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const req = new ClientRequestImpl(url, method);
   if (method) {
     options ??= {};
-    const args = deepMerge(options, { ...opts.args[1] ?? {} });
+    const args = deepMerge(options, { ...opts.args[1] });
     return req.fetch(opts.args[0], args);
   }
   return req;

package/dist/compose.js

@@ -3,6 +3,7 @@ import { Context } from "./context.js";
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
+    const isContext = context instanceof Context;
     return dispatch(0);
     async function dispatch(i) {
       if (i <= index) {
@@ -14,14 +15,14 @@ var compose = (middleware, onError, onNotFound) => {
       let handler;
       if (middleware[i]) {
         handler = middleware[i][0][0];
-        if (context instanceof Context) {
+        if (isContext) {
           context.req.routeIndex = i;
         }
       } else {
         handler = i === middleware.length && next || void 0;
       }
       if (!handler) {
-        if (context instanceof Context && context.finalized === false && onNotFound) {
+        if (isContext && context.finalized === false && onNotFound) {
           res = await onNotFound(context);
         }
       } else {
@@ -30,7 +31,7 @@ var compose = (middleware, onError, onNotFound) => {
             return dispatch(i + 1);
           });
         } catch (err) {
-          if (err instanceof Error && context instanceof Context && onError) {
+          if (err instanceof Error && isContext && onError) {
             context.error = err;
             res = await onError(err, context);
             isError = true;

package/dist/context.js

@@ -3,7 +3,9 @@ import { HonoRequest } from "./request.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "./utils/html.js";
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
 var setHeaders = (headers, map = {}) => {
-  Object.entries(map).forEach(([key, value]) => headers.set(key, value));
+  for (const key of Object.keys(map)) {
+    headers.set(key, map[key]);
+  }
   return headers;
 };
 var Context = class {
@@ -150,7 +152,7 @@ var Context = class {
     }
     return Object.fromEntries(this.#var);
   }
-  newResponse = (data, arg, headers) => {
+  #newResponse(data, arg, headers) {
     if (this.#isFresh && !headers && !arg && this.#status === 200) {
       return new Response(data, {
         headers: this.#preparedHeaders
@@ -202,9 +204,10 @@ var Context = class {
       status,
       headers: this.#headers
     });
-  };
+  }
+  newResponse = (...args) => this.#newResponse(...args);
   body = (data, arg, headers) => {
-    return typeof arg === "number" ? this.newResponse(data, arg, headers) : this.newResponse(data, arg);
+    return typeof arg === "number" ? this.#newResponse(data, arg, headers) : this.#newResponse(data, arg);
   };
   text = (text, arg, headers) => {
     if (!this.#preparedHeaders) {
@@ -214,27 +217,27 @@ var Context = class {
       this.#preparedHeaders = {};
     }
     this.#preparedHeaders["content-type"] = TEXT_PLAIN;
-    return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
+    return typeof arg === "number" ? this.#newResponse(text, arg, headers) : this.#newResponse(text, arg);
   };
   json = (object, arg, headers) => {
     const body = JSON.stringify(object);
     this.#preparedHeaders ??= {};
     this.#preparedHeaders["content-type"] = "application/json; charset=UTF-8";
-    return typeof arg === "number" ? this.newResponse(body, arg, headers) : this.newResponse(body, arg);
+    return typeof arg === "number" ? this.#newResponse(body, arg, headers) : this.#newResponse(body, arg);
   };
   html = (html, arg, headers) => {
     this.#preparedHeaders ??= {};
     this.#preparedHeaders["content-type"] = "text/html; charset=UTF-8";
     if (typeof html === "object") {
       return resolveCallback(html, HtmlEscapedCallbackPhase.Stringify, false, {}).then((html2) => {
-        return typeof arg === "number" ? this.newResponse(html2, arg, headers) : this.newResponse(html2, arg);
+        return typeof arg === "number" ? this.#newResponse(html2, arg, headers) : this.#newResponse(html2, arg);
       });
     }
-    return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
+    return typeof arg === "number" ? this.#newResponse(html, arg, headers) : this.#newResponse(html, arg);
   };
   redirect = (location, status) => {
     this.#headers ??= new Headers();
-    this.#headers.set("Location", location);
+    this.#headers.set("Location", String(location));
     return this.newResponse(null, status ?? 302);
   };
   notFound = () => {

package/dist/helper/html/index.js

@@ -4,7 +4,7 @@ var html = (strings, ...values) => {
   const buffer = [""];
   for (let i = 0, len = strings.length - 1; i < len; i++) {
     buffer[0] += strings[i];
-    const children = values[i] instanceof Array ? values[i].flat(Infinity) : [values[i]];
+    const children = Array.isArray(values[i]) ? values[i].flat(Infinity) : [values[i]];
     for (let i2 = 0, len2 = children.length; i2 < len2; i2++) {
       const child = children[i2];
       if (typeof child === "string") {

package/dist/helper/ssg/ssg.js

@@ -233,8 +233,8 @@ var toSSG = async (app, fs, options) => {
     result = { success: false, files: [], error: errorObj };
   }
   if (options?.afterGenerateHook) {
-    const conbinedAfterGenerateHooks = combineAfterGenerateHooks(options?.afterGenerateHook);
-    await conbinedAfterGenerateHooks(result);
+    const combinedAfterGenerateHooks = combineAfterGenerateHooks(options?.afterGenerateHook);
+    await combinedAfterGenerateHooks(result);
   }
   return result;
 };

package/dist/helper/ssg/utils.js

@@ -2,8 +2,8 @@
 import { METHOD_NAME_ALL } from "../../router.js";
 import { findTargetHandler, isMiddleware } from "../../utils/handler.js";
 var dirname = (path) => {
-  const splittedPath = path.split(/[\/\\]/);
-  return splittedPath.slice(0, -1).join("/");
+  const separatedPath = path.split(/[\/\\]/);
+  return separatedPath.slice(0, -1).join("/");
 };
 var normalizePath = (path) => {
   return path.replace(/(\\)/g, "/").replace(/\/$/g, "");