@suveren/gateway 0.40.0 → 0.41.0

package/node_modules/hono/dist/cjs/router/reg-exp-router/trie.js

@@ -8,8 +8,14 @@ var Trie = class {
 	#index = 0;
 	paths = require_router_utils.createNullObject();
 	insert(path, isStatic) {
+		const keys = [];
 		if (isStatic) {
-			this.#root.insert(path.split(""), 0, [], this.#context, true);
+			this.#root.insert(path.split(""), -1, [], this.#context, keys);
+			this.paths[path] = [
+				-1,
+				[],
+				keys
+			];
 			return;
 		}
 		const paramAssoc = [];
@@ -17,7 +23,7 @@ var Trie = class {
 		let markedPath = path;
 		for (let i = 0;;) {
 			let replaced = false;
-			markedPath = markedPath.replace(/\{[^}]+\}/g, (m) => {
+			markedPath = markedPath.replace(/\{(?:\{[\d,]+\}|[^}])+\}/g, (m) => {
 				const mark = `@\\${i}`;
 				groups[i] = [mark, m];
 				i++;
@@ -31,7 +37,7 @@ var Trie = class {
 		*  - /* wildcard
 		*  - character
 		*/
-		const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
+		const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./gs) || [];
 		for (let i = groups.length - 1; i >= 0; i--) {
 			const [mark] = groups[i];
 			for (let j = tokens.length - 1; j >= 0; j--) if (tokens[j].indexOf(mark) !== -1) {
@@ -39,8 +45,12 @@ var Trie = class {
 				break;
 			}
 		}
-		this.#root.insert(tokens, this.#index, paramAssoc, this.#context, false);
-		this.paths[path] = [this.#index++, paramAssoc];
+		this.#root.insert(tokens, this.#index, paramAssoc, this.#context, keys);
+		this.paths[path] = [
+			this.#index++,
+			paramAssoc,
+			keys
+		];
 	}
 	buildRegExp() {
 		let regexp = this.#root.buildRegExpStr();

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

@@ -16,7 +16,7 @@ const decodeJwtPart = (part) => JSON.parse(require_utils_jwt_utf8.utf8Decoder.de
 function isTokenHeader(obj) {
 	if (typeof obj === "object" && obj !== null) {
 		const objWithAlg = obj;
-		return "alg" in objWithAlg && Object.values(require_utils_jwt_jwa.AlgorithmTypes).includes(objWithAlg.alg) && (!("typ" in objWithAlg) || objWithAlg.typ === "JWT");
+		return "alg" in objWithAlg && Object.values(require_utils_jwt_jwa.AlgorithmTypes).includes(objWithAlg.alg) && (!("typ" in objWithAlg) || objWithAlg.typ === "JWT") && !("crit" in objWithAlg);
 	}
 	return false;
 }
@@ -67,6 +67,7 @@ const verify = async (token, publicKey, algOrOptions) => {
 		if (!(Array.isArray(payload.aud) ? payload.aud : [payload.aud]).some((payloadAud) => aud instanceof RegExp ? aud.test(payloadAud) : typeof aud === "string" ? payloadAud === aud : Array.isArray(aud) && aud.includes(payloadAud))) throw new require_utils_jwt_types.JwtTokenAudience(aud, payload.aud);
 	}
 	const headerPayload = token.substring(0, token.lastIndexOf("."));
+	if (!/^[A-Za-z0-9_-]*={0,2}$/.test(tokenParts[2])) throw new require_utils_jwt_types.JwtTokenInvalid(token);
 	let signature;
 	try {
 		signature = require_utils_encode.decodeBase64Url(tokenParts[2]);

package/node_modules/hono/dist/cjs/utils/mount.js

@@ -0,0 +1,35 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_request_constants = require("../request/constants.js");
+const require_utils_url = require("./url.js");
+//#region src/utils/mount.ts
+const getPathPrefixLength = (c, pathPrefix, routePath) => {
+	if (!/[:*]/.test(pathPrefix)) return pathPrefix.length;
+	const path = c.req.path;
+	const matchResult = c.req[require_request_constants.GET_MATCH_RESULT];
+	const paramNames = /* @__PURE__ */ new Set();
+	let length = 0;
+	for (const part of require_utils_url.splitRoutingPath(pathPrefix)) {
+		const pattern = require_utils_url.getPattern(part);
+		if (pattern && pattern !== "*") {
+			const name = pattern[1];
+			if (paramNames.has(name)) throw new Error(`mount(): Duplicate path parameter "${name}" in "${routePath}".`);
+			paramNames.add(name);
+		}
+		if (pattern && pattern !== "*" && pattern[2] !== true) {
+			const value = matchResult.length === 2 ? matchResult[1][matchResult[0][c.req.routeIndex][1][pattern[1]]] : matchResult[0][c.req.routeIndex][1][pattern[1]];
+			length += value.length + 1;
+		} else if (pattern || part.endsWith("*")) {
+			const end = path.indexOf("/", length + 1);
+			length = end === -1 ? path.length : end;
+		} else length += part.length + 1;
+	}
+	return length;
+};
+const createMountedRequest = (c, pathPrefix, routePath) => {
+	if (/[^/]\*$/.test(routePath)) throw new Error(`mount(): Wildcard must follow "/" in "${routePath}".`);
+	const url = new URL(c.req.raw.url);
+	url.pathname = require_utils_url.stripPathPrefix(url.pathname, c.req.path, getPathPrefixLength(c, pathPrefix, routePath));
+	return new Request(url, c.req.raw);
+};
+//#endregion
+exports.createMountedRequest = createMountedRequest;

package/node_modules/hono/dist/cjs/utils/url.js

@@ -111,6 +111,15 @@ const getPathNoStrict = (request) => {
 	const result = getPath(request);
 	return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
+const stripPathPrefix = (rawPath, decodedPath, prefixLength) => {
+	if (rawPath.at(-1) === "/" && decodedPath.at(-1) !== "/") rawPath = rawPath.slice(0, -1);
+	let index = 0;
+	for (let i = decodedPath.indexOf("/"); i !== -1 && i < prefixLength; i = decodedPath.indexOf("/", i + 1)) {
+		index = rawPath.indexOf("/", index + 1);
+		if (index === -1) return "/";
+	}
+	return rawPath.slice(index) || "/";
+};
 /**
 * Merge paths.
 * @param {string[]} ...paths - The paths to merge.
@@ -215,6 +224,7 @@ exports.getQueryStrings = getQueryStrings;
 exports.mergePath = mergePath;
 exports.splitPath = splitPath;
 exports.splitRoutingPath = splitRoutingPath;
+exports.stripPathPrefix = stripPathPrefix;
 exports.tryDecode = tryDecode;
 exports.tryDecodeURI = tryDecodeURI;
 exports.tryDecodeURIComponent = tryDecodeURIComponent;

package/node_modules/hono/dist/cjs/validator/validator.js

@@ -4,7 +4,7 @@ const require_utils_buffer = require("../utils/buffer.js");
 const require_helper_cookie_index = require("../helper/cookie/index.js");
 //#region src/validator/validator.ts
 const jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
-const multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/i;
+const multipartRegex = /^multipart\/form-data(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
 const urlencodedRegex = /^application\/x-www-form-urlencoded(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
 const validator = (target, validationFunc) => {
 	return async (c, next) => {

package/node_modules/hono/dist/context.js

@@ -197,7 +197,7 @@ var Context = class {
 	* ```
 	*/
 	header = (name, value, options) => {
-		if (this.finalized) this.#res = createResponseInstance(this.#res.body, this.#res);
+		if (this.finalized && !this.#res.bodyUsed) this.#res = createResponseInstance(this.#res.body, this.#res);
 		const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
 		if (value === void 0) headers.delete(name);
 		else if (options?.append) headers.append(name, value);

package/node_modules/hono/dist/helper/css/common.js

@@ -79,10 +79,8 @@ const buildStyleString = (strings, values) => {
 		for (let j = 0, len = vArray.length; j < len; j++) {
 			let value = vArray[j];
 			if (typeof value === "boolean" || value === null || value === void 0) continue;
-			if (typeof value === "string") {
-				if (/([\\"'\/])/.test(value)) styleString += value.replace(/([\\"']|(?<=<)\/)/g, "\\$1");
-				else styleString += value;
-			} else if (typeof value === "number") styleString += value;
+			if (typeof value === "string") styleString += value.replace(/[\\"']/g, "\\$&");
+			else if (typeof value === "number") styleString += value;
 			else if (value[CSS_ESCAPED]) styleString += value[CSS_ESCAPED];
 			else if (value[CLASS_NAME].startsWith("@keyframes ")) {
 				selectors.push(value);
@@ -107,7 +105,7 @@ const buildStyleString = (strings, values) => {
 	}
 	return [
 		label,
-		minify(styleString),
+		minify(styleString).replace(/<\//g, "<\\/"),
 		selectors,
 		externalClassNames
 	];

package/node_modules/hono/dist/hono-base.js

@@ -3,6 +3,7 @@ import { getPath, getPathNoStrict, mergePath } from "./utils/url.js";
 import { Context } from "./context.js";
 import { METHODS } from "./router.js";
 import { COMPOSED_HANDLER } from "./utils/constants.js";
+import { createMountedRequest } from "./utils/mount.js";
 //#region src/hono-base.ts
 /**
 * @module
@@ -227,17 +228,10 @@ var Hono = class Hono {
 			} catch {}
 			return [c.env, executionContext];
 		};
-		replaceRequest ||= (() => {
-			const mergedPath = mergePath(this._basePath, path);
-			const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-			return (request) => {
-				const url = new URL(request.url);
-				url.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
-				return new Request(url, request);
-			};
-		})();
+		const mergedPath = mergePath(this._basePath, path);
+		const defaultReplaceRequest = (c) => createMountedRequest(c, mergedPath.replace(/\/$/, ""), mergePath(mergedPath, "*"));
 		const handler = async (c, next) => {
-			const res = await applicationHandler(replaceRequest(c.req.raw), ...getOptions(c));
+			const res = await applicationHandler(replaceRequest ? replaceRequest(c.req.raw) : defaultReplaceRequest(c), ...getOptions(c));
 			if (res) return res;
 			await next();
 		};

package/node_modules/hono/dist/hono.js

@@ -1,6 +1,5 @@
 import { HonoBase as Hono$1 } from "./hono-base.js";
 import { RegExpRouter } from "./router/reg-exp-router/router.js";
-import "./router/reg-exp-router/index.js";
 import { SmartRouter } from "./router/smart-router/router.js";
 import { TrieRouter } from "./router/trie-router/router.js";
 import "./router/trie-router/index.js";

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

@@ -80,7 +80,7 @@ const basicAuth = (options, ...users) => {
 			}
 		}
 		const status = 401;
-		const headers = { "WWW-Authenticate": "Basic realm=\"" + options.realm?.replace(/"/g, "\\\"") + "\"" };
+		const headers = { "WWW-Authenticate": "Basic realm=\"" + options.realm?.replace(/[\\"]/g, "\\$&") + "\"" };
 		const responseMessage = typeof options.invalidUserMessage === "function" ? await options.invalidUserMessage(ctx) : options.invalidUserMessage;
 		const res = typeof responseMessage === "string" ? new Response(responseMessage, {
 			status,

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

@@ -44,7 +44,7 @@ const bearerAuth = (options) => {
 	if (!("token" in options || "verifyToken" in options)) throw new Error("bearer auth middleware requires options for \"token\" or \"verifyToken\"");
 	if (!options.realm) options.realm = "";
 	if (options.prefix === void 0) options.prefix = PREFIX;
-	const realm = options.realm?.replace(/"/g, "\\\"");
+	const realm = options.realm?.replace(/[\\"]/g, "\\$&");
 	const prefix = options.prefix;
 	const tokenRegexp = new RegExp(`^${TOKEN_STRINGS}$`);
 	const wwwAuthenticatePrefix = prefix === "" ? "" : `${prefix} `;

package/node_modules/hono/dist/middleware/csrf/index.js

@@ -8,7 +8,7 @@ const secFetchSiteValues = [
 ];
 const isSecFetchSite = (value) => secFetchSiteValues.includes(value);
 const isSafeMethodRe = /^(GET|HEAD|OPTIONS)$/;
-const isRequestedByFormElementRe = /^\b(application\/x-www-form-urlencoded|multipart\/form-data|text\/plain)\b/i;
+const isCsrfContentTypeRe = /^\b(application\/x-www-form-urlencoded|multipart\/form-data|text\/(?:plain|ping))\b/i;
 /**
 * CSRF Protection Middleware for Hono.
 *
@@ -94,7 +94,7 @@ const csrf = (options) => {
 		return await secFetchSiteHandler(secFetchSite, c);
 	};
 	return async function csrf(c, next) {
-		if (!isSafeMethodRe.test(c.req.method) && isRequestedByFormElementRe.test(c.req.header("content-type") || "text/plain") && !await isAllowedSecFetchSite(c.req.header("sec-fetch-site"), c) && !await isAllowedOrigin(c.req.header("origin"), c)) {
+		if (!isSafeMethodRe.test(c.req.method) && isCsrfContentTypeRe.test(c.req.header("content-type") || "text/plain") && !await isAllowedSecFetchSite(c.req.header("sec-fetch-site"), c) && !await isAllowedOrigin(c.req.header("origin"), c)) {
 			const res = new Response("Forbidden", { status: 403 });
 			throw new HTTPException(403, { res });
 		}

package/node_modules/hono/dist/middleware/jwk/jwk.js

@@ -109,8 +109,8 @@ const jwk = (options, init) => {
 	};
 };
 function unauthorizedResponse(opts) {
-	const realm = (opts.realm ?? opts.ctx.req.url).replace(/"/g, "\\\"");
-	const errDescription = opts.errDescription.replace(/"/g, "\\\"");
+	const realm = (opts.realm ?? opts.ctx.req.url).replace(/[\\"]/g, "\\$&");
+	const errDescription = opts.errDescription.replace(/[\\"]/g, "\\$&");
 	return new Response("Unauthorized", {
 		status: 401,
 		statusText: opts.statusText,

package/node_modules/hono/dist/middleware/jwt/jwt.js

@@ -103,8 +103,8 @@ const jwt = (options) => {
 	};
 };
 function unauthorizedResponse(opts) {
-	const realm = (opts.realm ?? opts.ctx.req.url).replace(/"/g, "\\\"");
-	const errDescription = opts.errDescription.replace(/"/g, "\\\"");
+	const realm = (opts.realm ?? opts.ctx.req.url).replace(/[\\"]/g, "\\$&");
+	const errDescription = opts.errDescription.replace(/[\\"]/g, "\\$&");
 	return new Response("Unauthorized", {
 		status: 401,
 		statusText: opts.statusText,

package/node_modules/hono/dist/middleware/language/language.js

@@ -1,5 +1,5 @@
-import { getCookie, setCookie } from "../../helper/cookie/index.js";
 import { parseAccept } from "../../utils/accept.js";
+import { getCookie, setCookie } from "../../helper/cookie/index.js";
 //#region src/middleware/language/language.ts
 const DEFAULT_OPTIONS = {
 	order: [

package/node_modules/hono/dist/middleware/mount/index.js

@@ -1,10 +1,9 @@
+import { createMountedRequest } from "../../utils/mount.js";
 import { routePath } from "../../helper/route/index.js";
 //#region src/middleware/mount/index.ts
 const defaultReplaceRequest = (c) => {
-	const pathPrefix = routePath(c).replace(/\/\*$/, "");
-	const url = new URL(c.req.raw.url);
-	url.pathname = c.req.path.slice(pathPrefix.length) || "/";
-	return new Request(url, c.req.raw);
+	const path = routePath(c);
+	return createMountedRequest(c, path.replace(/\/?\*$/, ""), path);
 };
 const defaultGetOptions = (c) => {
 	let executionContext = void 0;
@@ -21,6 +20,7 @@ const defaultGetOptions = (c) => {
 * @param {Function} applicationHandler - other Request Handler
 * @param {MountOptions} [options] - options of `mount()`
 * @returns {MiddlewareHandler} handler to register with `app.all()`
+* @throws {Error} If the route ends with a wildcard inside a segment (e.g. `/assets*`), or automatic request rewriting encounters duplicate path parameter names.
 *
 * @example
 * ```ts

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

@@ -1,8 +1,8 @@
 import { createNullObject } from "../utils.js";
 //#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 ONLY_WILDCARD_REG_EXP_STR = "[^]*";
+const TAIL_WILDCARD_REG_EXP_STR = "(?:|/[^]*)";
 const PATH_ERROR = Symbol();
 const regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 /**
@@ -15,8 +15,8 @@ const regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 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 === ".*" || a === "(?:|/.*)") return b === "(?:|/.*)" ? -1 : 1;
-	else if (b === ".*" || b === "(?:|/.*)") 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;
@@ -25,14 +25,14 @@ var Node = class Node {
 	#index;
 	#varIndex;
 	#children = createNullObject();
-	insert(tokens, index, paramMap, context, isStatic) {
+	insert(tokens, index, paramMap, context, keys) {
 		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
 			] : [
 				"",
 				"",
@@ -47,15 +47,16 @@ var Node = class Node {
 				const name = pattern[1];
 				let regexpStr = pattern[2] || "[^/]+";
 				if (name && pattern[2]) {
-					if (regexpStr === ".*") throw PATH_ERROR;
+					if (new RegExp(regexpStr).test("")) throw PATH_ERROR;
 					regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
 					if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
 					if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;
 				}
+				keys.push(regexpStr);
 				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;
+					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();
 				}
@@ -64,16 +65,17 @@ var Node = class Node {
 					paramMap.push([name, nextNode.#varIndex]);
 				}
 			} else {
+				keys.push(token);
 				nextNode = node.#children[token];
 				if (!nextNode) {
-					for (const k in node.#children) if (k.length > 1 && k !== ".*" && k !== "(?:|/.*)") throw PATH_ERROR;
+					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;
+		node.#index = index;
 	}
 	buildRegExpStr() {
 		const strList = Object.keys(this.#children).sort(compareKey).map((k) => {

package/node_modules/hono/dist/router/reg-exp-router/prepared-router.js

@@ -1,5 +1,5 @@
 import "../../router.js";
-import { emptyParam, match } from "./matcher.js";
+import { match } from "./matcher.js";
 import { RegExpRouter } from "./router.js";
 //#region src/router/reg-exp-router/prepared-router.ts
 var PreparedRegExpRouter = class {
@@ -27,7 +27,7 @@ var PreparedRegExpRouter = class {
 		if (!this.#matchers[method]) {
 			const all = this.#matchers["ALL"];
 			const staticMap = {};
-			for (const key in all[2]) staticMap[key] = [all[2][key][0].slice(), emptyParam];
+			for (const key in all[2]) staticMap[key] = [all[2][key][0].slice(), all[2][key][1]];
 			this.#matchers[method] = [
 				all[0],
 				all[1].map((list) => Array.isArray(list) ? list.slice() : 0),
@@ -71,7 +71,7 @@ const buildInitParams = ({ paths }) => {
 						...map
 					};
 					else relocateMap[path] = [[[], map]];
-					if (relocateMap[path][0][0].findIndex((j) => j === i) === -1) relocateMap[path][0][0].push(i);
+					if (!relocateMap[path][0][0].includes(i)) relocateMap[path][0][0].push(i);
 				}
 			});
 		});
@@ -79,7 +79,7 @@ const buildInitParams = ({ paths }) => {
 			if (p === path) {
 				relocateMap[path] ||= [[[]]];
 				const value = path2 === path ? "" : path2;
-				if (relocateMap[path][0][0].findIndex((v) => v === value) === -1) relocateMap[path][0][0].push(value);
+				if (!relocateMap[path][0][0].includes(value)) relocateMap[path][0][0].push(value);
 			}
 		});
 	}
@@ -88,7 +88,7 @@ const buildInitParams = ({ paths }) => {
 	return [matchers, relocateMap];
 };
 const serializeInitParams = ([matchers, relocateMap]) => {
-	return `[${JSON.stringify(matchers, (_, value) => value instanceof RegExp ? `##${value.toString()}##` : value).replace(/"##(.+?)##"/g, (_, str) => str.replace(/\\\\/g, "\\"))},${JSON.stringify(relocateMap)}]`;
+	return `[${JSON.stringify(matchers, (_, value) => value instanceof RegExp || value === void 0 ? `##${value}##` : value).replace(/"##(.+?)##"/g, (_, str) => str.replace(/\\\\/g, "\\"))},${JSON.stringify(relocateMap)}]`;
 };
 //#endregion
 export { PreparedRegExpRouter, buildInitParams, serializeInitParams };

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

@@ -2,24 +2,24 @@ import { checkOptionalParameter } from "../../utils/url.js";
 import { MESSAGE_MATCHER_IS_ALREADY_BUILT, UnsupportedPathError } from "../../router.js";
 import { createNullObject } from "../utils.js";
 import { emptyParam, match } from "./matcher.js";
-import { LABEL_REG_EXP_STR, PATH_ERROR, TAIL_WILDCARD_REG_EXP_STR } from "./node.js";
+import { PATH_ERROR } from "./node.js";
 import { Trie } from "./trie.js";
 //#region src/router/reg-exp-router/router.ts
-let wildcardRegExpCache = createNullObject();
-function buildWildcardRegExp(path) {
-	return wildcardRegExpCache[path] ??= new RegExp(`^${path.replace(/\/:[^/{}]+(?:\{\[\^\/]\+})?(?=[/{]|$)|\/?\*$|([.\\+*[^\]$()?{}|])/g, (match, metaChar) => metaChar ? `\\${metaChar}` : match === "/*" ? TAIL_WILDCARD_REG_EXP_STR : match === "*" ? ".*" : `/:${LABEL_REG_EXP_STR}`)}$`);
+function endsWithWildcard(keys) {
+	const tail = keys[keys.length - 1];
+	return tail === "[^]*" || tail === "(?:|/[^]*)";
 }
-function findMiddleware(middleware, path) {
-	for (const k of Object.keys(middleware).sort((a, b) => b.length - a.length)) if (buildWildcardRegExp(k).test(path)) return [...middleware[k]];
+function covers(wildcard, target) {
+	const last = wildcard.length - 1;
+	for (let i = 0; i < last; i++) if (wildcard[i] !== target[i]) return false;
+	return wildcard[last] === "[^]*" || target.length === last || target[last] === "/";
 }
 var RegExpRouter = class {
 	name = "RegExpRouter";
-	#middleware;
-	#routes;
+	#handlers;
 	#tries;
 	constructor() {
-		this.#middleware = { ["ALL"]: createNullObject() };
-		this.#routes = { ["ALL"]: createNullObject() };
+		this.#handlers = { ["ALL"]: [] };
 		this.#tries = { ["ALL"]: new Trie() };
 	}
 	#insertPath(method, path) {
@@ -30,65 +30,53 @@ var RegExpRouter = class {
 		}
 	}
 	add(method, path, handler) {
-		const middleware = this.#middleware;
-		const routes = this.#routes;
-		if (!middleware) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
-		if (!middleware[method]) {
-			this.#tries[method] = new Trie();
-			for (const handlerMap of [middleware, routes]) {
-				handlerMap[method] = createNullObject();
-				for (const p in handlerMap["ALL"]) {
-					handlerMap[method][p] = [...handlerMap["ALL"][p]];
-					this.#insertPath(method, p);
-				}
-			}
+		const handlers = this.#handlers;
+		if (!handlers) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
+		const tries = this.#tries;
+		if (!handlers[method]) {
+			tries[method] = new Trie();
+			handlers[method] = [...handlers["ALL"]];
+			for (const p in tries["ALL"].paths) this.#insertPath(method, p);
 		}
 		if (path === "/*") path = "*";
-		const methods = method === "ALL" ? Object.keys(middleware) : [method];
-		if (/\*$/.test(path)) {
-			const re = buildWildcardRegExp(path);
-			for (const m of methods) if (!middleware[m][path]) {
-				this.#insertPath(m, path);
-				middleware[m][path] = findMiddleware(middleware[m], path) || findMiddleware(middleware["ALL"], path) || [];
-			}
-			for (const handlerMap of [middleware, routes]) for (const m of methods) for (const p in handlerMap[m]) re.test(p) && handlerMap[m][p].push([handler, path]);
-			return;
-		}
+		const methods = method === "ALL" ? Object.keys(handlers) : [method];
 		const paths = checkOptionalParameter(path) || [path];
 		for (const path of paths) for (const m of methods) {
-			if (!routes[m][path]) {
-				this.#insertPath(m, path);
-				routes[m][path] = findMiddleware(middleware[m], path) || findMiddleware(middleware["ALL"], path) || [];
-			}
-			routes[m][path].push([handler, path]);
+			if (!tries[m].paths[path]) this.#insertPath(m, path);
+			handlers[m].push([handler, path]);
 		}
 	}
 	match = match;
 	buildAllMatchers() {
 		const matchers = createNullObject();
-		for (const method of Object.keys(this.#routes)) matchers[method] = this.#buildMatcher(method);
-		this.#middleware = this.#routes = this.#tries = void 0;
-		wildcardRegExpCache = createNullObject();
+		for (const method of Object.keys(this.#handlers)) matchers[method] = this.#buildMatcher(method);
+		this.#handlers = this.#tries = void 0;
 		return matchers;
 	}
 	#buildMatcher(method) {
-		const middleware = this.#middleware[method];
-		const routes = this.#routes[method];
+		const handlers = this.#handlers[method];
 		const trie = this.#tries[method];
 		const staticMap = createNullObject();
 		const handlerData = [];
 		const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-		for (const r of [middleware, routes]) for (const path in r) {
-			const handlers = r[path];
-			const pathData = trie.paths[path];
-			if (!pathData) {
-				staticMap[path] = [handlers.map(([h]) => [h, createNullObject()]), emptyParam];
-				continue;
-			}
-			handlerData[pathData[0]] = handlers.map(([h, handlerPath]) => [h, trie.paths[handlerPath][1].reduceRight((map, [key], i) => {
-				map[key] = paramReplacementMap[pathData[1][i][1]];
+		const own = createNullObject();
+		const entries = handlers.map(([h, p], i) => {
+			(own[p] ??= []).push(i);
+			return [h, trie.paths[p][1].reduceRight((map, [key, varIndex]) => {
+				map[key] = paramReplacementMap[varIndex];
 				return map;
-			}, createNullObject())]);
+			}, createNullObject())];
+		});
+		const wildcards = Object.keys(own).filter((p) => endsWithWildcard(trie.paths[p][2]));
+		for (const path in trie.paths) {
+			const [index, , keys] = trie.paths[path];
+			const indexes = [...own[path]];
+			for (const p of wildcards) if (p !== path && covers(trie.paths[p][2], keys)) indexes.push(...own[p]);
+			const data = indexes.sort((a, b) => a - b).map((i) => entries[i]);
+			if (index === -1) {
+				const last = Math.max(-1, ...data.flatMap(([, map]) => Object.values(map)));
+				staticMap[path] = [data, last === -1 ? emptyParam : path.match(regexp).slice(0, last + 1)];
+			} else handlerData[index] = data;
 		}
 		return [
 			regexp,

package/node_modules/hono/dist/router/reg-exp-router/trie.js

@@ -7,8 +7,14 @@ var Trie = class {
 	#index = 0;
 	paths = createNullObject();
 	insert(path, isStatic) {
+		const keys = [];
 		if (isStatic) {
-			this.#root.insert(path.split(""), 0, [], this.#context, true);
+			this.#root.insert(path.split(""), -1, [], this.#context, keys);
+			this.paths[path] = [
+				-1,
+				[],
+				keys
+			];
 			return;
 		}
 		const paramAssoc = [];
@@ -16,7 +22,7 @@ var Trie = class {
 		let markedPath = path;
 		for (let i = 0;;) {
 			let replaced = false;
-			markedPath = markedPath.replace(/\{[^}]+\}/g, (m) => {
+			markedPath = markedPath.replace(/\{(?:\{[\d,]+\}|[^}])+\}/g, (m) => {
 				const mark = `@\\${i}`;
 				groups[i] = [mark, m];
 				i++;
@@ -30,7 +36,7 @@ var Trie = class {
 		*  - /* wildcard
 		*  - character
 		*/
-		const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
+		const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./gs) || [];
 		for (let i = groups.length - 1; i >= 0; i--) {
 			const [mark] = groups[i];
 			for (let j = tokens.length - 1; j >= 0; j--) if (tokens[j].indexOf(mark) !== -1) {
@@ -38,8 +44,12 @@ var Trie = class {
 				break;
 			}
 		}
-		this.#root.insert(tokens, this.#index, paramAssoc, this.#context, false);
-		this.paths[path] = [this.#index++, paramAssoc];
+		this.#root.insert(tokens, this.#index, paramAssoc, this.#context, keys);
+		this.paths[path] = [
+			this.#index++,
+			paramAssoc,
+			keys
+		];
 	}
 	buildRegExp() {
 		let regexp = this.#root.buildRegExpStr();

package/node_modules/hono/dist/types/middleware/mount/index.d.ts

@@ -16,6 +16,7 @@ type MountOptions = MountOptionHandler | {
  * @param {Function} applicationHandler - other Request Handler
  * @param {MountOptions} [options] - options of `mount()`
  * @returns {MiddlewareHandler} handler to register with `app.all()`
+ * @throws {Error} If the route ends with a wildcard inside a segment (e.g. `/assets*`), or automatic request rewriting encounters duplicate path parameter names.
  *
  * @example
  * ```ts

package/node_modules/hono/dist/types/router/reg-exp-router/node.d.ts

@@ -1,7 +1,7 @@
 //#region src/router/reg-exp-router/node.d.ts
 export declare const LABEL_REG_EXP_STR = "[^/]+";
-export declare const ONLY_WILDCARD_REG_EXP_STR = ".*";
-export declare const TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
+export declare const ONLY_WILDCARD_REG_EXP_STR = "[^]*";
+export declare const TAIL_WILDCARD_REG_EXP_STR = "(?:|/[^]*)";
 export declare const PATH_ERROR: unique symbol;
 export type ParamAssocArray = [string, number][];
 export interface Context {
@@ -9,7 +9,7 @@ export interface Context {
 }
 export declare class Node {
   
-  insert(tokens: readonly string[], index: number, paramMap: ParamAssocArray, context: Context, isStatic: boolean): void;
+  insert(tokens: readonly string[], index: number, paramMap: ParamAssocArray, context: Context, keys: string[]): void;
   buildRegExpStr(): string;
 }
 //#endregion

package/node_modules/hono/dist/types/router/reg-exp-router/trie.d.ts

@@ -3,7 +3,7 @@ import { ParamAssocArray } from "./node.js";
 export type ReplacementMap = number[];
 export declare class Trie {
   
-  paths: Record<string, [number, ParamAssocArray]>;
+  paths: Record<string, [number, ParamAssocArray, string[]]>;
   insert(path: string, isStatic: boolean): void;
   buildRegExp(): [RegExp, ReplacementMap, ReplacementMap];
 }