@benjavicente/angular-router-experimental 1.142.11 → 1.142.13

package/dist/fesm2022/tanstack-angular-router-experimental.mjs

@@ -1,91 +1,97 @@
-import * as e from "@angular/core";
-import { ChangeDetectionStrategy as t, DestroyRef as n, ElementRef as r, EnvironmentInjector as i, InjectionToken as a, Injector as o, Renderer2 as s, ViewContainerRef as c, afterNextRender as l, assertInInjectionContext as u, computed as d, effect as f, inject as p, input as m, inputBinding as h, isDevMode as g, linkedSignal as _, signal as v, untracked as y } from "@angular/core";
-import { DOCUMENT as b } from "@angular/common";
+import { batch as e, createAtom as t } from "@tanstack/store";
+import * as n from "@angular/core";
+import { ChangeDetectionStrategy as r, DestroyRef as i, ElementRef as a, EnvironmentInjector as o, InjectionToken as s, Injector as c, Renderer2 as l, ViewContainerRef as u, afterNextRender as d, assertInInjectionContext as f, computed as p, effect as m, inject as h, input as g, inputBinding as _, isDevMode as v, linkedSignal as y, runInInjectionContext as b, signal as x, untracked as S } from "@angular/core";
+import { DOCUMENT as C } from "@angular/common";
 //#region ../router-core/dist/esm/utils.js
