hono 3.12.9 → 3.12.11

package/dist/cjs/helper/html/index.js

@@ -19,16 +19,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var html_exports = {};
 __export(html_exports, {
   html: () => html,
-  raw: () => raw
+  raw: () => import_html.raw
 });
 module.exports = __toCommonJS(html_exports);
 var import_html = require("../../utils/html");
-const raw = (value, callbacks) => {
-  const escapedString = new String(value);
-  escapedString.isEscaped = true;
-  escapedString.callbacks = callbacks;
-  return escapedString;
-};
 const html = (strings, ...values) => {
   const buffer = [""];
   for (let i = 0, len = strings.length - 1; i < len; i++) {
@@ -55,7 +49,7 @@ const html = (strings, ...values) => {
     }
   }
   buffer[0] += strings[strings.length - 1];
-  return buffer.length === 1 ? raw(buffer[0]) : (0, import_html.stringBufferToString)(buffer);
+  return buffer.length === 1 ? (0, import_html.raw)(buffer[0]) : (0, import_html.stringBufferToString)(buffer);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -100,7 +100,6 @@ class Node {
   search(method, path) {
     const handlerSets = [];
     this.params = {};
-    const params = {};
     const curNode = this;
     let curNodes = [curNode];
     const parts = (0, import_url.splitPath)(path);
@@ -124,6 +123,7 @@ class Node {
         }
         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["*"];
             if (astNode) {
@@ -149,10 +149,10 @@ class Node {
               if (isLast === true) {
                 handlerSets.push(...this.gHSets(child, method, params, node.params));
                 if (child.children["*"]) {
-                  handlerSets.push(...this.gHSets(child.children["*"], method, node.params, params));
+                  handlerSets.push(...this.gHSets(child.children["*"], method, params, node.params));
                 }
               } else {
-                child.params = { ...params };
+                child.params = params;
                 tempNodes.push(child);
               }
             }
@@ -164,7 +164,7 @@ class Node {
     const results = handlerSets.sort((a, b) => {
       return a.score - b.score;
     });
-    return [results.map(({ handler, params: params2 }) => [handler, params2])];
+    return [results.map(({ handler, params }) => [handler, params])];
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/html.js

@@ -20,16 +20,22 @@ var html_exports = {};
 __export(html_exports, {
   HtmlEscapedCallbackPhase: () => HtmlEscapedCallbackPhase,
   escapeToBuffer: () => escapeToBuffer,
+  raw: () => raw,
   resolveCallback: () => resolveCallback,
   stringBufferToString: () => stringBufferToString
 });
 module.exports = __toCommonJS(html_exports);
-var import_html = require("../helper/html");
 const HtmlEscapedCallbackPhase = {
   Stringify: 1,
   BeforeStream: 2,
   Stream: 3
 };
+const raw = (value, callbacks) => {
+  const escapedString = new String(value);
+  escapedString.isEscaped = true;
+  escapedString.callbacks = callbacks;
+  return escapedString;
+};
 const escapeRe = /[&<>'"]/;
 const stringBufferToString = async (buffer) => {
   let str = "";
@@ -57,7 +63,7 @@ const stringBufferToString = async (buffer) => {
       str = buf[0];
     }
   }
-  return (0, import_html.raw)(str, callbacks);
+  return raw(str, callbacks);
 };
 const escapeToBuffer = (str, buffer) => {
   const match = str.search(escapeRe);
@@ -109,7 +115,7 @@ const resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =
     ).then(() => buffer[0])
   );
   if (preserveCallbacks) {
-    return (0, import_html.raw)(await resStr, callbacks);
+    return raw(await resStr, callbacks);
   } else {
     return resStr;
   }
@@ -118,6 +124,7 @@ const resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =
 0 && (module.exports = {
   HtmlEscapedCallbackPhase,
   escapeToBuffer,
+  raw,
   resolveCallback,
   stringBufferToString
 });

package/dist/helper/html/index.js

@@ -1,11 +1,5 @@
 // src/helper/html/index.ts
-import { escapeToBuffer, stringBufferToString } from "../../utils/html.js";
-var raw = (value, callbacks) => {
-  const escapedString = new String(value);
-  escapedString.isEscaped = true;
-  escapedString.callbacks = callbacks;
-  return escapedString;
-};
+import { escapeToBuffer, stringBufferToString, raw } from "../../utils/html.js";
 var html = (strings, ...values) => {
   const buffer = [""];
   for (let i = 0, len = strings.length - 1; i < len; i++) {

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

@@ -78,7 +78,6 @@ var Node = class {
   search(method, path) {
     const handlerSets = [];
     this.params = {};
-    const params = {};
     const curNode = this;
     let curNodes = [curNode];
     const parts = splitPath(path);
@@ -102,6 +101,7 @@ var Node = class {
         }
         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["*"];
             if (astNode) {
@@ -127,10 +127,10 @@ var Node = class {
               if (isLast === true) {
                 handlerSets.push(...this.gHSets(child, method, params, node.params));
                 if (child.children["*"]) {
-                  handlerSets.push(...this.gHSets(child.children["*"], method, node.params, params));
+                  handlerSets.push(...this.gHSets(child.children["*"], method, params, node.params));
                 }
               } else {
-                child.params = { ...params };
+                child.params = params;
                 tempNodes.push(child);
               }
             }
@@ -142,7 +142,7 @@ var Node = class {
     const results = handlerSets.sort((a, b) => {
       return a.score - b.score;
     });
-    return [results.map(({ handler, params: params2 }) => [handler, params2])];
+    return [results.map(({ handler, params }) => [handler, params])];
   }
 };
 export {

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

@@ -1,3 +1,4 @@
-import type { HtmlEscapedString, HtmlEscapedCallback } from '../../utils/html';
-export declare const raw: (value: unknown, callbacks?: HtmlEscapedCallback[]) => HtmlEscapedString;
+import { raw } from '../../utils/html';
+import type { HtmlEscapedString } from '../../utils/html';
+export { raw };
 export declare const html: (strings: TemplateStringsArray, ...values: unknown[]) => HtmlEscapedString | Promise<HtmlEscapedString>;

package/dist/types/types.d.ts

@@ -380,7 +380,7 @@ type ExtractParams<Path extends string> = string extends Path ? Record<string, s
     [K in Param | keyof ExtractParams<`/${Rest}`>]: string;
 } : Path extends `${infer Start}:${infer Param}` ? {
     [K in Param]: string;
-} : never;
+} : {};
 export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = {
     [P in keyof OrigSchema as MergePath<SubPath, P & string>]: {
         [M in keyof OrigSchema[P]]: OrigSchema[P][M] extends {

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

@@ -29,6 +29,7 @@ export type HtmlEscapedString = string & HtmlEscaped;
  * ]
  */
 export type StringBuffer = (string | Promise<string>)[];
+export declare const raw: (value: unknown, callbacks?: HtmlEscapedCallback[]) => HtmlEscapedString;
 export declare const stringBufferToString: (buffer: StringBuffer) => Promise<HtmlEscapedString>;
 export declare const escapeToBuffer: (str: string, buffer: StringBuffer) => void;
 export declare const resolveCallback: (str: string | HtmlEscapedString, phase: (typeof HtmlEscapedCallbackPhase)[keyof typeof HtmlEscapedCallbackPhase], preserveCallbacks: boolean, context: object, buffer?: [string]) => Promise<string>;

package/dist/utils/html.js

@@ -1,10 +1,15 @@
 // src/utils/html.ts
-import { raw } from "../helper/html/index.js";
 var HtmlEscapedCallbackPhase = {
   Stringify: 1,
   BeforeStream: 2,
   Stream: 3
 };
+var raw = (value, callbacks) => {
+  const escapedString = new String(value);
+  escapedString.isEscaped = true;
+  escapedString.callbacks = callbacks;
+  return escapedString;
+};
 var escapeRe = /[&<>'"]/;
 var stringBufferToString = async (buffer) => {
   let str = "";
@@ -92,6 +97,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
 export {
   HtmlEscapedCallbackPhase,
   escapeToBuffer,
+  raw,
   resolveCallback,
   stringBufferToString
 };

package/package.json

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