@benjavicente/angular-router-experimental 1.142.12 → 1.142.14

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

@@ -1,92 +1,92 @@
 import "@tanstack/store";
 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 _, runInInjectionContext as ee, signal as v, untracked as y } from "@angular/core";
-import { DOCUMENT as te } from "@angular/common";
-var ne = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-function re(e, t, n = () => ({}), r = 0) {
+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 _, runInInjectionContext as ee, signal as te, untracked as v } from "@angular/core";
+import { DOCUMENT as ne } from "@angular/common";
+var re = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
+function ie(e, t, n = () => ({}), r = 0) {
 	if (e === t) return e;
 	if (r > 500) return t;
-	let i = t, a = w(e) && w(i);
-	if (!a && !(S(e) && S(i))) return i;
-	let o = a ? e : x(e);
+	let i = t, a = C(e) && C(i);
+	if (!a && !(x(e) && x(i))) return i;
+	let o = a ? e : b(e);
 	if (!o) return i;
-	let s = a ? i : x(i);
+	let s = a ? i : b(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 : ne.call(e, o)) && d++;
+			u[o] = l, (a ? t < c : re.call(e, o)) && d++;
 			continue;
 		}
 		if (l === null || f === null || typeof l != "object" || typeof f != "object") {
 			u[o] = f;
 			continue;
 		}
-		let p = re(l, f, n, r + 1);
+		let p = ie(l, f, n, r + 1);
 		u[o] = p, p === l && d++;
 	}
 	return c === l && d === c ? e : u;
 }