-function x(e) {
+function w(e) {
 	return e[e.length - 1];
 }
-function S(e) {
+function ee(e) {
 	return typeof e == "function";
 }
-function C(e, t) {
-	return S(e) ? e(t) : e;
+function T(e, t) {
+	return ee(e) ? e(t) : e;
 }
-var w = Object.prototype.hasOwnProperty, ee = Object.prototype.propertyIsEnumerable, te = () => Object.create(null), T = (e, t) => E(e, t, te);
-function E(e, t, n = () => ({}), r = 0) {
+var te = Object.prototype.hasOwnProperty, ne = Object.prototype.propertyIsEnumerable;
+function re(e) {
+	for (let t in e) if (te.call(e, t)) return !0;
+	return !1;
+}
+var ie = () => Object.create(null), E = (e, t) => D(e, t, ie);
+function D(e, t, n = () => ({}), r = 0) {
 	if (e === t) return e;
 	if (r > 500) return t;
-	let i = t, a = ie(e) && ie(i);
-	if (!a && !(D(e) && D(i))) return i;
-	let o = a ? e : ne(e);
+	let i = t, a = se(e) && se(i);
+	if (!a && !(O(e) && O(i))) return i;
+	let o = a ? e : ae(e);
 	if (!o) return i;
-	let s = a ? i : ne(i);
+	let s = a ? i : ae(i);
 	if (!s) return i;
 	let c = o.length, l = s.length, u = a ? Array(l) : n(), d = 0;
 	for (let t = 0; t < l; t++) {
 		let o = a ? t : s[t], l = e[o], f = i[o];
 		if (l === f) {
-			u[o] = l, (a ? t < c : w.call(e, o)) && d++;
+			u[o] = l, (a ? t < c : te.call(e, o)) && d++;
 			continue;
 		}
 		if (l === null || f === null || typeof l != "object" || typeof f != "object") {
 			u[o] = f;
 			continue;
 		}
-		let p = E(l, f, n, r + 1);
+		let p = D(l, f, n, r + 1);
 		u[o] = p, p === l && d++;
 	}
 	return c === l && d === c ? e : u;
 }
-function ne(e) {
+function ae(e) {
 	let t = Object.getOwnPropertyNames(e);
-	for (let n of t) if (!ee.call(e, n)) return !1;
+	for (let n of t) if (!ne.call(e, n)) return !1;
 	let n = Object.getOwnPropertySymbols(e);
 	if (n.length === 0) return t;
 	let r = t;
 	for (let t of n) {
-		if (!ee.call(e, t)) return !1;
+		if (!ne.call(e, t)) return !1;
 		r.push(t);
 	}
 	return r;
 }
-function D(e) {
-	if (!re(e)) return !1;
+function O(e) {
+	if (!oe(e)) return !1;
 	let t = e.constructor;
 	if (t === void 0) return !0;
 	let n = t.prototype;
-	return !(!re(n) || !n.hasOwnProperty("isPrototypeOf"));
+	return !(!oe(n) || !n.hasOwnProperty("isPrototypeOf"));
 }
-function re(e) {
+function oe(e) {
 	return Object.prototype.toString.call(e) === "[object Object]";
 }
-function ie(e) {
+function se(e) {
 	return Array.isArray(e) && e.length === Object.keys(e).length;
 }
-function O(e, t, n) {
+function k(e, t, n) {
 	if (e === t) return !0;
 	if (typeof e != typeof t) return !1;
 	if (Array.isArray(e) && Array.isArray(t)) {
 		if (e.length !== t.length) return !1;
-		for (let r = 0, i = e.length; r < i; r++) if (!O(e[r], t[r], n)) return !1;
+		for (let r = 0, i = e.length; r < i; r++) if (!k(e[r], t[r], n)) return !1;
 		return !0;
 	}
-	if (D(e) && D(t)) {
+	if (O(e) && O(t)) {
 		let r = n?.ignoreUndefined ?? !0;
 		if (n?.partial) {
-			for (let i in t) if ((!r || t[i] !== void 0) && !O(e[i], t[i], n)) return !1;
+			for (let i in t) if ((!r || t[i] !== void 0) && !k(e[i], t[i], n)) return !1;
 			return !0;
 		}
 		let i = 0;
 		if (!r) i = Object.keys(e).length;
 		else for (let t in e) e[t] !== void 0 && i++;
 		let a = 0;
-		for (let o in t) if ((!r || t[o] !== void 0) && (a++, a > i || !O(e[o], t[o], n))) return !1;
+		for (let o in t) if ((!r || t[o] !== void 0) && (a++, a > i || !k(e[o], t[o], n))) return !1;
 		return i === a;
 	}
 	return !1;
 }
-function k(e) {
+function A(e) {
 	let t, n, r = new Promise((e, r) => {
 		t = e, n = r;
 	});
@@ -95,19 +101,19 @@ function k(e) {
 		r.status = "rejected", n(e);
 	}, r;
 }
-function A(e) {
+function j(e) {
 	return !!(e && typeof e == "object" && typeof e.then == "function");
 }
-function ae(e, t) {
+function ce(e, t) {
 	for (let n = e.length - 1; n >= 0; n--) {
 		let r = e[n];
 		if (t(r)) return r;
 	}
 }
-function oe(e) {
+function le(e) {
 	return e.replace(/[\x00-\x1f\x7f]/g, "");
 }
-function se(e) {
+function ue(e) {
 	let t;
 	try {
 		t = decodeURI(e);
@@ -120,15 +126,15 @@ function se(e) {
 			}
 		});
 	}
-	return oe(t);
+	return le(t);
 }
-var ce = [
+var de = [
 	"http:",
 	"https:",
 	"mailto:",
 	"tel:"
 ];
-function le(e, t) {
+function fe(e, t) {
 	if (!e) return !1;
 	try {
 		let n = new URL(e);
@@ -137,34 +143,34 @@ function le(e, t) {
 		return !1;
 	}
 }
-var ue = {
+var pe = {
 	"&": "\\u0026",
 	">": "\\u003e",
 	"<": "\\u003c",
 	"\u2028": "\\u2028",
 	"\u2029": "\\u2029"
-}, de = /[&><\u2028\u2029]/g;
-function fe(e) {
-	return e.replace(de, (e) => ue[e]);
+}, me = /[&><\u2028\u2029]/g;
+function he(e) {
+	return e.replace(me, (e) => pe[e]);
 }
-function j(e) {
+function ge(e) {
 	if (!e || !/[%\\\x00-\x1f\x7f]/.test(e) && !e.startsWith("//")) return {
 		path: e,
 		handledProtocolRelativeURL: !1
 	};
 	let t = /%25|%5C/gi, n = 0, r = "", i;
-	for (; (i = t.exec(e)) !== null;) r += se(e.slice(n, i.index)) + i[0], n = t.lastIndex;
-	r += se(n ? e.slice(n) : e);
+	for (; (i = t.exec(e)) !== null;) r += ue(e.slice(n, i.index)) + i[0], n = t.lastIndex;
+	r += ue(n ? e.slice(n) : e);
 	let a = !1;
 	return r.startsWith("//") && (a = !0, r = "/" + r.replace(/^\/+/, "")), {
 		path: r,
 		handledProtocolRelativeURL: a
 	};
 }
-function pe(e) {
+function _e(e) {
 	return /\s|[^\u0000-\u007F]/.test(e) ? e.replace(/\s|[^\u0000-\u007F]/gu, encodeURIComponent) : e;
 }
-function me(e, t) {
+function ve(e, t) {
 	if (e === t) return !0;
 	if (e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
@@ -172,12 +178,12 @@ function me(e, t) {
 }
 //#endregion
 //#region ../router-core/dist/esm/invariant.js
-function he() {
+function ye() {
 	throw Error("Invariant failed");
 }
 //#endregion
 //#region ../router-core/dist/esm/lru-cache.js
-function ge(e) {
+function be(e) {
 	let t = /* @__PURE__ */ new Map(), n, r, i = (e) => {
 		e.next && (e.prev ? (e.prev.next = e.next, e.next.prev = e.prev, e.next = void 0, r && (r.next = e, e.prev = r)) : (e.next.prev = void 0, n = e.next, e.next = void 0, r && (e.prev = r, r.next = e)), r = e);
 	};
@@ -209,14 +215,14 @@ function ge(e) {
 }
 //#endregion
 //#region ../router-core/dist/esm/new-process-route-tree.js
-var M = 4, _e = 5;
-function ve(e) {
+var M = 4, xe = 5;
+function Se(e) {
 	let t = e.indexOf("{");
 	if (t === -1) return null;
 	let n = e.indexOf("}", t);
 	return n === -1 || t + 1 >= e.length ? null : [t, n];
 }
-function ye(e, t, n = new Uint16Array(6)) {
+function Ce(e, t, n = new Uint16Array(6)) {
 	let r = e.indexOf("/", t), i = r === -1 ? e.length : r, a = e.substring(t, i);
 	if (!a || !a.includes("$")) return n[0] = 0, n[1] = t, n[2] = t, n[3] = i, n[4] = i, n[5] = i, n;
 	if (a === "$") {
@@ -224,7 +230,7 @@ function ye(e, t, n = new Uint16Array(6)) {
 		return n[0] = 2, n[1] = t, n[2] = t, n[3] = r, n[4] = r, n[5] = r, n;
 	}
 	if (a.charCodeAt(0) === 36) return n[0] = 1, n[1] = t, n[2] = t + 1, n[3] = i, n[4] = i, n[5] = i, n;
-	let o = ve(a);
+	let o = Se(a);
 	if (o) {
 		let [r, s] = o, c = a.charCodeAt(r + 1);
 		if (c === 45) {
@@ -239,13 +245,13 @@ function ye(e, t, n = new Uint16Array(6)) {
 	}
 	return n[0] = 0, n[1] = t, n[2] = t, n[3] = i, n[4] = i, n[5] = i, n;
 }
-function be(e, t, n, r, i, a, o) {
+function we(e, t, n, r, i, a, o) {
 	o?.(n);
 	let s = r;
 	{
-		let r = n.fullPath ?? n.from, o = r.length, c = n.options?.caseSensitive ?? e, l = !!(n.options?.params?.parse && n.options?.skipRouteOnParseError?.params);
+		let r = n.fullPath ?? n.from, o = r.length, c = n.options?.caseSensitive ?? e, l = n.options?.params?.parse ?? n.options?.parseParams;
 		for (; s < o;) {
-			let e = ye(r, s, t), o, u = s, d = e[5];
+			let e = Ce(r, s, t), o, u = s, d = e[5];
 			switch (s = d + 1, a++, e[0]) {
 				case 0: {
 					let t = r.substring(e[2], e[3]);
@@ -269,25 +275,25 @@ function be(e, t, n, r, i, a, o) {
 					break;
 				}
 				case 1: {
-					let t = r.substring(u, e[1]), s = r.substring(e[4], d), f = c && !!(t || s), p = t ? f ? t : t.toLowerCase() : void 0, m = s ? f ? s : s.toLowerCase() : void 0, h = !l && i.dynamic?.find((e) => !e.skipOnParamError && e.caseSensitive === f && e.prefix === p && e.suffix === m);
+					let t = r.substring(u, e[1]), s = r.substring(e[4], d), f = c && !!(t || s), p = t ? f ? t : t.toLowerCase() : void 0, m = s ? f ? s : s.toLowerCase() : void 0, h = !l && i.dynamic?.find((e) => !e.parse && e.caseSensitive === f && e.prefix === p && e.suffix === m);
 					if (h) o = h;
 					else {
-						let e = Se(1, n.fullPath ?? n.from, f, p, m);
+						let e = Ee(1, n.fullPath ?? n.from, f, p, m);
 						o = e, e.depth = a, e.parent = i, i.dynamic ??= [], i.dynamic.push(e);
 					}
 					break;
 				}
 				case 3: {
-					let t = r.substring(u, e[1]), s = r.substring(e[4], d), f = c && !!(t || s), p = t ? f ? t : t.toLowerCase() : void 0, m = s ? f ? s : s.toLowerCase() : void 0, h = !l && i.optional?.find((e) => !e.skipOnParamError && e.caseSensitive === f && e.prefix === p && e.suffix === m);
+					let t = r.substring(u, e[1]), s = r.substring(e[4], d), f = c && !!(t || s), p = t ? f ? t : t.toLowerCase() : void 0, m = s ? f ? s : s.toLowerCase() : void 0, h = !l && i.optional?.find((e) => !e.parse && e.caseSensitive === f && e.prefix === p && e.suffix === m);
 					if (h) o = h;
 					else {
-						let e = Se(3, n.fullPath ?? n.from, f, p, m);
+						let e = Ee(3, n.fullPath ?? n.from, f, p, m);
 						o = e, e.parent = i, e.depth = a, i.optional ??= [], i.optional.push(e);
 					}
 					break;
 				}
 				case 2: {
-					let t = r.substring(u, e[1]), s = r.substring(e[4], d), l = c && !!(t || s), f = t ? l ? t : t.toLowerCase() : void 0, p = s ? l ? s : s.toLowerCase() : void 0, m = Se(2, n.fullPath ?? n.from, l, f, p);
+					let t = r.substring(u, e[1]), s = r.substring(e[4], d), l = c && !!(t || s), f = t ? l ? t : t.toLowerCase() : void 0, p = s ? l ? s : s.toLowerCase() : void 0, m = Ee(2, n.fullPath ?? n.from, l, f, p);
 					o = m, m.parent = i, m.depth = a, i.wildcard ??= [], i.wildcard.push(m);
 				}
 			}
@@ -295,21 +301,20 @@ function be(e, t, n, r, i, a, o) {
 		}
 		if (l && n.children && !n.isRoot && n.id && n.id.charCodeAt(n.id.lastIndexOf("/") + 1) === 95) {
 			let e = P(n.fullPath ?? n.from);
-			e.kind = _e, e.parent = i, a++, e.depth = a, i.pathless ??= [], i.pathless.push(e), i = e;
+			e.kind = xe, e.parent = i, a++, e.depth = a, i.pathless ??= [], i.pathless.push(e), i = e;
 		}
 		let u = (n.path || !n.children) && !n.isRoot;
 		if (u && r.endsWith("/")) {
 			let e = P(n.fullPath ?? n.from);
 			e.kind = M, e.parent = i, a++, e.depth = a, i.index = e, i = e;
 		}
-		i.parse = n.options?.params?.parse ?? null, i.skipOnParamError = l, i.parsingPriority = n.options?.skipRouteOnParseError?.priority ?? 0, u && !i.route && (i.route = n, i.fullPath = n.fullPath ?? n.from);
+		i.parse = l ?? null, u && !i.route && (i.route = n, i.fullPath = n.fullPath ?? n.from);
 	}
-	if (n.children) for (let r of n.children) be(e, t, r, s, i, a, o);
+	if (n.children) for (let r of n.children) we(e, t, r, s, i, a, o);
 }
-function xe(e, t) {
-	if (e.skipOnParamError && !t.skipOnParamError) return -1;
-	if (!e.skipOnParamError && t.skipOnParamError) return 1;
-	if (e.skipOnParamError && t.skipOnParamError && (e.parsingPriority || t.parsingPriority)) return t.parsingPriority - e.parsingPriority;
+function Te(e, t) {
+	if (e.parse && !t.parse) return -1;
+	if (!e.parse && t.parse) return 1;
 	if (e.prefix && t.prefix && e.prefix !== t.prefix) {
 		if (e.prefix.startsWith(t.prefix)) return -1;
 		if (t.prefix.startsWith(e.prefix)) return 1;
@@ -325,15 +330,15 @@ function N(e) {
 	if (e.static) for (let t of e.static.values()) N(t);
 	if (e.staticInsensitive) for (let t of e.staticInsensitive.values()) N(t);
 	if (e.dynamic?.length) {
-		e.dynamic.sort(xe);
+		e.dynamic.sort(Te);
 		for (let t of e.dynamic) N(t);
 	}
 	if (e.optional?.length) {
-		e.optional.sort(xe);
+		e.optional.sort(Te);
 		for (let t of e.optional) N(t);
 	}
 	if (e.wildcard?.length) {
-		e.wildcard.sort(xe);
+		e.wildcard.sort(Te);
 		for (let t of e.wildcard) N(t);
 	}
 }
@@ -351,12 +356,10 @@ function P(e) {
 		route: null,
 		fullPath: e,
 		parent: null,
-		parse: null,
-		skipOnParamError: !1,
-		parsingPriority: 0
+		parse: null
 	};
 }
-function Se(e, t, n, r, i) {
+function Ee(e, t, n, r, i) {
 	return {
 		kind: e,
 		depth: 0,
@@ -371,63 +374,61 @@ function Se(e, t, n, r, i) {
 		fullPath: t,
 		parent: null,
 		parse: null,
-		skipOnParamError: !1,
-		parsingPriority: 0,
 		caseSensitive: n,
 		prefix: r,
 		suffix: i
 	};
 }
-function Ce(e, t) {
+function De(e, t) {
 	let n = P("/"), r = new Uint16Array(6);
-	for (let t of e) be(!1, r, t, 1, n, 0);
-	N(n), t.masksTree = n, t.flatCache = ge(1e3);
+	for (let t of e) we(!1, r, t, 1, n, 0);
+	N(n), t.masksTree = n, t.flatCache = be(1e3);
 }
-function we(e, t) {
+function Oe(e, t) {
 	e ||= "/";
 	let n = t.flatCache.get(e);
 	if (n) return n;
-	let r = ke(e, t.masksTree);
+	let r = Ne(e, t.masksTree);
 	return t.flatCache.set(e, r), r;
 }
-function Te(e, t, n, r, i) {
+function ke(e, t, n, r, i) {
 	e ||= "/", r ||= "/";
 	let a = t ? `case\0${e}` : e, o = i.singleCache.get(a);
-	return o || (o = P("/"), be(t, new Uint16Array(6), { from: e }, 1, o, 0), i.singleCache.set(a, o)), ke(r, o, n);
+	return o || (o = P("/"), we(t, new Uint16Array(6), { from: e }, 1, o, 0), i.singleCache.set(a, o)), Ne(r, o, n);
 }
-function Ee(e, t, n = !1) {
+function Ae(e, t, n = !1) {
 	let r = n ? e : `nofuzz\0${e}`, i = t.matchCache.get(r);
 	if (i !== void 0) return i;
 	e ||= "/";
 	let a;
 	try {
-		a = ke(e, t.segmentTree, n);
+		a = Ne(e, t.segmentTree, n);
 	} catch (e) {
 		if (e instanceof URIError) a = null;
 		else throw e;
 	}
-	return a && (a.branch = je(a.route)), t.matchCache.set(r, a), a;
+	return a && (a.branch = Fe(a.route)), t.matchCache.set(r, a), a;
 }
-function De(e) {
+function je(e) {
 	return e === "/" ? e : e.replace(/\/{1,}$/, "");
 }
-function Oe(e, t = !1, n) {
+function Me(e, t = !1, n) {
 	let r = P(e.fullPath), i = new Uint16Array(6), a = {}, o = {}, s = 0;
-	return be(t, i, e, 1, r, 0, (e) => {
+	return we(t, i, e, 1, r, 0, (e) => {
 		if (n?.(e, s), e.id in a) {
 			if (process.env.NODE_ENV !== "production") throw Error(`Invariant failed: Duplicate routes found with id: ${String(e.id)}`);
-			he();
+			ye();
 		}
 		if (a[e.id] = e, s !== 0 && e.path) {
-			let t = De(e.fullPath);
+			let t = je(e.fullPath);
 			(!o[t] || e.fullPath.endsWith("/")) && (o[t] = e);
 		}
 		s++;
 	}), N(r), {
 		processedTree: {
 			segmentTree: r,
-			singleCache: ge(1e3),
-			matchCache: ge(1e3),
+			singleCache: be(1e3),
+			matchCache: be(1e3),
 			flatCache: null,
 			masksTree: null
 		},
@@ -435,22 +436,21 @@ function Oe(e, t = !1, n) {
 		routesByPath: o
 	};
 }
-function ke(e, t, n = !1) {
-	let r = e.split("/"), i = Ne(e, r, t, n);
+function Ne(e, t, n = !1) {
+	let r = e.split("/"), i = Le(e, r, t, n);
 	if (!i) return null;
-	let [a] = Ae(e, r, i);
+	let [a] = Pe(e, r, i);
 	return {
 		route: i.node.route,
-		rawParams: a,
-		parsedParams: i.parsedParams
+		rawParams: a
 	};
 }
-function Ae(e, t, n) {
-	let r = Me(n.node), i = null, a = Object.create(null), o = n.extract?.part ?? 0, s = n.extract?.node ?? 0, c = n.extract?.path ?? 0, l = n.extract?.segment ?? 0;
+function Pe(e, t, n) {
+	let r = Ie(n.node), i = null, a = Object.create(null), o = n.extract?.part ?? 0, s = n.extract?.node ?? 0, c = n.extract?.path ?? 0, l = n.extract?.segment ?? 0;
 	for (; s < r.length; o++, s++, c++, l++) {
 		let u = r[s];
 		if (u.kind === M) break;
-		if (u.kind === _e) {
+		if (u.kind === xe) {
 			l--, o--, c--;
 			continue;
 		}
@@ -486,239 +486,236 @@ function Ae(e, t, n) {
 		segment: l
 	}];
 }
-function je(e) {
+function Fe(e) {
 	let t = [e];
 	for (; e.parentRoute;) e = e.parentRoute, t.push(e);
 	return t.reverse(), t;
 }
-function Me(e) {
+function Ie(e) {
 	let t = Array(e.depth + 1);
 	do
 		t[e.depth] = e, e = e.parent;
 	while (e);
 	return t;
 }
-function Ne(e, t, n, r) {
+function Le(e, t, n, r) {
 	if (e === "/" && n.index) return {
 		node: n.index,
 		skipped: 0
 	};
-	let i = !x(t), a = i && e !== "/", o = t.length - (i ? 1 : 0), s = [{
+	let i = !w(t), a = i && e !== "/", o = t.length - (i ? 1 : 0), s = [{
 		node: n,
 		index: 1,
 		skipped: 0,
 		depth: 1,
-		statics: 1,
+		statics: 0,
 		dynamics: 0,
 		optionals: 0
-	}], c = null, l = null, u = null;
+	}], c = null, l = null;
 	for (; s.length;) {
-		let n = s.pop(), { node: i, index: d, skipped: f, depth: p, statics: m, dynamics: h, optionals: g } = n, { extract: _, rawParams: v, parsedParams: y } = n;
-		if (i.skipOnParamError) {
-			if (!Pe(e, t, n)) continue;
-			v = n.rawParams, _ = n.extract, y = n.parsedParams;
+		let n = s.pop(), { node: i, index: u, skipped: d, depth: f, statics: p, dynamics: m, optionals: h } = n, { extract: g, rawParams: _ } = n;
+		if (i.kind === 2 && i.route && !Ve(l, n)) continue;
+		if (i.parse) {
+			if (!Be(e, t, n)) continue;
+			_ = n.rawParams, g = n.extract;
 		}
-		r && i.route && i.kind !== M && F(l, n) && (l = n);
-		let b = d === o;
-		if (b && (i.route && !a && F(u, n) && (u = n), !i.optional && !i.wildcard && !i.index && !i.pathless)) continue;
-		let x = b ? void 0 : t[d], S;
-		if (b && i.index) {
+		r && i.route && i.kind !== M && Ve(c, n) && (c = n);
+		let v = u === o;
+		if (v && (i.route && (!a || i.kind === M || i.kind === 2) && Ve(l, n) && (l = n), !i.optional && !i.wildcard && !i.index && !i.pathless)) continue;
+		let y = v ? void 0 : t[u], b;
+		if (v && i.index) {
 			let n = {
 				node: i.index,
-				index: d,
-				skipped: f,
-				depth: p + 1,
-				statics: m,
-				dynamics: h,
-				optionals: g,
-				extract: _,
-				rawParams: v,
-				parsedParams: y
+				index: u,
+				skipped: d,
+				depth: f + 1,
+				statics: p,
+				dynamics: m,
+				optionals: h,
+				extract: g,
+				rawParams: _
 			}, r = !0;
-			if (i.index.skipOnParamError && (Pe(e, t, n) || (r = !1)), r) {
-				if (m === o && !h && !g && !f) return n;
-				F(u, n) && (u = n);
+			if (i.index.parse && (Be(e, t, n) || (r = !1)), r) {
+				if (!m && !h && !d && ze(p, o)) return n;
+				Ve(l, n) && (l = n);
 			}
 		}
-		if (i.wildcard && F(c, n)) for (let n of i.wildcard) {
-			let { prefix: r, suffix: i } = n;
-			if (r && (b || !(n.caseSensitive ? x : S ??= x.toLowerCase()).startsWith(r))) continue;
-			if (i) {
-				if (b) continue;
-				let e = t.slice(d).join("/").slice(-i.length);
-				if ((n.caseSensitive ? e : e.toLowerCase()) !== i) continue;
-			}
-			let a = {
-				node: n,
-				index: o,
-				skipped: f,
-				depth: p,
-				statics: m,
-				dynamics: h,
-				optionals: g,
-				extract: _,
-				rawParams: v,
-				parsedParams: y
-			};
-			if (!(n.skipOnParamError && !Pe(e, t, a))) {
-				c = a;
-				break;
+		if (i.wildcard) for (let e = i.wildcard.length - 1; e >= 0; e--) {
+			let n = i.wildcard[e], { prefix: r, suffix: a } = n;
+			if (!(r && (v || !(n.caseSensitive ? y : b ??= y.toLowerCase()).startsWith(r)))) {
+				if (a) {
+					if (v) continue;
+					let e = t.slice(u).join("/").slice(-a.length);
+					if ((n.caseSensitive ? e : e.toLowerCase()) !== a) continue;
+				}
+				s.push({
+					node: n,
+					index: o,
+					skipped: d,
+					depth: f + 1,
+					statics: p,
+					dynamics: m,
+					optionals: h,
+					extract: g,
+					rawParams: _
+				});
 			}
 		}
 		if (i.optional) {
-			let e = f | 1 << p, t = p + 1;
+			let e = d | 1 << f, t = f + 1;
 			for (let n = i.optional.length - 1; n >= 0; n--) {
 				let r = i.optional[n];
 				s.push({
 					node: r,
-					index: d,
+					index: u,
 					skipped: e,
 					depth: t,
-					statics: m,
-					dynamics: h,
-					optionals: g,
-					extract: _,
-					rawParams: v,
-					parsedParams: y
+					statics: p,
+					dynamics: m,
+					optionals: h,
+					extract: g,
+					rawParams: _
 				});
 			}
-			if (!b) for (let e = i.optional.length - 1; e >= 0; e--) {
+			if (!v) for (let e = i.optional.length - 1; e >= 0; e--) {
 				let n = i.optional[e], { prefix: r, suffix: a } = n;
 				if (r || a) {
-					let e = n.caseSensitive ? x : S ??= x.toLowerCase();
+					let e = n.caseSensitive ? y : b ??= y.toLowerCase();
 					if (r && !e.startsWith(r) || a && !e.endsWith(a)) continue;
 				}
 				s.push({
 					node: n,
-					index: d + 1,
-					skipped: f,
+					index: u + 1,
+					skipped: d,
 					depth: t,
-					statics: m,
-					dynamics: h,
-					optionals: g + 1,
-					extract: _,
-					rawParams: v,
-					parsedParams: y
+					statics: p,
+					dynamics: m,
+					optionals: h + Re(o, u),
+					extract: g,
+					rawParams: _
 				});
 			}
 		}
-		if (!b && i.dynamic && x) for (let e = i.dynamic.length - 1; e >= 0; e--) {
+		if (!v && i.dynamic && y) for (let e = i.dynamic.length - 1; e >= 0; e--) {
 			let t = i.dynamic[e], { prefix: n, suffix: r } = t;
 			if (n || r) {
-				let e = t.caseSensitive ? x : S ??= x.toLowerCase();
+				let e = t.caseSensitive ? y : b ??= y.toLowerCase();
 				if (n && !e.startsWith(n) || r && !e.endsWith(r)) continue;
 			}
 			s.push({
 				node: t,
-				index: d + 1,
-				skipped: f,
-				depth: p + 1,
-				statics: m,
-				dynamics: h + 1,
-				optionals: g,
-				extract: _,
-				rawParams: v,
-				parsedParams: y
+				index: u + 1,
+				skipped: d,
+				depth: f + 1,
+				statics: p,
+				dynamics: m + Re(o, u),
+				optionals: h,
+				extract: g,
+				rawParams: _
 			});
 		}
-		if (!b && i.staticInsensitive) {
-			let e = i.staticInsensitive.get(S ??= x.toLowerCase());
+		if (!v && i.staticInsensitive) {
+			let e = i.staticInsensitive.get(b ??= y.toLowerCase());
 			e && s.push({
 				node: e,
-				index: d + 1,
-				skipped: f,
-				depth: p + 1,
-				statics: m + 1,
-				dynamics: h,
-				optionals: g,
-				extract: _,
-				rawParams: v,
-				parsedParams: y
+				index: u + 1,
+				skipped: d,
+				depth: f + 1,
+				statics: p + Re(o, u),
+				dynamics: m,
+				optionals: h,
+				extract: g,
+				rawParams: _
 			});
 		}
-		if (!b && i.static) {
-			let e = i.static.get(x);
+		if (!v && i.static) {
+			let e = i.static.get(y);
 			e && s.push({
 				node: e,
-				index: d + 1,
-				skipped: f,
-				depth: p + 1,
-				statics: m + 1,
-				dynamics: h,
-				optionals: g,
-				extract: _,
-				rawParams: v,
-				parsedParams: y
+				index: u + 1,
+				skipped: d,
+				depth: f + 1,
+				statics: p + Re(o, u),
+				dynamics: m,
+				optionals: h,
+				extract: g,
+				rawParams: _
 			});
 		}
 		if (i.pathless) {
-			let e = p + 1;
+			let e = f + 1;
 			for (let t = i.pathless.length - 1; t >= 0; t--) {
 				let n = i.pathless[t];
 				s.push({
 					node: n,
-					index: d,
-					skipped: f,
+					index: u,
+					skipped: d,
 					depth: e,
-					statics: m,
-					dynamics: h,
-					optionals: g,
-					extract: _,
-					rawParams: v,
-					parsedParams: y
+					statics: p,
+					dynamics: m,
+					optionals: h,
+					extract: g,
+					rawParams: _
 				});
 			}
 		}
 	}
-	if (u && c) return F(c, u) ? u : c;
-	if (u) return u;
-	if (c) return c;
-	if (r && l) {
-		let n = l.index;
-		for (let e = 0; e < l.index; e++) n += t[e].length;
+	if (l) return l;
+	if (r && c) {
+		let n = c.index;
+		for (let e = 0; e < c.index; e++) n += t[e].length;
 		let r = n === e.length ? "/" : e.slice(n);
-		return l.rawParams ??= Object.create(null), l.rawParams["**"] = decodeURIComponent(r), l;
+		return c.rawParams ??= Object.create(null), c.rawParams["**"] = decodeURIComponent(r), c;
 	}
 	return null;
 }
-function Pe(e, t, n) {
+function Re(e, t) {
+	return 2 ** (e - t - 1);
+}
+function ze(e, t) {
+	return e === 2 ** (t - 1) - 1;
+}
+function Be(e, t, n) {
+	let r, i;
 	try {
-		let [r, i] = Ae(e, t, n);
-		n.rawParams = r, n.extract = i;
-		let a = n.node.parse(r);
-		return n.parsedParams = Object.assign(Object.create(null), n.parsedParams, a), !0;
+		[r, i] = Pe(e, t, n);
 	} catch {
 		return null;
 	}
+	if (n.rawParams = r, n.extract = i, !n.node.parse) return !0;
+	try {
+		if (n.node.parse(r) === !1) return null;
+	} catch {}
+	return !0;
 }
-function F(e, t) {
+function Ve(e, t) {
 	return e ? t.statics > e.statics || t.statics === e.statics && (t.dynamics > e.dynamics || t.dynamics === e.dynamics && (t.optionals > e.optionals || t.optionals === e.optionals && ((t.node.kind === M) > (e.node.kind === M) || t.node.kind === M == (e.node.kind === M) && t.depth > e.depth))) : !0;
 }
 //#endregion
 //#region ../router-core/dist/esm/path.js
-function Fe(e) {
-	return Ie(e.filter((e) => e !== void 0).join("/"));
+function He(e) {
+	return Ue(e.filter((e) => e !== void 0).join("/"));
 }
-function Ie(e) {
+function Ue(e) {
 	return e.replace(/\/{2,}/g, "/");
 }
-function Le(e) {
+function We(e) {
 	return e === "/" ? e : e.replace(/^\/{1,}/, "");
 }
-function I(e) {
+function F(e) {
 	let t = e.length;
 	return t > 1 && e[t - 1] === "/" ? e.replace(/\/{1,}$/, "") : e;
 }
-function Re(e) {
-	return I(Le(e));
+function Ge(e) {
+	return F(We(e));
 }
-function ze(e, t) {
+function Ke(e, t) {
 	return e?.endsWith("/") && e !== "/" && e !== `${t}/` ? e.slice(0, -1) : e;
 }
-function Be(e, t, n) {
-	return ze(e, n) === ze(t, n);
+function qe(e, t, n) {
+	return Ke(e, n) === Ke(t, n);
 }
-function Ve({ base: e, to: t, trailingSlash: n = "never", cache: r }) {
+function Je({ base: e, to: t, trailingSlash: n = "never", cache: r }) {
 	let i = t.startsWith("/"), a = !i && t === ".", o;
 	if (r) {
 		o = i ? t : a ? e : e + "\0" + t;
@@ -729,41 +726,26 @@ function Ve({ base: e, to: t, trailingSlash: n = "never", cache: r }) {
 	if (a) s = e.split("/");
 	else if (i) s = t.split("/");
 	else {
-		for (s = e.split("/"); s.length > 1 && x(s) === "";) s.pop();
+		for (s = e.split("/"); s.length > 1 && w(s) === "";) s.pop();
 		let n = t.split("/");
 		for (let e = 0, t = n.length; e < t; e++) {
 			let r = n[e];
 			r === "" ? e ? e === t - 1 && s.push(r) : s = [r] : r === ".." ? s.pop() : r === "." || s.push(r);
 		}
 	}
-	s.length > 1 && (x(s) === "" ? n === "never" && s.pop() : n === "always" && s.push(""));
-	let c, l = "";
-	for (let e = 0; e < s.length; e++) {
-		e > 0 && (l += "/");
-		let t = s[e];
-		if (!t) continue;
-		c = ye(t, 0, c);
-		let n = c[0];
-		if (n === 0) {
-			l += t;
-			continue;
-		}
-		let r = c[5], i = t.substring(0, c[1]), a = t.substring(c[4], r), o = t.substring(c[2], c[3]);
-		n === 1 ? l += i || a ? `${i}{$${o}}${a}` : `$${o}` : n === 2 ? l += i || a ? `${i}{$}${a}` : "$" : l += `${i}{-$${o}}${a}`;
-	}
-	l = Ie(l);
-	let u = l || "/";
-	return o && r && r.set(o, u), u;
+	s.length > 1 && (w(s) === "" ? n === "never" && s.pop() : n === "always" && s.push(""));
+	let c = Ue(s.join("/")) || "/";
+	return o && r && r.set(o, c), c;
 }
-function He(e) {
+function Ye(e) {
 	let t = new Map(e.map((e) => [encodeURIComponent(e), e])), n = Array.from(t.keys()).map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), r = new RegExp(n, "g");
 	return (e) => e.replace(r, (e) => t.get(e) ?? e);
 }
-function Ue(e, t, n) {
+function Xe(e, t, n) {
 	let r = t[e];
-	return typeof r == "string" ? e === "_splat" ? /^[a-zA-Z0-9\-._~!/]*$/.test(r) ? r : r.split("/").map((e) => Ge(e, n)).join("/") : Ge(r, n) : r;
+	return typeof r == "string" ? e === "_splat" ? /^[a-zA-Z0-9\-._~!/]*$/.test(r) ? r : r.split("/").map((e) => Qe(e, n)).join("/") : Qe(r, n) : r;
 }
-function We({ path: e, params: t, decoder: n, ...r }) {
+function Ze({ path: e, params: t, decoder: n, ...r }) {
 	let i = !1, a = Object.create(null);
 	if (!e || e === "/") return {
 		interpolatedPath: "/",
@@ -778,7 +760,7 @@ function We({ path: e, params: t, decoder: n, ...r }) {
 	let o = e.length, s = 0, c, l = "";
 	for (; s < o;) {
 		let r = s;
-		c = ye(e, r, c);
+		c = Ce(e, r, c);
 		let o = c[5];
 		if (s = o + 1, r === o) continue;
 		let u = c[0];
@@ -794,14 +776,14 @@ function We({ path: e, params: t, decoder: n, ...r }) {
 				i = !0, (u || d) && (l += "/" + u + d);
 				continue;
 			}
-			let f = Ue("_splat", t, n);
+			let f = Xe("_splat", t, n);
 			l += "/" + u + f + d;
 			continue;
 		}
 		if (u === 1) {
 			let s = e.substring(c[2], c[3]);
 			!i && !(s in t) && (i = !0), a[s] = t[s];
-			let u = e.substring(r, c[1]), d = e.substring(c[4], o), f = Ue(s, t, n) ?? "undefined";
+			let u = e.substring(r, c[1]), d = e.substring(c[4], o), f = Xe(s, t, n) ?? "undefined";
 			l += "/" + u + f + d;
 			continue;
 		}
@@ -809,7 +791,7 @@ function We({ path: e, params: t, decoder: n, ...r }) {
 			let i = e.substring(c[2], c[3]), s = t[i];
 			if (s == null) continue;
 			a[i] = s;
-			let u = e.substring(r, c[1]), d = e.substring(c[4], o), f = Ue(i, t, n) ?? "";
+			let u = e.substring(r, c[1]), d = e.substring(c[4], o), f = Xe(i, t, n) ?? "";
 			l += "/" + u + f + d;
 			continue;
 		}
@@ -820,69 +802,69 @@ function We({ path: e, params: t, decoder: n, ...r }) {
 		isMissingParams: i
 	};
 }
-function Ge(e, t) {
+function Qe(e, t) {
 	let n = encodeURIComponent(e);
 	return t?.(n) ?? n;
 }
 //#endregion
 //#region ../router-core/dist/esm/not-found.js
-function Ke(e = {}) {
+function $e(e = {}) {
 	if (e.isNotFound = !0, e.throw) throw e;
 	return e;
 }
-function L(e) {
-	return !!e?.isNotFound;
+function I(e) {
+	return e?.isNotFound === !0;
 }
 //#endregion
 //#region ../router-core/dist/esm/scroll-restoration.js
-function qe() {
+function et() {
 	try {
 		return typeof window < "u" && typeof window.sessionStorage == "object" ? window.sessionStorage : void 0;
 	} catch {
 		return;
 	}
 }
-var Je = "tsr-scroll-restoration-v1_3";
-function Ye() {
-	let e = qe();
+var tt = "tsr-scroll-restoration-v1_3";
+function nt() {
+	let e = et();
 	if (!e) return null;
 	let t = {};
 	try {
 		let n = JSON.parse(e.getItem("tsr-scroll-restoration-v1_3") || "{}");
-		D(n) && (t = n);
+		O(n) && (t = n);
 	} catch {}
 	return {
 		get state() {
 			return t;
 		},
 		set: (e) => {
-			t = C(e, t) || t;
+			t = T(e, t) || t;
 		},
 		persist: () => {
 			try {
-				e.setItem(Je, JSON.stringify(t));
+				e.setItem(tt, JSON.stringify(t));
 			} catch {
 				process.env.NODE_ENV !== "production" && console.warn("[ts-router] Could not persist scroll restoration state to sessionStorage.");
 			}
 		}
 	};
 }
-var Xe = Ye(), Ze = (e) => e.state.__TSR_key || e.href;
-function Qe(e) {
+var rt = nt(), it = (e) => e.state.__TSR_key || e.href;
+function at(e) {
 	let t = [], n;
 	for (; n = e.parentNode;) t.push(`${e.tagName}:nth-child(${Array.prototype.indexOf.call(n.children, e) + 1})`), e = n;
 	return `${t.reverse().join(" > ")}`.toLowerCase();
 }
-var $e = !1, et = "window", tt = "data-scroll-restoration-id";
-function nt(e, t) {
-	if (!Xe) return;
-	let n = Xe;
+var ot = !1, st = "window", ct = "data-scroll-restoration-id";
+function lt(e, t) {
+	if (!rt) return;
+	let n = rt;
 	if ((t ?? e.options.scrollRestoration ?? !1) && (e.isScrollRestoring = !0), e.isScrollRestorationSetup || !n) return;
-	e.isScrollRestorationSetup = !0, $e = !1;
-	let r = e.options.getScrollRestorationKey || Ze, i = /* @__PURE__ */ new Map();
+	e.isScrollRestorationSetup = !0, ot = !1;
+	let r = e.options.getScrollRestorationKey || it, i = /* @__PURE__ */ new Map();
 	window.history.scrollRestoration = "manual";
 	let a = (t) => {
-		if (!($e || !e.isScrollRestoring)) if (t.target === document || t.target === window) i.set(et, {
+		if (!(ot || !e.isScrollRestoring)) if (t.target === document || t.target === window) i.set(st, {
 			scrollX: window.scrollX || 0,
 			scrollY: window.scrollY || 0
 		});
@@ -898,10 +880,10 @@ function nt(e, t) {
 		let r = n.state[t] ||= {};
 		for (let [e, t] of i) {
 			let n;
-			if (e === et) n = et;
+			if (e === st) n = st;
 			else if (e.isConnected) {
-				let t = e.getAttribute(tt);
-				n = t ? `[${tt}="${t}"]` : Qe(e);
+				let t = e.getAttribute(ct);
+				n = t ? `[${ct}="${t}"]` : at(e);
 			}
 			n && (r[n] = t);
 		}
@@ -909,7 +891,7 @@ function nt(e, t) {
 	document.addEventListener("scroll", a, !0), e.subscribe("onBeforeLoad", (e) => {
 		o(e.fromLocation ? r(e.fromLocation) : void 0), i.clear();
 	}), window.addEventListener("pagehide", () => {
-		o(r(e.stores.resolvedLocation.state ?? e.stores.location.state)), n.persist();
+		o(r(e.stores.resolvedLocation.get() ?? e.stores.location.get())), n.persist();
 	}), e.subscribe("onRendered", (t) => {
 		let a = r(t.toLocation), o = e.options.scrollRestorationBehavior, s = e.options.scrollToTopSelectors;
 		if (i.clear(), !e.resetNextScroll) {
@@ -917,15 +899,15 @@ function nt(e, t) {
 			return;
 		}
 		if (!(typeof e.options.scrollRestoration == "function" && !e.options.scrollRestoration({ location: e.latestLocation }))) {
-			$e = !0;
+			ot = !0;
 			try {
 				let t = e.isScrollRestoring ? n.state[a] : void 0, r = !1;
 				if (t) for (let e in t) {
 					let n = t[e];
-					if (!D(n)) continue;
+					if (!O(n)) continue;
 					let { scrollX: i, scrollY: a } = n;
 					if (!(!Number.isFinite(i) || !Number.isFinite(a))) {
-						if (e === et) window.scrollTo({
+						if (e === st) window.scrollTo({
 							top: a,
 							left: i,
 							behavior: o
@@ -956,14 +938,14 @@ function nt(e, t) {
 							behavior: o
 						};
 						if (window.scrollTo(e), s) for (let t of s) {
-							if (t === et) continue;
+							if (t === st) continue;
 							let n = typeof t == "function" ? t() : document.querySelector(t);
 							n && n.scrollTo(e);
 						}
 					}
 				}
 			} finally {
-				$e = !1;
+				ot = !1;
 			}
 			e.isScrollRestoring && n.set((e) => (e[a] ||= {}, e));
 		}
@@ -971,7 +953,7 @@ function nt(e, t) {
 }
 //#endregion
 //#region ../router-core/dist/esm/qss.js
-function rt(e, t = String) {
+function ut(e, t = String) {
 	let n = new URLSearchParams();
 	for (let r in e) {
 		let i = e[r];
@@ -979,24 +961,24 @@ function rt(e, t = String) {
 	}
 	return n.toString();
 }
-function it(e) {
+function dt(e) {
 	return e ? e === "false" ? !1 : e === "true" ? !0 : e * 0 == 0 && +e + "" === e ? +e : e : "";
 }
-function at(e) {
+function ft(e) {
 	let t = new URLSearchParams(e), n = Object.create(null);
 	for (let [e, r] of t.entries()) {
 		let t = n[e];
-		t == null ? n[e] = it(r) : Array.isArray(t) ? t.push(it(r)) : n[e] = [t, it(r)];
+		t == null ? n[e] = dt(r) : Array.isArray(t) ? t.push(dt(r)) : n[e] = [t, dt(r)];
 	}
 	return n;
 }
 //#endregion
 //#region ../router-core/dist/esm/searchParams.js
-var ot = ct(JSON.parse), st = lt(JSON.stringify, JSON.parse);
-function ct(e) {
+var pt = ht(JSON.parse), mt = gt(JSON.stringify, JSON.parse);
+function ht(e) {
 	return (t) => {
 		t[0] === "?" && (t = t.substring(1));
-		let n = at(t);
+		let n = ft(t);
 		for (let t in n) {
 			let r = n[t];
 			if (typeof r == "string") try {
@@ -1006,7 +988,7 @@ function ct(e) {
 		return n;
 	};
 }
-function lt(e, t) {
+function gt(e, t) {
 	let n = typeof t == "function";
 	function r(r) {
 		if (typeof r == "object" && r) try {
@@ -1018,16 +1000,16 @@ function lt(e, t) {
 		return r;
 	}
 	return (e) => {
-		let t = rt(e, r);
+		let t = ut(e, r);
 		return t ? `?${t}` : "";
 	};
 }
 //#endregion
 //#region ../router-core/dist/esm/root.js
-var R = "__root__";
+var L = "__root__";
 //#endregion
 //#region ../router-core/dist/esm/redirect.js
-function ut(e) {
+function _t(e) {
 	if (e.statusCode = e.statusCode || e.code || 307, !e._builtLocation && !e.reloadDocument && typeof e.href == "string") try {
 		new URL(e.href), e.reloadDocument = !0;
 	} catch {}
@@ -1040,38 +1022,38 @@ function ut(e) {
 	if (n.options = e, e.throw) throw n;
 	return n;
 }
-function z(e) {
+function R(e) {
 	return e instanceof Response && !!e.options;
 }
 //#endregion
 //#region ../router-core/dist/esm/rewrite.js
-function dt(e) {
+function vt(e) {
 	return {
 		input: ({ url: t }) => {
-			for (let n of e) t = pt(n, t);
+			for (let n of e) t = bt(n, t);
 			return t;
 		},
 		output: ({ url: t }) => {
-			for (let n = e.length - 1; n >= 0; n--) t = mt(e[n], t);
+			for (let n = e.length - 1; n >= 0; n--) t = xt(e[n], t);
 			return t;
 		}
 	};
 }
-function ft(e) {
-	let t = Re(e.basepath), n = `/${t}`, r = `${n}/`, i = e.caseSensitive ? n : n.toLowerCase(), a = e.caseSensitive ? r : r.toLowerCase();
+function yt(e) {
+	let t = Ge(e.basepath), n = `/${t}`, r = `${n}/`, i = e.caseSensitive ? n : n.toLowerCase(), a = e.caseSensitive ? r : r.toLowerCase();
 	return {
 		input: ({ url: t }) => {
 			let r = e.caseSensitive ? t.pathname : t.pathname.toLowerCase();
 			return r === i ? t.pathname = "/" : r.startsWith(a) && (t.pathname = t.pathname.slice(n.length)), t;
 		},
-		output: ({ url: e }) => (e.pathname = Fe([
+		output: ({ url: e }) => (e.pathname = He([
 			"/",
 			t,
 			e.pathname
 		]), e)
 	};
 }
-function pt(e, t) {
+function bt(e, t) {
 	let n = e?.input?.({ url: t });
 	if (n) {
 		if (typeof n == "string") return new URL(n);
@@ -1079,7 +1061,7 @@ function pt(e, t) {
 	}
 	return t;
 }
-function mt(e, t) {
+function xt(e, t) {
 	let n = e?.output?.({ url: t });
 	if (n) {
 		if (typeof n == "string") return new URL(n);
@@ -1087,33 +1069,33 @@ function mt(e, t) {
 	}
 	return t;
 }
-function ht(e, t) {
-	let { createMutableStore: n, createReadonlyStore: r, batch: i, init: a } = t, o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), l = n(e.status), u = n(e.loadedAt), d = n(e.isLoading), f = n(e.isTransitioning), p = n(e.location), m = n(e.resolvedLocation), h = n(e.statusCode), g = n(e.redirect), _ = n([]), v = n([]), y = n([]), b = r(() => gt(o, _.state)), x = r(() => gt(s, v.state)), S = r(() => gt(c, y.state)), C = r(() => _.state[0]), w = r(() => _.state.some((e) => o.get(e)?.state.status === "pending")), ee = r(() => ({
-		locationHref: p.state.href,
-		resolvedLocationHref: m.state?.href,
-		status: l.state
-	})), te = r(() => ({
-		status: l.state,
-		loadedAt: u.state,
-		isLoading: d.state,
-		isTransitioning: f.state,
-		matches: b.state,
-		location: p.state,
-		resolvedLocation: m.state,
-		statusCode: h.state,
-		redirect: g.state
-	})), T = ge(64);
-	function E(e) {
-		let t = T.get(e);
+function St(e, t) {
+	let { createMutableStore: n, createReadonlyStore: r, batch: i, init: a } = t, o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), l = n(e.status), u = n(e.loadedAt), d = n(e.isLoading), f = n(e.isTransitioning), p = n(e.location), m = n(e.resolvedLocation), h = n(e.statusCode), g = n(e.redirect), _ = n([]), v = n([]), y = n([]), b = r(() => Ct(o, _.get())), x = r(() => Ct(s, v.get())), S = r(() => Ct(c, y.get())), C = r(() => _.get()[0]), w = r(() => _.get().some((e) => o.get(e)?.get().status === "pending")), ee = r(() => ({
+		locationHref: p.get().href,
+		resolvedLocationHref: m.get()?.href,
+		status: l.get()
+	})), T = r(() => ({
+		status: l.get(),
+		loadedAt: u.get(),
+		isLoading: d.get(),
+		isTransitioning: f.get(),
+		matches: b.get(),
+		location: p.get(),
+		resolvedLocation: m.get(),
+		statusCode: h.get(),
+		redirect: g.get()
+	})), te = be(64);
+	function ne(e) {
+		let t = te.get(e);
 		return t || (t = r(() => {
-			let t = _.state;
+			let t = _.get();
 			for (let n of t) {
 				let t = o.get(n);
-				if (t && t.routeId === e) return t.state;
+				if (t && t.routeId === e) return t.get();
 			}
-		}), T.set(e, t)), t;
+		}), te.set(e, t)), t;
 	}
-	let ne = {
+	let re = {
 		status: l,
 		loadedAt: u,
 		isLoading: d,
@@ -1123,44 +1105,44 @@ function ht(e, t) {
 		statusCode: h,
 		redirect: g,
 		matchesId: _,
-		pendingMatchesId: v,
-		cachedMatchesId: y,
-		activeMatchesSnapshot: b,
-		pendingMatchesSnapshot: x,
-		cachedMatchesSnapshot: S,
-		firstMatchId: C,
-		hasPendingMatches: w,
-		matchRouteReactivity: ee,
-		activeMatchStoresById: o,
-		pendingMatchStoresById: s,
-		cachedMatchStoresById: c,
-		__store: te,
-		getMatchStoreByRouteId: E,
-		setActiveMatches: D,
-		setPendingMatches: re,
-		setCachedMatches: ie
+		pendingIds: v,
+		cachedIds: y,
+		matches: b,
+		pendingMatches: x,
+		cachedMatches: S,
+		firstId: C,
+		hasPending: w,
+		matchRouteDeps: ee,
+		matchStores: o,
+		pendingMatchStores: s,
+		cachedMatchStores: c,
+		__store: T,
+		getRouteMatchStore: ne,
+		setMatches: ie,
+		setPending: E,
+		setCached: D
 	};
-	D(e.matches), a?.(ne);
-	function D(e) {
-		_t(e, o, _, n, i);
+	ie(e.matches), a?.(re);
+	function ie(e) {
+		wt(e, o, _, n, i);
 	}
-	function re(e) {
-		_t(e, s, v, n, i);
+	function E(e) {
+		wt(e, s, v, n, i);
 	}
-	function ie(e) {
-		_t(e, c, y, n, i);
+	function D(e) {
+		wt(e, c, y, n, i);
 	}
-	return ne;
+	return re;
 }
-function gt(e, t) {
+function Ct(e, t) {
 	let n = [];
 	for (let r of t) {
 		let t = e.get(r);
-		t && n.push(t.state);
+		t && n.push(t.get());
 	}
 	return n;
 }
-function _t(e, t, n, r, i) {
+function wt(e, t, n, r, i) {
 	let a = e.map((e) => e.id), o = new Set(a);
 	i(() => {
 		for (let e of t.keys()) o.has(e) || t.delete(e);
@@ -1171,16 +1153,16 @@ function _t(e, t, n, r, i) {
 				e.routeId = n.routeId, t.set(n.id, e);
 				continue;
 			}
-			e.routeId = n.routeId, e.state !== n && e.setState(() => n);
+			e.routeId = n.routeId, e.get() !== n && e.set(n);
 		}
-		me(n.state, a) || n.setState(() => a);
+		ve(n.get(), a) || n.set(a);
 	});
 }
 //#endregion
 //#region ../router-core/dist/esm/load-matches.js
-var vt = (e) => {
+var Tt = (e) => {
 	if (!e.rendered) return e.rendered = !0, e.onReady?.();
-}, yt = (e) => e.stores.matchesId.state.some((t) => e.stores.activeMatchStoresById.get(t)?.state._forcePending), bt = (e, t) => !!(e.preload && !e.router.stores.activeMatchStoresById.has(t)), B = (e, t, n = !0) => {
+}, Et = (e) => e.stores.matchesId.get().some((t) => e.stores.matchStores.get(t)?.get()._forcePending), Dt = (e, t) => !!(e.preload && !e.router.stores.matchStores.has(t)), z = (e, t, n = !0) => {
 	let r = { ...e.router.options.context ?? {} }, i = n ? t : t - 1;
 	for (let t = 0; t <= i; t++) {
 		let n = e.matches[t];
@@ -1189,7 +1171,7 @@ var vt = (e) => {
 		i && Object.assign(r, i.__routeContext, i.__beforeLoadContext);
 	}
 	return r;
-}, xt = (e, t) => {
+}, Ot = (e, t) => {
 	if (!e.matches.length) return;
 	let n = t.routeId, r = e.matches.findIndex((t) => t.routeId === e.router.routeTree.id), i = r >= 0 ? r : 0, a = n ? e.matches.findIndex((e) => e.routeId === n) : e.firstBadMatchIndex ?? e.matches.length - 1;
 	a < 0 && (a = i);
@@ -1198,31 +1180,31 @@ var vt = (e) => {
 		if (e.router.looseRoutesById[n.routeId].options.notFoundComponent) return t;
 	}
 	return n ? a : i;
-}, V = (e, t, n) => {
-	if (!(!z(n) && !L(n))) throw z(n) && n.redirectHandled && !n.options.reloadDocument ? n : (t && (t._nonReactive.beforeLoadPromise?.resolve(), t._nonReactive.loaderPromise?.resolve(), t._nonReactive.beforeLoadPromise = void 0, t._nonReactive.loaderPromise = void 0, t._nonReactive.error = n, e.updateMatch(t.id, (r) => ({
+}, B = (e, t, n) => {
+	if (!(!R(n) && !I(n))) throw R(n) && n.redirectHandled && !n.options.reloadDocument ? n : (t && (t._nonReactive.beforeLoadPromise?.resolve(), t._nonReactive.loaderPromise?.resolve(), t._nonReactive.beforeLoadPromise = void 0, t._nonReactive.loaderPromise = void 0, t._nonReactive.error = n, e.updateMatch(t.id, (r) => ({
 		...r,
-		status: z(n) ? "redirected" : r.status === "pending" ? "success" : r.status,
-		context: B(e, t.index),
+		status: R(n) ? "redirected" : I(n) ? "notFound" : r.status === "pending" ? "success" : r.status,
+		context: z(e, t.index),
 		isFetching: !1,
 		error: n
-	})), L(n) && !n.routeId && (n.routeId = t.routeId), t._nonReactive.loadPromise?.resolve()), z(n) && (e.rendered = !0, n.options._fromLocation = e.location, n.redirectHandled = !0, n = e.router.resolveRedirect(n)), n);
-}, St = (e, t) => {
+	})), I(n) && !n.routeId && (n.routeId = t.routeId), t._nonReactive.loadPromise?.resolve()), R(n) && (e.rendered = !0, n.options._fromLocation = e.location, n.redirectHandled = !0, n = e.router.resolveRedirect(n)), n);
+}, kt = (e, t) => {
 	let n = e.router.getMatch(t);
 	return !!(!n || n._nonReactive.dehydrated);
-}, Ct = (e, t, n) => {
-	let r = B(e, n);
+}, At = (e, t, n) => {
+	let r = z(e, n);
 	e.updateMatch(t, (e) => ({
 		...e,
 		context: r
 	}));
-}, H = (e, t, n, r) => {
+}, V = (e, t, n, r) => {
 	let { id: i, routeId: a } = e.matches[t], o = e.router.looseRoutesById[a];
 	if (n instanceof Promise) throw n;
-	n.routerCode = r, e.firstBadMatchIndex ??= t, V(e, e.router.getMatch(i), n);
+	n.routerCode = r, e.firstBadMatchIndex ??= t, B(e, e.router.getMatch(i), n);
 	try {
 		o.options.onError?.(n);
 	} catch (t) {
-		n = t, V(e, e.router.getMatch(i), n);
+		n = t, B(e, e.router.getMatch(i), n);
 	}
 	e.updateMatch(i, (e) => (e._nonReactive.beforeLoadPromise?.resolve(), e._nonReactive.beforeLoadPromise = void 0, e._nonReactive.loadPromise?.resolve(), {
 		...e,
@@ -1231,32 +1213,32 @@ var vt = (e) => {
 		isFetching: !1,
 		updatedAt: Date.now(),
 		abortController: new AbortController()
-	})), !e.preload && !z(n) && !L(n) && (e.serialError ??= n);
-}, wt = (e, t, n, r) => {
+	})), !e.preload && !R(n) && !I(n) && (e.serialError ??= n);
+}, jt = (e, t, n, r) => {
 	if (r._nonReactive.pendingTimeout !== void 0) return;
 	let i = n.options.pendingMs ?? e.router.options.defaultPendingMs;
-	if (e.onReady && !bt(e, t) && (n.options.loader || n.options.beforeLoad || Pt(n)) && typeof i == "number" && i !== Infinity && (n.options.pendingComponent ?? e.router.options?.defaultPendingComponent)) {
+	if (e.onReady && !Dt(e, t) && (n.options.loader || n.options.beforeLoad || Vt(n)) && typeof i == "number" && i !== Infinity && (n.options.pendingComponent ?? e.router.options?.defaultPendingComponent)) {
 		let t = setTimeout(() => {
-			vt(e);
+			Tt(e);
 		}, i);
 		r._nonReactive.pendingTimeout = t;
 	}
-}, Tt = (e, t, n) => {
+}, Mt = (e, t, n) => {
 	let r = e.router.getMatch(t);
 	if (!r._nonReactive.beforeLoadPromise && !r._nonReactive.loaderPromise) return;
-	wt(e, t, n, r);
+	jt(e, t, n, r);
 	let i = () => {
 		let n = e.router.getMatch(t);
-		n.preload && (n.status === "redirected" || n.status === "notFound") && V(e, n, n.error);
+		n.preload && (n.status === "redirected" || n.status === "notFound") && B(e, n, n.error);
 	};
 	return r._nonReactive.beforeLoadPromise ? r._nonReactive.beforeLoadPromise.then(i) : i();
-}, Et = (e, t, n, r) => {
+}, Nt = (e, t, n, r) => {
 	let i = e.router.getMatch(t), a = i._nonReactive.loadPromise;
-	i._nonReactive.loadPromise = k(() => {
+	i._nonReactive.loadPromise = A(() => {
 		a?.resolve(), a = void 0;
 	});
 	let { paramsError: o, searchError: s } = i;
-	o && H(e, n, o, "PARSE_PARAMS"), s && H(e, n, s, "VALIDATE_SEARCH"), wt(e, t, r, i);
+	o && V(e, n, o, "PARSE_PARAMS"), s && V(e, n, s, "VALIDATE_SEARCH"), jt(e, t, r, i);
 	let c = new AbortController(), l = !1, u = () => {
 		l || (l = !0, e.updateMatch(t, (e) => ({
 			...e,
@@ -1276,11 +1258,11 @@ var vt = (e) => {
 		});
 		return;
 	}
-	i._nonReactive.beforeLoadPromise = k();
+	i._nonReactive.beforeLoadPromise = A();
 	let f = {
-		...B(e, n, !1),
+		...z(e, n, !1),
 		...i.__routeContext
-	}, { search: p, params: m, cause: h } = i, g = bt(e, t), _ = {
+	}, { search: p, params: m, cause: h } = i, g = Dt(e, t), _ = {
 		search: p,
 		abortController: c,
 		params: m,
@@ -1303,7 +1285,7 @@ var vt = (e) => {
 			});
 			return;
 		}
-		(z(r) || L(r)) && (u(), H(e, n, r, "BEFORE_LOAD")), e.router.batch(() => {
+		(R(r) || I(r)) && (u(), V(e, n, r, "BEFORE_LOAD")), e.router.batch(() => {
 			u(), e.updateMatch(t, (e) => ({
 				...e,
 				__beforeLoadContext: r
@@ -1311,21 +1293,21 @@ var vt = (e) => {
 		});
 	}, y;
 	try {
-		if (y = r.options.beforeLoad(_), A(y)) return u(), y.catch((t) => {
-			H(e, n, t, "BEFORE_LOAD");
+		if (y = r.options.beforeLoad(_), j(y)) return u(), y.catch((t) => {
+			V(e, n, t, "BEFORE_LOAD");
 		}).then(v);
 	} catch (t) {
-		u(), H(e, n, t, "BEFORE_LOAD");
+		u(), V(e, n, t, "BEFORE_LOAD");
 	}
 	v(y);
-}, Dt = (e, t) => {
-	let { id: n, routeId: r } = e.matches[t], i = e.router.looseRoutesById[r], a = () => s(), o = () => Et(e, n, t, i), s = () => {
-		if (St(e, n)) return;
-		let t = Tt(e, n, i);
-		return A(t) ? t.then(o) : o();
+}, Pt = (e, t) => {
+	let { id: n, routeId: r } = e.matches[t], i = e.router.looseRoutesById[r], a = () => s(), o = () => Nt(e, n, t, i), s = () => {
+		if (kt(e, n)) return;
+		let t = Mt(e, n, i);
+		return j(t) ? t.then(o) : o();
 	};
 	return a();
-}, Ot = (e, t, n) => {
+}, Ft = (e, t, n) => {
 	let r = e.router.getMatch(t);
 	if (!r || !n.options.head && !n.options.scripts && !n.options.headers) return;
 	let i = {
@@ -1347,8 +1329,8 @@ var vt = (e) => {
 		scripts: t,
 		styles: e?.styles
 	}));
-}, kt = (e, t, n, r, i) => {
-	let a = t[r - 1], { params: o, loaderDeps: s, abortController: c, cause: l } = e.router.getMatch(n), u = B(e, r), d = bt(e, n);
+}, It = (e, t, n, r, i) => {
+	let a = t[r - 1], { params: o, loaderDeps: s, abortController: c, cause: l } = e.router.getMatch(n), u = z(e, r), d = Dt(e, n);
 	return {
 		params: o,
 		deps: s,
@@ -1365,18 +1347,18 @@ var vt = (e) => {
 		route: i,
 		...e.router.options.additionalContext
 	};
-}, At = async (e, t, n, r, i) => {
+}, Lt = async (e, t, n, r, i) => {
 	try {
 		let a = e.router.getMatch(n);
 		try {
-			U(i);
-			let o = i.options.loader, s = typeof o == "function" ? o : o?.handler, c = s?.(kt(e, t, n, r, i)), l = !!s && A(c);
+			H(i);
+			let o = i.options.loader, s = typeof o == "function" ? o : o?.handler, c = s?.(It(e, t, n, r, i)), l = !!s && j(c);
 			if ((l || i._lazyPromise || i._componentsPromise || i.options.head || i.options.scripts || i.options.headers || a._nonReactive.minPendingPromise) && e.updateMatch(n, (e) => ({
 				...e,
 				isFetching: "loader"
 			})), s) {
 				let t = l ? await c : c;
-				V(e, e.router.getMatch(n), t), t !== void 0 && e.updateMatch(n, (e) => ({
+				B(e, e.router.getMatch(n), t), t !== void 0 && e.updateMatch(n, (e) => ({
 					...e,
 					loaderData: t
 				}));
@@ -1386,7 +1368,7 @@ var vt = (e) => {
 			u && await u, i._componentsPromise && await i._componentsPromise, e.updateMatch(n, (t) => ({
 				...t,
 				error: void 0,
-				context: B(e, r),
+				context: z(e, r),
 				status: "success",
 				isFetching: !1,
 				updatedAt: Date.now()
@@ -1402,56 +1384,56 @@ var vt = (e) => {
 					...t,
 					status: t.status === "pending" ? "success" : t.status,
 					isFetching: !1,
-					context: B(e, r)
+					context: z(e, r)
 				}));
 				return;
 			}
 			let s = a._nonReactive.minPendingPromise;
-			s && await s, L(t) && await i.options.notFoundComponent?.preload?.(), V(e, e.router.getMatch(n), t);
+			s && await s, I(t) && await i.options.notFoundComponent?.preload?.(), B(e, e.router.getMatch(n), t);
 			try {
 				i.options.onError?.(t);
 			} catch (t) {
-				o = t, V(e, e.router.getMatch(n), t);
+				o = t, B(e, e.router.getMatch(n), t);
 			}
-			!z(o) && !L(o) && await U(i, ["errorComponent"]), e.updateMatch(n, (t) => ({
+			!R(o) && !I(o) && await H(i, ["errorComponent"]), e.updateMatch(n, (t) => ({
 				...t,
 				error: o,
-				context: B(e, r),
+				context: z(e, r),
 				status: "error",
 				isFetching: !1
 			}));
 		}
 	} catch (t) {
 		let r = e.router.getMatch(n);
-		r && (r._nonReactive.loaderPromise = void 0), V(e, r, t);
+		r && (r._nonReactive.loaderPromise = void 0), B(e, r, t);
 	}
-}, jt = async (e, t, n) => {
+}, Rt = async (e, t, n) => {
 	async function r(r, a, c, l, d) {
-		let f = Date.now() - a.updatedAt, p = r ? d.options.preloadStaleTime ?? e.router.options.defaultPreloadStaleTime ?? 3e4 : d.options.staleTime ?? e.router.options.defaultStaleTime ?? 0, m = d.options.shouldReload, h = typeof m == "function" ? m(kt(e, t, i, n, d)) : m, { status: g, invalid: _ } = l, v = f >= p && (!!e.forceStaleReload || l.cause === "enter" || c !== void 0 && c !== l.id);
+		let f = Date.now() - a.updatedAt, p = r ? d.options.preloadStaleTime ?? e.router.options.defaultPreloadStaleTime ?? 3e4 : d.options.staleTime ?? e.router.options.defaultStaleTime ?? 0, m = d.options.shouldReload, h = typeof m == "function" ? m(It(e, t, i, n, d)) : m, { status: g, invalid: _ } = l, v = f >= p && (!!e.forceStaleReload || l.cause === "enter" || c !== void 0 && c !== l.id);
 		o = g === "success" && (_ || (h ?? v)), r && d.options.preload === !1 || (o && !e.sync && u ? (s = !0, (async () => {
 			try {
-				await At(e, t, i, n, d);
+				await Lt(e, t, i, n, d);
 				let r = e.router.getMatch(i);
 				r._nonReactive.loaderPromise?.resolve(), r._nonReactive.loadPromise?.resolve(), r._nonReactive.loaderPromise = void 0, r._nonReactive.loadPromise = void 0;
 			} catch (t) {
-				z(t) && await e.router.navigate(t.options);
+				R(t) && await e.router.navigate(t.options);
 			}
-		})()) : g !== "success" || o ? await At(e, t, i, n, d) : Ct(e, i, n));
+		})()) : g !== "success" || o ? await Lt(e, t, i, n, d) : At(e, i, n));
 	}
 	let { id: i, routeId: a } = e.matches[n], o = !1, s = !1, c = e.router.looseRoutesById[a], l = c.options.loader, u = ((typeof l == "function" ? void 0 : l?.staleReloadMode) ?? e.router.options.defaultStaleReloadMode) !== "blocking";
-	if (St(e, i)) {
+	if (kt(e, i)) {
 		if (!e.router.getMatch(i)) return e.matches[n];
-		Ct(e, i, n);
+		At(e, i, n);
 	} else {
-		let t = e.router.getMatch(i), o = e.router.stores.matchesId.state[n], s = (o && e.router.stores.activeMatchStoresById.get(o) || null)?.routeId === a ? o : e.router.stores.activeMatchesSnapshot.state.find((e) => e.routeId === a)?.id, l = bt(e, i);
+		let t = e.router.getMatch(i), o = e.router.stores.matchesId.get()[n], s = (o && e.router.stores.matchStores.get(o) || null)?.routeId === a ? o : e.router.stores.matches.get().find((e) => e.routeId === a)?.id, l = Dt(e, i);
 		if (t._nonReactive.loaderPromise) {
 			if (t.status === "success" && !e.sync && !t.preload && u) return t;
 			await t._nonReactive.loaderPromise;
 			let n = e.router.getMatch(i), a = n._nonReactive.error || n.error;
-			a && V(e, n, a), n.status === "pending" && await r(l, t, s, n, c);
+			a && B(e, n, a), n.status === "pending" && await r(l, t, s, n, c);
 		} else {
-			let n = l && !e.router.stores.activeMatchStoresById.has(i), a = e.router.getMatch(i);
-			a._nonReactive.loaderPromise = k(), n !== a.preload && e.updateMatch(i, (e) => ({
+			let n = l && !e.router.stores.matchStores.has(i), a = e.router.getMatch(i);
+			a._nonReactive.loaderPromise = A(), n !== a.preload && e.updateMatch(i, (e) => ({
 				...e,
 				preload: n
 			})), await r(l, t, s, a, c);
@@ -1466,24 +1448,24 @@ var vt = (e) => {
 		invalid: !1
 	})), e.router.getMatch(i)) : d;
 };
-async function Mt(e) {
+async function zt(e) {
 	let t = e, n = [];
-	yt(t.router) && vt(t);
+	Et(t.router) && Tt(t);
 	let r;
 	for (let e = 0; e < t.matches.length; e++) {
 		try {
-			let n = Dt(t, e);
-			A(n) && await n;
+			let n = Pt(t, e);
+			j(n) && await n;
 		} catch (e) {
-			if (z(e)) throw e;
-			if (L(e)) r = e;
+			if (R(e)) throw e;
+			if (I(e)) r = e;
 			else if (!t.preload) throw e;
 			break;
 		}
 		if (t.serialError || t.firstBadMatchIndex != null) break;
 	}
-	let i = t.firstBadMatchIndex ?? t.matches.length, a = r && !t.preload ? xt(t, r) : void 0, o = r && t.preload ? 0 : a === void 0 ? i : Math.min(a + 1, i), s, c;
-	for (let e = 0; e < o; e++) n.push(jt(t, n, e));
+	let i = t.firstBadMatchIndex ?? t.matches.length, a = r && !t.preload ? Ot(t, r) : void 0, o = r && t.preload ? 0 : a === void 0 ? i : Math.min(a + 1, i), s, c;
+	for (let e = 0; e < o; e++) n.push(Rt(t, n, e));
 	try {
 		await Promise.all(n);
 	} catch {
@@ -1491,18 +1473,18 @@ async function Mt(e) {
 		for (let t of e) {
 			if (t.status !== "rejected") continue;
 			let e = t.reason;
-			if (z(e)) throw e;
-			L(e) ? s ??= e : c ??= e;
+			if (R(e)) throw e;
+			I(e) ? s ??= e : c ??= e;
 		}
 		if (c !== void 0) throw c;
 	}
 	let l = s ?? (r && !t.preload ? r : void 0), u = t.firstBadMatchIndex === void 0 ? t.matches.length - 1 : t.firstBadMatchIndex;
 	if (!l && r && t.preload) return t.matches;
 	if (l) {
-		let e = xt(t, l);
+		let e = Ot(t, l);
 		if (e === void 0) {
 			if (process.env.NODE_ENV !== "production") throw Error("Invariant failed: Could not find match for notFound boundary");
-			he();
+			ye();
 		}
 		let n = t.matches[e], r = t.router.looseRoutesById[n.routeId], i = t.router.options?.defaultNotFoundComponent;
 		!r.options.notFoundComponent && i && (r.options.notFoundComponent = i), l.routeId = n.routeId;
@@ -1518,7 +1500,7 @@ async function Mt(e) {
 				error: l
 			},
 			isFetching: !1
-		})), u = e, await U(r, ["notFoundComponent"]);
+		})), u = e, await H(r, ["notFoundComponent"]);
 	} else if (!t.preload) {
 		let e = t.matches[0];
 		e.globalNotFound || t.router.getMatch(e.id)?.globalNotFound && t.updateMatch(e.id, (e) => ({
@@ -1529,12 +1511,12 @@ async function Mt(e) {
 	}
 	if (t.serialError && t.firstBadMatchIndex !== void 0) {
 		let e = t.router.looseRoutesById[t.matches[t.firstBadMatchIndex].routeId];
-		await U(e, ["errorComponent"]);
+		await H(e, ["errorComponent"]);
 	}
 	for (let e = 0; e <= u; e++) {
 		let { id: n, routeId: r } = t.matches[e], i = t.router.looseRoutesById[r];
 		try {
-			let e = Ot(t, n, i);
+			let e = Ft(t, n, i);
 			if (e) {
 				let r = await e;
 				t.updateMatch(n, (e) => ({
@@ -1546,42 +1528,42 @@ async function Mt(e) {
 			console.error(`Error executing head for route ${r}:`, e);
 		}
 	}
-	let d = vt(t);
-	if (A(d) && await d, l) throw l;
+	let d = Tt(t);
+	if (j(d) && await d, l) throw l;
 	if (t.serialError && !t.preload && !t.onReady) throw t.serialError;
 	return t.matches;
 }
-function Nt(e, t) {
+function Bt(e, t) {
 	let n = t.map((t) => e.options[t]?.preload?.()).filter(Boolean);
 	if (n.length !== 0) return Promise.all(n);
 }
-function U(e, t = Ft) {
+function H(e, t = Ht) {
 	!e._lazyLoaded && e._lazyPromise === void 0 && (e.lazyFn ? e._lazyPromise = e.lazyFn().then((t) => {
 		let { id: n, ...r } = t.options;
 		Object.assign(e.options, r), e._lazyLoaded = !0, e._lazyPromise = void 0;
 	}) : e._lazyLoaded = !0);
-	let n = () => e._componentsLoaded ? void 0 : t === Ft ? (() => {
+	let n = () => e._componentsLoaded ? void 0 : t === Ht ? (() => {
 		if (e._componentsPromise === void 0) {
-			let t = Nt(e, Ft);
+			let t = Bt(e, Ht);
 			t ? e._componentsPromise = t.then(() => {
 				e._componentsLoaded = !0, e._componentsPromise = void 0;
 			}) : e._componentsLoaded = !0;
 		}
 		return e._componentsPromise;
-	})() : Nt(e, t);
+	})() : Bt(e, t);
 	return e._lazyPromise ? e._lazyPromise.then(n) : n();
 }
-function Pt(e) {
-	for (let t of Ft) if (e.options[t]?.preload) return !0;
+function Vt(e) {
+	for (let t of Ht) if (e.options[t]?.preload) return !0;
 	return !1;
 }
-var Ft = [
+var Ht = [
 	"component",
 	"errorComponent",
 	"pendingComponent",
 	"notFoundComponent"
-], W = "__TSR_index", It = "popstate", Lt = "beforeunload";
-function Rt(e) {
+], U = "__TSR_index", Ut = "popstate", Wt = "beforeunload";
+function Gt(e) {
 	let t = e.getLocation(), n = /* @__PURE__ */ new Set(), r = (r) => {
 		t = e.getLocation(), n.forEach((e) => e({
 			location: t,
@@ -1596,7 +1578,7 @@ function Rt(e) {
 		}
 		let a = e.getBlockers?.() ?? [], o = i.type === "PUSH" || i.type === "REPLACE";
 		if (typeof document < "u" && a.length && o) for (let n of a) {
-			let r = G(i.path, i.state);
+			let r = W(i.path, i.state);
 			if (await n.blockerFn({
 				currentLocation: t,
 				nextLocation: r,
@@ -1620,8 +1602,8 @@ function Rt(e) {
 			n.delete(e);
 		}),
 		push: (n, i, o) => {
-			let s = t.state[W];
-			i = zt(s + 1, i), a({
+			let s = t.state[U];
+			i = Kt(s + 1, i), a({
 				task: () => {
 					e.pushState(n, i), r({ type: "PUSH" });
 				},
@@ -1632,8 +1614,8 @@ function Rt(e) {
 			});
 		},
 		replace: (n, i, o) => {
-			let s = t.state[W];
-			i = zt(s, i), a({
+			let s = t.state[U];
+			i = Kt(s, i), a({
 				task: () => {
 					e.replaceState(n, i), r({ type: "REPLACE" });
 				},
@@ -1673,7 +1655,7 @@ function Rt(e) {
 				type: "FORWARD"
 			});
 		},
-		canGoBack: () => t.state[W] !== 0,
+		canGoBack: () => t.state[U] !== 0,
 		createHref: (t) => e.createHref(t),
 		block: (t) => {
 			if (!e.setBlockers) return () => {};
@@ -1688,22 +1670,22 @@ function Rt(e) {
 		notify: r
 	};
 }
-function zt(e, t) {
+function Kt(e, t) {
 	t ||= {};
-	let n = Wt();
+	let n = Zt();
 	return {
 		...t,
 		key: n,
 		__TSR_key: n,
-		[W]: e
+		[U]: e
 	};
 }
-function Bt(e) {
-	let t = e?.window ?? (typeof window < "u" ? window : void 0), n = t.history.pushState, r = t.history.replaceState, i = [], a = () => i, o = (e) => i = e, s = e?.createHref ?? ((e) => e), c = e?.parseLocation ?? (() => G(`${t.location.pathname}${t.location.search}${t.location.hash}`, t.history.state));
+function qt(e) {
+	let t = e?.window ?? (typeof window < "u" ? window : void 0), n = t.history.pushState, r = t.history.replaceState, i = [], a = () => i, o = (e) => i = e, s = e?.createHref ?? ((e) => e), c = e?.parseLocation ?? (() => W(`${t.location.pathname}${t.location.search}${t.location.hash}`, t.history.state));
 	if (!t.history.state?.__TSR_key && !t.history.state?.key) {
-		let e = Wt();
+		let e = Zt();
 		t.history.replaceState({
-			[W]: 0,
+			[U]: 0,
 			key: e,
 			__TSR_key: e
 		}, "");
@@ -1712,7 +1694,7 @@ function Bt(e) {
 		g && (C._ignoreSubscribers = !0, (g.isPush ? t.history.pushState : t.history.replaceState)(g.state, "", g.href), C._ignoreSubscribers = !1, g = void 0, _ = void 0, u = void 0);
 	}, y = (e, t, n) => {
 		let r = s(t);
-		_ || (u = l), l = G(t, n), g = {
+		_ || (u = l), l = W(t, n), g = {
 			href: r,
 			state: n,
 			isPush: g?.isPush || e === "push"
@@ -1724,7 +1706,7 @@ function Bt(e) {
 			f = !1;
 			return;
 		}
-		let e = c(), n = e.state[W] - l.state[W], r = n === 1, i = n === -1, o = !r && !i || d;
+		let e = c(), n = e.state[U] - l.state[U], r = n === 1, i = n === -1, o = !r && !i || d;
 		d = !1;
 		let s = o ? "GO" : i ? "BACK" : "FORWARD", u = o ? {
 			type: "GO",
@@ -1763,7 +1745,7 @@ function Bt(e) {
 			}
 		}
 		if (t) return e.preventDefault(), e.returnValue = "";
-	}, C = Rt({
+	}, C = Gt({
 		getLocation: h,
 		getLength: () => t.history.length,
 		pushState: (e, t) => y("push", e, t),
@@ -1778,7 +1760,7 @@ function Bt(e) {
 		createHref: (e) => s(e),
 		flush: v,
 		destroy: () => {
-			t.history.pushState = n, t.history.replaceState = r, t.removeEventListener(Lt, S, { capture: !0 }), t.removeEventListener(It, x);
+			t.history.pushState = n, t.history.replaceState = r, t.removeEventListener(Wt, S, { capture: !0 }), t.removeEventListener(Ut, x);
 		},
 		onBlocked: () => {
 			u && l !== u && (l = u);
@@ -1787,7 +1769,7 @@ function Bt(e) {
 		setBlockers: o,
 		notifyOnIndexChange: !1
 	});
-	return t.addEventListener(Lt, S, { capture: !0 }), t.addEventListener(It, x), t.history.pushState = function(...e) {
+	return t.addEventListener(Wt, S, { capture: !0 }), t.addEventListener(Ut, x), t.history.pushState = function(...e) {
 		let r = n.apply(t.history, e);
 		return C._ignoreSubscribers || b("PUSH"), r;
 	}, t.history.replaceState = function(...e) {
@@ -1795,20 +1777,20 @@ function Bt(e) {
 		return C._ignoreSubscribers || b("REPLACE"), n;
 	}, C;
 }
-function Vt(e) {
+function Jt(e) {
 	let t = e?.window ?? (typeof window < "u" ? window : void 0);
-	return Bt({
+	return qt({
 		window: t,
 		parseLocation: () => {
 			let e = t.location.hash.split("#").slice(1), n = e[0] ?? "/", r = t.location.search, i = e.slice(1);
-			return G(`${n}${r}${i.length === 0 ? "" : `#${i.join("#")}`}`, t.history.state);
+			return W(`${n}${r}${i.length === 0 ? "" : `#${i.join("#")}`}`, t.history.state);
 		},
 		createHref: (e) => `${t.location.pathname}${t.location.search}#${e}`
 	});
 }
-function Ht(e = { initialEntries: ["/"] }) {
-	let t = e.initialEntries, n = e.initialIndex ? Math.min(Math.max(e.initialIndex, 0), t.length - 1) : t.length - 1, r = t.map((e, t) => zt(t, void 0)), i = () => G(t[n], r[n]), a = [];
-	return Rt({
+function Yt(e = { initialEntries: ["/"] }) {
+	let t = e.initialEntries, n = e.initialIndex ? Math.min(Math.max(e.initialIndex, 0), t.length - 1) : t.length - 1, r = t.map((e, t) => Kt(t, void 0)), i = () => W(t[n], r[n]), a = [];
+	return Gt({
 		getLocation: i,
 		getLength: () => t.length,
 		pushState: (e, i) => {
@@ -1831,30 +1813,30 @@ function Ht(e = { initialEntries: ["/"] }) {
 		setBlockers: (e) => a = e
 	});
 }
-function Ut(e) {
+function Xt(e) {
 	let t = e.replace(/[\x00-\x1f\x7f]/g, "");
 	return t.startsWith("//") && (t = "/" + t.replace(/^\/+/, "")), t;
 }
-function G(e, t) {
-	let n = Ut(e), r = n.indexOf("#"), i = n.indexOf("?"), a = Wt();
+function W(e, t) {
+	let n = Xt(e), r = n.indexOf("#"), i = n.indexOf("?"), a = Zt();
 	return {
 		href: n,
 		pathname: n.substring(0, r > 0 ? i > 0 ? Math.min(r, i) : r : i > 0 ? i : n.length),
 		hash: r > -1 ? n.substring(r) : "",
 		search: i > -1 ? n.slice(i, r === -1 ? void 0 : r) : "",
 		state: t || {
-			[W]: 0,
+			[U]: 0,
 			key: a,
 			__TSR_key: a
 		}
 	};
 }
-function Wt() {
+function Zt() {
 	return (Math.random() + 1).toString(36).substring(7);
 }
 //#endregion
 //#region ../router-core/dist/esm/router.js
-function K(e, t) {
+function G(e, t) {
 	let n = t, r = e;
 	return {
 		fromLocation: n,
@@ -1864,41 +1846,41 @@ function K(e, t) {
 		hashChanged: n?.hash !== r.hash
 	};
 }
-var Gt = class {
+var Qt = class {
 	constructor(e, t) {
-		this.tempLocationKey = `${Math.round(Math.random() * 1e7)}`, this.resetNextScroll = !0, this.shouldViewTransition = void 0, this.isViewTransitionTypesSupported = void 0, this.subscribers = /* @__PURE__ */ new Set(), this.isScrollRestoring = !1, this.isScrollRestorationSetup = !1, this.startTransition = (e) => e(), this.update = (e) => {
+		this.tempLocationKey = `${Math.round(Math.random() * 1e7)}`, this.resetNextScroll = !0, this.shouldViewTransition = void 0, this.isViewTransitionTypesSupported = void 0, this.subscribers = /* @__PURE__ */ new Set(), this.isScrollRestoring = !1, this.isScrollRestorationSetup = !1, this.routeBranchCache = /* @__PURE__ */ new WeakMap(), this.startTransition = (e) => e(), this.update = (e) => {
 			process.env.NODE_ENV !== "production" && e.notFoundRoute && console.warn("The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/framework/react/guide/not-found-errors#migrating-from-notfoundroute for more info.");
 			let t = this.options, n = this.basepath ?? t?.basepath ?? "/", r = this.basepath === void 0, i = t?.rewrite;
 			if (this.options = {
 				...t,
 				...e
-			}, this.isServer = this.options.isServer ?? typeof document > "u", this.protocolAllowlist = new Set(this.options.protocolAllowlist), this.options.pathParamsAllowedCharacters && (this.pathParamsDecoder = He(this.options.pathParamsAllowedCharacters)), (!this.history || this.options.history && this.options.history !== this.history) && (this.options.history ? this.history = this.options.history : typeof window < "u" && (this.history = Bt())), this.origin = this.options.origin, !this.origin) {
+			}, this.isServer = this.options.isServer ?? typeof document > "u", this.protocolAllowlist = new Set(this.options.protocolAllowlist), this.options.pathParamsAllowedCharacters && (this.pathParamsDecoder = Ye(this.options.pathParamsAllowedCharacters)), (!this.history || this.options.history && this.options.history !== this.history) && (this.options.history ? this.history = this.options.history : typeof window < "u" && (this.history = qt())), this.origin = this.options.origin, !this.origin) {
 				let e = globalThis.window;
 				e && e.origin && e.origin !== "null" ? this.origin = e.origin : this.origin = "http://localhost";
 			}
 			if (this.history && this.updateLatestLocation(), this.options.routeTree !== this.routeTree) {
 				this.routeTree = this.options.routeTree;
 				let e;
-				this.resolvePathCache = ge(1e3), e = this.buildRouteTree(), this.setRoutes(e);
+				this.resolvePathCache = be(1e3), e = this.buildRouteTree(), this.setRoutes(e);
 			}
 			if (!this.stores && this.latestLocation) {
 				let e = this.getStoreConfig(this);
-				this.batch = e.batch, this.stores = ht(Zt(this.latestLocation), e), nt(this);
+				this.batch = e.batch, this.stores = St(an(this.latestLocation), e), lt(this);
 			}
 			let a = !1, o = this.options.basepath ?? "/", s = this.options.rewrite;
 			if (r || n !== o || i !== s) {
 				this.basepath = o;
-				let e = [], t = Re(o);
-				t && t !== "/" && e.push(ft({ basepath: o })), s && e.push(s), this.rewrite = e.length === 0 ? void 0 : e.length === 1 ? e[0] : dt(e), this.history && this.updateLatestLocation(), a = !0;
+				let e = [], t = Ge(o);
+				t && t !== "/" && e.push(yt({ basepath: o })), s && e.push(s), this.rewrite = e.length === 0 ? void 0 : e.length === 1 ? e[0] : vt(e), this.history && this.updateLatestLocation(), a = !0;
 			}
-			a && this.stores && this.stores.location.setState(() => this.latestLocation), typeof window < "u" && "CSS" in window && typeof window.CSS?.supports == "function" && (this.isViewTransitionTypesSupported = window.CSS.supports("selector(:active-view-transition-type(a)"));
+			a && this.stores && this.stores.location.set(this.latestLocation), typeof window < "u" && "CSS" in window && typeof window.CSS?.supports == "function" && (this.isViewTransitionTypesSupported = window.CSS.supports("selector(:active-view-transition-type(a))"));
 		}, this.updateLatestLocation = () => {
 			this.latestLocation = this.parseLocation(this.history.location, this.latestLocation);
 		}, this.buildRouteTree = () => {
-			let e = Oe(this.routeTree, this.options.caseSensitive, (e, t) => {
+			let e = Me(this.routeTree, this.options.caseSensitive, (e, t) => {
 				e.init({ originalIndex: t });
 			});
-			return this.options.routeMasks && Ce(this.options.routeMasks, e.processedTree), e;
+			return this.options.routeMasks && De(this.options.routeMasks, e.processedTree), e;
 		}, this.subscribe = (e, t) => {
 			let n = {
 				eventType: e,
@@ -1918,24 +1900,24 @@ var Gt = class {
 					return {
 						href: e + o + r,
 						publicHref: e + o + r,
-						pathname: j(e).path,
+						pathname: ge(e).path,
 						external: !1,
 						searchStr: o,
-						search: T(t?.search, i),
-						hash: j(r.slice(1)).path,
-						state: E(t?.state, a)
+						search: E(t?.search, i),
+						hash: ge(r.slice(1)).path,
+						state: D(t?.state, a)
 					};
 				}
-				let o = new URL(i, this.origin), s = pt(this.rewrite, o), c = this.options.parseSearch(s.search), l = this.options.stringifySearch(c);
+				let o = new URL(i, this.origin), s = bt(this.rewrite, o), c = this.options.parseSearch(s.search), l = this.options.stringifySearch(c);
 				return s.search = l, {
 					href: s.href.replace(s.origin, ""),
 					publicHref: i,
-					pathname: j(s.pathname).path,
+					pathname: ge(s.pathname).path,
 					external: !!this.rewrite && s.origin !== this.origin,
 					searchStr: l,
-					search: T(t?.search, c),
-					hash: j(s.hash.slice(1)).path,
-					state: E(t?.state, a)
+					search: E(t?.search, c),
+					hash: ge(s.hash.slice(1)).path,
+					state: D(t?.state, a)
 				};
 			}, r = n(e), { __tempLocation: i, __tempKey: a } = r.state;
 			if (i && (!a || a === this.tempLocationKey)) {
@@ -1946,15 +1928,15 @@ var Gt = class {
 				};
 			}
 			return r;
-		}, this.resolvePathWithBase = (e, t) => Ve({
+		}, this.resolvePathWithBase = (e, t) => Je({
 			base: e,
-			to: Ie(t),
+			to: t.includes("//") ? Ue(t) : t,
 			trailingSlash: this.options.trailingSlash,
 			cache: this.resolvePathCache
 		}), this.matchRoutes = (e, t, n) => typeof e == "string" ? this.matchRoutesInternal({
 			pathname: e,
 			search: t
-		}, n) : this.matchRoutesInternal(e, t), this.getMatchedRoutes = (e) => $t({
+		}, n) : this.matchRoutesInternal(e, t), this.getMatchedRoutes = (e) => sn({
 			pathname: e,
 			routesById: this.routesById,
 			processedTree: this.processedTree
@@ -1962,66 +1944,76 @@ var Gt = class {
 			let t = this.getMatch(e);
 			t && (t.abortController.abort(), clearTimeout(t._nonReactive.pendingTimeout), t._nonReactive.pendingTimeout = void 0);
 		}, this.cancelMatches = () => {
-			this.stores.pendingMatchesId.state.forEach((e) => {
+			this.stores.pendingIds.get().forEach((e) => {
 				this.cancelMatch(e);
-			}), this.stores.matchesId.state.forEach((e) => {
-				if (this.stores.pendingMatchStoresById.has(e)) return;
-				let t = this.stores.activeMatchStoresById.get(e)?.state;
+			}), this.stores.matchesId.get().forEach((e) => {
+				if (this.stores.pendingMatchStores.has(e)) return;
+				let t = this.stores.matchStores.get(e)?.get();
 				t && (t.status === "pending" || t.isFetching === "loader") && this.cancelMatch(e);
 			});
 		}, this.buildLocation = (e) => {
 			let t = (t = {}) => {
 				let n = t._fromLocation || this.pendingBuiltLocation || this.latestLocation, r = this.matchRoutesLightweight(n);
 				if (t.from && process.env.NODE_ENV !== "production" && t._isNavigate) {
-					let e = this.getMatchedRoutes(t.from).matchedRoutes, n = ae(r.matchedRoutes, (e) => Yt(e.fullPath, t.from)), i = ae(e, (e) => Yt(e.fullPath, r.fullPath));
+					let e = this.getMatchedRoutes(t.from).matchedRoutes, n = ce(r.matchedRoutes, (e) => nn(e.fullPath, t.from)), i = ce(e, (e) => nn(e.fullPath, r.fullPath));
 					!n && !i && console.warn(`Could not find match for from: ${t.from}`);
 				}
-				let i = t.unsafeRelative === "path" ? n.pathname : t.from ?? r.fullPath, a = this.resolvePathWithBase(i, "."), o = r.search, s = Object.assign(Object.create(null), r.params), c = t.to ? this.resolvePathWithBase(a, `${t.to}`) : this.resolvePathWithBase(a, "."), l = t.params === !1 || t.params === null ? Object.create(null) : (t.params ?? !0) === !0 ? s : Object.assign(s, C(t.params, s)), u = this.getMatchedRoutes(c), d = u.matchedRoutes;
-				if ((!u.foundRoute || u.foundRoute.path !== "/" && u.routeParams["**"]) && this.options.notFoundRoute && (d = [...d, this.options.notFoundRoute]), Object.keys(l).length > 0) for (let e of d) {
+				let i = t.unsafeRelative === "path" ? n.pathname : t.from ?? r.fullPath, a = t.to ? `${t.to}` : void 0, o = r.search, s = Object.assign(Object.create(null), r.params), c = a?.charCodeAt(0) === 47 ? "/" : this.resolvePathWithBase(i, "."), l = a ? this.resolvePathWithBase(c, a) : c, u = t.params === !1 || t.params === null ? Object.create(null) : (t.params ?? !0) === !0 ? s : Object.assign(s, T(t.params, s)), d = this.routesByPath[F(l)], f;
+				if (d) f = this.getRouteBranch(d);
+				else if (l.includes("$")) f = [];
+				else {
+					let e = this.getMatchedRoutes(l);
+					f = e.matchedRoutes, this.options.notFoundRoute && (!e.foundRoute || e.foundRoute.path !== "/" && e.routeParams["**"]) && (f = [...f, this.options.notFoundRoute]);
+				}
+				if (f.length && re(u)) for (let e of f) {
 					let t = e.options.params?.stringify ?? e.options.stringifyParams;
 					if (t) try {
-						Object.assign(l, t(l));
+						Object.assign(u, t(u));
 					} catch {}
 				}
-				let f = e.leaveParams ? c : j(We({
-					path: c,
-					params: l,
+				let p = e.leaveParams ? l : ge(Ze({
+					path: l,
+					params: u,
 					decoder: this.pathParamsDecoder,
 					server: this.isServer
-				}).interpolatedPath).path, p = o;
+				}).interpolatedPath).path;
+				if (process.env.NODE_ENV !== "production" && d && !e.leaveParams) try {
+					this.getMatchedRoutes(p).foundRoute?.id !== d.id && console.warn(`Generated path "${p}" for route "${d.id}" did not match the same route after params.stringify.`);
+				} catch {}
+				let m = o;
 				if (e._includeValidateSearch && this.options.search?.strict) {
 					let e = {};
-					d.forEach((t) => {
+					f.forEach((t) => {
 						if (t.options.validateSearch) try {
-							Object.assign(e, Qt(t.options.validateSearch, {
+							Object.assign(e, on(t.options.validateSearch, {
 								...e,
-								...p
+								...m
 							}));
 						} catch {}
-					}), p = e;
+					}), m = e;
 				}
-				p = en({
-					search: p,
+				m = cn({
+					search: m,
 					dest: t,
-					destRoutes: d,
+					destRoutes: f,
 					_includeValidateSearch: e._includeValidateSearch
-				}), p = T(o, p);
-				let m = this.options.stringifySearch(p), h = t.hash === !0 ? n.hash : t.hash ? C(t.hash, n.hash) : void 0, g = h ? `#${h}` : "", _ = t.state === !0 ? n.state : t.state ? C(t.state, n.state) : {};
-				_ = E(n.state, _);
-				let v = `${f}${m}${g}`, y, b, x = !1;
+				}), m = E(o, m);
+				let h = this.options.stringifySearch(m), g = t.hash === !0 ? n.hash : t.hash ? T(t.hash, n.hash) : void 0, _ = g ? `#${g}` : "", v = t.state === !0 ? n.state : t.state ? T(t.state, n.state) : {};
+				v = D(n.state, v);
+				let y = `${p}${h}${_}`, b, x, S = !1;
 				if (this.rewrite) {
-					let e = new URL(v, this.origin), t = mt(this.rewrite, e);
-					y = e.href.replace(e.origin, ""), t.origin === this.origin ? b = t.pathname + t.search + t.hash : (b = t.href, x = !0);
-				} else y = pe(v), b = y;
+					let e = new URL(y, this.origin), t = xt(this.rewrite, e);
+					b = e.href.replace(e.origin, ""), t.origin === this.origin ? x = t.pathname + t.search + t.hash : (x = t.href, S = !0);
+				} else b = _e(y), x = b;
 				return {
-					publicHref: b,
-					href: y,
-					pathname: f,
-					search: p,
-					searchStr: m,
-					state: _,
-					hash: h ?? "",
-					external: x,
+					publicHref: x,
+					href: b,
+					pathname: p,
+					search: m,
+					searchStr: h,
+					state: v,
+					hash: g ?? "",
+					external: S,
 					unmaskOnReload: t.unmaskOnReload
 				};
 			}, n = (n = {}, r) => {
@@ -2029,10 +2021,10 @@ var Gt = class {
 				if (!a) {
 					let n = Object.create(null);
 					if (this.options.routeMasks) {
-						let o = we(i.pathname, this.processedTree);
+						let o = Oe(i.pathname, this.processedTree);
 						if (o) {
 							Object.assign(n, o.rawParams);
-							let { from: i, params: s, ...c } = o.route, l = s === !1 || s === null ? Object.create(null) : (s ?? !0) === !0 ? n : Object.assign(n, C(s, n));
+							let { from: i, params: s, ...c } = o.route, l = s === !1 || s === null ? Object.create(null) : (s ?? !0) === !0 ? n : Object.assign(n, T(s, n));
 							r = {
 								from: e.from,
 								...c,
@@ -2058,12 +2050,12 @@ var Gt = class {
 				e.forEach((e) => {
 					n.state[e] = this.latestLocation.state[e];
 				});
-				let t = O(n.state, this.latestLocation.state);
+				let t = k(n.state, this.latestLocation.state);
 				return e.forEach((e) => {
 					delete n.state[e];
 				}), t;
-			}, i = I(this.latestLocation.href) === I(n.href), a = this.commitLocationPromise;
-			if (this.commitLocationPromise = k(() => {
+			}, i = F(this.latestLocation.href) === F(n.href), a = this.commitLocationPromise;
+			if (this.commitLocationPromise = A(() => {
 				a?.resolve(), a = void 0;
 			}), i && r()) this.load();
 			else {
@@ -2090,8 +2082,8 @@ var Gt = class {
 			return this.resetNextScroll = n.resetScroll ?? !0, this.history.subscribers.size || this.load(), this.commitLocationPromise;
 		}, this.buildAndCommitLocation = ({ replace: e, resetScroll: t, hashScrollIntoView: n, viewTransition: r, ignoreBlocker: i, href: a, ...o } = {}) => {
 			if (a) {
-				let t = this.history.location.state.__TSR_index, n = G(a, { __TSR_index: e ? t : t + 1 }), r = new URL(n.pathname, this.origin);
-				o.to = pt(this.rewrite, r).pathname, o.search = this.options.parseSearch(n.search), o.hash = n.hash.slice(1);
+				let t = this.history.location.state.__TSR_index, n = W(a, { __TSR_index: e ? t : t + 1 }), r = new URL(n.pathname, this.origin);
+				o.to = bt(this.rewrite, r).pathname, o.search = this.options.parseSearch(n.search), o.hash = n.hash.slice(1);
 			}
 			let s = this.buildLocation({
 				...o,
@@ -2123,7 +2115,7 @@ var Gt = class {
 					n ??= t.publicHref, r ??= t.publicHref;
 				}
 				let t = !a && r ? r : n;
-				if (le(t, this.protocolAllowlist)) return process.env.NODE_ENV !== "production" && console.warn(`Blocked navigation to dangerous protocol: ${t}`), Promise.resolve();
+				if (fe(t, this.protocolAllowlist)) return process.env.NODE_ENV !== "production" && console.warn(`Blocked navigation to dangerous protocol: ${t}`), Promise.resolve();
 				if (!i.ignoreBlocker) {
 					let e = this.history.getBlockers?.() ?? [];
 					for (let t of e) if (t?.blockerFn && await t.blockerFn({
@@ -2142,28 +2134,28 @@ var Gt = class {
 			});
 		}, this.beforeLoad = () => {
 			this.cancelMatches(), this.updateLatestLocation();
-			let e = this.matchRoutes(this.latestLocation), t = this.stores.cachedMatchesSnapshot.state.filter((t) => !e.some((e) => e.id === t.id));
+			let e = this.matchRoutes(this.latestLocation), t = this.stores.cachedMatches.get().filter((t) => !e.some((e) => e.id === t.id));
 			this.batch(() => {
-				this.stores.status.setState(() => "pending"), this.stores.statusCode.setState(() => 200), this.stores.isLoading.setState(() => !0), this.stores.location.setState(() => this.latestLocation), this.stores.setPendingMatches(e), this.stores.setCachedMatches(t);
+				this.stores.status.set("pending"), this.stores.statusCode.set(200), this.stores.isLoading.set(!0), this.stores.location.set(this.latestLocation), this.stores.setPending(e), this.stores.setCached(t);
 			});
 		}, this.load = async (e) => {
-			let t, n, r, i = this.stores.resolvedLocation.state ?? this.stores.location.state;
+			let t, n, r, i = this.stores.resolvedLocation.get() ?? this.stores.location.get();
 			for (r = new Promise((a) => {
 				this.startTransition(async () => {
 					try {
 						this.beforeLoad();
-						let t = this.latestLocation, n = this.stores.resolvedLocation.state, r = K(t, n);
-						this.stores.redirect.state || this.emit({
+						let t = this.latestLocation, n = G(t, this.stores.resolvedLocation.get());
+						this.stores.redirect.get() || this.emit({
 							type: "onBeforeNavigate",
-							...r
+							...n
 						}), this.emit({
 							type: "onBeforeLoad",
-							...r
-						}), await Mt({
+							...n
+						}), await zt({
 							router: this,
 							sync: e?.sync,
 							forceStaleReload: i.href === t.href,
-							matches: this.stores.pendingMatchesSnapshot.state,
+							matches: this.stores.pendingMatches.get(),
 							location: t,
 							updateMatch: this.updateMatch,
 							onReady: async () => {
@@ -2171,13 +2163,13 @@ var Gt = class {
 									this.startViewTransition(async () => {
 										let e = null, t = null, n = null, r = null;
 										this.batch(() => {
-											let i = this.stores.pendingMatchesSnapshot.state, a = i.length, o = this.stores.activeMatchesSnapshot.state;
-											e = a ? o.filter((e) => !this.stores.pendingMatchStoresById.has(e.id)) : null;
+											let i = this.stores.pendingMatches.get(), a = i.length, o = this.stores.matches.get();
+											e = a ? o.filter((e) => !this.stores.pendingMatchStores.has(e.id)) : null;
 											let s = /* @__PURE__ */ new Set();
-											for (let e of this.stores.pendingMatchStoresById.values()) e.routeId && s.add(e.routeId);
+											for (let e of this.stores.pendingMatchStores.values()) e.routeId && s.add(e.routeId);
 											let c = /* @__PURE__ */ new Set();
-											for (let e of this.stores.activeMatchStoresById.values()) e.routeId && c.add(e.routeId);
-											t = a ? o.filter((e) => !s.has(e.routeId)) : null, n = a ? i.filter((e) => !c.has(e.routeId)) : null, r = a ? i.filter((e) => c.has(e.routeId)) : o, this.stores.isLoading.setState(() => !1), this.stores.loadedAt.setState(() => Date.now()), a && (this.stores.setActiveMatches(i), this.stores.setPendingMatches([]), this.stores.setCachedMatches([...this.stores.cachedMatchesSnapshot.state, ...e.filter((e) => e.status !== "error" && e.status !== "notFound" && e.status !== "redirected")]), this.clearExpiredCache());
+											for (let e of this.stores.matchStores.values()) e.routeId && c.add(e.routeId);
+											t = a ? o.filter((e) => !s.has(e.routeId)) : null, n = a ? i.filter((e) => !c.has(e.routeId)) : null, r = a ? i.filter((e) => c.has(e.routeId)) : o, this.stores.isLoading.set(!1), this.stores.loadedAt.set(Date.now()), a && (this.stores.setMatches(i), this.stores.setPending([]), this.stores.setCached([...this.stores.cachedMatches.get(), ...e.filter((e) => e.status !== "error" && e.status !== "notFound" && e.status !== "redirected")]), this.clearExpiredCache());
 										});
 										for (let [e, i] of [
 											[t, "onLeave"],
@@ -2189,27 +2181,27 @@ var Gt = class {
 							}
 						});
 					} catch (e) {
-						z(e) ? (t = e, this.navigate({
+						R(e) ? (t = e, this.navigate({
 							...t.options,
 							replace: !0,
 							ignoreBlocker: !0
-						})) : L(e) && (n = e);
-						let r = t ? t.status : n ? 404 : this.stores.activeMatchesSnapshot.state.some((e) => e.status === "error") ? 500 : 200;
+						})) : I(e) && (n = e);
+						let r = t ? t.status : n ? 404 : this.stores.matches.get().some((e) => e.status === "error") ? 500 : 200;
 						this.batch(() => {
-							this.stores.statusCode.setState(() => r), this.stores.redirect.setState(() => t);
+							this.stores.statusCode.set(r), this.stores.redirect.set(t);
 						});
 					}
 					this.latestLoadPromise === r && (this.commitLocationPromise?.resolve(), this.latestLoadPromise = void 0, this.commitLocationPromise = void 0), a();
 				});
 			}), this.latestLoadPromise = r, await r; this.latestLoadPromise && r !== this.latestLoadPromise;) await this.latestLoadPromise;
 			let a;
-			this.hasNotFoundMatch() ? a = 404 : this.stores.activeMatchesSnapshot.state.some((e) => e.status === "error") && (a = 500), a !== void 0 && this.stores.statusCode.setState(() => a);
+			this.hasNotFoundMatch() ? a = 404 : this.stores.matches.get().some((e) => e.status === "error") && (a = 500), a !== void 0 && this.stores.statusCode.set(a);
 		}, this.startViewTransition = (e) => {
 			let t = this.shouldViewTransition ?? this.options.defaultViewTransition;
 			if (this.shouldViewTransition = void 0, t && typeof document < "u" && "startViewTransition" in document && typeof document.startViewTransition == "function") {
 				let n;
 				if (typeof t == "object" && this.isViewTransitionTypesSupported) {
-					let r = this.latestLocation, i = this.stores.resolvedLocation.state, a = typeof t.types == "function" ? t.types(K(r, i)) : t.types;
+					let r = this.latestLocation, i = this.stores.resolvedLocation.get(), a = typeof t.types == "function" ? t.types(G(r, i)) : t.types;
 					if (a === !1) {
 						e();
 						return;
@@ -2223,23 +2215,23 @@ var Gt = class {
 			} else e();
 		}, this.updateMatch = (e, t) => {
 			this.startTransition(() => {
-				let n = this.stores.pendingMatchStoresById.get(e);
+				let n = this.stores.pendingMatchStores.get(e);
 				if (n) {
-					n.setState(t);
+					n.set(t);
 					return;
 				}
-				let r = this.stores.activeMatchStoresById.get(e);
+				let r = this.stores.matchStores.get(e);
 				if (r) {
-					r.setState(t);
+					r.set(t);
 					return;
 				}
-				let i = this.stores.cachedMatchStoresById.get(e);
+				let i = this.stores.cachedMatchStores.get(e);
 				if (i) {
-					let n = t(i.state);
-					n.status === "redirected" ? this.stores.cachedMatchStoresById.delete(e) && this.stores.cachedMatchesId.setState((t) => t.filter((t) => t !== e)) : i.setState(() => n);
+					let n = t(i.get());
+					n.status === "redirected" ? this.stores.cachedMatchStores.delete(e) && this.stores.cachedIds.set((t) => t.filter((t) => t !== e)) : i.set(n);
 				}
 			});
-		}, this.getMatch = (e) => this.stores.cachedMatchStoresById.get(e)?.state ?? this.stores.pendingMatchStoresById.get(e)?.state ?? this.stores.activeMatchStoresById.get(e)?.state, this.invalidate = (e) => {
+		}, this.getMatch = (e) => this.stores.cachedMatchStores.get(e)?.get() ?? this.stores.pendingMatchStores.get(e)?.get() ?? this.stores.matchStores.get(e)?.get(), this.invalidate = (e) => {
 			let t = (t) => e?.filter?.(t) ?? !0 ? {
 				...t,
 				invalid: !0,
@@ -2249,7 +2241,7 @@ var Gt = class {
 				} : void 0
 			} : t;
 			return this.batch(() => {
-				this.stores.setActiveMatches(this.stores.activeMatchesSnapshot.state.map(t)), this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.map(t)), this.stores.setPendingMatches(this.stores.pendingMatchesSnapshot.state.map(t));
+				this.stores.setMatches(this.stores.matches.get().map(t)), this.stores.setCached(this.stores.cachedMatches.get().map(t)), this.stores.setPending(this.stores.pendingMatches.get().map(t));
 			}), this.shouldViewTransition = !1, this.load({ sync: e?.sync });
 		}, this.getParsedLocationHref = (e) => e.publicHref || "/", this.resolveRedirect = (e) => {
 			let t = e.headers.get("Location");
@@ -2263,11 +2255,11 @@ var Gt = class {
 					e.options.href = t, e.headers.set("Location", t);
 				}
 			} catch {}
-			if (e.options.href && !e.options._builtLocation && le(e.options.href, this.protocolAllowlist)) throw Error(process.env.NODE_ENV === "production" ? "Redirect blocked: unsafe protocol" : `Redirect blocked: unsafe protocol in href "${e.options.href}". Allowed protocols: ${Array.from(this.protocolAllowlist).join(", ")}.`);
+			if (e.options.href && !e.options._builtLocation && fe(e.options.href, this.protocolAllowlist)) throw Error(process.env.NODE_ENV === "production" ? "Redirect blocked: unsafe protocol" : `Redirect blocked: unsafe protocol in href "${e.options.href}". Allowed protocols: ${Array.from(this.protocolAllowlist).join(", ")}.`);
 			return e.headers.get("Location") || e.headers.set("Location", e.options.href), e;
 		}, this.clearCache = (e) => {
 			let t = e?.filter;
-			t === void 0 ? this.stores.setCachedMatches([]) : this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.filter((e) => !t(e)));
+			t === void 0 ? this.stores.setCached([]) : this.stores.setCached(this.stores.cachedMatches.get().filter((e) => !t(e)));
 		}, this.clearExpiredCache = () => {
 			let e = Date.now();
 			this.clearCache({ filter: (t) => {
@@ -2276,18 +2268,18 @@ var Gt = class {
 				let r = (t.preload ? n.options.preloadGcTime ?? this.options.defaultPreloadGcTime : n.options.gcTime ?? this.options.defaultGcTime) ?? 300 * 1e3;
 				return t.status === "error" ? !0 : e - t.updatedAt >= r;
 			} });
-		}, this.loadRouteChunk = U, this.preloadRoute = async (e) => {
+		}, this.loadRouteChunk = H, this.preloadRoute = async (e) => {
 			let t = e._builtLocation ?? this.buildLocation(e), n = this.matchRoutes(t, {
 				throwOnError: !0,
 				preload: !0,
 				dest: e
-			}), r = new Set([...this.stores.matchesId.state, ...this.stores.pendingMatchesId.state]), i = new Set([...r, ...this.stores.cachedMatchesId.state]), a = n.filter((e) => !i.has(e.id));
+			}), r = new Set([...this.stores.matchesId.get(), ...this.stores.pendingIds.get()]), i = new Set([...r, ...this.stores.cachedIds.get()]), a = n.filter((e) => !i.has(e.id));
 			if (a.length) {
-				let e = this.stores.cachedMatchesSnapshot.state;
-				this.stores.setCachedMatches([...e, ...a]);
+				let e = this.stores.cachedMatches.get();
+				this.stores.setCached([...e, ...a]);
 			}
 			try {
-				return n = await Mt({
+				return n = await zt({
 					router: this,
 					matches: n,
 					location: t,
@@ -2297,11 +2289,11 @@ var Gt = class {
 					}
 				}), n;
 			} catch (e) {
-				if (z(e)) return e.options.reloadDocument ? void 0 : await this.preloadRoute({
+				if (R(e)) return e.options.reloadDocument ? void 0 : await this.preloadRoute({
 					...e.options,
 					_fromLocation: t
 				});
-				L(e) || console.error(e);
+				I(e) || console.error(e);
 				return;
 			}
 		}, this.matchRoute = (e, t) => {
@@ -2311,10 +2303,10 @@ var Gt = class {
 				params: e.params || {},
 				leaveParams: !0
 			}, r = this.buildLocation(n);
-			if (t?.pending && this.stores.status.state !== "pending") return !1;
-			let i = (t?.pending === void 0 ? !this.stores.isLoading.state : t.pending) ? this.latestLocation : this.stores.resolvedLocation.state || this.stores.location.state, a = Te(r.pathname, t?.caseSensitive ?? !1, t?.fuzzy ?? !1, i.pathname, this.processedTree);
-			return !a || e.params && !O(a.rawParams, e.params, { partial: !0 }) ? !1 : t?.includeSearch ?? !0 ? O(i.search, r.search, { partial: !0 }) ? a.rawParams : !1 : a.rawParams;
-		}, this.hasNotFoundMatch = () => this.stores.activeMatchesSnapshot.state.some((e) => e.status === "notFound" || e.globalNotFound), this.getStoreConfig = t, this.update({
+			if (t?.pending && this.stores.status.get() !== "pending") return !1;
+			let i = (t?.pending === void 0 ? !this.stores.isLoading.get() : t.pending) ? this.latestLocation : this.stores.resolvedLocation.get() || this.stores.location.get(), a = ke(r.pathname, t?.caseSensitive ?? !1, t?.fuzzy ?? !1, i.pathname, this.processedTree);
+			return !a || e.params && !k(a.rawParams, e.params, { partial: !0 }) ? !1 : t?.includeSearch ?? !0 ? k(i.search, r.search, { partial: !0 }) ? a.rawParams : !1 : a.rawParams;
+		}, this.hasNotFoundMatch = () => this.stores.matches.get().some((e) => e.status === "notFound" || e.globalNotFound), this.getStoreConfig = t, this.update({
 			defaultPreloadDelay: 50,
 			defaultPendingMs: 1e3,
 			defaultPendingMinMs: 500,
@@ -2322,9 +2314,9 @@ var Gt = class {
 			...e,
 			caseSensitive: e.caseSensitive ?? !1,
 			notFoundMode: e.notFoundMode ?? "fuzzy",
-			stringifySearch: e.stringifySearch ?? st,
-			parseSearch: e.parseSearch ?? ot,
-			protocolAllowlist: e.protocolAllowlist ?? ce
+			stringifySearch: e.stringifySearch ?? mt,
+			parseSearch: e.parseSearch ?? pt,
+			protocolAllowlist: e.protocolAllowlist ?? de
 		}), typeof document < "u" && (self.__TSR_ROUTER__ = this);
 	}
 	isShell() {
@@ -2334,13 +2326,17 @@ var Gt = class {
 		return !!this.options.isPrerendering;
 	}
 	get state() {
-		return this.stores.__store.state;
+		return this.stores.__store.get();
 	}
 	setRoutes({ routesById: e, routesByPath: t, processedTree: n }) {
 		this.routesById = e, this.routesByPath = t, this.processedTree = n;
 		let r = this.options.notFoundRoute;
 		r && (r.init({ originalIndex: 99999999999 }), this.routesById[r.id] = r);
 	}
+	getRouteBranch(e) {
+		let t = this.routeBranchCache.get(e);
+		return t || (t = Fe(e), this.routeBranchCache.set(e, t)), t;
+	}
 	get looseRoutesById() {
 		return this.routesById;
 	}
@@ -2348,76 +2344,76 @@ var Gt = class {
 		return e?.id ? e.context ?? this.options.context ?? void 0 : this.options.context ?? void 0;
 	}
 	matchRoutesInternal(e, t) {
-		let n = this.getMatchedRoutes(e.pathname), { foundRoute: r, routeParams: i, parsedParams: a } = n, { matchedRoutes: o } = n, s = !1;
-		(r ? r.path !== "/" && i["**"] : I(e.pathname)) && (this.options.notFoundRoute ? o = [...o, this.options.notFoundRoute] : s = !0);
-		let c = s ? nn(this.options.notFoundMode, o) : void 0, l = Array(o.length), u = /* @__PURE__ */ new Map();
-		for (let e of this.stores.activeMatchStoresById.values()) e.routeId && u.set(e.routeId, e.state);
-		for (let n = 0; n < o.length; n++) {
-			let r = o[n], s = l[n - 1], d, f, p;
+		let n = this.getMatchedRoutes(e.pathname), { foundRoute: r, routeParams: i } = n, { matchedRoutes: a } = n, o = !1;
+		(r ? r.path !== "/" && i["**"] : F(e.pathname)) && (this.options.notFoundRoute ? a = [...a, this.options.notFoundRoute] : o = !0);
+		let s = o ? un(this.options.notFoundMode, a) : void 0, c = Array(a.length), l = /* @__PURE__ */ new Map();
+		for (let e of this.stores.matchStores.values()) e.routeId && l.set(e.routeId, e.get());
+		for (let n = 0; n < a.length; n++) {
+			let r = a[n], o = c[n - 1], u, d, f;
 			{
-				let n = s?.search ?? e.search, i = s?._strictSearch ?? void 0;
+				let n = o?.search ?? e.search, i = o?._strictSearch ?? void 0;
 				try {
-					let e = Qt(r.options.validateSearch, { ...n }) ?? void 0;
-					d = {
+					let e = on(r.options.validateSearch, { ...n }) ?? void 0;
+					u = {
 						...n,
 						...e
-					}, f = {
+					}, d = {
 						...i,
 						...e
-					}, p = void 0;
+					}, f = void 0;
 				} catch (e) {
 					let r = e;
-					if (e instanceof Kt || (r = new Kt(e.message, { cause: e })), t?.throwOnError) throw r;
-					d = n, f = {}, p = r;
+					if (e instanceof $t || (r = new $t(e.message, { cause: e })), t?.throwOnError) throw r;
+					u = n, d = {}, f = r;
 				}
 			}
-			let m = r.options.loaderDeps?.({ search: d }) ?? "", h = m ? JSON.stringify(m) : "", { interpolatedPath: g, usedParams: _ } = We({
+			let p = r.options.loaderDeps?.({ search: u }) ?? "", m = p ? JSON.stringify(p) : "", { interpolatedPath: h, usedParams: g } = Ze({
 				path: r.fullPath,
 				params: i,
 				decoder: this.pathParamsDecoder,
 				server: this.isServer
-			}), v = r.id + g + h, y = this.getMatch(v), b = u.get(r.id), x = y?._strictParams ?? _, S;
-			if (!y) try {
-				rn(r, _, a, x);
+			}), _ = r.id + h + m, v = this.getMatch(_), y = l.get(r.id), b = v?._strictParams ?? g, x;
+			if (!v) try {
+				dn(r, b);
 			} catch (e) {
-				if (S = L(e) || z(e) ? e : new qt(e.message, { cause: e }), t?.throwOnError) throw S;
+				if (x = I(e) || R(e) ? e : new en(e.message, { cause: e }), t?.throwOnError) throw x;
 			}
-			Object.assign(i, x);
-			let C = b ? "stay" : "enter", w;
-			if (y) w = {
-				...y,
-				cause: C,
-				params: b?.params ?? i,
-				_strictParams: x,
-				search: T(b ? b.search : y.search, d),
-				_strictSearch: f
+			Object.assign(i, b);
+			let S = y ? "stay" : "enter", C;
+			if (v) C = {
+				...v,
+				cause: S,
+				params: y?.params ?? i,
+				_strictParams: b,
+				search: E(y ? y.search : v.search, u),
+				_strictSearch: d
 			};
 			else {
-				let e = r.options.loader || r.options.beforeLoad || r.lazyFn || Pt(r) ? "pending" : "success";
-				w = {
-					id: v,
+				let e = r.options.loader || r.options.beforeLoad || r.lazyFn || Vt(r) ? "pending" : "success";
+				C = {
+					id: _,
 					ssr: r.options.ssr,
 					index: n,
 					routeId: r.id,
-					params: b?.params ?? i,
-					_strictParams: x,
-					pathname: g,
+					params: y?.params ?? i,
+					_strictParams: b,
+					pathname: h,
 					updatedAt: Date.now(),
-					search: b ? T(b.search, d) : d,
-					_strictSearch: f,
+					search: y ? E(y.search, u) : u,
+					_strictSearch: d,
 					searchError: void 0,
 					status: e,
 					isFetching: !1,
 					error: void 0,
-					paramsError: S,
+					paramsError: x,
 					__routeContext: void 0,
-					_nonReactive: { loadPromise: k() },
+					_nonReactive: { loadPromise: A() },
 					__beforeLoadContext: void 0,
 					context: {},
 					abortController: new AbortController(),
 					fetchCount: 0,
-					cause: C,
-					loaderDeps: b ? E(b.loaderDeps, m) : m,
+					cause: S,
+					loaderDeps: y ? D(y.loaderDeps, p) : p,
 					invalid: !1,
 					preload: !1,
 					links: void 0,
@@ -2428,18 +2424,18 @@ var Gt = class {
 					fullPath: r.fullPath
 				};
 			}
-			t?.preload || (w.globalNotFound = c === r.id), w.searchError = p;
-			let ee = this.getParentContext(s);
-			w.context = {
-				...ee,
-				...w.__routeContext,
-				...w.__beforeLoadContext
-			}, l[n] = w;
+			t?.preload || (C.globalNotFound = s === r.id), C.searchError = f;
+			let w = this.getParentContext(o);
+			C.context = {
+				...w,
+				...C.__routeContext,
+				...C.__beforeLoadContext
+			}, c[n] = C;
 		}
-		for (let t = 0; t < l.length; t++) {
-			let n = l[t], r = this.looseRoutesById[n.routeId], a = this.getMatch(n.id), o = u.get(n.routeId);
-			if (n.params = o ? T(o.params, i) : i, !a) {
-				let i = l[t - 1], a = this.getParentContext(i);
+		for (let t = 0; t < c.length; t++) {
+			let n = c[t], r = this.looseRoutesById[n.routeId], a = this.getMatch(n.id), o = l.get(n.routeId);
+			if (n.params = o ? E(o.params, i) : i, !a) {
+				let i = c[t - 1], a = this.getParentContext(i);
 				if (r.options.context) {
 					let t = {
 						deps: n.loaderDeps,
@@ -2454,7 +2450,7 @@ var Gt = class {
 						cause: n.cause,
 						abortController: n.abortController,
 						preload: !!n.preload,
-						matches: l,
+						matches: c,
 						routeId: r.id
 					};
 					n.__routeContext = r.options.context(t) ?? void 0;
@@ -2466,37 +2462,37 @@ var Gt = class {
 				};
 			}
 		}
-		return l;
+		return c;
 	}
 	matchRoutesLightweight(e) {
-		let { matchedRoutes: t, routeParams: n, parsedParams: r } = this.getMatchedRoutes(e.pathname), i = x(t), a = { ...e.search };
+		let { matchedRoutes: t, routeParams: n } = this.getMatchedRoutes(e.pathname), r = w(t), i = { ...e.search };
 		for (let e of t) try {
-			Object.assign(a, Qt(e.options.validateSearch, a));
+			Object.assign(i, on(e.options.validateSearch, i));
 		} catch {}
-		let o = x(this.stores.matchesId.state), s = o && this.stores.activeMatchStoresById.get(o)?.state, c = s && s.routeId === i.id && s.pathname === e.pathname, l;
-		if (c) l = s.params;
+		let a = w(this.stores.matchesId.get()), o = a && this.stores.matchStores.get(a)?.get(), s = o && o.routeId === r.id && o.pathname === e.pathname, c;
+		if (s) c = o.params;
 		else {
 			let e = Object.assign(Object.create(null), n);
-			for (let i of t) try {
-				rn(i, n, r ?? {}, e);
+			for (let n of t) try {
+				dn(n, e);
 			} catch {}
-			l = e;
+			c = e;
 		}
 		return {
 			matchedRoutes: t,
-			fullPath: i.fullPath,
-			search: a,
-			params: l
+			fullPath: r.fullPath,
+			search: i,
+			params: c
 		};
 	}
-}, Kt = class extends Error {}, qt = class extends Error {}, Jt = (e) => e.endsWith("/") && e.length > 1 ? e.slice(0, -1) : e;
-function Yt(e, t) {
-	return Jt(e) === Jt(t);
+}, $t = class extends Error {}, en = class extends Error {}, tn = (e) => e.endsWith("/") && e.length > 1 ? e.slice(0, -1) : e;
+function nn(e, t) {
+	return tn(e) === tn(t);
 }
-function Xt(e, t) {
+function rn(e, t) {
 	return async (...n) => (await e())[t || "default"](...n);
 }
-function Zt(e) {
+function an(e) {
 	return {
 		loadedAt: 0,
 		isLoading: !1,
@@ -2508,29 +2504,28 @@ function Zt(e) {
 		statusCode: 200
 	};
 }
-function Qt(e, t) {
+function on(e, t) {
 	if (e == null) return {};
 	if ("~standard" in e) {
 		let n = e["~standard"].validate(t);
-		if (n instanceof Promise) throw new Kt("Async validation not supported");
-		if (n.issues) throw new Kt(JSON.stringify(n.issues, void 0, 2), { cause: n });
+		if (n instanceof Promise) throw new $t("Async validation not supported");
+		if (n.issues) throw new $t(JSON.stringify(n.issues, void 0, 2), { cause: n });
 		return n.value;
 	}
 	return "parse" in e ? e.parse(t) : typeof e == "function" ? e(t) : {};
 }
-function $t({ pathname: e, routesById: t, processedTree: n }) {
-	let r = Object.create(null), i = I(e), a, o, s = Ee(i, n, !0);
-	return s && (a = s.route, Object.assign(r, s.rawParams), o = Object.assign(Object.create(null), s.parsedParams)), {
-		matchedRoutes: s?.branch || [t.__root__],
+function sn({ pathname: e, routesById: t, processedTree: n }) {
+	let r = Object.create(null), i = F(e), a, o = Ae(i, n, !0);
+	return o && (a = o.route, Object.assign(r, o.rawParams)), {
+		matchedRoutes: o?.branch || [t.__root__],
 		routeParams: r,
-		foundRoute: a,
-		parsedParams: o
+		foundRoute: a
 	};
 }
-function en({ search: e, dest: t, destRoutes: n, _includeValidateSearch: r }) {
-	return tn(n)(e, t, r ?? !1);
+function cn({ search: e, dest: t, destRoutes: n, _includeValidateSearch: r }) {
+	return ln(n)(e, t, r ?? !1);
 }
-function tn(e) {
+function ln(e) {
 	let t = {
 		dest: null,
 		_includeValidateSearch: !1,
@@ -2547,7 +2542,7 @@ function tn(e) {
 		try {
 			return {
 				...i,
-				...Qt(n.options.validateSearch, i) ?? void 0
+				...on(n.options.validateSearch, i) ?? void 0
 			};
 		} catch {
 			return i;
@@ -2555,7 +2550,7 @@ function tn(e) {
 	});
 	t.middlewares.push(({ search: e }) => {
 		let n = t.dest;
-		return n.search ? n.search === !0 ? e : C(n.search, e) : {};
+		return n.search ? n.search === !0 ? e : T(n.search, e) : {};
 	});
 	let n = (e, t, r) => {
 		if (e >= r.length) return t;
@@ -2569,24 +2564,24 @@ function tn(e) {
 		return t.dest = r, t._includeValidateSearch = i, n(0, e, t.middlewares);
 	};
 }
-function nn(e, t) {
+function un(e, t) {
 	if (e !== "root") for (let e = t.length - 1; e >= 0; e--) {
 		let n = t[e];
 		if (n.children) return n.id;
 	}
-	return R;
+	return L;
 }
-function rn(e, t, n, r) {
-	let i = e.options.params?.parse ?? e.options.parseParams;
-	if (i) if (e.options.skipRouteOnParseError) for (let e in t) e in n && (r[e] = n[e]);
-	else {
-		let e = i(r);
-		Object.assign(r, e);
+function dn(e, t) {
+	let n = e.options.params?.parse ?? e.options.parseParams;
+	if (n) {
+		let e = n(t);
+		if (e === !1) throw Error("Route params.parse returned false for a matched route");
+		Object.assign(t, e);
 	}
 }
 //#endregion
 //#region ../router-core/dist/esm/link.js
-var an = "Error preloading route! ☝️", on = class {
+var fn = "Error preloading route! ☝️", pn = class {
 	get to() {
 		return this._to;
 	}
@@ -2603,43 +2598,43 @@ var an = "Error preloading route! ☝️", on = class {
 		if (this.init = (e) => {
 			this.originalIndex = e.originalIndex;
 			let t = this.options, n = !t?.path && !t?.id;
-			if (this.parentRoute = this.options.getParentRoute?.(), n) this._path = R;
+			if (this.parentRoute = this.options.getParentRoute?.(), n) this._path = L;
 			else if (!this.parentRoute) {
 				if (process.env.NODE_ENV !== "production") throw Error("Invariant failed: Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.");
-				he();
+				ye();
 			}
-			let r = n ? R : t?.path;
-			r && r !== "/" && (r = Le(r));
-			let i = t?.id || r, a = n ? R : Fe([this.parentRoute.id === "__root__" ? "" : this.parentRoute.id, i]);
-			r === "__root__" && (r = "/"), a !== "__root__" && (a = Fe(["/", a]));
-			let o = a === "__root__" ? "/" : Fe([this.parentRoute.fullPath, r]);
-			this._path = r, this._id = a, this._fullPath = o, this._to = I(o);
-		}, this.addChildren = (e) => this._addFileChildren(e), this._addFileChildren = (e) => (Array.isArray(e) && (this.children = e), typeof e == "object" && e && (this.children = Object.values(e)), this), this._addFileTypes = () => this, this.updateLoader = (e) => (Object.assign(this.options, e), this), this.update = (e) => (Object.assign(this.options, e), this), this.lazy = (e) => (this.lazyFn = e, this), this.redirect = (e) => ut({
+			let r = n ? L : t?.path;
+			r && r !== "/" && (r = We(r));
+			let i = t?.id || r, a = n ? L : He([this.parentRoute.id === "__root__" ? "" : this.parentRoute.id, i]);
+			r === "__root__" && (r = "/"), a !== "__root__" && (a = He(["/", a]));
+			let o = a === "__root__" ? "/" : He([this.parentRoute.fullPath, r]);
+			this._path = r, this._id = a, this._fullPath = o, this._to = F(o);
+		}, this.addChildren = (e) => this._addFileChildren(e), this._addFileChildren = (e) => (Array.isArray(e) && (this.children = e), typeof e == "object" && e && (this.children = Object.values(e)), this), this._addFileTypes = () => this, this.updateLoader = (e) => (Object.assign(this.options, e), this), this.update = (e) => (Object.assign(this.options, e), this), this.lazy = (e) => (this.lazyFn = e, this), this.redirect = (e) => _t({
 			from: this.fullPath,
 			...e
 		}), this.options = e || {}, this.isRoot = !e?.getParentRoute, e?.id && e?.path) throw Error("Route cannot have both an 'id' and a 'path' option.");
 	}
-}, sn = class {
+}, mn = class {
 	constructor({ id: e }) {
-		this.notFound = (e) => Ke({
+		this.notFound = (e) => $e({
 			routeId: this.id,
 			...e
-		}), this.redirect = (e) => ut({
+		}), this.redirect = (e) => _t({
 			from: this.id,
 			...e
 		}), this.id = e;
 	}
-}, cn = class extends on {
+}, hn = class extends pn {
 	constructor(e) {
 		super(e);
 	}
-}, ln = (e) => ({
+}, gn = (e) => ({
 	serializationAdapters: e.serializationAdapters,
 	defaultSsr: e.defaultSsr
 });
 //#endregion
 //#region ../router-core/dist/esm/searchMiddleware.js
-function un(e) {
+function _n(e) {
 	return ({ search: t, next: n }) => {
 		let r = n(t);
 		if (e === !0) return {
@@ -2654,9 +2649,9 @@ function un(e) {
 }
 //#endregion
 //#region ../router-core/dist/esm/hash-scroll.js
-function dn(e) {
+function vn(e) {
 	if (typeof document < "u" && document.querySelector) {
-		let t = e.stores.location.state, n = t.state.__hashScrollIntoViewOptions ?? !0;
+		let t = e.stores.location.get(), n = t.state.__hashScrollIntoViewOptions ?? !0;
 		if (n && t.hash !== "") {
 			let e = document.getElementById(t.hash);
 			e && e.scrollIntoView(n);
@@ -2665,114 +2660,100 @@ function dn(e) {
 }
 //#endregion
 //#region src/routerStores.ts
-function fn(e, t) {
+function yn(e, t) {
 	e.childMatchIdByRouteId = t(() => {
-		let t = e.matchesId.state, n = {};
+		let t = e.matchesId.get(), n = {};
 		for (let r = 0; r < t.length - 1; r++) {
-			let i = t[r], a = t[r + 1];
-			if (i === void 0 || a === void 0) continue;
-			let o = e.activeMatchStoresById.get(i);
-			o?.routeId && (n[o.routeId] = a);
+			let i = e.matchStores.get(t[r]);
+			i?.routeId && (n[i.routeId] = t[r + 1]);
 		}
 		return n;
 	}), e.pendingRouteIds = t(() => {
-		let t = e.pendingMatchesId.state, n = {};
+		let t = e.pendingIds.get(), n = {};
 		for (let r of t) {
-			let t = e.pendingMatchStoresById.get(r);
+			let t = e.pendingMatchStores.get(r);
 			t?.routeId && (n[t.routeId] = !0);
 		}
 		return n;
 	});
 }
-function pn(t) {
-	let n = e.signal(t);
-	return {
-		get state() {
-			return n();
-		},
-		setState(e) {
-			n.update(e);
-		}
-	};
-}
-function mn(t) {
-	let n = e.computed(t);
-	return { get state() {
-		return n();
-	} };
-}
-var hn = (e) => ({
-	createMutableStore: pn,
-	createReadonlyStore: mn,
-	batch: (e) => e(),
-	init: (e) => fn(e, mn)
-}), gn = (e) => new _n(e), _n = class extends Gt {
+var bn = (n) => ({
+	createMutableStore: t,
+	createReadonlyStore: t,
+	batch: e,
+	init: (e) => yn(e, t)
+}), xn = (e) => new Sn(e), Sn = class extends Qt {
 	constructor(e) {
-		super(e, hn);
+		super(e, bn);
 	}
-}, vn = {
+}, Cn = {
 	matchId: () => void 0,
 	routeId: () => void 0,
 	match: () => void 0,
 	hasPending: () => !1
-}, q = new e.InjectionToken("MATCH_CONTEXT_INJECTOR", {
+}, K = new n.InjectionToken("MATCH_CONTEXT_INJECTOR", {
 	providedIn: "root",
-	factory: () => vn
-}), yn = new e.InjectionToken("ROUTER");
-function bn() {
-	return typeof document > "u" ? yn : window.__TSR_ROUTER_INJECTION_KEY__ ? window.__TSR_ROUTER_INJECTION_KEY__ : (window.__TSR_ROUTER_INJECTION_KEY__ = yn, yn);
+	factory: () => Cn
+}), wn = new n.InjectionToken("ROUTER");
+function Tn() {
+	return typeof document > "u" ? wn : window.__TSR_ROUTER_INJECTION_KEY__ ? window.__TSR_ROUTER_INJECTION_KEY__ : (window.__TSR_ROUTER_INJECTION_KEY__ = wn, wn);
 }
 //#endregion
 //#region src/injectRouter.ts
-function J(t) {
-	let n = e.inject(bn(), { optional: !0 });
-	return process.env.NODE_ENV !== "production" && (t?.warn ?? !0) && !n && console.warn("Warning: injectRouter must be used inside a <router-provider> component!"), n;
+function q(e) {
+	let t = n.inject(Tn(), { optional: !0 });
+	return process.env.NODE_ENV !== "production" && (e?.warn ?? !0) && !t && console.warn("Warning: injectRouter must be used inside a <router-provider> component!"), t;
 }
 //#endregion
-//#region src/injectStore.ts
-function Y(e, t = (e) => e, n = { equal: xn }) {
-	u(Y);
-	let r = typeof e == "function" ? e : () => e, i = _(() => t(r().state), n);
-	return f(() => {
-		i();
-	}), i.asReadonly();
-}
-function xn(e, t) {
-	if (Object.is(e, t)) return !0;
-	if (typeof e != "object" || !e || typeof t != "object" || !t) return !1;
-	if (e instanceof Map && t instanceof Map) {
-		if (e.size !== t.size) return !1;
-		for (let [n, r] of e) if (!t.has(n) || !Object.is(r, t.get(n))) return !1;
-		return !0;
-	}
-	if (e instanceof Set && t instanceof Set) {
-		if (e.size !== t.size) return !1;
-		for (let n of e) if (!t.has(n)) return !1;
-		return !0;
-	}
-	if (e instanceof Date && t instanceof Date) return e.getTime() === t.getTime();
-	let n = Object.keys(e);
-	if (n.length !== Object.keys(t).length) return !1;
-	for (let r of n) if (!Object.prototype.hasOwnProperty.call(t, r) || !Object.is(e[r], t[r])) return !1;
-	return !0;
+//#region src/store/injectSelector.ts
+function En(e, t) {
+	return t || (f(e), h(c));
+}
+function Dn(e, t = (e) => e, n) {
+	return b(En(Dn, n?.injector), () => {
+		let r = typeof e == "function" ? e : () => e, i = y(() => t(r().get()), { equal: n?.compare });
+		return m((e) => {
+			let { unsubscribe: n } = r().subscribe((e) => {
+				i.set(t(e));
+			});
+			e(n);
+		}), i.asReadonly();
+	});
+}
+//#endregion
+//#region src/store/injectStore.ts
+function J(e, t = (e) => e, n) {
+	let { equal: r, injector: i, ...a } = n ?? {};
+	return Dn(e, t, {
+		...a,
+		compare: r,
+		injector: i
+	});
 }
 //#endregion
 //#region src/injectMatch.ts
-function X(t) {
-	let n = J(), r = t.from ? void 0 : e.inject(q), i = Y(n.stores.pendingRouteIds, (e) => e), a = Y(n.stores.isTransitioning, (e) => e), o = () => t.from ? n.stores.getMatchStoreByRouteId(t.from).state : r?.match();
-	return e.computed(() => {
-		let e = o();
-		if (e !== void 0) return t.select ? t.select(e) : e;
-		if (!(t.from ? i()[t.from] : r?.hasPending() ?? !1) && !a() && (t.shouldThrow ?? !0)) {
-			if (process.env.NODE_ENV !== "production") throw Error(`Invariant failed: Could not find ${t.from ? `an active match from "${t.from}"` : "a nearest match!"}`);
-			he();
+var On = {
+	get: () => void 0,
+	subscribe: () => ({ unsubscribe: () => {} })
+};
+function Y(e) {
+	let t = q(), r = e.from ? void 0 : n.inject(K), i = J(e.from ? t.stores.getRouteMatchStore(e.from) : () => {
+		let e = r?.matchId();
+		return e ? t.stores.matchStores.get(e) ?? On : On;
+	}, (e) => e), a = J(t.stores.pendingRouteIds, (e) => e), o = J(t.stores.isTransitioning, (e) => e);
+	return n.computed(() => {
+		let t = i();
+		if (t !== void 0) return e.select ? e.select(t) : t;
+		if (!(e.from ? a()[e.from] : r?.hasPending() ?? !1) && !o() && (e.shouldThrow ?? !0)) {
+			if (process.env.NODE_ENV !== "production") throw Error(`Invariant failed: Could not find ${e.from ? `an active match from "${e.from}"` : "a nearest match!"}`);
+			ye();
 		}
-	}, { equal: O });
+	}, { equal: k });
 }
 //#endregion
 //#region src/injectLoaderData.ts
-function Sn(e) {
-	return X({
+function kn(e) {
+	return Y({
 		from: e.from,
 		strict: e.strict,
 		select: (t) => e.select ? e.select(t.loaderData) : t.loaderData
@@ -2780,17 +2761,17 @@ function Sn(e) {
 }
 //#endregion
 //#region src/injectLoaderDeps.ts
-function Cn(e) {
+function An(e) {
 	let { select: t, ...n } = e;
-	return X({
+	return Y({
 		...n,
 		select: (e) => t ? t(e.loaderDeps) : e.loaderDeps
 	});
 }
 //#endregion
 //#region src/injectNavigate.ts
-function wn(e) {
-	let t = J();
+function X(e) {
+	let t = q();
 	return ((n) => t.navigate({
 		...n,
 		from: n.from ?? e?.from
@@ -2798,8 +2779,8 @@ function wn(e) {
 }
 //#endregion
 //#region src/injectParams.ts
-function Tn(e) {
-	return X({
+function jn(e) {
+	return Y({
 		from: e.from,
 		strict: e.strict,
 		shouldThrow: e.shouldThrow,
@@ -2808,16 +2789,16 @@ function Tn(e) {
 }
 //#endregion
 //#region src/injectRouteContext.ts
-function En(e) {
-	return X({
+function Mn(e) {
+	return Y({
 		...e,
 		select: (t) => e.select ? e.select(t.context) : t.context
 	});
 }
 //#endregion
 //#region src/injectSearch.ts
-function Dn(e) {
-	return X({
+function Nn(e) {
+	return Y({
 		from: e.from,
 		strict: e.strict,
 		shouldThrow: e.shouldThrow,
@@ -2826,94 +2807,94 @@ function Dn(e) {
 }
 //#endregion
 //#region src/route.ts
-function On(e) {
-	return new kn({ id: e });
+function Pn(e) {
+	return new Fn({ id: e });
 }
-var kn = class extends sn {
+var Fn = class extends mn {
 	constructor({ id: e }) {
-		super({ id: e }), this.injectMatch = (e) => X({
+		super({ id: e }), this.injectMatch = (e) => Y({
 			select: e?.select,
 			from: this.id
-		}), this.injectRouteContext = (e) => En({
+		}), this.injectRouteContext = (e) => Mn({
 			...e,
 			from: this.id
-		}), this.injectSearch = (e) => Dn({
+		}), this.injectSearch = (e) => Nn({
 			select: e?.select,
 			from: this.id
-		}), this.injectParams = (e) => Tn({
+		}), this.injectParams = (e) => jn({
 			select: e?.select,
 			from: this.id
-		}), this.injectLoaderDeps = (e) => Cn({
+		}), this.injectLoaderDeps = (e) => An({
 			...e,
 			from: this.id,
 			strict: !1
-		}), this.injectLoaderData = (e) => Sn({
+		}), this.injectLoaderData = (e) => kn({
 			...e,
 			from: this.id,
 			strict: !1
-		}), this.injectNavigate = () => wn({ from: J().routesById[this.id].fullPath }), this.notFound = (e) => Ke({
+		}), this.injectNavigate = () => X({ from: q().routesById[this.id].fullPath }), this.notFound = (e) => $e({
 			routeId: this.id,
 			...e
 		});
 	}
-}, An = class extends on {
+}, In = class extends pn {
 	constructor(e) {
-		super(e), this.injectMatch = (e) => X({
+		super(e), this.injectMatch = (e) => Y({
 			select: e?.select,
 			from: this.id
-		}), this.injectRouteContext = (e) => X({
+		}), this.injectRouteContext = (e) => Y({
 			...e,
 			from: this.id,
 			select: (t) => e?.select ? e.select(t.context) : t.context
-		}), this.injectSearch = (e) => Dn({
+		}), this.injectSearch = (e) => Nn({
 			select: e?.select,
 			from: this.id
-		}), this.injectParams = (e) => Tn({
+		}), this.injectParams = (e) => jn({
 			select: e?.select,
 			from: this.id
-		}), this.injectLoaderDeps = (e) => Cn({
+		}), this.injectLoaderDeps = (e) => An({
 			...e,
 			from: this.id
-		}), this.injectLoaderData = (e) => Sn({
+		}), this.injectLoaderData = (e) => kn({
 			...e,
 			from: this.id
-		}), this.injectNavigate = () => wn({ from: this.fullPath });
+		}), this.injectNavigate = () => X({ from: this.fullPath });
 	}
 };
-function jn(e) {
-	return new An(e);
+function Ln(e) {
+	return new In(e);
 }
-function Mn() {
-	return (e) => In(e);
+function Rn() {
+	return (e) => Hn(e);
 }
-var Nn = class extends cn {
+var zn = class extends hn {
 	constructor(e) {
-		super(e), this.injectMatch = (e) => X({
+		super(e), this.injectMatch = (e) => Y({
 			select: e?.select,
 			from: this.id
-		}), this.injectRouteContext = (e) => X({
+		}), this.injectRouteContext = (e) => Y({
 			...e,
 			from: this.id,
 			select: (t) => e?.select ? e.select(t.context) : t.context
-		}), this.injectSearch = (e) => Dn({
+		}), this.injectSearch = (e) => Nn({
 			select: e?.select,
 			from: this.id
-		}), this.injectParams = (e) => Tn({
+		}), this.injectParams = (e) => jn({
 			select: e?.select,
 			from: this.id
-		}), this.injectLoaderDeps = (e) => Cn({
+		}), this.injectLoaderDeps = (e) => An({
 			...e,
 			from: this.id
-		}), this.injectLoaderData = (e) => Sn({
+		}), this.injectLoaderData = (e) => kn({
 			...e,
 			from: this.id
-		}), this.injectNavigate = () => wn({ from: this.fullPath });
+		}), this.injectNavigate = () => X({ from: this.fullPath });
 	}
 };
-function Pn(e) {
+function Bn(e) {
 	return e;
 }
-var Fn = class extends An {
+var Vn = class extends In {
 	constructor(e) {
 		super({
 			...e,
@@ -2921,98 +2902,98 @@ var Fn = class extends An {
 		});
 	}
 };
-function In(e) {
-	return new Nn(e);
+function Hn(e) {
+	return new zn(e);
 }
 //#endregion
 //#region src/fileRoute.ts
-function Ln(e) {
-	return typeof e == "object" ? new Rn().createRoute(e) : new Rn().createRoute;
+function Un(e) {
+	return typeof e == "object" ? new Wn().createRoute(e) : new Wn().createRoute;
 }
-var Rn = class {
+var Wn = class {
 	constructor() {
 		this.createRoute = (e) => {
-			let t = jn(e);
+			let t = Ln(e);
 			return t.isRoot = !1, t;
 		};
 	}
-}, zn = class {
+}, Gn = class {
 	constructor(e) {
-		this.injectMatch = (e) => X({
+		this.injectMatch = (e) => Y({
 			select: e?.select,
 			from: this.options.id
-		}), this.injectRouteContext = (e) => En({
+		}), this.injectRouteContext = (e) => Mn({
 			...e,
 			from: this.options.id
-		}), this.injectSearch = (e) => Dn({
+		}), this.injectSearch = (e) => Nn({
 			select: e?.select,
 			from: this.options.id
-		}), this.injectParams = (e) => Tn({
+		}), this.injectParams = (e) => jn({
 			select: e?.select,
 			from: this.options.id
-		}), this.injectLoaderDeps = (e) => Cn({
+		}), this.injectLoaderDeps = (e) => An({
 			...e,
 			from: this.options.id
-		}), this.injectLoaderData = (e) => Sn({
+		}), this.injectLoaderData = (e) => kn({
 			...e,
 			from: this.options.id
-		}), this.injectNavigate = () => wn({ from: J().routesById[this.options.id].fullPath }), this.options = e;
+		}), this.injectNavigate = () => X({ from: q().routesById[this.options.id].fullPath }), this.options = e;
 	}
 };
-function Bn(e) {
-	return (t) => new zn({
+function Kn(e) {
+	return (t) => new Gn({
 		id: e,
 		...t
 	});
 }
-function Vn(e) {
-	return typeof e == "object" ? new zn(e) : (t) => new zn({
+function qn(e) {
+	return typeof e == "object" ? new Gn(e) : (t) => new Gn({
 		id: e,
 		...t
 	});
 }
 //#endregion
 //#region src/renderer/injectRender.ts
-function Hn(e) {
-	let t = p(c), r = p(o), i = [];
-	f(() => {
-		let n = e(), a = Un(n);
-		if (Wn(i, a)) return;
-		i.length > 0 && t.clear(), i = a;
-		let s = n?.component;
-		if (!s) return;
-		let c = n.providers ?? [], l = o.create({
-			providers: c,
-			parent: r
-		}), u = Object.entries(n.inputs ?? {}).map(([e, t]) => h(e, t));
-		t.createComponent(s, {
+function Jn(e) {
+	let t = h(u), n = h(c), r = [];
+	m(() => {
+		let i = e(), a = Yn(i);
+		if (Xn(r, a)) return;
+		r.length > 0 && t.clear(), r = a;
+		let o = i?.component;
+		if (!o) return;
+		let s = i.providers ?? [], l = c.create({
+			providers: s,
+			parent: n
+		}), u = Object.entries(i.inputs ?? {}).map(([e, t]) => _(e, t));
+		t.createComponent(o, {
 			injector: l,
 			bindings: u
 		}).changeDetectorRef.markForCheck();
-	}), p(n).onDestroy(() => {
+	}), h(i).onDestroy(() => {
 		t.clear();
 	});
 }
-function Un(e) {
+function Yn(e) {
 	let t = e?.component;
-	return !e || !t ? [] : [t, e.key];
+	return !e || !t ? [] : Array.isArray(e.key) ? [t, ...e.key] : [t, e.key];
 }
-function Wn(e, t) {
+function Xn(e, t) {
 	if (e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
 	return !0;
 }
 //#endregion
 //#region src/DefaultNotFound.ts
-var Gn = class n {
+var Zn = class e {
 	static {
-		this.ɵfac = function(e) {
-			return new (e || n)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
-			type: n,
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
 			selectors: [["tanstack-angular-router-default-no-found"]],
 			hostAttrs: [
 				2,
@@ -3021,68 +3002,93 @@ var Gn = class n {
 			],
 			decls: 2,
 			vars: 0,
-			template: function(t, n) {
-				t & 1 && (e.ɵɵelementStart(0, "p"), e.ɵɵtext(1, "Not found"), e.ɵɵelementEnd());
+			template: function(e, t) {
+				e & 1 && (n.ɵɵelementStart(0, "p"), n.ɵɵtext(1, "Not found"), n.ɵɵelementEnd());
 			},
 			encapsulation: 2,
-			changeDetection: t.OnPush
+			changeDetection: r.OnPush
 		});
 	}
-}, Kn = new e.InjectionToken("ERROR_STATE_INJECTOR_TOKEN");
-function qn() {
-	let t = e.inject(Kn, { optional: !0 });
-	if (!t) throw Error("injectErrorState was called outside of an error component");
-	return t;
+}, Qn = new n.InjectionToken("ERROR_STATE_INJECTOR_TOKEN");
+function $n() {
+	let e = n.inject(Qn, { optional: !0 });
+	if (!e) throw Error("injectErrorState was called outside of an error component");
+	return e;
 }
 //#endregion
 //#region src/injectRouterState.ts
-function Jn(t) {
-	let n = J({ warn: t?.router === void 0 }), r = Y((t?.router ?? n).stores.__store, (e) => e);
-	return e.computed(() => t?.select ? t.select(r()) : r(), { equal: O });
+function er(e) {
+	let t = q({ warn: e?.router === void 0 }), n = e?.router ?? t;
+	return e?.select ? J(n.stores.__store, e.select, { equal: k }) : J(n.stores.__store);
 }
 //#endregion
 //#region src/renderer/injectIsCatchingError.ts
-function Yn({ matchId: t }) {
-	let n = J(), r = Jn({ select: (e) => e.matches }), i = e.computed(() => r().findIndex((e) => e.id === t()));
-	return e.computed(() => {
-		if (n.options.defaultErrorComponent != null) return !1;
+function tr({ matchId: e }) {
+	let t = q(), r = er({ select: (e) => e.matches }), i = n.computed(() => r().findIndex((t) => t.id === e()));
+	return n.computed(() => {
+		if (t.options.defaultErrorComponent != null) return;
 		let e = i();
-		if (e === -1) return !1;
-		let t = r();
-		for (let r = e + 1; r < t.length; r++) {
-			let e = t[r];
-			if (n.routesById[e?.routeId].options.errorComponent != null) return !1;
-			if (e?.status === "error") return !0;
+		if (e === -1) return;
+		let n = r();
+		for (let r = e + 1; r < n.length; r++) {
+			let e = n[r];
+			if (t.routesById[e?.routeId].options.errorComponent != null) return;
+			if (e?.status === "error") return e;
 		}
-		return !1;
 	});
 }
 //#endregion
 //#region src/Match.ts
-function Xn({ parentRouteIsRoot: e }) {
-	let t = J({ warn: !1 }), r = p(i), a = p(n), o = Y(t.stores.resolvedLocation, (e) => e?.state.__TSR_key), s = Y(t.stores.loadedAt, (e) => e), c, u = 0;
-	a.onDestroy(() => {
-		u++;
-	}), f(() => {
+var nr = {
+	get: () => void 0,
+	subscribe: () => ({ unsubscribe: () => {} })
+}, rr = class e {
+	constructor() {
+		this.state = h(Qn), this.message = p(() => {
+			let e = this.state.error;
+			return e instanceof Error ? e.stack ?? e.message : String(e);
+		});
+	}
+	static {
+		this.ɵfac = function(t) {
+			return new (t || e)();
+		};
+	}
+	static {
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
+			selectors: [["tanstack-router-default-error"]],
+			decls: 5,
+			vars: 1,
+			consts: [["role", "alert"]],
+			template: function(e, t) {
+				e & 1 && (n.ɵɵelementStart(0, "div", 0)(1, "p"), n.ɵɵtext(2, "Something went wrong."), n.ɵɵelementEnd(), n.ɵɵelementStart(3, "pre"), n.ɵɵtext(4), n.ɵɵelementEnd()()), e & 2 && (n.ɵɵadvance(4), n.ɵɵtextInterpolate(t.message()));
+			},
+			encapsulation: 2
+		});
+	}
+};
+function ir({ parentRouteIsRoot: e }) {
+	let t = q({ warn: !1 }), n = h(o), r = h(i), a = J(t.stores.resolvedLocation, (e) => e?.state?.__TSR_key), s = J(t.stores.loadedAt, (e) => e), c, l = 0;
+	r.onDestroy(() => {
+		l++;
+	}), m(() => {
 		if (!e()) return;
-		o(), s();
-		let n = ++u;
-		l({ read: () => {
-			if (n !== u || !e() || t.isServer) return;
-			let r = t.latestLocation.href;
-			c !== void 0 && c === r || (c = r, t.emit({
+		a(), s();
+		let r = ++l;
+		d({ read: () => {
+			if (r !== l || !e() || t.isServer) return;
+			let n = t.latestLocation.href;
+			c !== void 0 && c === n || (c = n, t.emit({
 				type: "onRendered",
-				...K(t.stores.location.state, t.stores.resolvedLocation.state)
+				...G(t.stores.location.get(), t.stores.resolvedLocation.get())
 			}));
-		} }, { injector: r });
+		} }, { injector: n });
 	});
 }
-var Zn = class t {
+var ar = class e {
 	constructor() {
-		this.matchId = m.required(), this.router = J(), this.match = d(() => {
-			let e = this.matchId();
-			return e ? this.router.stores.activeMatchStoresById.get(e)?.state : void 0;
-		}), this.matchData = d(() => {
+		this.matchId = g.required(), this.router = q(), this.match = p(() => this.matchSignal()), this.matchSignal = J(() => this.router.stores.matchStores.get(this.matchId()) ?? nr, (e) => e), this.matchData = p(() => {
 			let e = this.match();
 			if (!e) return null;
 			let t = e.routeId, n = this.router.routesById[t], r = n.parentRoute?.id ?? null, i = (n.options.remountDeps ?? this.router.options.defaultRemountDeps)?.({
@@ -3097,77 +3103,84 @@ var Zn = class t {
 				match: e,
 				parentRouteId: r
 			};
-		}), this.isFistRouteInRouteTree = d(() => this.matchData()?.parentRouteId === R), this.resolvedNoSsr = d(() => {
+		}), this.isFistRouteInRouteTree = p(() => this.matchData()?.parentRouteId === L), this.resolvedNoSsr = p(() => {
 			let e = this.matchData()?.match;
 			return e ? e.ssr === !1 || e.ssr === "data-only" : !0;
-		}), this.shouldClientOnly = d(() => {
+		}), this.shouldClientOnly = p(() => {
 			let e = this.matchData()?.match;
 			return e ? this.resolvedNoSsr() || !!e._displayPending : !0;
-		}), this.parentRouteIdSignal = d(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = d(() => R), this.hasPendingMatch = d(() => {
+		}), this.parentRouteIdSignal = p(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = p(() => L), this.hasPendingMatch = p(() => {
 			let e = this.matchData()?.route.id;
 			return e ? !!this.pendingRouteIds()[e] : !1;
-		}), this.pendingRouteIds = Y(this.router.stores.pendingRouteIds, (e) => e), this.nearestMatchContext = {
+		}), this.pendingRouteIds = J(this.router.stores.pendingRouteIds, (e) => e), this.nearestMatchContext = {
 			matchId: this.matchId,
-			routeId: d(() => this.matchData()?.route.id),
+			routeId: p(() => this.matchData()?.route.id),
 			match: this.match,
 			hasPending: this.hasPendingMatch
-		}, this.isCatchingError = Yn({ matchId: this.matchId }), this.render = Hn(() => {
+		}, this.catchingErrorMatch = tr({ matchId: this.matchId }), this.render = Jn(() => {
 			let e = this.matchData();
-			if (!e || this.shouldClientOnly() && this.router.isServer) return null;
+			if (!e) return null;
 			let { match: t, route: n } = e;
-			if (t.status === "notFound") return { component: $n(this.router, n) };
-			if (t.status === "error" || this.isCatchingError()) return {
-				component: (Z(n.options.errorComponent) ?? Z(this.router.options.defaultErrorComponent)) || null,
-				providers: [{
-					provide: Kn,
-					useValue: {
-						error: t.error,
-						reset: () => {
-							this.router.invalidate();
-						},
-						info: { componentStack: "" }
-					}
-				}]
-			};
-			if (t.status === "redirected" || t.status === "pending") {
+			if (this.shouldClientOnly() && this.router.isServer) {
+				let e = Z(n.options.pendingComponent) ?? Z(this.router.options.defaultPendingComponent);
+				return e ? { component: e } : null;
+			}
+			if (t.status === "notFound") return { component: sr(this.router, n) };
+			if (t.status === "error" || this.catchingErrorMatch()) {
+				let e = this.catchingErrorMatch();
+				return {
+					component: cr(this.router, n),
+					providers: [{
+						provide: Qn,
+						useValue: {
+							error: t.status === "error" ? t.error : e?.error,
+							reset: () => {
+								this.router.invalidate();
+							},
+							info: { componentStack: "" }
+						}
+					}]
+				};
+			} else if (t.status === "redirected" || t.status === "pending") {
 				let t = n.isRoot && (Z(n.options.component) ?? Z(this.router.options.defaultComponent));
-				return t && t !== Qn ? {
+				return t && t !== or ? {
 					key: e.key,
 					component: t,
 					providers: [{
-						provide: q,
+						provide: K,
 						useValue: this.nearestMatchContext
 					}]
 				} : { component: Z(n.options.pendingComponent) ?? Z(this.router.options.defaultPendingComponent) };
 			} else {
-				let t = Z(n.options.component) ?? Z(this.router.options.defaultComponent) ?? Qn;
+				let t = Z(n.options.component) ?? Z(this.router.options.defaultComponent) ?? or;
 				return {
 					key: e.key,
 					component: t,
 					providers: [{
-						provide: q,
+						provide: K,
 						useValue: this.nearestMatchContext
 					}]
 				};
 			}
-		}), this.onRendered = Xn({ parentRouteIsRoot: d(() => this.parentRouteIdSignal() === R) });
+		}), this.onRendered = ir({ parentRouteIsRoot: p(() => this.parentRouteIdSignal() === L) });
 	}
 	static {
-		this.ɵfac = function(e) {
-			return new (e || t)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
-			type: t,
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
 			selectors: [["router-match"], [
 				"",
 				"router-match",
 				""
 			]],
+			hostAttrs: ["hidden", ""],
 			hostVars: 1,
-			hostBindings: function(t, n) {
-				t & 2 && e.ɵɵattribute("data-matchId", n.matchId());
+			hostBindings: function(e, t) {
+				e & 2 && n.ɵɵattribute("data-matchId", t.matchId());
 			},
 			inputs: { matchId: [1, "matchId"] },
 			decls: 0,
@@ -3176,32 +3189,33 @@ var Zn = class t {
 			encapsulation: 2
 		});
 	}
-}, Qn = class t {
+}, or = class e {
 	constructor() {
-		this.router = J(), this.nearestMatch = p(q), this.currentMatch = d(() => {
+		this.router = q(), this.nearestMatch = h(K), this.currentMatch = J(() => {
 			let e = this.nearestMatch.matchId();
-			return e ? this.router.stores.activeMatchStoresById.get(e)?.state : void 0;
-		}), this.routeId = d(() => this.currentMatch()?.routeId), this.route = d(() => this.router.routesById[this.routeId()]), this.parentGlobalNotFound = d(() => this.currentMatch()?.globalNotFound ?? !1), this.childMatchIdByRouteId = Y(this.router.stores.childMatchIdByRouteId, (e) => e), this.childMatchId = d(() => {
+			return e ? this.router.stores.matchStores.get(e) ?? nr : nr;
+		}, (e) => e), this.routeId = p(() => this.currentMatch()?.routeId), this.route = p(() => this.router.routesById[this.routeId()]), this.parentGlobalNotFound = p(() => this.currentMatch()?.globalNotFound ?? !1), this.childMatchIdByRouteId = J(this.router.stores.childMatchIdByRouteId, (e) => e), this.childMatchId = p(() => {
 			let e = this.routeId();
 			return e ? this.childMatchIdByRouteId()[e] ?? null : null;
-		}), this.render = Hn(() => this.parentGlobalNotFound() ? { component: $n(this.router, this.route()) } : this.childMatchId() ? {
-			component: Zn,
+		}), this.render = Jn(() => this.parentGlobalNotFound() ? { component: sr(this.router, this.route()) } : this.childMatchId() ? {
+			component: ar,
 			inputs: { matchId: () => this.childMatchId() }
 		} : null);
 	}
 	static {
-		this.ɵfac = function(e) {
-			return new (e || t)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
-			type: t,
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
 			selectors: [["outlet"], [
 				"",
 				"outlet",
 				""
 			]],
+			hostAttrs: ["hidden", ""],
 			decls: 0,
 			vars: 0,
 			template: function(e, t) {},
@@ -3212,181 +3226,185 @@ var Zn = class t {
 function Z(e) {
 	return typeof e == "function" ? e() : e;
 }
-function $n(e, t) {
-	return (Z(t.options.notFoundComponent) ?? Z(e.options.defaultNotFoundComponent)) || (g() && !t.options.notFoundComponent && console.warn(`A notFoundError was encountered on the route with ID "${t.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Page not found</p>)`), Gn);
+function sr(e, t) {
+	return (Z(t.options.notFoundComponent) ?? Z(e.options.defaultNotFoundComponent)) || (v() && !t.options.notFoundComponent && console.warn(`A notFoundError was encountered on the route with ID "${t.id}", but a notFoundComponent option was not configured, nor was a router level defaultNotFoundComponent configured. Consider configuring at least one of these to avoid TanStack Router's overly generic defaultNotFoundComponent (<p>Page not found</p>)`), Zn);
+}
+function cr(e, t) {
+	return (Z(t.options.errorComponent) ?? Z(e.options.defaultErrorComponent)) || (v() && !t.options.errorComponent && console.warn(`An error was encountered on the route with ID "${t.id}", but an errorComponent option was not configured, nor was a router level defaultErrorComponent configured. Consider configuring at least one of these to avoid TanStack Router's generic defaultErrorComponent.`), rr);
 }
 //#endregion
 //#region ../router-core/dist/esm/scroll-restoration-script/client.js
-function er(e) {
+function lr(e) {
 	return null;
 }
 //#endregion
 //#region src/ssr-scroll-restoration.ts
-var tr = "data-tsr-scroll-restoration-inline";
-function nr() {
-	let e = J(), t = p(b), n = p(i);
-	e.isServer && l(() => {
+var ur = "data-tsr-scroll-restoration-inline";
+function dr() {
+	let e = q(), t = h(C), n = h(o);
+	e.isServer && d(() => {
 		let n = e.options.scrollRestoration;
-		if (!n || typeof n == "function" && !n({ location: e.latestLocation }) || t.querySelector(`script[${tr}]`)) return;
-		let r = er(e);
+		if (!n || typeof n == "function" && !n({ location: e.latestLocation }) || t.querySelector(`script[${ur}]`)) return;
+		let r = lr(e);
 		if (!r) return;
 		let i = t.createElement("script");
-		i.setAttribute(tr, ""), i.className = "$tsr", i.text = `${r};document.currentScript.remove()`;
+		i.setAttribute(ur, ""), i.className = "$tsr", i.text = `${r};document.currentScript.remove()`;
 		let a = e.options.ssr?.nonce;
 		a && i.setAttribute("nonce", a), (t.head ?? t.body).appendChild(i);
 	}, { injector: n });
 }
 //#endregion
 //#region src/transitioner.ts
-var rr = {
+var fr = {
 	router: null,
 	mounted: !1
 };
-function ir() {
-	let t = J(), n = e.inject(e.EnvironmentInjector);
-	if (t.isServer) return;
-	let r = e.inject(e.DestroyRef), i = !1, a = Y(t.stores.isLoading, (e) => e), o = Y(t.stores.isTransitioning, (e) => e), s = Y(t.stores.hasPendingMatches, (e) => e), c = Y(t.stores.status, (e) => e), l = Y(t.stores.location, (e) => e), u = Y(t.stores.resolvedLocation, (e) => e), d = e.computed(() => a() || o() || s()), f = e.computed(() => a() || s()), p = ar(() => a()), m = ar(() => d()), h = ar(() => f());
-	t.startTransition = (r) => {
-		t.stores.isTransitioning.setState(() => !0);
+function pr() {
+	let e = q(), t = n.inject(n.EnvironmentInjector);
+	if (e.isServer) return;
+	let r = n.inject(n.DestroyRef), i = !1, a = J(e.stores.isLoading, (e) => e), o = J(e.stores.isTransitioning, (e) => e), s = J(e.stores.hasPending, (e) => e), c = J(e.stores.status, (e) => e), l = J(e.stores.location, (e) => e), u = J(e.stores.resolvedLocation, (e) => e), d = n.computed(() => a() || o() || s()), f = n.computed(() => a() || s()), p = mr(() => a()), m = mr(() => d()), h = mr(() => f());
+	e.startTransition = (r) => {
+		e.stores.isTransitioning.set(!0);
 		let a = () => {
-			i || e.afterNextRender({ read: () => {
+			i || n.afterNextRender({ read: () => {
 				try {
-					t.stores.isTransitioning.setState(() => !1);
+					e.stores.isTransitioning.set(!1);
 				} catch {}
-			} }, { injector: n });
+			} }, { injector: t });
 		}, o = r();
 		o instanceof Promise ? o.finally(() => a()) : a();
 	};
 	let g;
-	e.afterNextRender(() => {
-		g = t.history.subscribe(t.load);
-		let e = t.buildLocation({
-			to: t.latestLocation.pathname,
+	n.afterNextRender(() => {
+		g = e.history.subscribe(e.load);
+		let t = e.buildLocation({
+			to: e.latestLocation.pathname,
 			search: !0,
 			params: !0,
 			hash: !0,
 			state: !0,
 			_includeValidateSearch: !0
 		});
-		I(t.latestLocation.href) !== I(e.href) && t.commitLocation({
-			...e,
+		F(e.latestLocation.href) !== F(t.href) && e.commitLocation({
+			...t,
 			replace: !0
 		});
 	});
-	let _ = e.signal(!1);
-	e.afterNextRender(() => {
-		_.set(!0), d() || c() === "pending" && (t.stores.status.setState(() => "idle"), t.stores.resolvedLocation.setState(() => l()));
+	let _ = n.signal(!1);
+	n.afterNextRender(() => {
+		_.set(!0), d() || c() === "pending" && (e.stores.status.set("idle"), e.stores.resolvedLocation.set(l()));
 	}), r.onDestroy(() => {
 		_.set(!1), i = !0, g && g();
-	}), e.afterNextRender(() => {
-		typeof window < "u" && t.ssr || rr.router === t && rr.mounted || (rr = {
-			router: t,
+	}), n.afterNextRender(() => {
+		typeof window < "u" && e.ssr || fr.router === e && fr.mounted || (fr = {
+			router: e,
 			mounted: !0
 		}, (async () => {
 			try {
-				await t.load();
+				await e.load();
 			} catch (e) {
 				console.error(e);
 			}
 		})());
-	}), e.effect(() => {
+	}), n.effect(() => {
 		if (_()) try {
-			p() && !a() && t.emit({
+			p() && !a() && e.emit({
 				type: "onLoad",
-				...K(l(), u())
+				...G(l(), u())
 			});
 		} catch {}
-	}), e.effect(() => {
+	}), n.effect(() => {
 		if (_()) try {
-			h() && !f() && t.emit({
+			h() && !f() && e.emit({
 				type: "onBeforeRouteMount",
-				...K(l(), u())
+				...G(l(), u())
 			});
 		} catch {}
-	}), e.effect(() => {
+	}), n.effect(() => {
 		if (_()) try {
-			if (m() && !d() && c() === "pending" && (t.stores.status.setState(() => "idle"), t.stores.resolvedLocation.setState(() => l())), m() && !d()) {
-				let e = K(l(), u());
-				t.emit({
+			if (m() && !d() && c() === "pending" && (e.stores.status.set("idle"), e.stores.resolvedLocation.set(l())), m() && !d()) {
+				let t = G(l(), u());
+				e.emit({
 					type: "onResolved",
-					...e
-				}), e.hrefChanged && dn(t);
+					...t
+				}), t.hrefChanged && vn(e);
 			}
 		} catch {}
 	});
 }
-function ar(t) {
-	let n = e.computed(t), r = null;
-	return e.computed(() => {
+function mr(e) {
+	let t = n.computed(e), r = null;
+	return n.computed(() => {
 		let e = r;
-		return r = n(), e;
+		return r = t(), e;
 	});
 }
 //#endregion
 //#region src/Matches.ts
-var or = class t {
+var hr = class e {
 	constructor() {
-		this.router = J(), this.matchId = Y(this.router.stores.firstMatchId, (e) => e), this.ssrScrollRestoration = nr(), this.transitioner = ir(), this.render = Hn(() => {
+		this.router = q(), this.matchId = J(this.router.stores.firstId, (e) => e), this.ssrScrollRestoration = dr(), this.transitioner = pr(), this.render = Jn(() => {
 			let e = this.matchId();
 			return e ? {
-				component: Zn,
+				component: ar,
 				inputs: { matchId: () => e }
 			} : null;
 		});
 	}
 	static {
-		this.ɵfac = function(e) {
-			return new (e || t)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
-			type: t,
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
 			selectors: [["router-matches"]],
+			hostAttrs: ["hidden", ""],
 			decls: 0,
 			vars: 0,
 			template: function(e, t) {},
 			encapsulation: 2
 		});
 	}
-}, sr = new a("CONTEXT", {
+}, gr = new s("CONTEXT", {
 	providedIn: "root",
 	factory: () => ({})
-}), cr = new a("OPTIONS", {
+}), _r = new s("OPTIONS", {
 	providedIn: "root",
 	factory: () => ({})
 });
-function lr(e) {
-	let t = p(i);
+function vr(e) {
+	let t = h(o);
 	return {
 		inject: t.get.bind(t),
 		...e
 	};
 }
-function ur({ router: e, context: t, options: n }) {
+function yr({ router: e, context: t, options: n }) {
 	return [
 		{
-			provide: bn(),
+			provide: Tn(),
 			useValue: e
 		},
 		{
-			provide: sr,
-			useFactory: () => lr(t ?? {})
+			provide: gr,
+			useFactory: () => vr(t ?? {})
 		},
 		{
-			provide: cr,
+			provide: _r,
 			useValue: n ?? {}
 		}
 	];
 }
-var dr = class t {
+var br = class e {
 	constructor() {
-		this.injectedContext = p(sr), this.injectedOptions = p(cr), this.injectedRouter = p(bn(), { optional: !0 }), this.context = m(this.injectedContext), this.options = m(this.injectedOptions), this.routerInput = m(void 0, { alias: "router" }), this.router = d(() => {
+		this.injectedContext = h(gr), this.injectedOptions = h(_r), this.injectedRouter = h(Tn(), { optional: !0 }), this.context = g(this.injectedContext), this.options = g(this.injectedOptions), this.routerInput = g(void 0, { alias: "router" }), this.router = p(() => {
 			let e = this.routerInput();
 			if (e) return e;
 			if (this.injectedRouter) return this.injectedRouter;
 			throw Error("No router provided to <router-provider>. Provide a router with provideTanstackRouter or the router input");
-		}), this.updateRouter = f(() => {
+		}), this.updateRouter = m(() => {
 			let e = this.router(), t = this.context(), n = this.options();
 			e.update({
 				...e.options,
@@ -3396,30 +3414,31 @@ var dr = class t {
 					...t
 				}
 			});
-		}), this.render = Hn(() => {
-			let e = y(this.router);
+		}), this.render = Jn(() => {
+			let e = S(this.router);
 			return {
-				component: or,
+				component: hr,
 				providers: [{
-					provide: bn(),
+					provide: Tn(),
 					useValue: e
 				}]
 			};
 		});
 	}
 	static {
-		this.ɵfac = function(e) {
-			return new (e || t)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
-			type: t,
+		this.ɵcmp = /* @__PURE__ */ n.ɵɵdefineComponent({
+			type: e,
 			selectors: [["router-provider"], [
 				"",
 				"router-provider",
 				""
 			]],
+			hostAttrs: ["hidden", ""],
 			inputs: {
 				context: [1, "context"],
 				options: [1, "options"],
@@ -3435,21 +3454,21 @@ var dr = class t {
 			encapsulation: 2
 		});
 	}
-}, Q = new e.InjectionToken("TANSTACK_DOCUMENT_ROUTER"), fr = "data-tsr-managed", pr = "data-tsr-id";
+}, Q = new n.InjectionToken("TANSTACK_DOCUMENT_ROUTER"), xr = "data-tsr-managed", Sr = "data-tsr-id";
 //#endregion
 //#region src/document/managed-dom.ts
-function mr(e) {
+function Cr(e) {
 	if (!e || e.tag === "title" || e.tag === "script" && !e.attrs?.src && typeof e.children != "string") return [];
 	let t = {
 		...e,
-		attrs: hr(e.attrs)
+		attrs: wr(e.attrs)
 	};
 	return [{
 		...t,
-		id: _r(t)
+		id: Er(t)
 	}];
 }
-function hr(e) {
+function wr(e) {
 	if (!e) return {};
 	let t = {};
 	for (let n of Object.keys(e).sort()) {
@@ -3460,27 +3479,27 @@ function hr(e) {
 	}
 	return t;
 }
-function gr(e) {
+function Tr(e) {
 	let t = /* @__PURE__ */ new Set();
 	return e.filter((e) => t.has(e.id) ? !1 : (t.add(e.id), !0));
 }
-function _r(e) {
+function Er(e) {
 	let t = JSON.stringify(e), n = 2166136261;
 	for (let e = 0; e < t.length; e++) n ^= t.charCodeAt(e), n = Math.imul(n, 16777619);
 	return `tsr-${(n >>> 0).toString(36)}`;
 }
-function vr({ root: e, bucket: t, renderer: n }) {
+function Dr({ root: e, bucket: t, renderer: n }) {
 	let r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = [];
 	return {
-		mount(n = yr(e, t)) {
+		mount(n = Or(e, t)) {
 			r.clear(), i.clear(), a = [], n.forEach((e) => {
-				let t = e.getAttribute(pr);
+				let t = e.getAttribute(Sr);
 				t && (r.set(t, e), a.push(t));
 			});
 		},
 		sync(o) {
 			let s = o.map((e) => e.id);
-			if (Er(a, s)) return;
+			if (Fr(a, s)) return;
 			let c = new Map(o.map((e) => [e.id, {
 				id: e.id,
 				tag: e
@@ -3488,12 +3507,12 @@ function vr({ root: e, bucket: t, renderer: n }) {
 			for (let t of a) {
 				if (c.has(t)) continue;
 				let a = r.get(t);
-				a && (Tr(a, e, n), r.delete(t), i.delete(t));
+				a && (Pr(a, e, n), r.delete(t), i.delete(t));
 			}
 			let l = e.firstChild;
 			for (let a of o) {
 				let o = r.get(a.id);
-				o || (o = br(a, t, e.ownerDocument, n), r.set(a.id, o)), o !== l && wr(e, o, l, n), i.set(a.id, {
+				o || (o = kr(a, t, e.ownerDocument, n), r.set(a.id, o)), o !== l && Nr(e, o, l, n), i.set(a.id, {
 					id: a.id,
 					tag: a
 				}), l = o.nextSibling;
@@ -3507,33 +3526,33 @@ function vr({ root: e, bucket: t, renderer: n }) {
 		}
 	};
 }
-function yr(e, t) {
-	return Array.from(e.querySelectorAll(`[${fr}="${t}"]`));
+function Or(e, t) {
+	return Array.from(e.querySelectorAll(`[${xr}="${t}"]`));
 }
-function br(e, t, n, r) {
-	let i = xr(n, e.tag, r);
-	Sr(i, fr, t, r), Sr(i, pr, e.id, r);
-	for (let [t, n] of Object.entries(e.attrs ?? {})) t !== "suppressHydrationWarning" && (n == null || n === !1 || Sr(i, t === "className" ? "class" : t, typeof n == "boolean" ? "" : String(n), r));
-	return "children" in e && typeof e.children == "string" && Cr(i, e.children, r), i;
+function kr(e, t, n, r) {
+	let i = Ar(n, e.tag, r);
+	jr(i, xr, t, r), jr(i, Sr, e.id, r);
+	for (let [t, n] of Object.entries(e.attrs ?? {})) t !== "suppressHydrationWarning" && (n == null || n === !1 || jr(i, t === "className" ? "class" : t, typeof n == "boolean" ? "" : String(n), r));
+	return "children" in e && typeof e.children == "string" && Mr(i, e.children, r), i;
 }
-function xr(e, t, n) {
+function Ar(e, t, n) {
 	return n ? n.createElement(t) : e.createElement(t);
 }
-function Sr(e, t, n, r) {
+function jr(e, t, n, r) {
 	if (r) {
 		r.setAttribute(e, t, n);
 		return;
 	}
 	e.setAttribute(t, n);
 }
-function Cr(e, t, n) {
+function Mr(e, t, n) {
 	if (n) {
 		n.setProperty(e, "textContent", t);
 		return;
 	}
 	e.textContent = t;
 }
-function wr(e, t, n, r) {
+function Nr(e, t, n, r) {
 	if (!(t.parentNode === e && t.nextSibling === n)) {
 		if (r) {
 			r.insertBefore(e, t, n);
@@ -3542,51 +3561,51 @@ function wr(e, t, n, r) {
 		e.insertBefore(t, n);
 	}
 }
-function Tr(e, t, n) {
+function Pr(e, t, n) {
 	if (n) {
 		n.removeChild(t, e);
 		return;
 	}
 	t.removeChild(e);
 }
-function Er(e, t) {
+function Fr(e, t) {
 	if (e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
 	return !0;
 }
 //#endregion
 //#region src/document/document-dehydration.ts
-function Dr(e) {
-	return e.serverSsr ? gr(mr(e.serverSsr.takeBufferedScripts())) : [];
+function Ir(e) {
+	return e.serverSsr ? Tr(Cr(e.serverSsr.takeBufferedScripts())) : [];
 }
-function Or(e, t) {
+function Lr(e, t) {
 	return t.length === 0 ? e : {
 		...e,
-		body: gr([...t, ...e.body])
+		body: Tr([...t, ...e.body])
 	};
 }
 //#endregion
 //#region src/document/build-match-managed-document.ts
 function $(e) {
-	let t = e.options.ssr?.nonce, n = e.stores.activeMatchesSnapshot.state, r = Ar(n), i = jr(n, t), a = Mr(n, t), o = Nr(e, n, t), s = Pr(e, n, t), c = Fr(n, t), l = Ir(n, t), u = Lr(n, t), d = Rr(e, n, t);
+	let t = e.options.ssr?.nonce, n = e.stores.matches.get(), r = zr(n), i = Br(n, t), a = Vr(n, t), o = Hr(e, n, t), s = Ur(e, n, t), c = Wr(n, t), l = Gr(n, t), u = Kr(n, t), d = qr(e, n, t);
 	return {
 		title: r,
-		head: gr([
+		head: Tr([
 			...i,
 			...s,
 			...a,
 			...o,
 			...c,
 			...l
-		].flatMap((e) => mr(e))),
-		body: gr([...u, ...d].flatMap((e) => mr(e)))
+		].flatMap((e) => Cr(e))),
+		body: Tr([...u, ...d].flatMap((e) => Cr(e)))
 	};
 }
-function kr(e) {
-	return Or($(e), Dr(e));
+function Rr(e) {
+	return Lr($(e), Ir(e));
 }
-function Ar(e) {
-	let t = zr(e);
+function zr(e) {
+	let t = Jr(e);
 	for (let e = t.length - 1; e >= 0; e--) {
 		let n = t[e];
 		for (let e = n.length - 1; e >= 0; e--) {
@@ -3595,8 +3614,8 @@ function Ar(e) {
 		}
 	}
 }
-function jr(e, t) {
-	let n = zr(e), r = [], i = {};
+function Br(e, t) {
+	let n = Jr(e), r = [], i = {};
 	for (let e = n.length - 1; e >= 0; e--) {
 		let a = n[e];
 		for (let e = a.length - 1; e >= 0; e--) {
@@ -3611,7 +3630,7 @@ function jr(e, t) {
 							type: "application/ld+json",
 							nonce: t
 						},
-						children: fe(e)
+						children: he(e)
 					});
 				} catch {}
 				continue;
@@ -3638,7 +3657,7 @@ function jr(e, t) {
 		}
 	}), r.reverse(), r;
 }
-function Mr(e, t) {
+function Vr(e, t) {
 	return e.map((e) => e.links).filter(Boolean).flat(1).map((e) => ({
 		tag: "link",
 		attrs: {
@@ -3647,7 +3666,7 @@ function Mr(e, t) {
 		}
 	}));
 }
-function Nr(e, t, n) {
+function Hr(e, t, n) {
 	return t.map((t) => e.ssr?.manifest?.routes[t.routeId]?.assets ?? []).filter(Boolean).flat(1).filter((e) => e.tag === "link").map((e) => ({
 		tag: "link",
 		attrs: {
@@ -3657,7 +3676,7 @@ function Nr(e, t, n) {
 		}
 	}));
 }
-function Pr(e, t, n) {
+function Ur(e, t, n) {
 	let r = [];
 	return t.map((t) => e.looseRoutesById[t.routeId]).forEach((t) => e.ssr?.manifest?.routes[t.id]?.preloads?.filter(Boolean).forEach((e) => {
 		r.push({
@@ -3670,7 +3689,7 @@ function Pr(e, t, n) {
 		});
 	})), r;
 }
-function Fr(e, t) {
+function Wr(e, t) {
 	return e.map((e) => e.styles).flat(1).filter(Boolean).map(({ children: e, ...n }) => ({
 		tag: "style",
 		attrs: {
@@ -3680,7 +3699,7 @@ function Fr(e, t) {
 		children: typeof e == "string" ? e : void 0
 	}));
 }
-function Ir(e, t) {
+function Gr(e, t) {
 	return e.map((e) => e.headScripts).flat(1).filter(Boolean).map(({ children: e, ...n }) => ({
 		tag: "script",
 		attrs: {
@@ -3690,7 +3709,7 @@ function Ir(e, t) {
 		children: typeof e == "string" ? e : void 0
 	}));
 }
-function Lr(e, t) {
+function Kr(e, t) {
 	return e.map((e) => e.scripts).flat(1).filter(Boolean).map(({ children: e, ...n }) => ({
 		tag: "script",
 		attrs: {
@@ -3701,7 +3720,7 @@ function Lr(e, t) {
 		children: typeof e == "string" ? e : void 0
 	}));
 }
-function Rr(e, t, n) {
+function qr(e, t, n) {
 	return t.map((t) => e.looseRoutesById[t.routeId]).flatMap((t) => e.ssr?.manifest?.routes[t.id]?.assets?.filter((e) => e.tag === "script").map((e) => ({
 		tag: "script",
 		attrs: {
@@ -3711,48 +3730,48 @@ function Rr(e, t, n) {
 		children: e.children
 	})) ?? []);
 }
-function zr(e) {
+function Jr(e) {
 	return e.reduce((e, t) => (t.meta && e.push(t.meta), e), []);
 }
 //#endregion
 //#region src/document/document-equality.ts
-function Br(e, t) {
-	return e.title === t.title && Vr(e.head, t.head) && Vr(e.body, t.body);
+function Yr(e, t) {
+	return e.title === t.title && Xr(e.head, t.head) && Xr(e.body, t.body);
 }
-function Vr(e, t) {
+function Xr(e, t) {
 	if (e.length !== t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n]?.id !== t[n]?.id) return !1;
 	return !0;
 }
 //#endregion
 //#region src/document/install-unified-document-sync.ts
-function Hr({ document: e, initialTitle: t, headCollection: n, bodyCollection: r, nextContent: i }) {
+function Zr({ document: e, initialTitle: t, headCollection: n, bodyCollection: r, nextContent: i }) {
 	i.title === void 0 ? e.title = t : e.title = i.title, n.sync(i.head), r.sync(i.body);
 }
-function Ur(t) {
-	let n = e.inject(b), r = e.inject(e.RendererFactory2, { optional: !0 }), i = e.inject(e.DestroyRef), a = Y(t.stores.activeMatchesSnapshot, (e) => e), o = r?.createRenderer(null, null) ?? null, s = n.title, c = vr({
-		root: n.head,
+function Qr(e) {
+	let t = n.inject(C), r = n.inject(n.RendererFactory2, { optional: !0 }), i = n.inject(n.DestroyRef), a = J(e.stores.matches, (e) => e), o = r?.createRenderer(null, null) ?? null, s = t.title, c = Dr({
+		root: t.head,
 		bucket: "head",
 		renderer: o
-	}), l = vr({
-		root: n.body,
+	}), l = Dr({
+		root: t.body,
 		bucket: "body",
 		renderer: o
-	}), u = Dr(t), d = () => Or($(t), u);
+	}), u = Ir(e), d = () => Lr($(e), u);
 	c.mount(), l.mount();
 	let f = d();
-	Hr({
-		document: n,
+	Zr({
+		document: t,
 		initialTitle: s,
 		headCollection: c,
 		bodyCollection: l,
 		nextContent: f
 	});
-	let p = e.effect(() => {
+	let p = n.effect(() => {
 		a();
 		let e = d();
-		Br(f, e) || (f = e, Hr({
-			document: n,
+		Yr(f, e) || (f = e, Zr({
+			document: t,
 			initialTitle: s,
 			headCollection: c,
 			bodyCollection: l,
@@ -3760,150 +3779,148 @@ function Ur(t) {
 		}));
 	});
 	i.onDestroy(() => {
-		p.destroy(), c.destroy(), l.destroy(), n.title = s;
+		p.destroy(), c.destroy(), l.destroy(), t.title = s;
 	});
 }
 //#endregion
 //#region src/document/provide-tanstack-body-managed-tags.ts
-function Wr(t) {
-	let n = e.inject(b), r = e.inject(e.RendererFactory2, { optional: !0 }), i = e.inject(e.DestroyRef), a = Y(t.stores.activeMatchesSnapshot, (e) => e), o = Dr(t), s = () => o.length === 0 ? $(t).body : gr([...o, ...$(t).body]), c = r?.createRenderer(null, null) ?? null, l = vr({
-		root: n.body,
+function $r(e) {
+	let t = n.inject(C), r = n.inject(n.RendererFactory2, { optional: !0 }), i = n.inject(n.DestroyRef), a = J(e.stores.matches, (e) => e), o = Ir(e), s = () => o.length === 0 ? $(e).body : Tr([...o, ...$(e).body]), c = r?.createRenderer(null, null) ?? null, l = Dr({
+		root: t.body,
 		bucket: "body",
 		renderer: c
 	});
 	l.mount();
 	let u = s();
 	l.sync(u);
-	let d = e.effect(() => {
+	let d = n.effect(() => {
 		a();
 		let e = s();
-		Vr(u, e) || (u = e, l.sync(e));
+		Xr(u, e) || (u = e, l.sync(e));
 	});
 	i.onDestroy(() => {
 		d.destroy(), l.destroy();
 	});
 }
-function Gr() {
-	Wr(e.inject(Q));
+function ei() {
+	$r(n.inject(Q));
 }
-function Kr(t) {
-	return e.makeEnvironmentProviders([{
+function ti(e) {
+	return n.makeEnvironmentProviders([{
 		provide: Q,
-		useValue: t
-	}, e.provideEnvironmentInitializer(Gr)]);
+		useValue: e
+	}, n.provideEnvironmentInitializer(ei)]);
 }
 //#endregion
 //#region src/document/provide-tanstack-document-title.ts
-function qr(t) {
-	let n = e.inject(b), r = e.inject(e.DestroyRef), i = Y(t.stores.activeMatchesSnapshot, (e) => e), a = n.title, o = $(t).title, s = (e) => {
-		e === void 0 ? n.title = a : n.title = e;
+function ni(e) {
+	let t = n.inject(C), r = n.inject(n.DestroyRef), i = J(e.stores.matches, (e) => e), a = t.title, o = $(e).title, s = (e) => {
+		e === void 0 ? t.title = a : t.title = e;
 	};
 	s(o);
-	let c = e.effect(() => {
+	let c = n.effect(() => {
 		i();
-		let e = $(t).title;
-		e !== o && (o = e, s(e));
+		let t = $(e).title;
+		t !== o && (o = t, s(t));
 	});
 	r.onDestroy(() => {
-		c.destroy(), n.title = a;
+		c.destroy(), t.title = a;
 	});
 }
-function Jr() {
-	qr(e.inject(Q));
+function ri() {
+	ni(n.inject(Q));
 }
-function Yr(t) {
-	return e.makeEnvironmentProviders([{
+function ii(e) {
+	return n.makeEnvironmentProviders([{
 		provide: Q,
-		useValue: t
-	}, e.provideEnvironmentInitializer(Jr)]);
+		useValue: e
+	}, n.provideEnvironmentInitializer(ri)]);
 }
 //#endregion
 //#region src/document/provide-tanstack-head-managed-tags.ts
-function Xr(t) {
-	let n = e.inject(b), r = e.inject(e.RendererFactory2, { optional: !0 }), i = e.inject(e.DestroyRef), a = Y(t.stores.activeMatchesSnapshot, (e) => e), o = r?.createRenderer(null, null) ?? null, s = vr({
-		root: n.head,
+function ai(e) {
+	let t = n.inject(C), r = n.inject(n.RendererFactory2, { optional: !0 }), i = n.inject(n.DestroyRef), a = J(e.stores.matches, (e) => e), o = r?.createRenderer(null, null) ?? null, s = Dr({
+		root: t.head,
 		bucket: "head",
 		renderer: o
 	});
 	s.mount();
-	let c = $(t).head;
+	let c = $(e).head;
 	s.sync(c);
-	let l = e.effect(() => {
+	let l = n.effect(() => {
 		a();
-		let e = $(t).head;
-		Vr(c, e) || (c = e, s.sync(e));
+		let t = $(e).head;
+		Xr(c, t) || (c = t, s.sync(t));
 	});
 	i.onDestroy(() => {
 		l.destroy(), s.destroy();
 	});
 }
-function Zr() {
-	Xr(e.inject(Q));
+function oi() {
+	ai(n.inject(Q));
 }
-function Qr(t) {
-	return e.makeEnvironmentProviders([{
+function si(e) {
+	return n.makeEnvironmentProviders([{
 		provide: Q,
-		useValue: t
-	}, e.provideEnvironmentInitializer(Zr)]);
+		useValue: e
+	}, n.provideEnvironmentInitializer(oi)]);
 }
 //#endregion
 //#region src/document/provide-tanstack-document.ts
-var $r = {
+var ci = {
 	title: !0,
 	headTags: !0,
 	bodyScripts: !0
 };
-function ei(t, n = {}) {
+function li(e, t = {}) {
 	let r = {
-		...$r,
-		...n
+		...ci,
+		...t
 	}, i = r.title && r.headTags && r.bodyScripts;
-	return e.makeEnvironmentProviders([{
+	return n.makeEnvironmentProviders([{
 		provide: Q,
-		useValue: t
-	}, e.provideEnvironmentInitializer(() => {
+		useValue: e
+	}, n.provideEnvironmentInitializer(() => {
 		if (i) {
-			Ur(t);
+			Qr(e);
 			return;
 		}
-		r.title && qr(t), r.headTags && Xr(t), r.bodyScripts && Wr(t);
+		r.title && ni(e), r.headTags && ai(e), r.bodyScripts && $r(e);
 	})]);
 }
-function ti(e) {
-	return ei(e);
+function ui(e) {
+	return li(e);
 }
 //#endregion
 //#region src/injectMatches.ts
-function ni(t) {
-	let n = Y(J().stores.activeMatchesSnapshot, (e) => e);
-	return e.computed(() => {
-		let e = n();
-		return t?.select ? t.select(e) : e;
-	}, { equal: O });
-}
-function ri(t) {
-	let n = e.inject(q);
-	return ni({ select: (e) => {
-		let r = e.slice(0, e.findIndex((e) => e.id === n.matchId()));
-		return t?.select ? t.select(r) : r;
+function di(e) {
+	return J(q().stores.matches, (t) => {
+		let n = t;
+		return e?.select ? e.select(n) : n;
+	}, { equal: k });
+}
+function fi(e) {
+	let t = n.inject(K);
+	return di({ select: (n) => {
+		let r = n.slice(0, n.findIndex((e) => e.id === t.matchId()));
+		return e?.select ? e.select(r) : r;
 	} });
 }
-function ii(t) {
-	let n = e.inject(q);
-	return ni({ select: (e) => {
-		let r = e.slice(e.findIndex((e) => e.id === n.matchId()) + 1);
-		return t?.select ? t.select(r) : r;
+function pi(e) {
+	let t = n.inject(K);
+	return di({ select: (n) => {
+		let r = n.slice(n.findIndex((e) => e.id === t.matchId()) + 1);
+		return e?.select ? e.select(r) : r;
 	} });
 }
 //#endregion
 //#region src/injectMatchRoute.ts
-function ai() {
-	let t = J(), n = Y(t.stores.matchRouteReactivity, (e) => e);
-	return (r) => e.computed(() => {
-		n();
-		let { pending: e, caseSensitive: i, fuzzy: a, includeSearch: o, ...s } = r;
-		return t.matchRoute(s, {
-			pending: e,
+function mi() {
+	let e = q(), t = J(e.stores.matchRouteDeps, (e) => e);
+	return (r) => n.computed(() => {
+		let { pending: n, caseSensitive: i, fuzzy: a, includeSearch: o, ...s } = r;
+		return t(), e.matchRoute(s, {
+			pending: n,
 			caseSensitive: i,
 			fuzzy: a,
 			includeSearch: o
@@ -3911,14 +3928,21 @@ function ai() {
 	});
 }
 //#endregion
+//#region src/injectIsShell.ts
+function hi() {
+	let e = q();
+	return p(() => e.isShell());
+}
+//#endregion
 //#region src/injectLocation.ts
-function oi(e) {
-	return Y(J().stores.location, (t) => e?.select ? e.select(t) : t, { equal: O });
+function gi(e) {
+	let t = q();
+	return e?.select ? J(t.stores.location, e.select, { equal: k }) : J(t.stores.location);
 }
 //#endregion
 //#region src/injectBlocker.ts
-function si(t) {
-	let { shouldBlockFn: n, enableBeforeUnload: r = !0, disabled: i = !1, withResolver: a = !1 } = t, o = J(), { history: s } = o, c = e.signal({
+function _i(e) {
+	let { shouldBlockFn: t, enableBeforeUnload: r = !0, disabled: i = !1, withResolver: a = !1 } = e, o = q(), { history: s } = o, c = n.signal({
 		status: "idle",
 		current: void 0,
 		next: void 0,
@@ -3926,10 +3950,10 @@ function si(t) {
 		proceed: void 0,
 		reset: void 0
 	});
-	return e.effect((e) => {
-		let t = (typeof i == "function" ? i() : i) ? void 0 : s.block({
+	return n.effect((e) => {
+		let n = (typeof i == "function" ? i() : i) ? void 0 : s.block({
 			blockerFn: async (e) => {
-				function t(e) {
+				function n(e) {
 					let t = o.parseLocation(e), n = o.getMatchedRoutes(t.pathname);
 					return n.foundRoute === void 0 ? {
 						routeId: "__notFound__",
@@ -3945,9 +3969,9 @@ function si(t) {
 						search: t.search
 					};
 				}
-				let r = t(e.currentLocation), i = t(e.nextLocation);
+				let r = n(e.currentLocation), i = n(e.nextLocation);
 				if (r.routeId === "__notFound__" && i.routeId !== "__notFound__") return !1;
-				let s = await n({
+				let s = await t({
 					action: e.action,
 					current: r,
 					next: i
@@ -3975,80 +3999,80 @@ function si(t) {
 			},
 			enableBeforeUnload: r
 		});
-		e(() => t?.());
+		e(() => n?.());
 	}), c.asReadonly();
 }
 //#endregion
 //#region src/injectCanGoBack.ts
-function ci() {
-	return Y(J().stores.location, (e) => e.state.__TSR_index !== 0);
+function vi() {
+	return J(q().stores.location, (e) => (e.state?.__TSR_index ?? 0) !== 0);
 }
 //#endregion
 //#region src/injectIntersectionObserver.ts
-function li(t, n, r) {
-	let i = e.inject(e.ElementRef);
-	e.afterRenderEffect((e) => {
+function yi(e, t, r) {
+	let i = n.inject(n.ElementRef);
+	n.afterRenderEffect((n) => {
 		let a = typeof IntersectionObserver == "function", o = i.nativeElement;
 		if (!o || !a || r()) return;
-		let s = new IntersectionObserver(([e]) => t(e), n);
-		s.observe(o), e(() => {
+		let s = new IntersectionObserver(([t]) => e(t), t);
+		s.observe(o), n(() => {
 			s.disconnect();
 		});
 	});
 }
 //#endregion
 //#region src/Link.ts
-var ui = class t {
+var bi = class e {
 	constructor() {
-		this.passiveEvents = fi(() => ({ touchstart: this.handleTouchStart })), this.options = m.required({ alias: "link" }), this.router = J(), this.isTransitioning = v(!1), this.from = d(() => y(() => this.options().from)), this.disabled = d(() => this._options().disabled ?? !1), this.target = d(() => this._options().target), this._options = d(() => ({
+		this.passiveEvents = Si(() => ({ touchstart: this.handleTouchStart })), this.options = g.required({ alias: "link" }), this.router = q(), this.isTransitioning = x(!1), this.from = p(() => S(() => this.options().from)), this.disabled = p(() => this._options().disabled ?? !1), this.target = p(() => this._options().target), this._options = p(() => ({
 			...this.options(),
 			from: this.from()
-		})), this.nextLocation = d(() => {
+		})), this.nextLocation = p(() => {
 			let e = this.location();
 			return this.router.buildLocation({
 				_fromLocation: e,
 				...this._options()
 			});
-		}), this.hrefOption = d(() => {
+		}), this.hrefOption = p(() => {
 			if (this._options().disabled) return;
 			let e = this.nextLocation().maskedLocation ?? this.nextLocation(), t = e.external;
 			return {
 				href: t ? e.publicHref : this.router.history.createHref(e.publicHref) || "/",
 				external: t
 			};
-		}), this.externalLink = d(() => {
+		}), this.externalLink = p(() => {
 			let e = this.hrefOption();
 			if (e?.external) return e.href;
 			try {
 				return new URL(this.options().to), this.options().to;
 			} catch {}
-		}), this.preload = d(() => this.options().reloadDocument ? !1 : this.options().preload ?? this.router.options.defaultPreload), this.preloadDelay = d(() => this.options().preloadDelay ?? this.router.options.defaultPreloadDelay ?? 0), this.location = oi(), this.isActiveProps = d(() => {
+		}), this.preload = p(() => this.options().reloadDocument ? !1 : this.options().preload ?? this.router.options.defaultPreload), this.preloadDelay = p(() => this.options().preloadDelay ?? this.router.options.defaultPreloadDelay ?? 0), this.location = gi(), this.isActiveProps = p(() => {
 			let e = this.options(), t = this.isActive() ? e.activeProps : e.inactiveProps;
 			if (!(!t || typeof t != "object")) return t;
-		}), this.isActive = d(() => {
+		}), this.isActive = p(() => {
 			if (this.externalLink()) return !1;
 			let e = this.options().activeOptions;
 			if (e?.exact) {
-				if (!Be(this.location().pathname, this.nextLocation().pathname, this.router.basepath)) return !1;
+				if (!qe(this.location().pathname, this.nextLocation().pathname, this.router.basepath)) return !1;
 			} else {
-				let e = ze(this.location().pathname, this.router.basepath), t = ze(this.nextLocation().pathname, this.router.basepath);
+				let e = Ke(this.location().pathname, this.router.basepath), t = Ke(this.nextLocation().pathname, this.router.basepath);
 				if (!(e.startsWith(t) && (e.length === t.length || e[t.length] === "/"))) return !1;
 			}
-			return (e?.includeSearch ?? !0) && !O(this.location().search, this.nextLocation().search, {
+			return (e?.includeSearch ?? !0) && !k(this.location().search, this.nextLocation().search, {
 				partial: !e?.exact,
 				ignoreUndefined: !e?.explicitUndefined
 			}) ? !1 : e?.includeHash ? this.location().hash === this.nextLocation().hash : !0;
 		}), this.doPreload = () => {
 			this.router.preloadRoute(this.options()).catch((e) => {
-				console.warn(e), console.warn(an);
+				console.warn(e), console.warn(fn);
 			});
 		}, this.preloadViewportIoCallback = (e) => {
 			e?.isIntersecting && this.doPreload();
-		}, this.viewportPreloader = li(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = f(() => {
+		}, this.viewportPreloader = yi(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = m(() => {
 			this.hasRenderFetched || !this._options().disabled && this.preload() === "render" && (this.doPreload(), this.hasRenderFetched = !0);
 		}), this.handleClick = (e) => {
 			let t = e.currentTarget.getAttribute("target"), n = this._options().target, r = n === void 0 ? t : n;
-			if (!this._options().disabled && !di(e) && !e.defaultPrevented && (!r || r === "_self") && e.button === 0) {
+			if (!this._options().disabled && !xi(e) && !e.defaultPrevented && (!r || r === "_self") && e.button === 0) {
 				e.preventDefault(), this.isTransitioning.set(!0);
 				let t = this.router.subscribe("onResolved", () => {
 					t(), this.isTransitioning.set(!1);
@@ -4075,33 +4099,33 @@ var ui = class t {
 		};
 	}
 	static {
-		this.ɵfac = function(e) {
-			return new (e || t)();
+		this.ɵfac = function(t) {
+			return new (t || e)();
 		};
 	}
 	static {
-		this.ɵdir = /* @__PURE__ */ e.ɵɵdefineDirective({
-			type: t,
+		this.ɵdir = /* @__PURE__ */ n.ɵɵdefineDirective({
+			type: e,
 			selectors: [[
 				"a",
 				"link",
 				""
 			]],
 			hostVars: 11,
-			hostBindings: function(t, n) {
-				if (t & 1 && e.ɵɵlistener("click", function(e) {
-					return n.handleClick(e);
+			hostBindings: function(e, t) {
+				if (e & 1 && n.ɵɵlistener("click", function(e) {
+					return t.handleClick(e);
 				})("focus", function() {
-					return n.handleFocus();
+					return t.handleFocus();
 				})("mouseenter", function(e) {
-					return n.handleEnter(e);
+					return t.handleEnter(e);
 				})("mouseover", function(e) {
-					return n.handleEnter(e);
+					return t.handleEnter(e);
 				})("mouseleave", function(e) {
-					return n.handleLeave(e);
-				}), t & 2) {
-					let t, r, i;
-					e.ɵɵdomProperty("href", (t = n.hrefOption()) == null ? null : t.href), e.ɵɵattribute("target", n.target())("role", n.disabled() ? "link" : void 0)("aria-disabled", n.disabled())("data-status", n.isActive() ? "active" : void 0)("aria-current", n.isActive() ? "page" : void 0)("data-transitioning", n.isTransitioning() ? "transitioning" : void 0), e.ɵɵstyleMap((r = n.isActiveProps()) == null ? null : r.style), e.ɵɵclassMap((i = n.isActiveProps()) == null ? null : i.class);
+					return t.handleLeave(e);
+				}), e & 2) {
+					let e, r, i;
+					n.ɵɵdomProperty("href", (e = t.hrefOption()) == null ? null : e.href), n.ɵɵattribute("target", t.target())("role", t.disabled() ? "link" : void 0)("aria-disabled", t.disabled())("data-status", t.isActive() ? "active" : void 0)("aria-current", t.isActive() ? "page" : void 0)("data-transitioning", t.isTransitioning() ? "transitioning" : void 0), n.ɵɵstyleMap((r = t.isActiveProps()) == null ? null : r.style), n.ɵɵclassMap((i = t.isActiveProps()) == null ? null : i.class);
 				}
 			},
 			inputs: { options: [
@@ -4113,19 +4137,19 @@ var ui = class t {
 		});
 	}
 };
-function di(e) {
+function xi(e) {
 	return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
-function fi(e) {
-	let t = p(r).nativeElement, i = p(n), a = p(s), o = [];
-	l(() => {
-		for (let [n, r] of Object.entries(e())) {
-			let e = a.listen(t, n, r, { passive: !0 });
+function Si(e) {
+	let t = h(a).nativeElement, n = h(i), r = h(l), o = [];
+	d(() => {
+		for (let [n, i] of Object.entries(e())) {
+			let e = r.listen(t, n, i, { passive: !0 });
 			o.push(e);
 		}
-	}), i.onDestroy(() => {
+	}), n.onDestroy(() => {
 		for (; o.length;) o.pop()?.();
 	});
 }
 //#endregion
-export { zn as LazyRoute, ui as Link, or as Matches, Fn as NotFoundRoute, Qn as Outlet, Nn as RootRoute, An as Route, kn as RouteApi, Zn as RouteMatch, _n as Router, dr as RouterProvider, kr as buildManagedDocumentContent, $ as buildMatchManagedDocumentContent, Bt as createBrowserHistory, Ln as createFileRoute, Vt as createHashHistory, Rt as createHistory, Vn as createLazyFileRoute, Bn as createLazyRoute, Ht as createMemoryHistory, In as createRootRoute, Mn as createRootRouteWithContext, jn as createRoute, Pn as createRouteMask, gn as createRouter, ln as createRouterConfig, On as getRouteApi, si as injectBlocker, ci as injectCanGoBack, ii as injectChildMatches, qn as injectErrorState, Sn as injectLoaderData, Cn as injectLoaderDeps, oi as injectLocation, X as injectMatch, ai as injectMatchRoute, ni as injectMatches, wn as injectNavigate, Tn as injectParams, ri as injectParentMatches, En as injectRouteContext, J as injectRouter, Jn as injectRouterState, Dn as injectSearch, nr as injectSsrScrollRestorationScript, Y as injectStore, z as isRedirect, Xt as lazyFn, Ke as notFound, ti as provideHeadContent, Kr as provideTanstackBodyManagedTags, ei as provideTanstackDocument, Yr as provideTanstackDocumentTitle, Qr as provideTanstackHeadManagedTags, ur as provideTanstackRouter, ut as redirect, un as retainSearchParams };
+export { Gn as LazyRoute, bi as Link, hr as Matches, Vn as NotFoundRoute, or as Outlet, zn as RootRoute, In as Route, Fn as RouteApi, ar as RouteMatch, Sn as Router, br as RouterProvider, Rr as buildManagedDocumentContent, $ as buildMatchManagedDocumentContent, qt as createBrowserHistory, Un as createFileRoute, Jt as createHashHistory, Gt as createHistory, qn as createLazyFileRoute, Kn as createLazyRoute, Yt as createMemoryHistory, Hn as createRootRoute, Rn as createRootRouteWithContext, Ln as createRoute, Bn as createRouteMask, xn as createRouter, gn as createRouterConfig, Pn as getRouteApi, _i as injectBlocker, vi as injectCanGoBack, pi as injectChildMatches, $n as injectErrorState, hi as injectIsShell, kn as injectLoaderData, An as injectLoaderDeps, gi as injectLocation, Y as injectMatch, mi as injectMatchRoute, di as injectMatches, X as injectNavigate, jn as injectParams, fi as injectParentMatches, Mn as injectRouteContext, q as injectRouter, er as injectRouterState, Nn as injectSearch, dr as injectSsrScrollRestorationScript, J as injectStore, R as isRedirect, rn as lazyFn, $e as notFound, ui as provideHeadContent, ti as provideTanstackBodyManagedTags, li as provideTanstackDocument, ii as provideTanstackDocumentTitle, si as provideTanstackHeadManagedTags, yr as provideTanstackRouter, _t as redirect, _n as retainSearchParams };