hono 4.13.8 → 4.13.10

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

@@ -1,5 +1,2 @@
-// src/router/linear-router/index.ts
 import { LinearRouter } from "./router.js";
-export {
-  LinearRouter
-};
+export { LinearRouter };

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

@@ -1,123 +1,96 @@
-// src/router/linear-router/router.ts
-import { METHOD_NAME_ALL, UnsupportedPathError } from "../../router.js";
 import { checkOptionalParameter } from "../../utils/url.js";
-var emptyParams = /* @__PURE__ */ Object.create(null);
-var splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
-var splitByStarRe = /\*/;
+import { UnsupportedPathError } from "../../router.js";
+//#region src/router/linear-router/router.ts
+const emptyParams = Object.create(null);
+const splitPathRe = /\/(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/[^\/\?]+|(\?)/g;
+const splitByStarRe = /\*/;
 var LinearRouter = class {
-  name = "LinearRouter";
-  #routes = [];
-  add(method, path, handler) {
-    for (let i = 0, paths = checkOptionalParameter(path) || [path], len = paths.length; i < len; i++) {
-      this.#routes.push([method, paths[i], handler]);
-    }
-  }
-  match(method, path) {
-    const handlers = [];
-    ROUTES_LOOP: for (let i = 0, len = this.#routes.length; i < len; i++) {
-      const [routeMethod, routePath, handler] = this.#routes[i];
-      if (routeMethod === method || routeMethod === METHOD_NAME_ALL) {
-        if (routePath === "*" || routePath === "/*") {
-          handlers.push([handler, emptyParams]);
-          continue;
-        }
-        const hasStar = routePath.indexOf("*") !== -1;
-        const hasLabel = routePath.indexOf(":") !== -1;
-        if (!hasStar && !hasLabel) {
-          if (routePath === path || routePath + "/" === path) {
-            handlers.push([handler, emptyParams]);
-          }
-        } else if (hasStar && !hasLabel) {
-          const endsWithStar = routePath.charCodeAt(routePath.length - 1) === 42;
-          const endsWithSlashStar = routePath.endsWith("/*");
-          const parts = (endsWithStar ? routePath.slice(0, endsWithSlashStar ? -2 : -1) : routePath).split(splitByStarRe);
-          const lastIndex = parts.length - 1;
-          for (let j = 0, pos = 0, len2 = parts.length; j < len2; j++) {
-            const part = parts[j];
-            const index = path.indexOf(part, pos);
-            if (index !== pos) {
-              continue ROUTES_LOOP;
-            }
-            pos += part.length;
-            if (j === lastIndex) {
-              if (endsWithSlashStar) {
-                if (pos !== path.length && path.charCodeAt(pos) !== 47) {
-                  continue ROUTES_LOOP;
-                }
-              } else if (!endsWithStar && pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) {
-                continue ROUTES_LOOP;
-              }
-            } else {
-              const index2 = path.indexOf("/", pos);
-              if (index2 === -1) {
-                continue ROUTES_LOOP;
-              }
-              pos = index2;
-            }
-          }
-          handlers.push([handler, emptyParams]);
-        } else if (hasLabel && !hasStar) {
-          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++) {
-            if (pos === -1 || pos >= path.length) {
-              continue ROUTES_LOOP;
-            }
-            const part = parts[j];
-            if (part.charCodeAt(1) === 58) {
-              if (path.charCodeAt(pos) !== 47) {
-                continue ROUTES_LOOP;
-              }
-              let name = part.slice(2);
-              let value;
-              if (name.charCodeAt(name.length - 1) === 125) {
-                const openBracePos = name.indexOf("{");
-                const next = parts[j + 1];
-                const lookahead = next && next[1] !== ":" && next[1] !== "*" ? `(?=${next})` : "";
-                const pattern = name.slice(openBracePos + 1, -1) + lookahead;
-                const restPath = path.slice(pos + 1);
-                const match = new RegExp(pattern, "d").exec(restPath);
-                if (!match || match.indices[0][0] !== 0 || match.indices[0][1] === 0) {
-                  continue ROUTES_LOOP;
-                }
-                name = name.slice(0, openBracePos);
-                value = restPath.slice(...match.indices[0]);
-                pos += match.indices[0][1] + 1;
-              } else {
-                let endValuePos = path.indexOf("/", pos + 1);
-                if (endValuePos === -1) {
-                  if (pos + 1 === path.length) {
-                    continue ROUTES_LOOP;
-                  }
-                  endValuePos = path.length;
-                }
-                value = path.slice(pos + 1, endValuePos);
-                pos = endValuePos;
-              }
-              params[name] ||= value;
-            } else {
-              const index = path.indexOf(part, pos);
-              if (index !== pos) {
-                continue ROUTES_LOOP;
-              }
-              pos += part.length;
-            }
-            if (j === lastIndex) {
-              if (pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) {
-                continue ROUTES_LOOP;
-              }
-            }
-          }
-          handlers.push([handler, params]);
-        } else if (hasLabel && hasStar) {
-          throw new UnsupportedPathError();
-        }
-      }
-    }
-    return [handlers];
-  }
-};
-export {
-  LinearRouter
+	name = "LinearRouter";
+	#routes = [];
+	add(method, path, handler) {
+		for (let i = 0, paths = checkOptionalParameter(path) || [path], len = paths.length; i < len; i++) this.#routes.push([
+			method,
+			paths[i],
+			handler
+		]);
+	}
+	match(method, path) {
+		const handlers = [];
+		ROUTES_LOOP: for (let i = 0, len = this.#routes.length; i < len; i++) {
+			const [routeMethod, routePath, handler] = this.#routes[i];
+			if (routeMethod === method || routeMethod === "ALL") {
+				if (routePath === "*" || routePath === "/*") {
+					handlers.push([handler, emptyParams]);
+					continue;
+				}
+				const hasStar = routePath.indexOf("*") !== -1;
+				const hasLabel = routePath.indexOf(":") !== -1;
+				if (!hasStar && !hasLabel) {
+					if (routePath === path || routePath + "/" === path) handlers.push([handler, emptyParams]);
+				} else if (hasStar && !hasLabel) {
+					const endsWithStar = routePath.charCodeAt(routePath.length - 1) === 42;
+					const endsWithSlashStar = routePath.endsWith("/*");
+					const parts = (endsWithStar ? routePath.slice(0, endsWithSlashStar ? -2 : -1) : routePath).split(splitByStarRe);
+					const lastIndex = parts.length - 1;
+					for (let j = 0, pos = 0, len = parts.length; j < len; j++) {
+						const part = parts[j];
+						if (path.indexOf(part, pos) !== pos) continue ROUTES_LOOP;
+						pos += part.length;
+						if (j === lastIndex) {
+							if (endsWithSlashStar) {
+								if (pos !== path.length && path.charCodeAt(pos) !== 47) continue ROUTES_LOOP;
+							} else if (!endsWithStar && pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) continue ROUTES_LOOP;
+						} else {
+							const index = path.indexOf("/", pos);
+							if (index === -1) continue ROUTES_LOOP;
+							pos = index;
+						}
+					}
+					handlers.push([handler, emptyParams]);
+				} else if (hasLabel && !hasStar) {
+					const params = Object.create(null);
+					const parts = routePath.match(splitPathRe);
+					const lastIndex = parts.length - 1;
+					for (let j = 0, pos = 0, len = parts.length; j < len; j++) {
+						if (pos === -1 || pos >= path.length) continue ROUTES_LOOP;
+						const part = parts[j];
+						if (part.charCodeAt(1) === 58) {
+							if (path.charCodeAt(pos) !== 47) continue ROUTES_LOOP;
+							let name = part.slice(2);
+							let value;
+							if (name.charCodeAt(name.length - 1) === 125) {
+								const openBracePos = name.indexOf("{");
+								const next = parts[j + 1];
+								const lookahead = next && next[1] !== ":" && next[1] !== "*" ? `(?=${next})` : "";
+								const pattern = name.slice(openBracePos + 1, -1) + lookahead;
+								const restPath = path.slice(pos + 1);
+								const match = new RegExp(pattern, "d").exec(restPath);
+								if (!match || match.indices[0][0] !== 0 || match.indices[0][1] === 0) continue ROUTES_LOOP;
+								name = name.slice(0, openBracePos);
+								value = restPath.slice(...match.indices[0]);
+								pos += match.indices[0][1] + 1;
+							} else {
+								let endValuePos = path.indexOf("/", pos + 1);
+								if (endValuePos === -1) endValuePos = path.length;
+								if (endValuePos === pos + 1) continue ROUTES_LOOP;
+								value = path.slice(pos + 1, endValuePos);
+								pos = endValuePos;
+							}
+							params[name] ||= value;
+						} else {
+							if (path.indexOf(part, pos) !== pos) continue ROUTES_LOOP;
+							pos += part.length;
+						}
+						if (j === lastIndex) {
+							if (pos !== path.length && !(pos === path.length - 1 && path.charCodeAt(pos) === 47)) continue ROUTES_LOOP;
+						}
+					}
+					handlers.push([handler, params]);
+				} else if (hasLabel && hasStar) throw new UnsupportedPathError();
+			}
+		}
+		return [handlers];
+	}
 };
