driftjs-router 0.0.16 → 0.0.18

package/dist/index-es.js

@@ -1,16 +1,14 @@
-import { createContext as e, onUnmount as t } from "driftjs-shared";
+import { createContext as e, normalizePath as t, onUnmount as n } from "driftjs-shared";
+//#region \0rolldown/runtime.js
+var r = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports);
+//#endregion
 //#region src/path.ts
-function n(e) {
-	if (!e || e === "/") return "/";
-	let t = e.replace(/\/+/g, "/");
-	return t.startsWith("/") || (t = "/" + t), t.length > 1 && t.endsWith("/") && (t = t.slice(0, -1)), t;
-}
-function r(e) {
+function i(e) {
 	if (!e) return "";
 	let t = e.trim();
 	return t.startsWith("/") || (t = "/" + t), t.length > 1 && t.endsWith("/") && (t = t.slice(0, -1)), t === "/" ? "" : t;
 }
-function i(e, t) {
+function a(e, t) {
 	if (!t) return e;
 	if (e.startsWith(t)) {
 		let n = e.slice(t.length);
@@ -18,17 +16,17 @@ function i(e, t) {
 	}
 	return e;
 }
-function a(e, t) {
+function o(e, t) {
 	let n = t.startsWith("/") ? t : "/" + t;
 	return e ? e + n : n;
 }
-function o(e, t) {
+function s(e, t) {
 	let n = t.startsWith("/") ? t : "/" + t;
 	return (e || "") + "#" + n;
 }
 //#endregion
 //#region src/history.ts
-function s() {
+function c() {
 	let e = [];
 	return {
 		get list() {
@@ -48,50 +46,50 @@ function s() {
 		}
 	};
 }
-function c(e) {
+function l(e) {
 	if (typeof window > "u") return null;
 	let t = e ?? window.history.state;
 	if (!t || typeof t != "object") return t ?? null;
 	let { __drift_pos: n, __drift_has_data: r, ...i } = t;
 	return Object.keys(i).length > 0 || r ? i : null;
 }
-function l(e, t) {
+function u(e, t) {
 	return {
 		...e || {},
 		__drift_pos: t,
 		...e === void 0 ? {} : { __drift_has_data: !0 }
 	};
 }
-function u(e = "") {
-	let t = r(e), n = s(), o = () => typeof window > "u" ? "/" : window.location.pathname + window.location.search + window.location.hash, u = () => i(o(), t) || "/", d = u(), f = typeof window < "u" && window.history.state && typeof window.history.state.__drift_pos == "number" ? window.history.state.__drift_pos : 0;
+function d(e = "") {
+	let t = i(e), n = c(), r = () => typeof window > "u" ? "/" : window.location.pathname + window.location.search + window.location.hash, s = () => a(r(), t) || "/", d = s(), f = typeof window < "u" && window.history.state && typeof window.history.state.__drift_pos == "number" ? window.history.state.__drift_pos : 0;
 	if (typeof window < "u" && (window.history.state == null || typeof window.history.state.__drift_pos != "number")) {
 		let e = window.history.state || {};
 		window.history.replaceState({
 			...e,
 			__drift_pos: f
-		}, "", a(t, d));
+		}, "", o(t, d));
 	}
 	let p = (e) => {
-		let t = d, r = u();
+		let t = d, r = s();
 		d = r;
 		let i = typeof window < "u" && window.history.state || e.state || null, a = i && typeof i.__drift_pos == "number" ? i.__drift_pos : f, o = a - f;
 		f = a;
-		let s = {
+		let c = {
 			direction: o > 0 ? "forward" : o < 0 ? "back" : "unknown",
 			delta: o,
 			type: "pop"
 		};
-		n.notify(r, t, s);
+		n.notify(r, t, c);
 	};
 	return typeof window < "u" && window.addEventListener("popstate", p), {
 		get base() {
 			return t;
 		},
 		get location() {
-			return u();
+			return s();
 		},
 		get state() {
-			return c(window.history.state);
+			return l(window.history.state);
 		},
 		listen(e) {
 			return n.listen(e);
@@ -99,12 +97,12 @@ function u(e = "") {
 		push(e, n) {
 			if (typeof window > "u") return;
 			f++;
-			let r = a(t, e), i = l(n, f);
+			let r = o(t, e), i = u(n, f);
 			window.history.pushState(i, "", r), d = e;
 		},
 		replace(e, n) {
 			if (typeof window > "u") return;
-			let r = a(t, e), i = l(n, f);
+			let r = o(t, e), i = u(n, f);
 			window.history.replaceState(i, "", r), d = e;
 		},
 		go(e) {
@@ -115,57 +113,57 @@ function u(e = "") {
 		}
 	};
 }
-function d(e = "") {
-	let t = r(e), n = s(), i = () => {
+function f(e = "") {
+	let t = i(e), n = c(), r = () => {
 		if (typeof window > "u") return "/";
 		let e = window.location.hash;
 		if (!e || e === "#") return "/";
 		let t = e.startsWith("#") ? e.slice(1) : e;
 		return t.startsWith("/") ? t : "/" + t;
-	}, a = i(), u = typeof window < "u" && window.history.state && typeof window.history.state.__drift_pos == "number" ? window.history.state.__drift_pos : 0;
+	}, a = r(), o = typeof window < "u" && window.history.state && typeof window.history.state.__drift_pos == "number" ? window.history.state.__drift_pos : 0;
 	if (typeof window < "u" && (window.history.state == null || typeof window.history.state.__drift_pos != "number")) {
 		let e = window.history.state || {};
 		window.history.replaceState({
 			...e,
-			__drift_pos: u
-		}, "", o(t, a));
+			__drift_pos: o
+		}, "", s(t, a));
 	}
 	let d = (e) => {
-		let t = i();
+		let t = r();
 		if (t === a) return;
-		let r = a;
+		let i = a;
 		a = t;
-		let o = typeof window < "u" && window.history.state || null, s = o && typeof o.__drift_pos == "number" ? o.__drift_pos : u, c = s - u;
-		u = s;
-		let l = {
-			direction: c > 0 ? "forward" : c < 0 ? "back" : "unknown",
-			delta: c,
+		let s = typeof window < "u" && window.history.state || null, c = s && typeof s.__drift_pos == "number" ? s.__drift_pos : o, l = c - o;
+		o = c;
+		let u = {
+			direction: l > 0 ? "forward" : l < 0 ? "back" : "unknown",
+			delta: l,
 			type: "pop"
 		};
-		n.notify(t, r, l);
+		n.notify(t, i, u);
 	};
 	return typeof window < "u" && (window.addEventListener("popstate", d), window.addEventListener("hashchange", d)), {
 		get base() {
 			return t;
 		},
 		get location() {
-			return i();
+			return r();
 		},
 		get state() {
-			return c(window.history.state);
+			return l(window.history.state);
 		},
 		listen(e) {
 			return n.listen(e);
 		},
 		push(e, n) {
 			if (typeof window > "u") return;
-			u++;
-			let r = o(t, e), i = l(n, u);
+			o++;
+			let r = s(t, e), i = u(n, o);
 			window.history.pushState(i, "", r), a = e;
 		},
 		replace(e, n) {
 			if (typeof window > "u") return;
-			let r = o(t, e), i = l(n, u);
+			let r = s(t, e), i = u(n, o);
 			window.history.replaceState(i, "", r), a = e;
 		},
 		go(e) {
@@ -176,14 +174,14 @@ function d(e = "") {
 		}
 	};
 }
-function f(e = "/", t = "") {
-	let n = r(t), a = [i(e.startsWith("/") ? e : "/" + e, n) || "/"], o = [null], s = 0, c = [];
+function p(e = "/", t = "") {
+	let n = i(t), r = [a(e.startsWith("/") ? e : "/" + e, n) || "/"], o = [null], s = 0, c = [];
 	return {
 		get base() {
 			return n;
 		},
 		get location() {
-			return a[s] ?? "/";
+			return r[s] ?? "/";
 		},
 		get state() {
 			return o[s] ?? null;
@@ -196,286 +194,227 @@ function f(e = "/", t = "") {
 		},
 		push(e, t) {
 			let n = e.startsWith("/") ? e : "/" + e;
-			a.splice(s + 1), o.splice(s + 1), a.push(n), o.push(t || null), s++;
+			r.splice(s + 1), o.splice(s + 1), r.push(n), o.push(t || null), s++;
 		},
 		replace(e, t) {
 			let n = e.startsWith("/") ? e : "/" + e;
-			a[s] = n, o[s] = t || null;
+			r[s] = n, o[s] = t || null;
 		},
 		go(e) {
-			let t = a[s] ?? "/", n = s + e;
-			if (n >= 0 && n < a.length) {
+			let t = r[s] ?? "/", n = s + e;
+			if (n >= 0 && n < r.length) {
 				s = n;
-				let r = a[s] ?? "/", i = {
+				let i = r[s] ?? "/", a = {
 					direction: e > 0 ? "forward" : e < 0 ? "back" : "unknown",
 					delta: e,
 					type: "pop"
 				};
-				for (let e of c) e(r, t, i);
+				for (let e of c) e(i, t, a);
 			}
 		},
 		destroy() {
-			c.length = 0, a.length = 0, o.length = 0, s = 0;
+			c.length = 0, r.length = 0, o.length = 0, s = 0;
 		}
 	};
 }
 //#endregion
-//#region ../../node_modules/.pnpm/path-to-regexp@6.3.0/node_modules/path-to-regexp/dist.es2015/index.js
-function p(e) {
-	for (var t = [], n = 0; n < e.length;) {
-		var r = e[n];
-		if (r === "*" || r === "+" || r === "?") {
-			t.push({
-				type: "MODIFIER",
-				index: n,
-				value: e[n++]
-			});
-			continue;
-		}
-		if (r === "\\") {
-			t.push({
-				type: "ESCAPED_CHAR",
-				index: n++,
-				value: e[n++]
-			});
-			continue;
-		}
-		if (r === "{") {
-			t.push({
-				type: "OPEN",
-				index: n,
-				value: e[n++]
-			});
-			continue;
+//#region src/matcher.ts
+var m = (/* @__PURE__ */ r(((e) => {
+	Object.defineProperty(e, "__esModule", { value: !0 }), e.PathError = e.TokenData = void 0, e.compile = l, e.pathToRegexp = f;
+	var t = "/", n = (e) => e, r = /^[$_\p{ID_Start}]$/u, i = /^[$\u200c\u200d\p{ID_Continue}]$/u;
+	function a(e) {
+		return e.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
+	}
+	var o = class {
+		constructor(e, t) {
+			this.tokens = e, this.originalPath = t;
 		}
-		if (r === "}") {
-			t.push({
-				type: "CLOSE",
-				index: n,
-				value: e[n++]
-			});
-			continue;
+	};
+	e.TokenData = o;
+	var s = class extends TypeError {
+		constructor(e, t) {
+			let n = e;
+			t && (n += `: ${t}`), n += "; visit https://git.new/pathToRegexpError for info", super(n), this.originalPath = t;
 		}
-		if (r === ":") {
-			for (var i = "", a = n + 1; a < e.length;) {
-				var o = e.charCodeAt(a);
-				if (o >= 48 && o <= 57 || o >= 65 && o <= 90 || o >= 97 && o <= 122 || o === 95) {
-					i += e[a++];
-					continue;
-				}
-				break;
+	};
+	e.PathError = s;
+	function c(e, t = {}) {
+		let { encodePath: a = n } = t, c = [...e], l = 0;
+		function u(t) {
+			let n = [], o = "";
+			function d() {
+				o &&= (n.push({
+					type: "text",
+					value: a(o)
+				}), "");
 			}
-			if (!i) throw TypeError(`Missing parameter name at ${n}`);
-			t.push({
-				type: "NAME",
-				index: n,
-				value: i
-			}), n = a;
-			continue;
-		}
-		if (r === "(") {
-			var s = 1, c = "", a = n + 1;
-			if (e[a] === "?") throw TypeError(`Pattern cannot start with "?" at ${a}`);
-			for (; a < e.length;) {
-				if (e[a] === "\\") {
-					c += e[a++] + e[a++];
+			for (; l < c.length;) {
+				let a = c[l++];
+				if (a === t) return d(), n;
+				if (a === "\\") {
+					if (l === c.length) throw new s(`Unexpected end after \\ at index ${l}`, e);
+					o += c[l++];
 					continue;
 				}
-				if (e[a] === ")") {
-					if (s--, s === 0) {
-						a++;
-						break;
+				if (a === ":" || a === "*") {
+					let t = a === ":" ? "param" : "wildcard", o = "";
+					if (r.test(c[l])) do
+						o += c[l++];
+					while (i.test(c[l]));
+					else if (c[l] === "\"") {
+						let t = l;
+						for (; l < c.length;) {
+							if (c[++l] === "\"") {
+								l++, t = 0;
+								break;
+							}
+							c[l] === "\\" && l++, o += c[l];
+						}
+						if (t) throw new s(`Unterminated quote at index ${t}`, e);
 					}
-				} else if (e[a] === "(" && (s++, e[a + 1] !== "?")) throw TypeError(`Capturing groups are not allowed at ${a}`);
-				c += e[a++];
+					if (!o) throw new s(`Missing parameter name at index ${l}`, e);
+					d(), n.push({
+						type: t,
+						name: o
+					});
+					continue;
+				}
+				if (a === "{") {
+					d(), n.push({
+						type: "group",
+						tokens: u("}")
+					});
+					continue;
+				}
+				if (a === "}" || a === "(" || a === ")" || a === "[" || a === "]" || a === "+" || a === "?" || a === "!") throw new s(`Unexpected ${a} at index ${l - 1}`, e);
+				o += a;
 			}
-			if (s) throw TypeError(`Unbalanced pattern at ${n}`);
-			if (!c) throw TypeError(`Missing pattern at ${n}`);
-			t.push({
-				type: "PATTERN",
-				index: n,
-				value: c
-			}), n = a;
-			continue;
+			if (t) throw new s(`Unexpected end at index ${l}, expected ${t}`, e);
+			return d(), n;
 		}
-		t.push({
-			type: "CHAR",
-			index: n,
-			value: e[n++]
-		});
+		return new o(u(""), e);
 	}
-	return t.push({
-		type: "END",
-		index: n,
-		value: ""
-	}), t;
-}
-function m(e, t) {
-	t === void 0 && (t = {});
-	for (var n = p(e), r = t.prefixes, i = r === void 0 ? "./" : r, a = t.delimiter, o = a === void 0 ? "/#?" : a, s = [], c = 0, l = 0, u = "", d = function(e) {
-		if (l < n.length && n[l].type === e) return n[l++].value;
-	}, f = function(e) {
-		var t = d(e);
-		if (t !== void 0) return t;
-		var r = n[l], i = r.type, a = r.index;
-		throw TypeError(`Unexpected ${i} at ${a}, expected ${e}`);
-	}, m = function() {
-		for (var e = "", t; t = d("CHAR") || d("ESCAPED_CHAR");) e += t;
-		return e;
-	}, h = function(e) {
-		for (var t = 0, n = o; t < n.length; t++) {
-			var r = n[t];
-			if (e.indexOf(r) > -1) return !0;
-		}
-		return !1;
-	}, g = function(e) {
-		var t = s[s.length - 1], n = e || (t && typeof t == "string" ? t : "");
-		if (t && !n) throw TypeError(`Must have text between two parameters, missing text after "${t.name}"`);
-		return !n || h(n) ? `[^${_(o)}]+?` : `(?:(?!${_(n)})[^${_(o)}])+?`;
-	}; l < n.length;) {
-		var v = d("CHAR"), y = d("NAME"), b = d("PATTERN");
-		if (y || b) {
-			var x = v || "";
-			i.indexOf(x) === -1 && (u += x, x = ""), u &&= (s.push(u), ""), s.push({
-				name: y || c++,
-				prefix: x,
-				suffix: "",
-				pattern: b || g(x),
-				modifier: d("MODIFIER") || ""
-			});
-			continue;
-		}
-		var S = v || d("ESCAPED_CHAR");
-		if (S) {
-			u += S;
-			continue;
+	function l(e, n = {}) {
+		let { encode: r = encodeURIComponent, delimiter: i = t } = n, a = u((typeof e == "object" ? e : c(e, n)).tokens, i, r);
+		return function(e = {}) {
+			let t = [], n = a(e, t);
+			if (t.length) throw TypeError(`Missing parameters: ${t.join(", ")}`);
+			return n;
+		};
+	}
+	function u(e, t, n) {
+		let r = e.map((e) => d(e, t, n));
+		return (e, t) => {
+			let n = "";
+			for (let i of r) n += i(e, t);
+			return n;
+		};
+	}
+	function d(e, t, r) {
+		if (e.type === "text") return () => e.value;
+		if (e.type === "group") {
+			let n = u(e.tokens, t, r);
+			return (e, t) => {
+				let r = t.length, i = n(e, t);
+				return t.length === r ? i : (t.length = r, "");
+			};
 		}
-		if (u &&= (s.push(u), ""), d("OPEN")) {
-			var x = m(), C = d("NAME") || "", w = d("PATTERN") || "", T = m();
-			f("CLOSE"), s.push({
-				name: C || (w ? c++ : ""),
-				pattern: C && !w ? g(x) : w,
-				prefix: x,
-				suffix: T,
-				modifier: d("MODIFIER") || ""
+		let i = r || n;
+		return e.type === "wildcard" && r !== !1 ? (n, r) => {
+			let a = n[e.name];
+			if (a == null) return r.push(e.name), "";
+			if (!Array.isArray(a) || a.length === 0) throw TypeError(`Expected "${e.name}" to be a non-empty array`);
+			let o = "";
+			for (let n = 0; n < a.length; n++) {
+				if (typeof a[n] != "string") throw TypeError(`Expected "${e.name}/${n}" to be a string`);
+				n > 0 && (o += t), o += i(a[n]);
+			}
+			return o;
+		} : (t, n) => {
+			let r = t[e.name];
+			if (r == null) return n.push(e.name), "";
+			if (typeof r != "string") throw TypeError(`Expected "${e.name}" to be a string`);
+			return i(r);
+		};
+	}
+	function f(e, n = {}) {
+		let { delimiter: r = t, end: i = !0, sensitive: o = !1, trailing: l = !0 } = n, u = [], d = "", f = 0;
+		function h(e) {
+			if (Array.isArray(e)) {
+				for (let t of e) h(t);
+				return;
+			}
+			let t = typeof e == "object" ? e : c(e, n);
+			p(t.tokens, 0, [], (e) => {
+				if (f >= 256) throw new s("Too many path combinations", t.originalPath);
+				f > 0 && (d += "|"), d += m(e, r, u, t.originalPath), f++;
 			});
-			continue;
 		}
-		f("END");
+		h(e);
+		let g = `^(?:${d})`;
+		return l && (g += "(?:" + a(r) + "$)?"), g += i ? "$" : "(?=" + a(r) + "|$)", {
+			regexp: new RegExp(g, o ? "" : "i"),
+			keys: u
+		};
 	}
-	return s;
-}
-function h(e, t) {
-	return g(m(e, t), t);
-}
-function g(e, t) {
-	t === void 0 && (t = {});
-	var n = v(t), r = t.encode, i = r === void 0 ? function(e) {
-		return e;
-	} : r, a = t.validate, o = a === void 0 || a, s = e.map(function(e) {
-		if (typeof e == "object") return RegExp(`^(?:${e.pattern})\$`, n);
-	});
-	return function(t) {
-		for (var n = "", r = 0; r < e.length; r++) {
-			var a = e[r];
-			if (typeof a == "string") {
-				n += a;
+	function p(e, t, n, r) {
+		for (; t < e.length;) {
+			let i = e[t++];
+			if (i.type === "group") {
+				let a = n.length;
+				p(i.tokens, 0, n, (n) => p(e, t, n, r)), n.length = a;
 				continue;
 			}
-			var c = t ? t[a.name] : void 0, l = a.modifier === "?" || a.modifier === "*", u = a.modifier === "*" || a.modifier === "+";
-			if (Array.isArray(c)) {
-				if (!u) throw TypeError(`Expected "${a.name}" to not repeat, but got an array`);
-				if (c.length === 0) {
-					if (l) continue;
-					throw TypeError(`Expected "${a.name}" to not be empty`);
-				}
-				for (var d = 0; d < c.length; d++) {
-					var f = i(c[d], a);
-					if (o && !s[r].test(f)) throw TypeError(`Expected all "${a.name}" to match "${a.pattern}", but got "${f}"`);
-					n += a.prefix + f + a.suffix;
-				}
-				continue;
-			}
-			if (typeof c == "string" || typeof c == "number") {
-				var f = i(String(c), a);
-				if (o && !s[r].test(f)) throw TypeError(`Expected "${a.name}" to match "${a.pattern}", but got "${f}"`);
-				n += a.prefix + f + a.suffix;
-				continue;
+			n.push(i);
+		}
+		r(n);
+	}
+	function m(e, t, n, r) {
+		let i = "", o = "", c = "", l = 0, u = 0, d = 0;
+		function f(n, r) {
+			for (; n < e.length;) {
+				let i = e[n++];
+				if (i.type === r) return !0;
+				if (i.type === "text" && i.value.includes(t)) break;
 			}
-			if (!l) {
-				var p = u ? "an array" : "a string";
-				throw TypeError(`Expected "${a.name}" to be ${p}`);
+			return !1;
+		}
+		function p(t) {
+			let n = "";
+			for (; t < e.length;) {
+				let r = e[t++];
+				if (r.type !== "text") break;
+				n += r.value;
 			}
+			return n;
 		}
-		return n;
-	};
-}
-function _(e) {
-	return e.replace(/([.+*?=^!:${}()[\]|/\\])/g, "\\$1");
-}
-function v(e) {
-	return e && e.sensitive ? "" : "i";
-}
-function y(e, t) {
-	if (!t) return e;
-	for (var n = /\((?:\?<(.*?)>)?(?!\?)/g, r = 0, i = n.exec(e.source); i;) t.push({
-		name: i[1] || r++,
-		prefix: "",
-		suffix: "",
-		modifier: "",
-		pattern: ""
-	}), i = n.exec(e.source);
-	return e;
-}
-function b(e, t, n) {
-	var r = e.map(function(e) {
-		return C(e, t, n).source;
-	});
-	return RegExp(`(?:${r.join("|")})`, v(n));
-}
-function x(e, t, n) {
-	return S(m(e, n), t, n);
-}
-function S(e, t, n) {
-	n === void 0 && (n = {});
-	for (var r = n.strict, i = r !== void 0 && r, a = n.start, o = a === void 0 || a, s = n.end, c = s === void 0 || s, l = n.encode, u = l === void 0 ? function(e) {
-		return e;
-	} : l, d = n.delimiter, f = d === void 0 ? "/#?" : d, p = n.endsWith, m = `[${_(p === void 0 ? "" : p)}]|\$`, h = `[${_(f)}]`, g = o ? "^" : "", y = 0, b = e; y < b.length; y++) {
-		var x = b[y];
-		if (typeof x == "string") g += _(u(x));
-		else {
-			var S = _(u(x.prefix)), C = _(u(x.suffix));
-			if (x.pattern) if (t && t.push(x), S || C) if (x.modifier === "+" || x.modifier === "*") {
-				var w = x.modifier === "*" ? "?" : "";
-				g += `(?:${S}((?:${x.pattern})(?:${C}${S}(?:${x.pattern}))*)${C})${w}`;
-			} else g += `(?:${S}(${x.pattern})${C})${x.modifier}`;
-			else {
-				if (x.modifier === "+" || x.modifier === "*") throw TypeError(`Can not repeat "${x.name}" without a prefix and suffix`);
-				g += `(${x.pattern})${x.modifier}`;
+		for (; d < e.length;) {
+			let m = e[d++];
+			if (m.type === "text") {
+				i += a(m.value), o += m.value, l === 2 && (c += m.value), m.value.includes(t) && (u = 0);
+				continue;
 			}
-			else g += `(?:${S}${C})${x.modifier}`;
+			if (m.type === "param" || m.type === "wildcard") {
+				if (l && !o) throw new s(`Missing text before "${m.name}" ${m.type}`, r);
+				m.type === "param" ? (i += u & 2 ? `(${h(t, o)}+)` : f(d, "wildcard") ? `(${h(t, p(d))}+)` : u & 1 ? `(${h(t, o)}+|${a(o)})` : `(${h(t, "")}+)`, u |= l = 1) : (i += u & 2 ? `(${h(o, "")}+)` : c ? `(${h(c, "")}+|${h(t, "")}+)` : "([^]+)", c = "", u |= l = 2), n.push(m), o = "";
+				continue;
+			}
+			throw TypeError(`Unknown token type: ${m.type}`);
 		}
+		return i;
 	}
-	if (c) i || (g += `${h}?`), g += n.endsWith ? `(?=${m})` : "$";
-	else {
-		var T = e[e.length - 1], E = typeof T == "string" ? h.indexOf(T[T.length - 1]) > -1 : T === void 0;
-		i || (g += `(?:${h}(?=${m}))?`), E || (g += `(?=${h}|${m})`);
+	function h(e, t) {
+		return t.length > e.length ? h(t, e) : (e === t && (t = ""), t.length > 1 ? `(?:(?!${a(e)}|${a(t)})[^])` : e.length > 1 ? `(?:(?!${a(e)})[^${a(t)}])` : `[^${a(e + t)}]`);
 	}
-	return new RegExp(g, v(n));
-}
-function C(e, t, n) {
-	return e instanceof RegExp ? y(e, t) : Array.isArray(e) ? b(e, t, n) : x(e, t, n);
-}
-//#endregion
-//#region src/matcher.ts
-function w(e) {
+})))();
+function h(e) {
 	try {
 		return decodeURIComponent(e);
 	} catch {
 		return e;
 	}
 }
-function T(e) {
+function g(e) {
 	let t = Object.create(null);
 	if (!e) return t;
 	let n = e.startsWith("?") ? e.slice(1) : e;
@@ -495,7 +434,7 @@ function T(e) {
 	}
 	return t;
 }
-function E(e) {
+function _(e) {
 	let t = Object.keys(e);
 	if (t.length === 0) return "";
 	let n = [];
@@ -510,69 +449,76 @@ function E(e) {
 	}
 	return n.length > 0 ? "?" + n.join("&") : "";
 }
-function D(e) {
-	let t = e.replace(/\/\*$/, "/(.*)"), n = 0, r = "";
-	for (; n < t.length;) if (t[n] === ":" && /[a-zA-Z0-9_$]/.test(t[n + 1] || "")) {
+function v(e) {
+	let t = e.replace(/:([a-zA-Z0-9_$]+)\(\.\*\)\*?/g, "*$1");
+	t = t.replace(/\/\*$/, "/*pathMatch"), t = t.replace(/\/(:[a-zA-Z0-9_$]+)\?/g, "{/$1}");
+	let n = [], r = "", i = 0;
+	for (; i < t.length;) if (t[i] === ":" && /[a-zA-Z0-9_$]/.test(t[i + 1] || "")) {
 		let e = "";
-		for (n++; n < t.length && /[a-zA-Z0-9_$]/.test(t[n]);) e += t[n], n++;
-		if (t[n] === "(") {
-			let i = 1, a = "";
-			for (n++; n < t.length && i > 0;) {
-				if (t[n] === "\\") {
-					a += t[n] + (t[n + 1] || ""), n += 2;
+		for (i++; i < t.length && /[a-zA-Z0-9_$]/.test(t[i]);) e += t[i], i++;
+		if (r += ":" + e, t[i] === "(") {
+			let e = 1, r = "";
+			for (i++; i < t.length && e > 0;) {
+				if (t[i] === "\\") {
+					r += t[i] + (t[i + 1] || ""), i += 2;
 					continue;
 				}
-				if (t[n] === "(") {
-					i++, a += "(?:", n++;
-					continue;
-				}
-				if (t[n] === ")" && (i--, i === 0)) {
-					n++;
+				if (t[i] === "(") e++;
+				else if (t[i] === ")" && (e--, e === 0)) {
+					i++;
 					break;
 				}
-				a += t[n], n++;
+				r += t[i], i++;
 			}
-			r += `:${e}(${a})`;
-		} else r += `:${e}`;
-	} else r += t[n], n++;
-	return r;
+			r && n.push(r.replace(/(^|[^\\])\((?!\?)/g, "$1(?:"));
+		}
+	} else r += t[i], i++;
+	return {
+		normalized: r,
+		patterns: n
+	};
 }
-function O(e, t) {
+function y(e, t) {
 	let n = {};
-	for (let [e, r] of Object.entries(t)) r != null && (n[e] = r);
+	for (let [e, r] of Object.entries(t)) r != null && (n[e] = Array.isArray(r) ? r.join("/") : String(r));
+	let { normalized: r } = v(e);
 	try {
-		return h(D(e.replace(/\/\*$/, "/:pathMatch(.*)")), {
-			validate: !1,
-			encode: (e) => e
-		})(n);
+		return (0, m.compile)(r, { encode: !1 })(n);
 	} catch {
-		let t = e;
-		for (let [e, r] of Object.entries(n)) t = e === "pathMatch" ? t.replace(/\/\*$/, "/" + (Array.isArray(r) ? r.join("/") : String(r))) : t.replace(RegExp(`:${e}\\b(?:\\([^)]+\\))?[?*+]?`, "g"), Array.isArray(r) ? r.join("/") : String(r));
-		return t = t.replace(/\/:[a-zA-Z0-9_$]+\?/g, "").replace(/:[a-zA-Z0-9_$]+\?/g, ""), t;
+		let e = r;
+		for (let [t, r] of Object.entries(n)) e = e.replace(RegExp(`:${t}\\b`, "g"), String(r)), e = e.replace(RegExp(`\\*${t}\\b`, "g"), String(r));
+		return e = e.replace(/\{(\/[^}]+)\}/g, ""), e;
 	}
 }
-function k(e) {
+function b(e) {
 	if (e === "/" || e === "") return {
 		regex: /^\/?$/,
 		paramNames: [],
 		score: 1e3
 	};
-	let t = D(e), n = [], r = C(t, n, {
+	let { normalized: t, patterns: n } = v(e), { regexp: r, keys: i } = (0, m.pathToRegexp)(t, {
 		sensitive: !1,
-		strict: !1,
 		end: !0
-	}), i = n.map((e) => typeof e.name == "number" ? "pathMatch" : String(e.name)), a = 0;
-	for (let t of e.split("/").filter(Boolean)) t === "*" || t.includes("(.*)") ? a += 1 : t.includes(":") ? t.includes("(") ? a += 30 : t.includes("?") ? a += 15 : a += 20 : a += 100;
+	}), a = r.source;
+	for (let e of n) a = a.replace("([^\\/]+)", `(${e})`);
+	let o = n.length > 0 ? new RegExp(a, r.flags) : r, s = i.map((e) => typeof e.name == "number" ? "pathMatch" : String(e.name)), c = 0;
+	for (let t of e.split("/").filter(Boolean)) t === "*" || t.includes("(.*)") || t.startsWith("*") ? c += 1 : t.includes(":") ? t.includes("(") ? c += 30 : t.includes("?") ? c += 15 : c += 20 : c += 100;
 	return {
-		regex: r,
-		paramNames: i,
-		score: a
+		regex: o,
+		paramNames: s,
+		score: c
 	};
 }
-function A(e, t) {
+function x(e, n) {
 	let r = e.path;
-	r = t ? e.path.startsWith("/") ? n(e.path) : n(`${t.path === "/" ? "" : t.path}/${e.path}`) : n(e.path);
-	let { regex: i, paramNames: a, score: o } = k(r), s = {};
+	if (n) {
+		if (e.path.startsWith("/")) r = t(e.path);
+		else {
+			let i = n.path === "/" ? "" : n.path;
+			r = t(`${i}/${e.path}`);
+		}
+	} else r = t(e.path);
+	let { regex: i, paramNames: a, score: o } = b(r), s = {};
 	e.components ? Object.assign(s, e.components) : e.component && (s.default = e.component);
 	let c = e.beforeEnter ? Array.isArray(e.beforeEnter) ? e.beforeEnter : [e.beforeEnter] : void 0, l = {};
 	typeof e.props == "boolean" || typeof e.props == "function" ? l.default = e.props : e.props && typeof e.props == "object" && (l = e.props);
@@ -584,16 +530,16 @@ function A(e, t) {
 		meta: e.meta || {},
 		beforeEnter: c,
 		props: l,
-		parent: t,
+		parent: n,
 		regex: i,
 		paramNames: a,
 		score: o,
 		redirect: e.redirect
 	};
-	return e.children && e.children.length > 0 && (u.children = e.children.map((e) => A(e, u))), u;
+	return e.children && e.children.length > 0 && (u.children = e.children.map((e) => x(e, u))), u;
 }
-function j(e) {
-	let t = [], r = /* @__PURE__ */ new Map(), i = [];
+function S(e) {
+	let n = [], r = /* @__PURE__ */ new Map(), i = [];
 	function a(e, t) {
 		t.push(e), e.name && r.set(e.name, e);
 		for (let n of e.children) a(n, t);
@@ -602,22 +548,22 @@ function j(e) {
 		r.clear();
 		let e = [];
 		for (let t of i) a(t, e);
-		t = e.sort((e, t) => {
+		n = e.sort((e, t) => {
 			let n = e.score ?? 0;
 			return (t.score ?? 0) - n;
 		});
 	}
-	for (let t of e) i.push(A(t));
+	for (let t of e) i.push(x(t));
 	o();
 	function s(e) {
-		let r = n(e);
-		for (let e of t) {
+		let r = t(e);
+		for (let e of n) {
 			let t = r.match(e.regex);
 			if (t) {
 				let n = {};
 				for (let r = 0; r < e.paramNames.length; r++) {
 					let i = e.paramNames[r], a = t[r + 1];
-					n[i] = a === void 0 ? "" : w(a);
+					n[i] = a === void 0 ? "" : h(a);
 				}
 				return {
 					record: e,
@@ -630,25 +576,25 @@ function j(e) {
 			params: {}
 		};
 	}
-	function c(e, t) {
+	function c(e, n) {
 		let i = "/", a = {}, o = "", c = {}, l;
 		if (typeof e == "string") {
 			let t = e.indexOf("#"), n = e;
 			t !== -1 && (o = e.slice(t), n = e.slice(0, t));
 			let r = n.indexOf("?");
-			r === -1 ? i = n : (a = T(n.slice(r)), i = n.slice(0, r));
+			r === -1 ? i = n : (a = g(n.slice(r)), i = n.slice(0, r));
 		} else {
 			if (e.name) {
 				l = e.name;
 				let t = r.get(l);
-				t && (i = t.path, c = { ...e.params || {} }, i = O(i, c));
+				t && (i = t.path, c = { ...e.params || {} }, i = y(i, c));
 			} else e.path && (i = e.path);
 			e.query && (a = { ...e.query }), e.hash && (o = e.hash.startsWith("#") ? e.hash : "#" + e.hash), e.params && (c = {
 				...c,
 				...e.params
 			});
 		}
-		i = n(i);
+		i = t(i);
 		let { record: u, params: d } = s(i), f = {
 			...d,
 			...c
@@ -657,7 +603,7 @@ function j(e) {
 			let e = u;
 			for (; e;) p.unshift(e), e = e.parent;
 		}
-		let m = E(a), h = i + m + o;
+		let m = _(a), h = i + m + o;
 		return {
 			path: i,
 			fullPath: h,
@@ -676,14 +622,14 @@ function j(e) {
 			if (typeof e == "string" && t) {
 				let n = r.get(e);
 				if (n) {
-					let e = A(t, n);
+					let e = x(t, n);
 					return n.children.push(e), o(), () => {
 						let t = n.children.indexOf(e);
 						t !== -1 && (n.children.splice(t, 1), o());
 					};
 				}
 			} else if (typeof e == "object") {
-				let t = A(e);
+				let t = x(e);
 				return i.push(t), o(), () => {
 					let e = i.indexOf(t);
 					e !== -1 && (i.splice(e, 1), o());
@@ -708,15 +654,15 @@ function j(e) {
 			return r.has(e);
 		},
 		getRoutes() {
-			return [...t];
+			return [...n];
 		}
 	};
 }
 //#endregion
 //#region types/index.ts
-var M = /* @__PURE__ */ function(e) {
+var C = /* @__PURE__ */ function(e) {
 	return e[e.aborted = 4] = "aborted", e[e.cancelled = 8] = "cancelled", e[e.duplicated = 16] = "duplicated", e;
-}({}), N = e(void 0, "DriftRouter"), P = e(void 0, "DriftRoute"), F = e(0, "DriftRouterDepth"), I = Object.freeze({
+}({}), w = e(void 0, "DriftRouter"), T = e(void 0, "DriftRoute"), E = e(0, "DriftRouterDepth"), D = Object.freeze({
 	path: "/",
 	fullPath: "/",
 	query: {},
@@ -727,16 +673,16 @@ var M = /* @__PURE__ */ function(e) {
 	meta: {},
 	href: "/"
 });
-function L(e, t, n, r) {
+function O(e, t, n, r) {
 	let i = "Navigation failed";
-	e === M.aborted ? i = `Navigation aborted from "${t.fullPath}" to "${n.fullPath}" via a navigation guard.` : e === M.cancelled ? i = `Navigation cancelled from "${t.fullPath}" to "${n.fullPath}" with a newer navigation.` : e === M.duplicated && (i = `Avoided redundant navigation to current location: "${n.fullPath}".`);
+	e === C.aborted ? i = `Navigation aborted from "${t.fullPath}" to "${n.fullPath}" via a navigation guard.` : e === C.cancelled ? i = `Navigation cancelled from "${t.fullPath}" to "${n.fullPath}" with a newer navigation.` : e === C.duplicated && (i = `Avoided redundant navigation to current location: "${n.fullPath}".`);
 	let a = Error(r || i);
 	return a.name = "NavigationFailure", a.type = e, a.from = t, a.to = n, a;
 }
-function R(e, t) {
+function k(e, t) {
 	return !e || typeof e != "object" || e.name !== "NavigationFailure" || typeof e.type != "number" ? !1 : t === void 0 || e.type === t;
 }
-async function z(e) {
+async function A(e) {
 	for (let t of e) for (let e of Object.keys(t.components)) {
 		let n = t.components[e];
 		if (typeof n == "function" && !("__drift_fn__" in n) && !n.bytecode) try {
@@ -747,7 +693,7 @@ async function z(e) {
 		}
 	}
 }
-async function B(e, t, n) {
+async function j(e, t, n) {
 	for (let r of e) {
 		let e;
 		try {
@@ -760,8 +706,8 @@ async function B(e, t, n) {
 	}
 	return !0;
 }
-function V(e) {
-	let { history: t, routes: n, scrollBehavior: r, linkActiveClass: i, linkExactActiveClass: a } = e, o = j(n), s = [], c = [], l = [], u = [], d = [], f = I, p = null, m = null, h = null;
+function M(e) {
+	let { history: t, routes: n, scrollBehavior: r, linkActiveClass: i, linkExactActiveClass: a } = e, o = S(n), s = [], c = [], l = [], u = [], d = [], f = D, p = null, m = null, h = null;
 	p = new Promise((e, t) => {
 		m = e, h = t;
 	});
@@ -770,7 +716,7 @@ function V(e) {
 		if (u.length > 0) for (let t of u) t(e);
 	}
 	function v(e, t, n) {
-		if (!(typeof window > "u" || !r)) try {
+		if (typeof window < "u" && r) try {
 			let i = r(e, t, n);
 			if (!i) return;
 			let a = (e) => {
@@ -791,32 +737,32 @@ function V(e) {
 	async function y(e, n = !1, r = !1, i = 0) {
 		if (i > 20) {
 			let t = o.resolve(e, f);
-			return L(M.aborted, f, t, "Infinite redirect loop detected");
+			return O(C.aborted, f, t, "Infinite redirect loop detected");
 		}
 		let a = o.resolve(e, f), u = f;
 		if (a.matched.length > 0) {
 			let e = a.matched[a.matched.length - 1];
 			if (e.redirect) return y(typeof e.redirect == "function" ? e.redirect(a) : e.redirect, !0, r, i + 1);
 		}
-		if (u.fullPath === a.fullPath && u !== I) return L(M.duplicated, u, a);
+		if (u.fullPath === a.fullPath && u !== D) return O(C.duplicated, u, a);
 		let p = ++g, m = [...s];
 		for (let e of a.matched) e.beforeEnter && m.push(...e.beforeEnter);
-		let h = await B(m, a, u);
-		if (p !== g) return L(M.cancelled, u, a);
-		if (h === !1) return L(M.aborted, u, a);
-		if (h instanceof Error) return _(h), L(M.aborted, u, a, h.message);
+		let h = await j(m, a, u);
+		if (p !== g) return O(C.cancelled, u, a);
+		if (h === !1) return O(C.aborted, u, a);
+		if (h instanceof Error) return _(h), O(C.aborted, u, a, h.message);
 		if (typeof h == "string" || typeof h == "object" && h) return y(h, n, r, i + 1);
 		try {
-			await z(a.matched);
+			await A(a.matched);
 		} catch (e) {
-			return _(e), L(M.aborted, u, a, String(e));
+			return _(e), O(C.aborted, u, a, String(e));
 		}
-		if (p !== g) return L(M.cancelled, u, a);
+		if (p !== g) return O(C.cancelled, u, a);
 		if (c.length > 0) {
-			let e = await B(c, a, u);
-			if (p !== g) return L(M.cancelled, u, a);
-			if (e === !1) return L(M.aborted, u, a);
-			if (e instanceof Error) return _(e), L(M.aborted, u, a, e.message);
+			let e = await j(c, a, u);
+			if (p !== g) return O(C.cancelled, u, a);
+			if (e === !1) return O(C.aborted, u, a);
+			if (e instanceof Error) return _(e), O(C.aborted, u, a, e.message);
 			if (typeof e == "string" || typeof e == "object" && e) return y(e, n, r, i + 1);
 		}
 		r || (n ? t.replace(a.fullPath) : t.push(a.fullPath));
@@ -835,10 +781,10 @@ function V(e) {
 	}
 	let b = t.listen(async (e, n, r) => {
 		let i = await y(e, !1, r.type === "pop");
-		i && R(i, M.aborted) && r.delta && t.go(-r.delta);
+		i && k(i, C.aborted) && r.delta && t.go(-r.delta);
 	});
 	return y(t.location || "/", !0, !0).then((e) => {
-		e && e.type === M.aborted ? (h && h(e), _(e)) : m && m();
+		e && e.type === C.aborted ? (h && h(e), _(e)) : m && m();
 	}).catch((e) => {
 		h && h(e), _(e);
 	}), {
@@ -918,7 +864,7 @@ function V(e) {
 }
 //#endregion
 //#region src/components/RouterView.drift
-var H = {
+var N = {
 	bytecode: new Uint32Array([
 		6,
 		0,
@@ -994,11 +940,11 @@ var H = {
 	derived: [],
 	effects: [],
 	scope: {
-		RouterContext: N,
-		RouterDepthContext: F,
-		onUnmount: t
+		RouterContext: w,
+		RouterDepthContext: E,
+		onUnmount: n
 	}
-}, U = {
+}, P = {
 	bytecode: new Uint32Array([
 		6,
 		0,
@@ -1147,9 +1093,9 @@ var H = {
 	derived: [],
 	effects: [],
 	scope: {
-		RouterContext: N,
-		onUnmount: t
+		RouterContext: w,
+		onUnmount: n
 	}
 };
 //#endregion
-export { U as Link, P as RouteContext, N as RouterContext, F as RouterDepthContext, H as RouterView, I as START_LOCATION_NORMALIZED, l as buildHistoryState, k as compilePathToRegex, s as createHistoryListeners, a as createHref, j as createMatcher, f as createMemoryHistory, L as createNavigationFailure, V as createRouter, d as createWebHashHistory, u as createWebHistory, c as extractHistoryState, o as formatHashHref, R as isNavigationFailure, r as normalizeBase, n as normalizePath, A as normalizeRouteRecord, T as parseQuery, E as stringifyQuery, i as stripBase };
+export { P as Link, T as RouteContext, w as RouterContext, E as RouterDepthContext, N as RouterView, D as START_LOCATION_NORMALIZED, u as buildHistoryState, b as compilePathToRegex, c as createHistoryListeners, o as createHref, S as createMatcher, p as createMemoryHistory, O as createNavigationFailure, M as createRouter, f as createWebHashHistory, d as createWebHistory, l as extractHistoryState, s as formatHashHref, k as isNavigationFailure, i as normalizeBase, t as normalizePath, x as normalizeRouteRecord, g as parseQuery, _ as stringifyQuery, a as stripBase };