@benjavicente/angular-router-experimental 1.142.13 → 1.142.14

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

@@ -1,7 +1,6 @@
 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";
+import { ChangeDetectionStrategy as r, DOCUMENT as i, DestroyRef as a, ElementRef as o, EnvironmentInjector as s, InjectionToken as c, Injector as l, Renderer2 as u, ViewContainerRef as d, afterNextRender as f, assertInInjectionContext as p, computed as m, effect as h, inject as g, input as _, inputBinding as v, isDevMode as y, linkedSignal as b, runInInjectionContext as x, signal as S, untracked as C } from "@angular/core";
 //#region ../router-core/dist/esm/utils.js
 function w(e) {
 	return e[e.length - 1];
@@ -2707,12 +2706,12 @@ function q(e) {
 //#endregion
 //#region src/store/injectSelector.ts
 function En(e, t) {
-	return t || (f(e), h(c));
+	return t || (p(e), g(l));
 }
 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) => {
+	return x(En(Dn, n?.injector), () => {
+		let r = typeof e == "function" ? e : () => e, i = b(() => t(r().get()), { equal: n?.compare });
+		return h((e) => {
 			let { unsubscribe: n } = r().subscribe((e) => {
 				i.set(t(e));
 			});
@@ -2955,22 +2954,22 @@ function qn(e) {
 //#endregion
 //#region src/renderer/injectRender.ts
 function Jn(e) {
-	let t = h(u), n = h(c), r = [];
-	m(() => {
+	let t = g(d), n = g(l), r = [];
+	h(() => {
 		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({
+		let s = i.providers ?? [], c = l.create({
 			providers: s,
 			parent: n
-		}), u = Object.entries(i.inputs ?? {}).map(([e, t]) => _(e, t));
+		}), u = Object.entries(i.inputs ?? {}).map(([e, t]) => v(e, t));
 		t.createComponent(o, {
-			injector: l,
+			injector: c,
 			bindings: u
 		}).changeDetectorRef.markForCheck();
-	}), h(i).onDestroy(() => {
+	}), g(a).onDestroy(() => {
 		t.clear();
 	});
 }
@@ -3044,7 +3043,7 @@ var nr = {
 	subscribe: () => ({ unsubscribe: () => {} })
 }, rr = class e {
 	constructor() {
-		this.state = h(Qn), this.message = p(() => {
+		this.state = g(Qn), this.message = m(() => {
 			let e = this.state.error;
 			return e instanceof Error ? e.stack ?? e.message : String(e);
 		});
@@ -3069,14 +3068,14 @@ var nr = {
 	}
 };
 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;
+	let t = q({ warn: !1 }), n = g(s), r = g(a), i = J(t.stores.resolvedLocation, (e) => e?.state?.__TSR_key), o = J(t.stores.loadedAt, (e) => e), c, l = 0;
 	r.onDestroy(() => {
 		l++;
-	}), m(() => {
+	}), h(() => {
 		if (!e()) return;
-		a(), s();
+		i(), o();
 		let r = ++l;
-		d({ read: () => {
+		f({ read: () => {
 			if (r !== l || !e() || t.isServer) return;
 			let n = t.latestLocation.href;
 			c !== void 0 && c === n || (c = n, t.emit({
@@ -3088,7 +3087,7 @@ function ir({ parentRouteIsRoot: e }) {
 }
 var ar = class e {
 	constructor() {
-		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(() => {
+		this.matchId = _.required(), this.router = q(), this.match = m(() => this.matchSignal()), this.matchSignal = J(() => this.router.stores.matchStores.get(this.matchId()) ?? nr, (e) => e), this.matchData = m(() => {
 			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)?.({
@@ -3103,18 +3102,18 @@ var ar = class e {
 				match: e,
 				parentRouteId: r
 			};
-		}), this.isFistRouteInRouteTree = p(() => this.matchData()?.parentRouteId === L), this.resolvedNoSsr = p(() => {
+		}), this.isFistRouteInRouteTree = m(() => this.matchData()?.parentRouteId === L), this.resolvedNoSsr = m(() => {
 			let e = this.matchData()?.match;
 			return e ? e.ssr === !1 || e.ssr === "data-only" : !0;
-		}), this.shouldClientOnly = p(() => {
+		}), this.shouldClientOnly = m(() => {
 			let e = this.matchData()?.match;
 			return e ? this.resolvedNoSsr() || !!e._displayPending : !0;
-		}), this.parentRouteIdSignal = p(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = p(() => L), this.hasPendingMatch = p(() => {
+		}), this.parentRouteIdSignal = m(() => this.matchData()?.parentRouteId ?? ""), this.rootRouteIdSignal = m(() => L), this.hasPendingMatch = m(() => {
 			let e = this.matchData()?.route.id;
 			return e ? !!this.pendingRouteIds()[e] : !1;
 		}), this.pendingRouteIds = J(this.router.stores.pendingRouteIds, (e) => e), this.nearestMatchContext = {
 			matchId: this.matchId,
-			routeId: p(() => this.matchData()?.route.id),
+			routeId: m(() => this.matchData()?.route.id),
 			match: this.match,
 			hasPending: this.hasPendingMatch
 		}, this.catchingErrorMatch = tr({ matchId: this.matchId }), this.render = Jn(() => {
@@ -3162,7 +3161,7 @@ var ar = class e {
 					}]
 				};
 			}
-		}), this.onRendered = ir({ parentRouteIsRoot: p(() => this.parentRouteIdSignal() === L) });
+		}), this.onRendered = ir({ parentRouteIsRoot: m(() => this.parentRouteIdSignal() === L) });
 	}
 	static {
 		this.ɵfac = function(t) {
@@ -3191,10 +3190,10 @@ var ar = class e {
 	}
 }, or = class e {
 	constructor() {
-		this.router = q(), this.nearestMatch = h(K), this.currentMatch = J(() => {
+		this.router = q(), this.nearestMatch = g(K), this.currentMatch = J(() => {
 			let e = this.nearestMatch.matchId();
 			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(() => {
+		}, (e) => e), this.routeId = m(() => this.currentMatch()?.routeId), this.route = m(() => this.router.routesById[this.routeId()]), this.parentGlobalNotFound = m(() => this.currentMatch()?.globalNotFound ?? !1), this.childMatchIdByRouteId = J(this.router.stores.childMatchIdByRouteId, (e) => e), this.childMatchId = m(() => {
 			let e = this.routeId();
 			return e ? this.childMatchIdByRouteId()[e] ?? null : null;
 		}), this.render = Jn(() => this.parentGlobalNotFound() ? { component: sr(this.router, this.route()) } : this.childMatchId() ? {
@@ -3227,10 +3226,10 @@ function Z(e) {
 	return typeof e == "function" ? e() : e;
 }
 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);
+	return (Z(t.options.notFoundComponent) ?? Z(e.options.defaultNotFoundComponent)) || (y() && !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);
+	return (Z(t.options.errorComponent) ?? Z(e.options.defaultErrorComponent)) || (y() && !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
@@ -3241,8 +3240,8 @@ function lr(e) {
 //#region src/ssr-scroll-restoration.ts
 var ur = "data-tsr-scroll-restoration-inline";
 function dr() {
-	let e = q(), t = h(C), n = h(o);
-	e.isServer && d(() => {
+	let e = q(), t = g(i), n = g(s);
+	e.isServer && f(() => {
 		let n = e.options.scrollRestoration;
 		if (!n || typeof n == "function" && !n({ location: e.latestLocation }) || t.querySelector(`script[${ur}]`)) return;
 		let r = lr(e);
@@ -3367,15 +3366,15 @@ var hr = class e {
 			encapsulation: 2
 		});
 	}
-}, gr = new s("CONTEXT", {
+}, gr = new c("CONTEXT", {
 	providedIn: "root",
 	factory: () => ({})
-}), _r = new s("OPTIONS", {
+}), _r = new c("OPTIONS", {
 	providedIn: "root",
 	factory: () => ({})
 });
 function vr(e) {
-	let t = h(o);
+	let t = g(s);
 	return {
 		inject: t.get.bind(t),
 		...e
@@ -3399,12 +3398,12 @@ function yr({ router: e, context: t, options: n }) {
 }
 var br = class e {
 	constructor() {
-		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(() => {
+		this.injectedContext = g(gr), this.injectedOptions = g(_r), this.injectedRouter = g(Tn(), { optional: !0 }), this.context = _(this.injectedContext), this.options = _(this.injectedOptions), this.routerInput = _(void 0, { alias: "router" }), this.router = m(() => {
 			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 = m(() => {
+		}), this.updateRouter = h(() => {
 			let e = this.router(), t = this.context(), n = this.options();
 			e.update({
 				...e.options,
@@ -3415,7 +3414,7 @@ var br = class e {
 				}
 			});
 		}), this.render = Jn(() => {
-			let e = S(this.router);
+			let e = C(this.router);
 			return {
 				component: hr,
 				providers: [{
@@ -3749,7 +3748,7 @@ function Zr({ document: e, initialTitle: t, headCollection: n, bodyCollection: r
 	i.title === void 0 ? e.title = t : e.title = i.title, n.sync(i.head), r.sync(i.body);
 }
 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({
+	let t = n.inject(n.DOCUMENT), 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
@@ -3785,7 +3784,7 @@ function Qr(e) {
 //#endregion
 //#region src/document/provide-tanstack-body-managed-tags.ts
 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({
+	let t = n.inject(n.DOCUMENT), 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
@@ -3814,7 +3813,7 @@ function ti(e) {
 //#endregion
 //#region src/document/provide-tanstack-document-title.ts
 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) => {
+	let t = n.inject(n.DOCUMENT), 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);
@@ -3839,7 +3838,7 @@ function ii(e) {
 //#endregion
 //#region src/document/provide-tanstack-head-managed-tags.ts
 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({
+	let t = n.inject(n.DOCUMENT), 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
@@ -3931,7 +3930,7 @@ function mi() {
 //#region src/injectIsShell.ts
 function hi() {
 	let e = q();
-	return p(() => e.isShell());
+	return m(() => e.isShell());
 }
 //#endregion
 //#region src/injectLocation.ts
@@ -4024,32 +4023,32 @@ function yi(e, t, r) {
 //#region src/Link.ts
 var bi = class e {
 	constructor() {
-		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.passiveEvents = Si(() => ({ touchstart: this.handleTouchStart })), this.options = _.required({ alias: "link" }), this.router = q(), this.isTransitioning = S(!1), this.from = m(() => C(() => this.options().from)), this.disabled = m(() => this._options().disabled ?? !1), this.target = m(() => this._options().target), this._options = m(() => ({
 			...this.options(),
 			from: this.from()
-		})), this.nextLocation = p(() => {
+		})), this.nextLocation = m(() => {
 			let e = this.location();
 			return this.router.buildLocation({
 				_fromLocation: e,
 				...this._options()
 			});
-		}), this.hrefOption = p(() => {
+		}), this.hrefOption = m(() => {
 			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 = p(() => {
+		}), this.externalLink = m(() => {
 			let e = this.hrefOption();
 			if (e?.external) return e.href;
 			try {
 				return new URL(this.options().to), this.options().to;
 			} catch {}
-		}), 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(() => {
+		}), this.preload = m(() => this.options().reloadDocument ? !1 : this.options().preload ?? this.router.options.defaultPreload), this.preloadDelay = m(() => this.options().preloadDelay ?? this.router.options.defaultPreloadDelay ?? 0), this.location = gi(), this.isActiveProps = m(() => {
 			let e = this.options(), t = this.isActive() ? e.activeProps : e.inactiveProps;
 			if (!(!t || typeof t != "object")) return t;
-		}), this.isActive = p(() => {
+		}), this.isActive = m(() => {
 			if (this.externalLink()) return !1;
 			let e = this.options().activeOptions;
 			if (e?.exact) {
@@ -4068,7 +4067,7 @@ var bi = class e {
 			});
 		}, this.preloadViewportIoCallback = (e) => {
 			e?.isIntersecting && this.doPreload();
-		}, this.viewportPreloader = yi(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = m(() => {
+		}, this.viewportPreloader = yi(this.preloadViewportIoCallback, { rootMargin: "100px" }, () => !!this._options().disabled || this.preload() !== "viewport"), this.hasRenderFetched = !1, this.rendererPreloader = h(() => {
 			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;
@@ -4141,14 +4140,14 @@ function xi(e) {
 	return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
 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);
+	let t = g(o).nativeElement, n = g(a), r = g(u), i = [];
+	f(() => {
+		for (let [n, a] of Object.entries(e())) {
+			let e = r.listen(t, n, a, { passive: !0 });
+			i.push(e);
 		}
 	}), n.onDestroy(() => {
-		for (; o.length;) o.pop()?.();
+		for (; i.length;) i.pop()?.();
 	});
 }
 //#endregion

package/dist/types/tanstack-angular-router-experimental-experimental.d.ts

@@ -22,6 +22,40 @@ export declare function injectRouteErrorHandler<TRouter extends AnyRouter = Regi
 export { }
 
 
+declare module '@benjavicente/router-core' {
+    interface LazyRoute<in out TRoute extends AnyRoute> {
+        injectMatch: InjectMatchRoute<TRoute['id']>;
+        injectRouteContext: InjectRouteContextRoute<TRoute['id']>;
+        injectSearch: InjectSearchRoute<TRoute['id']>;
+        injectParams: InjectParamsRoute<TRoute['id']>;
+        injectLoaderDeps: InjectLoaderDepsRoute<TRoute['id']>;
+        injectLoaderData: InjectLoaderDataRoute<TRoute['id']>;
+        injectNavigate: () => UseNavigateResult<TRoute['fullPath']>;
+    }
+}
+
+
+declare module '@benjavicente/router-core' {
+    interface UpdatableRouteOptionsExtensions {
+        component?: RouteComponent;
+        errorComponent?: false | null | undefined | ErrorRouteComponent;
+        notFoundComponent?: NotFoundRouteComponent;
+        pendingComponent?: RouteComponent;
+    }
+    interface RootRouteOptionsExtensions {
+    }
+    interface RouteExtensions<in out TId extends string, in out TFullPath extends string> {
+        injectMatch: InjectMatchRoute<TId>;
+        injectRouteContext: InjectRouteContextRoute<TId>;
+        injectSearch: InjectSearchRoute<TId>;
+        injectParams: InjectParamsRoute<TId>;
+        injectLoaderDeps: InjectLoaderDepsRoute<TId>;
+        injectLoaderData: InjectLoaderDataRoute<TId>;
+        injectNavigate: () => UseNavigateResult<TFullPath>;
+    }
+}
+
+
 declare module '@benjavicente/router-core' {
     interface RouterOptionsExtensions {
         /**
@@ -58,36 +92,9 @@ declare module '@benjavicente/router-core' {
 }
 
 
-declare module '@benjavicente/router-core' {
-    interface UpdatableRouteOptionsExtensions {
-        component?: RouteComponent;
-        errorComponent?: false | null | undefined | ErrorRouteComponent;
-        notFoundComponent?: NotFoundRouteComponent;
-        pendingComponent?: RouteComponent;
-    }
-    interface RootRouteOptionsExtensions {
-    }
-    interface RouteExtensions<in out TId extends string, in out TFullPath extends string> {
-        injectMatch: InjectMatchRoute<TId>;
-        injectRouteContext: InjectRouteContextRoute<TId>;
-        injectSearch: InjectSearchRoute<TId>;
-        injectParams: InjectParamsRoute<TId>;
-        injectLoaderDeps: InjectLoaderDepsRoute<TId>;
-        injectLoaderData: InjectLoaderDataRoute<TId>;
-        injectNavigate: () => UseNavigateResult<TFullPath>;
-    }
-}
-
-
-declare module '@benjavicente/router-core' {
-    interface LazyRoute<in out TRoute extends AnyRoute> {
-        injectMatch: InjectMatchRoute<TRoute['id']>;
-        injectRouteContext: InjectRouteContextRoute<TRoute['id']>;
-        injectSearch: InjectSearchRoute<TRoute['id']>;
-        injectParams: InjectParamsRoute<TRoute['id']>;
-        injectLoaderDeps: InjectLoaderDepsRoute<TRoute['id']>;
-        injectLoaderData: InjectLoaderDataRoute<TRoute['id']>;
-        injectNavigate: () => UseNavigateResult<TRoute['fullPath']>;
+declare global {
+    interface Window {
+        __TSR_ROUTER_INJECTION_KEY__?: Angular.InjectionToken<AnyRouter>;
     }
 }
 
@@ -102,10 +109,3 @@ declare module '@benjavicente/router-core' {
         pendingRouteIds: RouterReadableStore<Record<string, boolean>>;
     }
 }
-
-
-declare global {
-    interface Window {
-        __TSR_ROUTER_INJECTION_KEY__?: Angular.InjectionToken<AnyRouter>;
-    }
-}

package/dist/types/tanstack-angular-router-experimental.d.ts

@@ -657,6 +657,40 @@ export declare type UseBlockerOpts<TRouter extends AnyRouter = RegisteredRouter,
 export { }
 
 
+declare module '@benjavicente/router-core' {
+    interface LazyRoute<in out TRoute extends AnyRoute> {
+        injectMatch: InjectMatchRoute<TRoute['id']>;
+        injectRouteContext: InjectRouteContextRoute<TRoute['id']>;
+        injectSearch: InjectSearchRoute<TRoute['id']>;
+        injectParams: InjectParamsRoute<TRoute['id']>;
+        injectLoaderDeps: InjectLoaderDepsRoute<TRoute['id']>;
+        injectLoaderData: InjectLoaderDataRoute<TRoute['id']>;
+        injectNavigate: () => UseNavigateResult<TRoute['fullPath']>;
+    }
+}
+
+
+declare module '@benjavicente/router-core' {
+    interface UpdatableRouteOptionsExtensions {
+        component?: RouteComponent;
+        errorComponent?: false | null | undefined | ErrorRouteComponent;
+        notFoundComponent?: NotFoundRouteComponent;
+        pendingComponent?: RouteComponent;
+    }
+    interface RootRouteOptionsExtensions {
+    }
+    interface RouteExtensions<in out TId extends string, in out TFullPath extends string> {
+        injectMatch: InjectMatchRoute<TId>;
+        injectRouteContext: InjectRouteContextRoute<TId>;
+        injectSearch: InjectSearchRoute<TId>;
+        injectParams: InjectParamsRoute<TId>;
+        injectLoaderDeps: InjectLoaderDepsRoute<TId>;
+        injectLoaderData: InjectLoaderDataRoute<TId>;
+        injectNavigate: () => UseNavigateResult<TFullPath>;
+    }
+}
+
+
 declare module '@benjavicente/router-core' {
     interface RouterOptionsExtensions {
         /**
@@ -693,36 +727,9 @@ declare module '@benjavicente/router-core' {
 }
 
 
-declare module '@benjavicente/router-core' {
-    interface UpdatableRouteOptionsExtensions {
-        component?: RouteComponent;
-        errorComponent?: false | null | undefined | ErrorRouteComponent;
-        notFoundComponent?: NotFoundRouteComponent;
-        pendingComponent?: RouteComponent;
-    }
-    interface RootRouteOptionsExtensions {
-    }
-    interface RouteExtensions<in out TId extends string, in out TFullPath extends string> {
-        injectMatch: InjectMatchRoute<TId>;
-        injectRouteContext: InjectRouteContextRoute<TId>;
-        injectSearch: InjectSearchRoute<TId>;
-        injectParams: InjectParamsRoute<TId>;
-        injectLoaderDeps: InjectLoaderDepsRoute<TId>;
-        injectLoaderData: InjectLoaderDataRoute<TId>;
-        injectNavigate: () => UseNavigateResult<TFullPath>;
-    }
-}
-
-
-declare module '@benjavicente/router-core' {
-    interface LazyRoute<in out TRoute extends AnyRoute> {
-        injectMatch: InjectMatchRoute<TRoute['id']>;
-        injectRouteContext: InjectRouteContextRoute<TRoute['id']>;
-        injectSearch: InjectSearchRoute<TRoute['id']>;
-        injectParams: InjectParamsRoute<TRoute['id']>;
-        injectLoaderDeps: InjectLoaderDepsRoute<TRoute['id']>;
-        injectLoaderData: InjectLoaderDataRoute<TRoute['id']>;
-        injectNavigate: () => UseNavigateResult<TRoute['fullPath']>;
+declare global {
+    interface Window {
+        __TSR_ROUTER_INJECTION_KEY__?: Angular.InjectionToken<AnyRouter>;
     }
 }
 
@@ -737,10 +744,3 @@ declare module '@benjavicente/router-core' {
         pendingRouteIds: RouterReadableStore<Record<string, boolean>>;
     }
 }
-
-
-declare global {
-    interface Window {
-        __TSR_ROUTER_INJECTION_KEY__?: Angular.InjectionToken<AnyRouter>;
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benjavicente/angular-router-experimental",
-  "version": "1.142.13",
+  "version": "1.142.14",
   "description": "Modern and scalable routing for Angular applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/document/install-unified-document-sync.ts

@@ -1,4 +1,3 @@
-import { DOCUMENT } from '@angular/common'
 import * as Angular from '@angular/core'
 import { injectStore } from '../store/injectStore'
 import { buildMatchManagedDocumentContent } from './build-match-managed-document'
@@ -42,7 +41,7 @@ function applyManagedDocumentContent({
  * Used by `provideTanstackDocument` when all features are enabled.
  */
 export function installUnifiedTanstackDocumentSync(injectedRouter: AnyRouter) {
-  const document = Angular.inject(DOCUMENT)
+  const document = Angular.inject(Angular.DOCUMENT)
   const rendererFactory = Angular.inject(Angular.RendererFactory2, {
     optional: true,
   })

package/src/document/provide-tanstack-body-managed-tags.ts

@@ -1,4 +1,3 @@
-import { DOCUMENT } from '@angular/common'
 import * as Angular from '@angular/core'
 import { injectStore } from '../store/injectStore'
 import { buildMatchManagedDocumentContent } from './build-match-managed-document'
@@ -14,7 +13,7 @@ import type { ManagedTag } from './managed-document-types'
  * on the server only (call from an injection context).
  */
 export function installTanstackBodyManagedTags(injectedRouter: AnyRouter) {
-  const document = Angular.inject(DOCUMENT)
+  const document = Angular.inject(Angular.DOCUMENT)
   const rendererFactory = Angular.inject(Angular.RendererFactory2, {
     optional: true,
   })

package/src/document/provide-tanstack-document-title.ts

@@ -1,4 +1,3 @@
-import { DOCUMENT } from '@angular/common'
 import * as Angular from '@angular/core'
 import { injectStore } from '../store/injectStore'
 import { buildMatchManagedDocumentContent } from './build-match-managed-document'
@@ -7,7 +6,7 @@ import type { AnyRouter } from '@benjavicente/router-core'
 
 /** Sync `document.title` from the router (call from an injection context). */
 export function installTanstackDocumentTitle(injectedRouter: AnyRouter) {
-  const document = Angular.inject(DOCUMENT)
+  const document = Angular.inject(Angular.DOCUMENT)
   const destroyRef = Angular.inject(Angular.DestroyRef)
   const activeMatches = injectStore(
     injectedRouter.stores.matches,

package/src/document/provide-tanstack-head-managed-tags.ts

@@ -1,4 +1,3 @@
-import { DOCUMENT } from '@angular/common'
 import * as Angular from '@angular/core'
 import { injectStore } from '../store/injectStore'
 import { buildMatchManagedDocumentContent } from './build-match-managed-document'
@@ -10,7 +9,7 @@ import type { ManagedTag } from './managed-document-types'
 
 /** Managed `<head>` tags from active matches (call from an injection context). */
 export function installTanstackHeadManagedTags(injectedRouter: AnyRouter) {
-  const document = Angular.inject(DOCUMENT)
+  const document = Angular.inject(Angular.DOCUMENT)
   const rendererFactory = Angular.inject(Angular.RendererFactory2, {
     optional: true,
   })

package/src/ssr-scroll-restoration.ts

@@ -1,4 +1,4 @@
-import { DOCUMENT } from '@angular/common'
+import { DOCUMENT } from '@angular/core'
 import { EnvironmentInjector, afterNextRender, inject } from '@angular/core'
 import { getScrollRestorationScriptForRouter } from '@benjavicente/router-core/scroll-restoration-script'
 import { injectRouter } from './injectRouter'