+//#endregion
+export { LinearRouter };

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

@@ -1,5 +1,2 @@
-// src/router/pattern-router/index.ts
 import { PatternRouter } from "./router.js";
-export {
-  PatternRouter
-};
+export { PatternRouter };

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

@@ -1,42 +1,41 @@
-// src/router/pattern-router/router.ts
-import { METHOD_NAME_ALL, UnsupportedPathError } from "../../router.js";
-var emptyParams = /* @__PURE__ */ Object.create(null);
+import { UnsupportedPathError } from "../../router.js";
+//#region src/router/pattern-router/router.ts
+const emptyParams = Object.create(null);
 var PatternRouter = class {
-  name = "PatternRouter";
-  #routes = [];
-  add(method, path, handler) {
-    const suffix = path.endsWith("/*") ? "(?:$|/)" : path.endsWith("*") ? "" : "/?$";
-    path = path.replace(/\*$/, "");
-    if (path.at(-1) === "?") {
-      path = path.slice(0, -1);
-      this.add(method, path.replace(/\/[^/]+$/, ""), handler);
-    }
-    const parts = (path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+/g) || []).map(
-      (part) => {
-        const match = part.match(/^\/:([^{]+)(?:{(.*)})?/);
-        return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
-      }
-    );
-    try {
-      this.#routes.push([new RegExp(`^${parts.join("")}${suffix}`), method, handler]);
-    } catch {
-      throw new UnsupportedPathError();
-    }
-  }
-  match(method, path) {
-    const handlers = [];
-    for (let i = 0, len = this.#routes.length; i < len; i++) {
-      const [pattern, routeMethod, handler] = this.#routes[i];
-      if (routeMethod === method || routeMethod === METHOD_NAME_ALL) {
-        const match = pattern.exec(path);
-        if (match) {
-          handlers.push([handler, match.groups || emptyParams]);
-        }
-      }
-    }
-    return [handlers];
-  }
-};
-export {
-  PatternRouter
+	name = "PatternRouter";
+	#routes = [];
+	add(method, path, handler) {
+		const suffix = path.endsWith("/*") ? "(?:$|/)" : path.endsWith("*") ? "" : "/?$";
+		path = path.replace(/\*$/, "");
+		if (path.at(-1) === "?") {
+			path = path.slice(0, -1);
+			this.add(method, path.replace(/\/[^/]+$/, ""), handler);
+		}
+		const parts = (path.match(/\/?(:\w+(?:{(?:(?:{[\d,]+})|[^}])+})?)|\/?[^\/\?]+/g) || []).map((part) => {
+			const match = part.match(/^\/:([^{]+)(?:{(.*)})?/);
+			return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
+		});
+		try {
+			this.#routes.push([
+				new RegExp(`^${parts.join("")}${suffix}`),
+				method,
+				handler
+			]);
+		} catch {
+			throw new UnsupportedPathError();
+		}
+	}
+	match(method, path) {
+		const handlers = [];
+		for (let i = 0, len = this.#routes.length; i < len; i++) {
+			const [pattern, routeMethod, handler] = this.#routes[i];
+			if (routeMethod === method || routeMethod === "ALL") {
+				const match = pattern.exec(path);
+				if (match) handlers.push([handler, match.groups || emptyParams]);
+			}
+		}
+		return [handlers];
+	}
 };