-function x(e) {
+function b(e) {
 	let t = Object.getOwnPropertyNames(e);
-	for (let n of t) if (!b.call(e, n)) return !1;
+	for (let n of t) if (!y.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 (!b.call(e, t)) return !1;
+		if (!y.call(e, t)) return !1;
 		r.push(t);
 	}
 	return r;
 }
-function S(e) {
-	if (!C(e)) return !1;
+function x(e) {
+	if (!S(e)) return !1;
 	let t = e.constructor;
 	if (t === void 0) return !0;
 	let n = t.prototype;
-	return !(!C(n) || !n.hasOwnProperty("isPrototypeOf"));
+	return !(!S(n) || !n.hasOwnProperty("isPrototypeOf"));
 }
-function C(e) {
+function S(e) {
 	return Object.prototype.toString.call(e) === "[object Object]";
 }
-function w(e) {
+function C(e) {
 	return Array.isArray(e) && e.length === Object.keys(e).length;
 }
-function T(e, t, n) {
+function w(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 (!T(e[r], t[r], n)) return !1;
+		for (let r = 0, i = e.length; r < i; r++) if (!w(e[r], t[r], n)) return !1;
 		return !0;
 	}
-	if (S(e) && S(t)) {
+	if (x(e) && x(t)) {
 		let r = n?.ignoreUndefined ?? !0;
 		if (n?.partial) {
-			for (let i in t) if ((!r || t[i] !== void 0) && !T(e[i], t[i], n)) return !1;
+			for (let i in t) if ((!r || t[i] !== void 0) && !w(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 || !T(e[o], t[o], n))) return !1;
+		for (let o in t) if ((!r || t[o] !== void 0) && (a++, a > i || !w(e[o], t[o], n))) return !1;
 		return i === a;
 	}
 	return !1;
 }
-function ie() {
+function ae() {
 	throw Error("Invariant failed");
 }
-var ae = 4, E = 5;
-function D(e) {
+var oe = 4, T = 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 oe(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 === "$") {
@@ -94,7 +94,7 @@ function oe(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 = D(a);
+	let o = se(a);
 	if (o) {
 		let [r, s] = o, c = a.charCodeAt(r + 1);
 		if (c === 45) {
@@ -109,13 +109,13 @@ function oe(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 se(e, t, n, r, i, a, o) {
+function le(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?.parseParams;
 		for (; s < o;) {
-			let e = oe(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]);
@@ -124,7 +124,7 @@ function se(e, t, n, r, i, a, o) {
 						if (e) o = e;
 						else {
 							i.static ??= /* @__PURE__ */ new Map();
-							let e = A(n.fullPath ?? n.from);
+							let e = O(n.fullPath ?? n.from);
 							e.parent = i, e.depth = a, o = e, i.static.set(t, e);
 						}
 					} else {
@@ -132,7 +132,7 @@ function se(e, t, n, r, i, a, o) {
 						if (r) o = r;
 						else {
 							i.staticInsensitive ??= /* @__PURE__ */ new Map();
-							let t = A(n.fullPath ?? n.from);
+							let t = O(n.fullPath ?? n.from);
 							t.parent = i, t.depth = a, o = t, i.staticInsensitive.set(e, t);
 						}
 					}
@@ -142,7 +142,7 @@ function se(e, t, n, r, i, a, o) {
 					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 = j(1, n.fullPath ?? n.from, f, p, m);
+						let e = k(1, n.fullPath ?? n.from, f, p, m);
 						o = e, e.depth = a, e.parent = i, i.dynamic ??= [], i.dynamic.push(e);
 					}
 					break;
@@ -151,32 +151,32 @@ function se(e, t, n, r, i, a, o) {
 					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 = j(3, n.fullPath ?? n.from, f, p, m);
+						let e = k(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 = j(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 = k(2, n.fullPath ?? n.from, l, f, p);
 					o = m, m.parent = i, m.depth = a, i.wildcard ??= [], i.wildcard.push(m);
 				}
 			}
 			i = o;
 		}
 		if (l && n.children && !n.isRoot && n.id && n.id.charCodeAt(n.id.lastIndexOf("/") + 1) === 95) {
-			let e = A(n.fullPath ?? n.from);
-			e.kind = E, e.parent = i, a++, e.depth = a, i.pathless ??= [], i.pathless.push(e), i = e;
+			let e = O(n.fullPath ?? n.from);
+			e.kind = T, 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 = A(n.fullPath ?? n.from);
-			e.kind = ae, e.parent = i, a++, e.depth = a, i.index = e, i = e;
+			let e = O(n.fullPath ?? n.from);
+			e.kind = oe, e.parent = i, a++, e.depth = a, i.index = e, i = e;
 		}
 		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) se(e, t, r, s, i, a, o);
+	if (n.children) for (let r of n.children) le(e, t, r, s, i, a, o);
 }
-function O(e, t) {
+function E(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) {
@@ -189,24 +189,24 @@ function O(e, t) {
 	}
 	return e.prefix && !t.prefix ? -1 : !e.prefix && t.prefix ? 1 : e.suffix && !t.suffix ? -1 : !e.suffix && t.suffix ? 1 : e.caseSensitive && !t.caseSensitive ? -1 : !e.caseSensitive && t.caseSensitive ? 1 : 0;
 }
-function k(e) {
-	if (e.pathless) for (let t of e.pathless) k(t);
-	if (e.static) for (let t of e.static.values()) k(t);
-	if (e.staticInsensitive) for (let t of e.staticInsensitive.values()) k(t);
+function D(e) {
+	if (e.pathless) for (let t of e.pathless) D(t);
+	if (e.static) for (let t of e.static.values()) D(t);
+	if (e.staticInsensitive) for (let t of e.staticInsensitive.values()) D(t);
 	if (e.dynamic?.length) {
-		e.dynamic.sort(O);
-		for (let t of e.dynamic) k(t);
+		e.dynamic.sort(E);
+		for (let t of e.dynamic) D(t);
 	}
 	if (e.optional?.length) {
-		e.optional.sort(O);
-		for (let t of e.optional) k(t);
+		e.optional.sort(E);
+		for (let t of e.optional) D(t);
 	}
 	if (e.wildcard?.length) {
-		e.wildcard.sort(O);
-		for (let t of e.wildcard) k(t);
+		e.wildcard.sort(E);
+		for (let t of e.wildcard) D(t);
 	}
 }
-function A(e) {
+function O(e) {
 	return {
 		kind: 0,
 		depth: 0,
@@ -223,7 +223,7 @@ function A(e) {
 		parse: null
 	};
 }
-function j(e, t, n, r, i) {
+function k(e, t, n, r, i) {
 	return {
 		kind: e,
 		depth: 0,
@@ -243,19 +243,19 @@ function j(e, t, n, r, i) {
 		suffix: i
 	};
 }
-function M(e) {
+function A(e) {
 	let t = e.length;
 	return t > 1 && e[t - 1] === "/" ? e.replace(/\/{1,}$/, "") : e;
 }
-function N(e, t) {
+function j(e, t) {
 	return e?.endsWith("/") && e !== "/" && e !== `${t}/` ? e.slice(0, -1) : e;
 }
-function ce(e, t, n) {
-	return N(e, n) === N(t, n);
+function M(e, t, n) {
+	return j(e, n) === j(t, n);
 }
 JSON.parse, JSON.stringify, JSON.parse;
-var P = "__root__";
-function F(e, t) {
+var N = "__root__";
+function P(e, t) {
 	let n = t, r = e;
 	return {
 		fromLocation: n,
@@ -266,8 +266,8 @@ function F(e, t) {
 	};
 }
 Error, Error;
-var le = "Error preloading route! ☝️";
-function ue(e) {
+var ue = "Error preloading route! ☝️";
+function de(e) {
 	if (typeof document < "u" && document.querySelector) {
 		let t = e.stores.location.get(), n = t.state.__hashScrollIntoViewOptions ?? !0;
 		if (n && t.hash !== "") {
@@ -276,27 +276,27 @@ function ue(e) {
 		}
 	}
 }
-var de = {
+var fe = {
 	matchId: () => void 0,
 	routeId: () => void 0,
 	match: () => void 0,
 	hasPending: () => !1
-}, I = /* @__PURE__ */ new e.InjectionToken("MATCH_CONTEXT_INJECTOR", {
+}, F = /* @__PURE__ */ new e.InjectionToken("MATCH_CONTEXT_INJECTOR", {
 	providedIn: "root",
-	factory: () => de
-}), L = /* @__PURE__ */ new e.InjectionToken("ROUTER");
-function R() {
-	return typeof document > "u" ? L : window.__TSR_ROUTER_INJECTION_KEY__ ? window.__TSR_ROUTER_INJECTION_KEY__ : (window.__TSR_ROUTER_INJECTION_KEY__ = L, L);
+	factory: () => fe
+}), I = /* @__PURE__ */ new e.InjectionToken("ROUTER");
+function L() {
+	return typeof document > "u" ? I : window.__TSR_ROUTER_INJECTION_KEY__ ? window.__TSR_ROUTER_INJECTION_KEY__ : (window.__TSR_ROUTER_INJECTION_KEY__ = I, I);
 }
-function z(t) {
-	let n = e.inject(R(), { optional: !0 });
+function R(t) {
+	let n = e.inject(L(), { 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 B(e, t) {
+function z(e, t) {
 	return t || (u(e), p(o));
 }
-function V(e, t = (e) => e, n) {
-	return ee(B(V, n?.injector), () => {
+function B(e, t = (e) => e, n) {
+	return ee(z(B, n?.injector), () => {
 		let r = typeof e == "function" ? e : () => e, i = _(() => t(r().get()), { equal: n?.compare });
 		return f((e) => {
 			let { unsubscribe: n } = r().subscribe((e) => {
@@ -306,37 +306,37 @@ function V(e, t = (e) => e, n) {
 		}), i.asReadonly();
 	});
 }
-function H(e, t = (e) => e, n) {
+function V(e, t = (e) => e, n) {
 	let { equal: r, injector: i, ...a } = n ?? {};
-	return V(e, t, {
+	return B(e, t, {
 		...a,
 		compare: r,
 		injector: i
 	});
 }
-var U = {
+var H = {
 	get: () => void 0,
 	subscribe: () => ({ unsubscribe: () => {} })
 };
-function fe(t) {
-	let n = z(), r = t.from ? void 0 : e.inject(I), i = H(t.from ? n.stores.getRouteMatchStore(t.from) : () => {
+function pe(t) {
+	let n = R(), r = t.from ? void 0 : e.inject(F), i = V(t.from ? n.stores.getRouteMatchStore(t.from) : () => {
 		let e = r?.matchId();
-		return e ? n.stores.matchStores.get(e) ?? U : U;
-	}, (e) => e), a = H(n.stores.pendingRouteIds, (e) => e), o = H(n.stores.isTransitioning, (e) => e);
+		return e ? n.stores.matchStores.get(e) ?? H : H;
+	}, (e) => e), a = V(n.stores.pendingRouteIds, (e) => e), o = V(n.stores.isTransitioning, (e) => e);
 	return e.computed(() => {
 		let e = i();
 		if (e !== void 0) return t.select ? t.select(e) : e;
 		if (!(t.from ? a()[t.from] : r?.hasPending() ?? !1) && !o() && (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!"}`);
-			ie();
+			ae();
 		}
-	}, { equal: T });
+	}, { equal: w });
 }
-function W(e) {
+function U(e) {
 	let t = p(c), r = p(o), i = [];
 	f(() => {
-		let n = e(), a = pe(n);
-		if (G(i, a)) return;
+		let n = e(), a = me(n);
+		if (W(i, a)) return;
 		i.length > 0 && t.clear(), i = a;
 		let s = n?.component;
 		if (!s) return;
@@ -352,16 +352,16 @@ function W(e) {
 		t.clear();
 	});
 }
-function pe(e) {
+function me(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 G(e, t) {
+function W(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;
 }
-var me = class n {
+var he = class n {
 	static {
 		this.ɵfac = function(e) {
 			return new (e || n)();
@@ -385,32 +385,56 @@ var me = class n {
 			changeDetection: t.OnPush
 		});
 	}
-}, he = /* @__PURE__ */ new e.InjectionToken("ERROR_STATE_INJECTOR_TOKEN");
+}, G = /* @__PURE__ */ new e.InjectionToken("ERROR_STATE_INJECTOR_TOKEN");
 function ge(e) {
-	let t = z({ warn: e?.router === void 0 }), n = e?.router ?? t;
-	return e?.select ? H(n.stores.__store, e.select, { equal: T }) : H(n.stores.__store);
+	let t = R({ warn: e?.router === void 0 }), n = e?.router ?? t;
+	return e?.select ? V(n.stores.__store, e.select, { equal: w }) : V(n.stores.__store);
 }
 function _e({ matchId: t }) {
-	let n = z(), r = ge({ select: (e) => e.matches }), i = e.computed(() => r().findIndex((e) => e.id === t()));
+	let n = R(), r = ge({ select: (e) => e.matches }), i = e.computed(() => r().findIndex((e) => e.id === t()));
 	return e.computed(() => {
-		if (n.options.defaultErrorComponent != null) return !1;
+		if (n.options.defaultErrorComponent != null) return;
 		let e = i();
-		if (e === -1) return !1;
+		if (e === -1) return;
 		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 (n.routesById[e?.routeId].options.errorComponent != null) return;
+			if (e?.status === "error") return e;
 		}
-		return !1;
 	});
 }
 var K = {
 	get: () => void 0,
 	subscribe: () => ({ unsubscribe: () => {} })
+}, ve = class t {
+	constructor() {
+		this.state = p(G), this.message = d(() => {
+			let e = this.state.error;
+			return e instanceof Error ? e.stack ?? e.message : String(e);
+		});
+	}
+	static {
+		this.ɵfac = function(e) {
+			return new (e || t)();
+		};
+	}
+	static {
+		this.ɵcmp = /* @__PURE__ */ e.ɵɵdefineComponent({
+			type: t,
+			selectors: [["tanstack-router-default-error"]],
+			decls: 5,
+			vars: 1,
+			consts: [["role", "alert"]],
+			template: function(t, n) {
+				t & 1 && (e.ɵɵelementStart(0, "div", 0)(1, "p"), e.ɵɵtext(2, "Something went wrong."), e.ɵɵelementEnd(), e.ɵɵelementStart(3, "pre"), e.ɵɵtext(4), e.ɵɵelementEnd()()), t & 2 && (e.ɵɵadvance(4), e.ɵɵtextInterpolate(n.message()));
+			},
+			encapsulation: 2
+		});
+	}
 };
-function ve({ parentRouteIsRoot: e }) {
-	let t = z({ warn: !1 }), r = p(i), a = p(n), o = H(t.stores.resolvedLocation, (e) => e?.state?.__TSR_key), s = H(t.stores.loadedAt, (e) => e), c, u = 0;
+function ye({ parentRouteIsRoot: e }) {
+	let t = R({ warn: !1 }), r = p(i), a = p(n), o = V(t.stores.resolvedLocation, (e) => e?.state?.__TSR_key), s = V(t.stores.loadedAt, (e) => e), c, u = 0;
 	a.onDestroy(() => {
 		u++;
 	}), f(() => {
@@ -422,14 +446,14 @@ function ve({ parentRouteIsRoot: e }) {
 			let r = t.latestLocation.href;
 			c !== void 0 && c === r || (c = r, t.emit({
 				type: "onRendered",
-				...F(t.stores.location.get(), t.stores.resolvedLocation.get())
+				...P(t.stores.location.get(), t.stores.resolvedLocation.get())
 			}));
 		} }, { injector: r });
 	});
 }
 var q = class t {
 	constructor() {
-		this.matchId = m.required(), this.router = z(), this.match = d(() => this.matchSignal()), this.matchSignal = H(() => this.router.stores.matchStores.get(this.matchId()) ?? K, (e) => e), this.matchData = d(() => {
+		this.matchId = m.required(), this.router = R(), this.match = d(() => this.matchSignal()), this.matchSignal = V(() => this.router.stores.matchStores.get(this.matchId()) ?? K, (e) => e), this.matchData = d(() => {
 			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)?.({
@@ -444,45 +468,51 @@ var q = class t {
 				match: e,
 				parentRouteId: r
 			};
-		}), this.isFistRouteInRouteTree = d(() => this.matchData()?.parentRouteId === P), this.resolvedNoSsr = d(() => {
+		}), this.isFistRouteInRouteTree = d(() => this.matchData()?.parentRouteId === N), this.resolvedNoSsr = d(() => {
 			let e = this.matchData()?.match;
 			return e ? e.ssr === !1 || e.ssr === "data-only" : !0;
 		}), this.shouldClientOnly = d(() => {
 			let e = this.matchData()?.match;
 			return e ? this.resolvedNoSsr() || !!e._displayPending : !0;
-		}), this.parentRouteIdSignal = d(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = d(() => P), this.hasPendingMatch = d(() => {
+		}), this.parentRouteIdSignal = d(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = d(() => N), this.hasPendingMatch = d(() => {
 			let e = this.matchData()?.route.id;
 			return e ? !!this.pendingRouteIds()[e] : !1;
-		}), this.pendingRouteIds = H(this.router.stores.pendingRouteIds, (e) => e), this.nearestMatchContext = {
+		}), this.pendingRouteIds = V(this.router.stores.pendingRouteIds, (e) => e), this.nearestMatchContext = {
 			matchId: this.matchId,
 			routeId: d(() => this.matchData()?.route.id),
 			match: this.match,
 			hasPending: this.hasPendingMatch
-		}, this.isCatchingError = _e({ matchId: this.matchId }), this.render = W(() => {
+		}, this.catchingErrorMatch = _e({ matchId: this.matchId }), this.render = U(() => {
 			let e = this.matchData();
-			if (!e || this.shouldClientOnly() && this.router.isServer) return null;
+			if (!e) return null;
 			let { match: t, route: n } = e;
+			if (this.shouldClientOnly() && this.router.isServer) {
+				let e = Y(n.options.pendingComponent) ?? Y(this.router.options.defaultPendingComponent);
+				return e ? { component: e } : null;
+			}
 			if (t.status === "notFound") return { component: X(this.router, n) };
-			if (t.status === "error" || this.isCatchingError()) return {
-				component: (Y(n.options.errorComponent) ?? Y(this.router.options.defaultErrorComponent)) || null,
-				providers: [{
-					provide: he,
-					useValue: {
-						error: t.error,
-						reset: () => {
-							this.router.invalidate();
-						},
-						info: { componentStack: "" }
-					}
-				}]
-			};
-			if (t.status === "redirected" || t.status === "pending") {
+			if (t.status === "error" || this.catchingErrorMatch()) {
+				let e = this.catchingErrorMatch();
+				return {
+					component: be(this.router, n),
+					providers: [{
+						provide: G,
+						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 && (Y(n.options.component) ?? Y(this.router.options.defaultComponent));
 				return t && t !== J ? {
 					key: e.key,
 					component: t,
 					providers: [{
-						provide: I,
+						provide: F,
 						useValue: this.nearestMatchContext
 					}]
 				} : { component: Y(n.options.pendingComponent) ?? Y(this.router.options.defaultPendingComponent) };
@@ -492,12 +522,12 @@ var q = class t {
 					key: e.key,
 					component: t,
 					providers: [{
-						provide: I,
+						provide: F,
 						useValue: this.nearestMatchContext
 					}]
 				};
 			}
-		}), this.onRendered = ve({ parentRouteIsRoot: d(() => this.parentRouteIdSignal() === P) });
+		}), this.onRendered = ye({ parentRouteIsRoot: d(() => this.parentRouteIdSignal() === N) });
 	}
 	static {
 		this.ɵfac = function(e) {
@@ -526,13 +556,13 @@ var q = class t {
 	}
 }, J = class t {
 	constructor() {
-		this.router = z(), this.nearestMatch = p(I), this.currentMatch = H(() => {
+		this.router = R(), this.nearestMatch = p(F), this.currentMatch = V(() => {
 			let e = this.nearestMatch.matchId();
 			return e ? this.router.stores.matchStores.get(e) ?? K : K;
-		}, (e) => e), this.routeId = d(() => this.currentMatch()?.routeId), this.route = d(() => this.router.routesById[this.routeId()]), this.parentGlobalNotFound = d(() => this.currentMatch()?.globalNotFound ?? !1), this.childMatchIdByRouteId = H(this.router.stores.childMatchIdByRouteId, (e) => e), this.childMatchId = d(() => {
+		}, (e) => e), this.routeId = d(() => this.currentMatch()?.routeId), this.route = d(() => this.router.routesById[this.routeId()]), this.parentGlobalNotFound = d(() => this.currentMatch()?.globalNotFound ?? !1), this.childMatchIdByRouteId = V(this.router.stores.childMatchIdByRouteId, (e) => e), this.childMatchId = d(() => {
 			let e = this.routeId();
 			return e ? this.childMatchIdByRouteId()[e] ?? null : null;
-		}), this.render = W(() => this.parentGlobalNotFound() ? { component: X(this.router, this.route()) } : this.childMatchId() ? {
+		}), this.render = U(() => this.parentGlobalNotFound() ? { component: X(this.router, this.route()) } : this.childMatchId() ? {
 			component: q,
 			inputs: { matchId: () => this.childMatchId() }
 		} : null);
@@ -562,18 +592,21 @@ function Y(e) {
 	return typeof e == "function" ? e() : e;
 }
 function X(e, t) {
-	return (Y(t.options.notFoundComponent) ?? Y(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>)`), me);
+	return (Y(t.options.notFoundComponent) ?? Y(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>)`), he);
 }
-function ye(e) {
+function be(e, t) {
+	return (Y(t.options.errorComponent) ?? Y(e.options.defaultErrorComponent)) || (g() && !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.`), ve);
+}
+function xe(e) {
 	return null;
 }
 var Z = "data-tsr-scroll-restoration-inline";
-function be() {
-	let e = z(), t = p(te), n = p(i);
+function Se() {
+	let e = R(), t = p(ne), n = p(i);
 	e.isServer && l(() => {
 		let n = e.options.scrollRestoration;
 		if (!n || typeof n == "function" && !n({ location: e.latestLocation }) || t.querySelector(`script[${Z}]`)) return;
-		let r = ye(e);
+		let r = xe(e);
 		if (!r) return;
 		let i = t.createElement("script");
 		i.setAttribute(Z, ""), i.className = "$tsr", i.text = `${r};document.currentScript.remove()`;
@@ -585,10 +618,10 @@ var Q = {
 	router: null,
 	mounted: !1
 };
-function xe() {
-	let t = z(), n = e.inject(e.EnvironmentInjector);
+function Ce() {
+	let t = R(), n = e.inject(e.EnvironmentInjector);
 	if (t.isServer) return;
-	let r = e.inject(e.DestroyRef), i = !1, a = H(t.stores.isLoading, (e) => e), o = H(t.stores.isTransitioning, (e) => e), s = H(t.stores.hasPending, (e) => e), c = H(t.stores.status, (e) => e), l = H(t.stores.location, (e) => e), u = H(t.stores.resolvedLocation, (e) => e), d = e.computed(() => a() || o() || s()), f = e.computed(() => a() || s()), p = $(() => a()), m = $(() => d()), h = $(() => f());
+	let r = e.inject(e.DestroyRef), i = !1, a = V(t.stores.isLoading, (e) => e), o = V(t.stores.isTransitioning, (e) => e), s = V(t.stores.hasPending, (e) => e), c = V(t.stores.status, (e) => e), l = V(t.stores.location, (e) => e), u = V(t.stores.resolvedLocation, (e) => e), d = e.computed(() => a() || o() || s()), f = e.computed(() => a() || s()), p = $(() => a()), m = $(() => d()), h = $(() => f());
 	t.startTransition = (r) => {
 		t.stores.isTransitioning.set(!0);
 		let a = () => {
@@ -611,7 +644,7 @@ function xe() {
 			state: !0,
 			_includeValidateSearch: !0
 		});
-		M(t.latestLocation.href) !== M(e.href) && t.commitLocation({
+		A(t.latestLocation.href) !== A(e.href) && t.commitLocation({
 			...e,
 			replace: !0
 		});
@@ -636,24 +669,24 @@ function xe() {
 		if (_()) try {
 			p() && !a() && t.emit({
 				type: "onLoad",
-				...F(l(), u())
+				...P(l(), u())
 			});
 		} catch {}
 	}), e.effect(() => {
 		if (_()) try {
 			h() && !f() && t.emit({
 				type: "onBeforeRouteMount",
-				...F(l(), u())
+				...P(l(), u())
 			});
 		} catch {}
 	}), e.effect(() => {
 		if (_()) try {
 			if (m() && !d() && c() === "pending" && (t.stores.status.set("idle"), t.stores.resolvedLocation.set(l())), m() && !d()) {
-				let e = F(l(), u());
+				let e = P(l(), u());
 				t.emit({
 					type: "onResolved",
 					...e
-				}), e.hrefChanged && ue(t);
+				}), e.hrefChanged && de(t);
 			}
 		} catch {}
 	});
@@ -665,9 +698,9 @@ function $(t) {
 		return r = n(), e;
 	});
 }
-var Se = class t {
+var we = class t {
 	constructor() {
-		this.router = z(), this.matchId = H(this.router.stores.firstId, (e) => e), this.ssrScrollRestoration = be(), this.transitioner = xe(), this.render = W(() => {
+		this.router = R(), this.matchId = V(this.router.stores.firstId, (e) => e), this.ssrScrollRestoration = Se(), this.transitioner = Ce(), this.render = U(() => {
 			let e = this.matchId();
 			return e ? {
 				component: q,
@@ -691,16 +724,16 @@ var Se = class t {
 			encapsulation: 2
 		});
 	}
-}, Ce = /* @__PURE__ */ new a("CONTEXT", {
+}, Te = /* @__PURE__ */ new a("CONTEXT", {
 	providedIn: "root",
 	factory: () => ({})
-}), we = /* @__PURE__ */ new a("OPTIONS", {
+}), Ee = /* @__PURE__ */ new a("OPTIONS", {
 	providedIn: "root",
 	factory: () => ({})
 });
 (class t {
 	constructor() {
-		this.injectedContext = p(Ce), this.injectedOptions = p(we), this.injectedRouter = p(R(), { optional: !0 }), this.context = m(this.injectedContext), this.options = m(this.injectedOptions), this.routerInput = m(void 0, { alias: "router" }), this.router = d(() => {
+		this.injectedContext = p(Te), this.injectedOptions = p(Ee), this.injectedRouter = p(L(), { optional: !0 }), this.context = m(this.injectedContext), this.options = m(this.injectedOptions), this.routerInput = m(void 0, { alias: "router" }), this.router = d(() => {
 			let e = this.routerInput();
 			if (e) return e;
 			if (this.injectedRouter) return this.injectedRouter;
@@ -715,12 +748,12 @@ var Se = class t {
 					...t
 				}
 			});
-		}), this.render = W(() => {
-			let e = y(this.router);
+		}), this.render = U(() => {
+			let e = v(this.router);
 			return {
-				component: Se,
+				component: we,
 				providers: [{
-					provide: R(),
+					provide: L(),
 					useValue: e
 				}]
 			};
@@ -756,11 +789,11 @@ var Se = class t {
 		});
 	}
 });
-function Te(e) {
-	let t = z();
-	return e?.select ? H(t.stores.location, e.select, { equal: T }) : H(t.stores.location);
+function De(e) {
+	let t = R();
+	return e?.select ? V(t.stores.location, e.select, { equal: w }) : V(t.stores.location);
 }
-function Ee(t, n, r) {
+function Oe(t, n, r) {
 	let i = e.inject(e.ElementRef);
 	e.afterRenderEffect((e) => {
 		let a = typeof IntersectionObserver == "function", o = i.nativeElement;
@@ -773,7 +806,7 @@ function Ee(t, n, r) {
 }
 (class t {
 	constructor() {
-		this.passiveEvents = Oe(() => ({ touchstart: this.handleTouchStart })), this.options = m.required({ alias: "link" }), this.router = z(), 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 = Ae(() => ({ touchstart: this.handleTouchStart })), this.options = m.required({ alias: "link" }), this.router = R(), this.isTransitioning = te(!1), this.from = d(() => v(() => this.options().from)), this.disabled = d(() => this._options().disabled ?? !1), this.target = d(() => this._options().target), this._options = d(() => ({
 			...this.options(),
 			from: this.from()
 		})), this.nextLocation = d(() => {
@@ -795,33 +828,33 @@ function Ee(t, n, r) {
 			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 = Te(), this.isActiveProps = d(() => {
+		}), 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 = De(), this.isActiveProps = d(() => {
 			let e = this.options(), t = this.isActive() ? e.activeProps : e.inactiveProps;
 			if (!(!t || typeof t != "object")) return t;
 		}), this.isActive = d(() => {
 			if (this.externalLink()) return !1;
 			let e = this.options().activeOptions;
 			if (e?.exact) {
-				if (!ce(this.location().pathname, this.nextLocation().pathname, this.router.basepath)) return !1;
+				if (!M(this.location().pathname, this.nextLocation().pathname, this.router.basepath)) return !1;
 			} else {
-				let e = N(this.location().pathname, this.router.basepath), t = N(this.nextLocation().pathname, this.router.basepath);
+				let e = j(this.location().pathname, this.router.basepath), t = j(this.nextLocation().pathname, this.router.basepath);
 				if (!(e.startsWith(t) && (e.length === t.length || e[t.length] === "/"))) return !1;
 			}
-			return (e?.includeSearch ?? !0) && !T(this.location().search, this.nextLocation().search, {
+			return (e?.includeSearch ?? !0) && !w(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(le);
+				console.warn(e), console.warn(ue);
 			});
 		}, this.preloadViewportIoCallback = (e) => {
 			e?.isIntersecting && this.doPreload();
-		}, this.viewportPreloader = Ee(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = f(() => {
+		}, this.viewportPreloader = Oe(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = f(() => {
 			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 && !De(e) && !e.defaultPrevented && (!r || r === "_self") && e.button === 0) {
+			if (!this._options().disabled && !ke(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);
@@ -886,10 +919,10 @@ function Ee(t, n, r) {
 		});
 	}
 });
-function De(e) {
+function ke(e) {
 	return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
-function Oe(e) {
+function Ae(e) {
 	let t = p(r).nativeElement, i = p(n), a = p(s), o = [];
 	l(() => {
 		for (let [n, r] of Object.entries(e())) {
@@ -902,8 +935,8 @@ function Oe(e) {
 }
 //#endregion
 //#region experimental/injectRouteErrorHandler.ts
-function ke(e) {
-	let t = z(), r = fe({ from: e.from }), i = !1;
+function je(e) {
+	let t = R(), r = pe({ from: e.from }), i = !1;
 	return p(n).onDestroy(() => {
 		i = !0;
 	}), { throw: (e) => {
@@ -911,7 +944,7 @@ function ke(e) {
 			console.warn("Attempted to throw error to route after it has been destroyed");
 			return;
 		}
-		let n = y(r).id;
+		let n = v(r).id;
 		t.updateMatch(n, (t) => ({
 			...t,
 			error: e,
@@ -922,4 +955,4 @@ function ke(e) {
 	} };
 }
 //#endregion
-export { ke as injectRouteErrorHandler };
+export { je as injectRouteErrorHandler };