@tanstack/router-core 1.168.8 → 1.168.10

package/dist/esm/router.js

@@ -130,7 +130,7 @@ var RouterCore = class {
 				if (this.history) this.updateLatestLocation();
 				needsLocationUpdate = true;
 			}
-			if (needsLocationUpdate && this.stores) this.stores.location.setState(() => this.latestLocation);
+			if (needsLocationUpdate && this.stores) this.stores.location.set(this.latestLocation);
 			if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") this.isViewTransitionTypesSupported = window.CSS.supports("selector(:active-view-transition-type(a)");
 		};
 		this.updateLatestLocation = () => {
@@ -234,12 +234,12 @@ var RouterCore = class {
 			match._nonReactive.pendingTimeout = void 0;
 		};
 		this.cancelMatches = () => {
-			this.stores.pendingMatchesId.state.forEach((matchId) => {
+			this.stores.pendingMatchesId.get().forEach((matchId) => {
 				this.cancelMatch(matchId);
 			});
-			this.stores.matchesId.state.forEach((matchId) => {
+			this.stores.matchesId.get().forEach((matchId) => {
 				if (this.stores.pendingMatchStoresById.has(matchId)) return;
-				const match = this.stores.activeMatchStoresById.get(matchId)?.state;
+				const match = this.stores.activeMatchStoresById.get(matchId)?.get();
 				if (!match) return;
 				if (match.status === "pending" || match.isFetching === "loader") this.cancelMatch(matchId);
 			});
@@ -507,12 +507,12 @@ var RouterCore = class {
 				}
 			}
 			const pendingMatches = this.matchRoutes(this.latestLocation);
-			const nextCachedMatches = this.stores.cachedMatchesSnapshot.state.filter((d) => !pendingMatches.some((e) => e.id === d.id));
+			const nextCachedMatches = this.stores.cachedMatchesSnapshot.get().filter((d) => !pendingMatches.some((e) => e.id === d.id));
 			this.batch(() => {
-				this.stores.status.setState(() => "pending");
-				this.stores.statusCode.setState(() => 200);
-				this.stores.isLoading.setState(() => true);
-				this.stores.location.setState(() => this.latestLocation);
+				this.stores.status.set("pending");
+				this.stores.statusCode.set(200);
+				this.stores.isLoading.set(true);
+				this.stores.location.set(this.latestLocation);
 				this.stores.setPendingMatches(pendingMatches);
 				this.stores.setCachedMatches(nextCachedMatches);
 			});
@@ -521,15 +521,14 @@ var RouterCore = class {
 			let redirect;
 			let notFound;
 			let loadPromise;
-			const previousLocation = this.stores.resolvedLocation.state ?? this.stores.location.state;
+			const previousLocation = this.stores.resolvedLocation.get() ?? this.stores.location.get();
 			loadPromise = new Promise((resolve) => {
 				this.startTransition(async () => {
 					try {
 						this.beforeLoad();
 						const next = this.latestLocation;
-						const prevLocation = this.stores.resolvedLocation.state;
-						const locationChangeInfo = getLocationChangeInfo(next, prevLocation);
-						if (!this.stores.redirect.state) this.emit({
+						const locationChangeInfo = getLocationChangeInfo(next, this.stores.resolvedLocation.get());
+						if (!this.stores.redirect.get()) this.emit({
 							type: "onBeforeNavigate",
 							...locationChangeInfo
 						});
@@ -541,7 +540,7 @@ var RouterCore = class {
 							router: this,
 							sync: opts?.sync,
 							forceStaleReload: previousLocation.href === next.href,
-							matches: this.stores.pendingMatchesSnapshot.state,
+							matches: this.stores.pendingMatchesSnapshot.get(),
 							location: next,
 							updateMatch: this.updateMatch,
 							onReady: async () => {
@@ -552,9 +551,9 @@ var RouterCore = class {
 										let hookEnteringMatches = null;
 										let hookStayingMatches = null;
 										this.batch(() => {
-											const pendingMatches = this.stores.pendingMatchesSnapshot.state;
+											const pendingMatches = this.stores.pendingMatchesSnapshot.get();
 											const mountPending = pendingMatches.length;
-											const currentMatches = this.stores.activeMatchesSnapshot.state;
+											const currentMatches = this.stores.activeMatchesSnapshot.get();
 											exitingMatches = mountPending ? currentMatches.filter((match) => !this.stores.pendingMatchStoresById.has(match.id)) : null;
 											const pendingRouteIds = /* @__PURE__ */ new Set();
 											for (const s of this.stores.pendingMatchStoresById.values()) if (s.routeId) pendingRouteIds.add(s.routeId);
@@ -563,8 +562,8 @@ var RouterCore = class {
 											hookExitingMatches = mountPending ? currentMatches.filter((match) => !pendingRouteIds.has(match.routeId)) : null;
 											hookEnteringMatches = mountPending ? pendingMatches.filter((match) => !activeRouteIds.has(match.routeId)) : null;
 											hookStayingMatches = mountPending ? pendingMatches.filter((match) => activeRouteIds.has(match.routeId)) : currentMatches;
-											this.stores.isLoading.setState(() => false);
-											this.stores.loadedAt.setState(() => Date.now());
+											this.stores.isLoading.set(false);
+											this.stores.loadedAt.set(Date.now());
 											/**
 											* When committing new matches, cache any exiting matches that are still usable.
 											* Routes that resolved with `status: 'error'` or `status: 'notFound'` are
@@ -574,7 +573,7 @@ var RouterCore = class {
 											if (mountPending) {
 												this.stores.setActiveMatches(pendingMatches);
 												this.stores.setPendingMatches([]);
-												this.stores.setCachedMatches([...this.stores.cachedMatchesSnapshot.state, ...exitingMatches.filter((d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected")]);
+												this.stores.setCachedMatches([...this.stores.cachedMatchesSnapshot.get(), ...exitingMatches.filter((d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected")]);
 												this.clearExpiredCache();
 											}
 										});
@@ -599,10 +598,10 @@ var RouterCore = class {
 								ignoreBlocker: true
 							});
 						} else if (isNotFound(err)) notFound = err;
-						const nextStatusCode = redirect ? redirect.status : notFound ? 404 : this.stores.activeMatchesSnapshot.state.some((d) => d.status === "error") ? 500 : 200;
+						const nextStatusCode = redirect ? redirect.status : notFound ? 404 : this.stores.activeMatchesSnapshot.get().some((d) => d.status === "error") ? 500 : 200;
 						this.batch(() => {
-							this.stores.statusCode.setState(() => nextStatusCode);
-							this.stores.redirect.setState(() => redirect);
+							this.stores.statusCode.set(nextStatusCode);
+							this.stores.redirect.set(redirect);
 						});
 					}
 					if (this.latestLoadPromise === loadPromise) {
@@ -618,8 +617,8 @@ var RouterCore = class {
 			while (this.latestLoadPromise && loadPromise !== this.latestLoadPromise) await this.latestLoadPromise;
 			let newStatusCode = void 0;
 			if (this.hasNotFoundMatch()) newStatusCode = 404;
-			else if (this.stores.activeMatchesSnapshot.state.some((d) => d.status === "error")) newStatusCode = 500;
-			if (newStatusCode !== void 0) this.stores.statusCode.setState(() => newStatusCode);
+			else if (this.stores.activeMatchesSnapshot.get().some((d) => d.status === "error")) newStatusCode = 500;
+			if (newStatusCode !== void 0) this.stores.statusCode.set(newStatusCode);
 		};
 		this.startViewTransition = (fn) => {
 			const shouldViewTransition = this.shouldViewTransition ?? this.options.defaultViewTransition;
@@ -628,7 +627,7 @@ var RouterCore = class {
 				let startViewTransitionParams;
 				if (typeof shouldViewTransition === "object" && this.isViewTransitionTypesSupported) {
 					const next = this.latestLocation;
-					const prevLocation = this.stores.resolvedLocation.state;
+					const prevLocation = this.stores.resolvedLocation.get();
 					const resolvedViewTransitionTypes = typeof shouldViewTransition.types === "function" ? shouldViewTransition.types(getLocationChangeInfo(next, prevLocation)) : shouldViewTransition.types;
 					if (resolvedViewTransitionTypes === false) {
 						fn();
@@ -646,25 +645,25 @@ var RouterCore = class {
 			this.startTransition(() => {
 				const pendingMatch = this.stores.pendingMatchStoresById.get(id);
 				if (pendingMatch) {
-					pendingMatch.setState(updater);
+					pendingMatch.set(updater);
 					return;
 				}
 				const activeMatch = this.stores.activeMatchStoresById.get(id);
 				if (activeMatch) {
-					activeMatch.setState(updater);
+					activeMatch.set(updater);
 					return;
 				}
 				const cachedMatch = this.stores.cachedMatchStoresById.get(id);
 				if (cachedMatch) {
-					const next = updater(cachedMatch.state);
+					const next = updater(cachedMatch.get());
 					if (next.status === "redirected") {
-						if (this.stores.cachedMatchStoresById.delete(id)) this.stores.cachedMatchesId.setState((prev) => prev.filter((matchId) => matchId !== id));
-					} else cachedMatch.setState(() => next);
+						if (this.stores.cachedMatchStoresById.delete(id)) this.stores.cachedMatchesId.set((prev) => prev.filter((matchId) => matchId !== id));
+					} else cachedMatch.set(next);
 				}
 			});
 		};
 		this.getMatch = (matchId) => {
-			return this.stores.cachedMatchStoresById.get(matchId)?.state ?? this.stores.pendingMatchStoresById.get(matchId)?.state ?? this.stores.activeMatchStoresById.get(matchId)?.state;
+			return this.stores.cachedMatchStoresById.get(matchId)?.get() ?? this.stores.pendingMatchStoresById.get(matchId)?.get() ?? this.stores.activeMatchStoresById.get(matchId)?.get();
 		};
 		this.invalidate = (opts) => {
 			const invalidate = (d) => {
@@ -679,9 +678,9 @@ var RouterCore = class {
 				return d;
 			};
 			this.batch(() => {
-				this.stores.setActiveMatches(this.stores.activeMatchesSnapshot.state.map(invalidate));
-				this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.map(invalidate));
-				this.stores.setPendingMatches(this.stores.pendingMatchesSnapshot.state.map(invalidate));
+				this.stores.setActiveMatches(this.stores.activeMatchesSnapshot.get().map(invalidate));
+				this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.get().map(invalidate));
+				this.stores.setPendingMatches(this.stores.pendingMatchesSnapshot.get().map(invalidate));
 			});
 			this.shouldViewTransition = false;
 			return this.load({ sync: opts?.sync });
@@ -710,7 +709,7 @@ var RouterCore = class {
 		};
 		this.clearCache = (opts) => {
 			const filter = opts?.filter;
-			if (filter !== void 0) this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.state.filter((m) => !filter(m)));
+			if (filter !== void 0) this.stores.setCachedMatches(this.stores.cachedMatchesSnapshot.get().filter((m) => !filter(m)));
 			else this.stores.setCachedMatches([]);
 		};
 		this.clearExpiredCache = () => {
@@ -732,11 +731,11 @@ var RouterCore = class {
 				preload: true,
 				dest: opts
 			});
-			const activeMatchIds = new Set([...this.stores.matchesId.state, ...this.stores.pendingMatchesId.state]);
-			const loadedMatchIds = new Set([...activeMatchIds, ...this.stores.cachedMatchesId.state]);
+			const activeMatchIds = new Set([...this.stores.matchesId.get(), ...this.stores.pendingMatchesId.get()]);
+			const loadedMatchIds = new Set([...activeMatchIds, ...this.stores.cachedMatchesId.get()]);
 			const matchesToCache = matches.filter((match) => !loadedMatchIds.has(match.id));
 			if (matchesToCache.length) {
-				const cachedMatches = this.stores.cachedMatchesSnapshot.state;
+				const cachedMatches = this.stores.cachedMatchesSnapshot.get();
 				this.stores.setCachedMatches([...cachedMatches, ...matchesToCache]);
 			}
 			try {
@@ -771,8 +770,8 @@ var RouterCore = class {
 				leaveParams: true
 			};
 			const next = this.buildLocation(matchLocation);
-			if (opts?.pending && this.stores.status.state !== "pending") return false;
-			const baseLocation = (opts?.pending === void 0 ? !this.stores.isLoading.state : opts.pending) ? this.latestLocation : this.stores.resolvedLocation.state || this.stores.location.state;
+			if (opts?.pending && this.stores.status.get() !== "pending") return false;
+			const baseLocation = (opts?.pending === void 0 ? !this.stores.isLoading.get() : opts.pending) ? this.latestLocation : this.stores.resolvedLocation.get() || this.stores.location.get();
 			const match = findSingleMatch(next.pathname, opts?.caseSensitive ?? false, opts?.fuzzy ?? false, baseLocation.pathname, this.processedTree);
 			if (!match) return false;
 			if (location.params) {
@@ -782,7 +781,7 @@ var RouterCore = class {
 			return match.rawParams;
 		};
 		this.hasNotFoundMatch = () => {
-			return this.stores.activeMatchesSnapshot.state.some((d) => d.status === "notFound" || d.globalNotFound);
+			return this.stores.activeMatchesSnapshot.get().some((d) => d.status === "notFound" || d.globalNotFound);
 		};
 		this.getStoreConfig = getStoreConfig;
 		this.update({
@@ -806,7 +805,7 @@ var RouterCore = class {
 		return !!this.options.isPrerendering;
 	}
 	get state() {
-		return this.stores.__store.state;
+		return this.stores.__store.get();
 	}
 	setRoutes({ routesById, routesByPath, processedTree }) {
 		this.routesById = routesById;
@@ -834,7 +833,7 @@ var RouterCore = class {
 		const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
 		const matches = new Array(matchedRoutes.length);
 		const previousActiveMatchesByRouteId = /* @__PURE__ */ new Map();
-		for (const store of this.stores.activeMatchStoresById.values()) if (store.routeId) previousActiveMatchesByRouteId.set(store.routeId, store.state);
+		for (const store of this.stores.activeMatchStoresById.values()) if (store.routeId) previousActiveMatchesByRouteId.set(store.routeId, store.get());
 		for (let index = 0; index < matchedRoutes.length; index++) {
 			const route = matchedRoutes[index];
 			const parentMatch = matches[index - 1];
@@ -990,8 +989,8 @@ var RouterCore = class {
 		for (const route of matchedRoutes) try {
 			Object.assign(accumulatedSearch, validateSearch(route.options.validateSearch, accumulatedSearch));
 		} catch {}
-		const lastStateMatchId = last(this.stores.matchesId.state);
-		const lastStateMatch = lastStateMatchId && this.stores.activeMatchStoresById.get(lastStateMatchId)?.state;
+		const lastStateMatchId = last(this.stores.matchesId.get());
+		const lastStateMatch = lastStateMatchId && this.stores.activeMatchStoresById.get(lastStateMatchId)?.get();
 		const canReuseParams = lastStateMatch && lastStateMatch.routeId === lastRoute.id && lastStateMatch.pathname === location.pathname;
 		let params;
 		if (canReuseParams) params = lastStateMatch.params;