+//#endregion
+export { PatternRouter };

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

@@ -1,9 +1,3 @@
-// src/router/reg-exp-router/index.ts
 import { RegExpRouter } from "./router.js";
 import { PreparedRegExpRouter, buildInitParams, serializeInitParams } from "./prepared-router.js";
-export {
-  PreparedRegExpRouter,
-  RegExpRouter,
-  buildInitParams,
-  serializeInitParams
-};
+export { PreparedRegExpRouter, RegExpRouter, buildInitParams, serializeInitParams };

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

@@ -1,25 +1,19 @@
-// src/router/reg-exp-router/matcher.ts
-import { METHOD_NAME_ALL } from "../../router.js";
-var emptyParam = [];
+import "../../router.js";
+//#region src/router/reg-exp-router/matcher.ts
+const emptyParam = [];
 function match(method, path) {
-  const matchers = this.buildAllMatchers();
-  const match2 = ((method2, path2) => {
-    const matcher = matchers[method2] || matchers[METHOD_NAME_ALL];
-    const staticMatch = matcher[2][path2];
-    if (staticMatch) {
-      return staticMatch;
-    }
-    const match3 = path2.match(matcher[0]);
-    if (!match3) {
-      return [[], emptyParam];
-    }
-    const index = match3.indexOf("", 1);
-    return [matcher[1][index], match3];
-  });
-  this.match = match2;
-  return match2(method, path);
+	const matchers = this.buildAllMatchers();
+	const match = ((method, path) => {
+		const matcher = matchers[method] || matchers["ALL"];
+		const staticMatch = matcher[2][path];
+		if (staticMatch) return staticMatch;
+		const match = path.match(matcher[0]);
+		if (!match) return [[], emptyParam];
+		const index = match.indexOf("", 1);
+		return [matcher[1][index], match];
+	});
+	this.match = match;
+	return match(method, path);
 }
