@suveren/gateway 0.39.0 → 0.41.0

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/middleware/serve-static/index.js

@@ -1,4 +1,5 @@
 import { tryDecodeURI } from "../../utils/url.js";
+import { parseAccept } from "../../utils/accept.js";
 import { COMPRESSIBLE_CONTENT_TYPE_REGEX } from "../../utils/compress.js";
 import { getMimeType } from "../../utils/mime.js";
 import { defaultJoin } from "./path.js";
@@ -19,6 +20,7 @@ const serveStatic = (options) => {
 	const join = options.join ?? defaultJoin;
 	return async (c, next) => {
 		if (c.finalized) return next();
+		if (c.req.method !== "GET" && c.req.method !== "HEAD") return next();
 		let filename;
 		if (options.path) filename = options.path;
 		else try {
@@ -38,7 +40,7 @@ const serveStatic = (options) => {
 			const mimeType = options.mimes && getMimeType(path, options.mimes) || getMimeType(path);
 			c.header("Content-Type", mimeType || "application/octet-stream");
 			if (options.precompressed && (!mimeType || COMPRESSIBLE_CONTENT_TYPE_REGEX.test(mimeType))) {
-				const acceptEncodingSet = new Set(c.req.header("Accept-Encoding")?.split(",").map((encoding) => encoding.trim()));
+				const acceptEncodingSet = new Set(parseAccept(c.req.header("Accept-Encoding") ?? "").filter((encoding) => encoding.q > 0).map((encoding) => encoding.type));
 				for (const encoding of ENCODINGS_ORDERED_KEYS) {
 					if (!acceptEncodingSet.has(encoding)) continue;
 					const compressedContent = await getContent(path + ENCODINGS[encoding], c);

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/router/trie-router/node.js

@@ -97,7 +97,7 @@ var Node = class Node {
 						const restPathString = path.slice(partOffsets[i]);
 						const m = matcher.exec(restPathString);
 						if (m) {
-							params[name] = m[0];
+							if (!Object.hasOwn(params, name)) params[name] = m[0];
 							this.#pushHandlerSets(handlerSets, child, method, node.#params, params);
 							if (m[0].length === restPathString.length && child.#children["*"]) this.#pushHandlerSets(handlerSets, child.#children["*"], method, node.#params, params);
 							for (const _ in child.#children) {
@@ -110,7 +110,7 @@ var Node = class Node {
 						}
 					}
 					if (matcher === true || matcher.test(part)) {
-						params[name] = part;
+						if (!Object.hasOwn(params, name)) params[name] = part;
 						if (isLast) {
 							this.#pushHandlerSets(handlerSets, child, method, params, node.#params);
 							if (child.#children["*"]) this.#pushHandlerSets(handlerSets, child.#children["*"], method, params, node.#params);

package/node_modules/hono/dist/types/adapter/aws-lambda/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/aws-lambda/conninfo.d.ts
 /**
  * Get connection information from AWS Lambda

package/node_modules/hono/dist/types/adapter/bun/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/bun/conninfo.d.ts
 /**
  * Get ConnInfo with Bun

package/node_modules/hono/dist/types/adapter/bun/ssg.d.ts

@@ -1,4 +1,4 @@
-import { FileSystemModule, ToSSGAdaptorInterface } from "../../helper/ssg/ssg.js";
+import { FileSystemModule, ToSSGAdaptorInterface } from "../../helper/ssg/index.js";
 //#region src/adapter/bun/ssg.d.ts
 /**
  * @experimental

package/node_modules/hono/dist/types/adapter/cloudflare-pages/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/cloudflare-pages/conninfo.d.ts
 /**
  * Get connection information from Cloudflare Pages

package/node_modules/hono/dist/types/adapter/cloudflare-workers/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/cloudflare-workers/conninfo.d.ts
 /**
  * @deprecated `hono/cloudflare-workers` will be removed in v5. Install `@hono/cloudflare-workers` and import from there instead.

package/node_modules/hono/dist/types/adapter/deno/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/deno/conninfo.d.ts
 /**
  * Get conninfo with Deno

package/node_modules/hono/dist/types/adapter/deno/ssg.d.ts

@@ -1,4 +1,4 @@
-import { FileSystemModule, ToSSGAdaptorInterface } from "../../helper/ssg/ssg.js";
+import { FileSystemModule, ToSSGAdaptorInterface } from "../../helper/ssg/index.js";
 //#region src/adapter/deno/ssg.d.ts
 /**
  * @experimental

package/node_modules/hono/dist/types/adapter/lambda-edge/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/lambda-edge/conninfo.d.ts
 /**
  * @deprecated `hono/lambda-edge` will be removed in v5. Install `@hono/lambda-edge` and import from there instead.

package/node_modules/hono/dist/types/adapter/netlify/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/netlify/conninfo.d.ts
 /**
  * Get connection information from Netlify

package/node_modules/hono/dist/types/adapter/vercel/conninfo.d.ts

@@ -1,4 +1,4 @@
-import { GetConnInfo } from "../../helper/conninfo/types.js";
+import { GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/adapter/vercel/conninfo.d.ts
 /**
  * @deprecated `hono/vercel` will be removed in v5. Install `@hono/vercel` and import from there instead.

package/node_modules/hono/dist/types/helper/testing/index.d.ts

@@ -2,7 +2,8 @@ import { UnionToIntersection } from "../../utils/types.js";
 import { Schema } from "../../types.js";
 import { ExecutionContext } from "../../context.js";
 import { Hono } from "../../hono.js";
-import { Client, ClientRequestOptions } from "../../client/types.js";
+import { ClientRequestOptions } from "../../client/index.js";
+import { Client } from "../../client/types.js";
 //#region src/helper/testing/index.d.ts
 type ExtractEnv<T> = T extends Hono<infer E, Schema, string> ? E : never;
 export declare const testClient: <T extends Hono<any, Schema, string>>(app: T, Env?: ExtractEnv<T>["Bindings"] | {}, executionCtx?: ExecutionContext, options?: Omit<ClientRequestOptions, "fetch">) => UnionToIntersection<Client<T, "http://localhost">>;

package/node_modules/hono/dist/types/hono-base.d.ts

@@ -6,14 +6,6 @@ type GetPath<E extends Env> = (request: Request, options?: {
   env?: E['Bindings'];
 }) => string;
 export type HonoOptions<E extends Env> = {
-  /**
-   * `strict` option specifies whether to distinguish whether the last path is a directory or not.
-   *
-   * @see {@link https://hono.dev/docs/api/hono#strict-mode}
-   *
-   * @default true
-   */
-  strict?: boolean;
   /**
    * `router` option specifies which router to use.
    *
@@ -25,6 +17,15 @@ export type HonoOptions<E extends Env> = {
    * ```
    */
   router?: Router<[H, RouterRoute]>;
+} & ({
+  /**
+   * `strict` option specifies whether to distinguish whether the last path is a directory or not.
+   *
+   * @see {@link https://hono.dev/docs/api/hono#strict-mode}
+   *
+   * @default true
+   */
+  strict?: true;
   /**
    * `getPath` can handle the host header value.
    *
@@ -46,7 +47,18 @@ export type HonoOptions<E extends Env> = {
    * ```
    */
   getPath?: GetPath<E>;
-};
+} | {
+  /**
+   * `strict` option specifies whether to distinguish whether the last path is a directory or not.
+   * When `strict` is `false`, `getPath` is not used.
+   *
+   * @see {@link https://hono.dev/docs/api/hono#strict-mode}
+   *
+   * @default true
+   */
+  strict: false;
+  getPath?: never;
+});
 type MountOptionHandler = (c: Context) => unknown;
 type MountReplaceRequest = (originalRequest: Request) => Request;
 type MountOptions = MountOptionHandler | {

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

@@ -2,5 +2,5 @@ import { Env, ErrorHandler, Handler, Input, MiddlewareHandler, Next, NotFoundHan
 import { HonoRequest } from "./request.js";
 import { Context, ContextRenderer, ContextVariableMap, ExecutionContext } from "./context.js";
 import { Hono } from "./hono.js";
-import { ClientRequestOptions, InferRequestType, InferResponseType } from "./client/types.js";
+import { ClientRequestOptions, InferRequestType, InferResponseType } from "./client/index.js";
 export { type ClientRequestOptions, Context, type ContextRenderer, type ContextVariableMap, type Env, type ErrorHandler, type ExecutionContext, type Handler, Hono, type HonoRequest, type InferRequestType, type InferResponseType, type Input, type MiddlewareHandler, type Next, type NotFoundHandler, type NotFoundResponse, type Schema, type ToSchema, type TypedResponse, type ValidationTargets };

package/node_modules/hono/dist/types/jsx/components.d.ts

@@ -1,6 +1,6 @@
 import { HtmlEscapedString } from "../utils/html.js";
-import { PropsWithChildren } from "./types.js";
-import { Child, FC } from "./base.js";
+import { PropsWithChildren } from "./index.js";
+import { Child, FC } from "./index.js";
 //#region src/jsx/components.d.ts
 export declare const childrenToString: (children: Child[]) => Promise<HtmlEscapedString[]>;
 export type ErrorHandler = (error: Error) => void;

package/node_modules/hono/dist/types/jsx/context.d.ts

@@ -1,5 +1,5 @@
-import { PropsWithChildren } from "./types.js";
-import { FC } from "./base.js";
+import { PropsWithChildren } from "./index.js";
+import { FC } from "./index.js";
 //#region src/jsx/context.d.ts
 export interface Context<T> extends FC<PropsWithChildren<{
   value: T;

package/node_modules/hono/dist/types/jsx/dom/components.d.ts

@@ -1,6 +1,6 @@
 import { ErrorHandler, FallbackRender } from "../components.js";
-import { PropsWithChildren } from "../types.js";
-import { Child, FC } from "../base.js";
+import { PropsWithChildren } from "../index.js";
+import { Child, FC } from "../index.js";
 //#region src/jsx/dom/components.d.ts
 export declare const ErrorBoundary: FC<PropsWithChildren<{
   fallback?: Child;

package/node_modules/hono/dist/types/jsx/dom/css.d.ts

@@ -1,6 +1,6 @@
 import { ClassNameSlug, CssClassName, CssVariableType, OnInvalidSlug, rawCssString } from "../../helper/css/common.js";
-import { PropsWithChildren } from "../types.js";
-import { FC } from "../base.js";
+import { PropsWithChildren } from "../index.js";
+import { FC } from "../index.js";
 //#region src/jsx/dom/css.d.ts
 interface CreateCssJsxDomObjectsType {
   (args: {

package/node_modules/hono/dist/types/jsx/streaming.d.ts

@@ -1,7 +1,8 @@
 import { HtmlEscapedString } from "../utils/html.js";
-import { PropsWithChildren } from "./types.js";
-import { Context } from "./context.js";
-import { FC, JSXNode } from "./base.js";
+import { PropsWithChildren } from "./index.js";
+import { Context } from "./index.js";
+import { FC } from "./index.js";
+import { JSXNode } from "./base.js";
 //#region src/jsx/streaming.d.ts
 /**
  * Used to specify nonce for scripts generated by `Suspense` and `ErrorBoundary`.

package/node_modules/hono/dist/types/middleware/bearer-auth/index.d.ts

@@ -1,7 +1,8 @@
 import { Env, MiddlewareHandler } from "../../types.js";
 import { Context } from "../../context.js";
 //#region src/middleware/bearer-auth/index.d.ts
-type MessageFunction = (c: Context) => string | object | Promise<string | object>;
+type MessageValue = string | object | Response;
+type MessageFunction = (c: Context) => MessageValue | Promise<MessageValue>;
 type CustomizedErrorResponseOptions = {
   wwwAuthenticateHeader?: string | object | MessageFunction;
   message?: string | object | MessageFunction;

package/node_modules/hono/dist/types/middleware/ip-restriction/index.d.ts

@@ -1,6 +1,6 @@
-import { MiddlewareHandler } from "../../types.js";
-import { Context } from "../../context.js";
-import { AddressType, GetConnInfo } from "../../helper/conninfo/types.js";
+import { MiddlewareHandler } from "../../index.js";
+import { Context } from "../../index.js";
+import { AddressType, GetConnInfo } from "../../helper/conninfo/index.js";
 //#region src/middleware/ip-restriction/index.d.ts
 /**
  * Function to get IP Address

package/node_modules/hono/dist/types/middleware/jsx-renderer/index.d.ts

@@ -1,8 +1,8 @@
 import { Env, Input, MiddlewareHandler } from "../../types.js";
 import { Context, PropsForRenderer } from "../../context.js";
-import { PropsWithChildren } from "../../jsx/types.js";
-import { Context as Context$1 } from "../../jsx/context.js";
-import { FC } from "../../jsx/base.js";
+import { PropsWithChildren } from "../../jsx/index.js";
+import { Context as Context$1 } from "../../jsx/index.js";
+import { FC } from "../../jsx/index.js";
 //#region src/middleware/jsx-renderer/index.d.ts
 export declare const RequestContext: Context$1<Context<any, any, {}> | null>;
 type RendererOptions = {

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