-export {
-  emptyParam,
-  match
-};
+//#endregion
+export { emptyParam, match };

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

@@ -1,114 +1,91 @@
-// src/router/reg-exp-router/node.ts
 import { createNullObject } from "../utils.js";
-var LABEL_REG_EXP_STR = "[^/]+";
-var ONLY_WILDCARD_REG_EXP_STR = ".*";
-var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
-var PATH_ERROR = /* @__PURE__ */ Symbol();
-var regExpMetaChars = new Set(".\\+*[^]$()");
+//#region src/router/reg-exp-router/node.ts
+const LABEL_REG_EXP_STR = "[^/]+";
+const ONLY_WILDCARD_REG_EXP_STR = ".*";
+const TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
+const PATH_ERROR = Symbol();
+const regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
+/**
+* Sort order:
+* 1. literal
+* 2. special pattern (e.g. :label{[0-9]+})
+* 3. common label pattern (e.g. :label)
+* 4. wildcard
+*/
 function compareKey(a, b) {
-  if (a.length === 1) {
-    return b.length === 1 ? a < b ? -1 : 1 : -1;
-  }
-  if (b.length === 1) {
-    return 1;
-  }
-  if (a === ONLY_WILDCARD_REG_EXP_STR || a === TAIL_WILDCARD_REG_EXP_STR) {
-    return b === TAIL_WILDCARD_REG_EXP_STR ? -1 : 1;
-  } else if (b === ONLY_WILDCARD_REG_EXP_STR || b === TAIL_WILDCARD_REG_EXP_STR) {
-    return -1;
-  }
-  if (a === LABEL_REG_EXP_STR) {
-    return 1;
-  } else if (b === LABEL_REG_EXP_STR) {
-    return -1;
-  }
-  return a.length === b.length ? a < b ? -1 : 1 : b.length - a.length;
+	if (a.length === 1) return b.length === 1 ? a < b ? -1 : 1 : -1;
+	if (b.length === 1) return 1;
+	if (a === ".*" || a === "(?:|/.*)") return b === "(?:|/.*)" ? -1 : 1;
+	else if (b === ".*" || b === "(?:|/.*)") return -1;
+	if (a === "[^/]+") return 1;
+	else if (b === "[^/]+") return -1;
+	return a.length === b.length ? a < b ? -1 : 1 : b.length - a.length;
 }
-var Node = class _Node {
-  // handler index of a dynamic path, or -1 for a static path terminal
-  #index;
-  #varIndex;
-  #children = createNullObject();
-  insert(tokens, index, paramMap, context, isStatic) {
-    let node = this;
-    for (let i = 0, len = tokens.length; i < len; i++) {
-      const token = tokens[i];
-      const pattern = token.length === 1 ? token === "*" ? i === len - 1 ? ["", "", ONLY_WILDCARD_REG_EXP_STR] : ["", "", LABEL_REG_EXP_STR] : null : token === "/*" ? ["", "", TAIL_WILDCARD_REG_EXP_STR] : token.match(/^\:([^\{\}]+)(?:\{(.+)\})?$/);
-      let nextNode;
-      if (pattern) {
-        const name = pattern[1];
-        let regexpStr = pattern[2] || LABEL_REG_EXP_STR;
-        if (name && pattern[2]) {
-          if (regexpStr === ".*") {
-            throw PATH_ERROR;
-          }
-          regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
-          if (/\((?!\?:)/.test(regexpStr)) {
-            throw PATH_ERROR;
-          }
-          if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) {
-            throw PATH_ERROR;
-          }
-        }
-        nextNode = node.#children[regexpStr];
-        if (!nextNode) {
-          if (regexpStr !== ONLY_WILDCARD_REG_EXP_STR && regexpStr !== TAIL_WILDCARD_REG_EXP_STR) {
-            for (const k in node.#children) {
-              if (
-                // a single-char pattern coexists with single-char literals as a literal does
-                (regexpStr.length > 1 || k.length > 1) && k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR
-              ) {
-                throw PATH_ERROR;
-              }
-            }
-          }
-          nextNode = node.#children[regexpStr] = new _Node();
-        }
-        if (name !== "") {
-          nextNode.#varIndex ??= context.varIndex++;
-          paramMap.push([name, nextNode.#varIndex]);
-        }
-      } else {
-        nextNode = node.#children[token];
-        if (!nextNode) {
-          for (const k in node.#children) {
-            if (k.length > 1 && k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR) {
-              throw PATH_ERROR;
-            }
-          }
-          nextNode = node.#children[token] = new _Node();
-        }
-      }
-      node = nextNode;
-    }
-    if (node.#index !== void 0) {
-      throw PATH_ERROR;
-    }
-    node.#index = isStatic ? -1 : index;
-  }
-  buildRegExpStr() {
-    const childKeys = Object.keys(this.#children).sort(compareKey);
-    const strList = childKeys.map((k) => {
-      const c = this.#children[k];
-      const childStr = c.buildRegExpStr();
-      return childStr === "" ? "" : (typeof c.#varIndex === "number" ? `(${k})@${c.#varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + childStr;
-    }).filter(Boolean);
-    if (typeof this.#index === "number" && this.#index !== -1) {
-      strList.unshift(`#${this.#index}`);
-    }
-    if (strList.length === 0) {
-      return "";
-    }
-    if (strList.length === 1) {
-      return strList[0];
-    }
-    return "(?:" + strList.join("|") + ")";
-  }
-};
-export {
-  LABEL_REG_EXP_STR,
-  Node,
-  ONLY_WILDCARD_REG_EXP_STR,
-  PATH_ERROR,
-  TAIL_WILDCARD_REG_EXP_STR
+var Node = class Node {
+	#index;
+	#varIndex;
+	#children = createNullObject();
+	insert(tokens, index, paramMap, context, isStatic) {
+		let node = this;
+		for (let i = 0, len = tokens.length; i < len; i++) {
+			const token = tokens[i];
+			const pattern = token.length === 1 ? token === "*" ? i === len - 1 ? [
+				"",
+				"",
+				".*"
+			] : [
+				"",
+				"",
+				LABEL_REG_EXP_STR
+			] : null : token === "/*" ? [
+				"",
+				"",
+				TAIL_WILDCARD_REG_EXP_STR
+			] : token.match(/^\:([^\{\}]+)(?:\{(.+)\})?$/);
+			let nextNode;
+			if (pattern) {
+				const name = pattern[1];
+				let regexpStr = pattern[2] || "[^/]+";
+				if (name && pattern[2]) {
+					if (regexpStr === ".*") throw PATH_ERROR;
+					regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
+					if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
+					if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;
+				}
+				nextNode = node.#children[regexpStr];
+				if (!nextNode) {
+					if (regexpStr !== ".*" && regexpStr !== "(?:|/.*)") {
+						for (const k in node.#children) if ((regexpStr.length > 1 || k.length > 1) && k !== ".*" && k !== "(?:|/.*)") throw PATH_ERROR;
+					}
+					nextNode = node.#children[regexpStr] = new Node();
+				}
+				if (name !== "") {
+					nextNode.#varIndex ??= context.varIndex++;
+					paramMap.push([name, nextNode.#varIndex]);
+				}
+			} else {
+				nextNode = node.#children[token];
+				if (!nextNode) {
+					for (const k in node.#children) if (k.length > 1 && k !== ".*" && k !== "(?:|/.*)") throw PATH_ERROR;
+					nextNode = node.#children[token] = new Node();
+				}
+			}
+			node = nextNode;
+		}
+		if (node.#index !== void 0) throw PATH_ERROR;
+		node.#index = isStatic ? -1 : index;
+	}
+	buildRegExpStr() {
+		const strList = Object.keys(this.#children).sort(compareKey).map((k) => {
+			const c = this.#children[k];
+			const childStr = c.buildRegExpStr();
+			return childStr === "" ? "" : (typeof c.#varIndex === "number" ? `(${k})@${c.#varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + childStr;
+		}).filter(Boolean);
+		if (typeof this.#index === "number" && this.#index !== -1) strList.unshift(`#${this.#index}`);
+		if (strList.length === 0) return "";
+		if (strList.length === 1) return strList[0];
+		return "(?:" + strList.join("|") + ")";
+	}
 };
+//#endregion
+export { LABEL_REG_EXP_STR, Node, ONLY_WILDCARD_REG_EXP_STR, PATH_ERROR, TAIL_WILDCARD_REG_EXP_STR };