@tanstack/router-core 1.171.15 → 1.171.16

package/dist/cjs/router.cjs

@@ -7,12 +7,15 @@ const require_scroll_restoration = require("./scroll-restoration.cjs");
 const require_searchParams = require("./searchParams.cjs");
 const require_root = require("./root.cjs");
 const require_redirect = require("./redirect.cjs");
-const require_load_matches = require("./load-matches.cjs");
+const require_load_client = require("./load-client.cjs");
 const require_rewrite = require("./rewrite.cjs");
 const require_stores = require("./stores.cjs");
 let _tanstack_history = require("@tanstack/history");
 let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
 //#region src/router.ts
+function routeNeedsLoad(route) {
+	return route.options.loader || route.options.beforeLoad || route.lazyFn || route.options.component?.preload || route.options.pendingComponent?.preload;
+}
 /**
 * Convert an unknown error into a minimal, serializable object.
 * Includes name and message (and stack in development).
@@ -39,17 +42,34 @@ const trailingSlashOptions = {
 * resolved locations.
 */
 function getLocationChangeInfo(location, resolvedLocation) {
-	const fromLocation = resolvedLocation;
-	const toLocation = location;
 	return {
-		fromLocation,
-		toLocation,
-		pathChanged: fromLocation?.pathname !== toLocation.pathname,
-		hrefChanged: fromLocation?.href !== toLocation.href,
-		hashChanged: fromLocation?.hash !== toLocation.hash
+		fromLocation: resolvedLocation,
+		toLocation: location,
+		pathChanged: resolvedLocation?.pathname !== location.pathname,
+		hrefChanged: resolvedLocation?.href !== location.href,
+		hashChanged: resolvedLocation?.hash !== location.hash
 	};
 }
 /**
+* Return only state owned by the application, excluding volatile history
+* bookkeeping. Mask payloads (`__tempLocation`/`__tempKey`) are kept: they
+* distinguish otherwise-identical locations.
+*/
+function _getUserHistoryState({ key: _key, __TSR_key: _tsrKey, __TSR_index: _tsrIndex, __hashScrollIntoViewOptions: _hashScroll, ...state }) {
+	return state;
+}
+/** Run route lifecycle callbacks in leave/enter/stay phases. */
+function runRouteLifecycle(router, previous, matches, isCurrent) {
+	for (const match of previous) {
+		if (isCurrent?.() === false) return;
+		if (!matches.some((candidate) => candidate.routeId === match.routeId)) router.routesById[match.routeId].options.onLeave?.(match);
+	}
+	for (const match of matches) {
+		if (isCurrent?.() === false) return;
+		router.routesById[match.routeId].options[previous.some((candidate) => candidate.routeId === match.routeId) ? "onStay" : "onEnter"]?.(match);
+	}
+}
+/**
 * Core, framework-agnostic router engine that powers TanStack Router.
 *
 * Provides navigation, matching, loading, preloading, caching and event APIs
@@ -65,12 +85,15 @@ var RouterCore = class {
 	constructor(options, getStoreConfig) {
 		this.tempLocationKey = `${Math.round(Math.random() * 1e7)}`;
 		this._scroll = { next: true };
-		this.shouldViewTransition = void 0;
-		this.isViewTransitionTypesSupported = void 0;
 		this.subscribers = /* @__PURE__ */ new Set();
+		this._cache = /* @__PURE__ */ new Map();
+		this._committed = [];
 		this.routeBranchCache = /* @__PURE__ */ new WeakMap();
 		this.lightweightCache = /* @__PURE__ */ new WeakMap();
-		this.startTransition = (fn) => fn();
+		this.startTransition = async (fn) => {
+			fn();
+			return false;
+		};
 		this.update = (newOptions) => {
 			if (process.env.NODE_ENV !== "production") {
 				if (newOptions.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.");
@@ -83,7 +106,7 @@ var RouterCore = class {
 				...prevOptions,
 				...newOptions
 			};
-			this.isServer = this.options.isServer ?? typeof document === "undefined";
+			this.isServer = this.options.isServer ?? _tanstack_router_core_isServer.isServer ?? typeof document === "undefined";
 			this.protocolAllowlist = new Set(this.options.protocolAllowlist);
 			if (this.options.pathParamsAllowedCharacters) this.pathParamsDecoder = require_path.compileDecodeCharMap(this.options.pathParamsAllowedCharacters);
 			if (!this.history || this.options.history && this.options.history !== this.history) if (!this.options.history) {
@@ -114,10 +137,9 @@ var RouterCore = class {
 			if (!this.stores && this.latestLocation) {
 				const config = this.getStoreConfig(this);
 				this.batch = config.batch;
-				this.stores = require_stores.createRouterStores(getInitialRouterState(this.latestLocation), config);
+				this.stores = require_stores.createRouterStores(this.latestLocation, config);
 				if (!(_tanstack_router_core_isServer.isServer ?? this.isServer)) require_scroll_restoration.setupScrollRestoration(this);
 			}
-			let needsLocationUpdate = false;
 			const nextBasepath = this.options.basepath ?? "/";
 			const nextRewriteOption = this.options.rewrite;
 			if (basepathWasUnset || prevBasepath !== nextBasepath || prevRewriteOption !== nextRewriteOption) {
@@ -128,10 +150,8 @@ var RouterCore = class {
 				if (nextRewriteOption) rewrites.push(nextRewriteOption);
 				this.rewrite = rewrites.length === 0 ? void 0 : rewrites.length === 1 ? rewrites[0] : require_rewrite.composeRewrites(rewrites);
 				if (this.history) this.updateLatestLocation();
-				needsLocationUpdate = true;
+				if (this.stores) this.stores.location.set(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 = () => {
 			this.latestLocation = this.parseLocation(this.history.location, this.latestLocation);
@@ -154,9 +174,11 @@ var RouterCore = class {
 			};
 		};
 		this.emit = (routerEvent) => {
-			this.subscribers.forEach((listener) => {
-				if (listener.eventType === routerEvent.type) listener.fn(routerEvent);
-			});
+			for (const listener of this.subscribers) if (listener.eventType === routerEvent.type) try {
+				listener.fn(routerEvent);
+			} catch (e) {
+				console.error(e);
+			}
 		};
 		this.parseLocation = (locationToParse, previousLocation) => {
 			const parse = ({ pathname, search, hash, href, state }) => {
@@ -220,33 +242,18 @@ var RouterCore = class {
 			return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
 		};
 		this.getMatchedRoutes = (pathname) => {
-			return getMatchedRoutes({
-				pathname,
-				routesById: this.routesById,
-				processedTree: this.processedTree
-			});
-		};
-		this.cancelMatch = (id) => {
-			const match = this.getMatch(id);
-			if (!match) return;
-			match.abortController.abort();
-			clearTimeout(match._nonReactive.pendingTimeout);
-			match._nonReactive.pendingTimeout = void 0;
-		};
-		this.cancelMatches = () => {
-			this.stores.pendingIds.get().forEach((matchId) => {
-				this.cancelMatch(matchId);
-			});
-			this.stores.matchesId.get().forEach((matchId) => {
-				if (this.stores.pendingMatchStores.has(matchId)) return;
-				const match = this.stores.matchStores.get(matchId)?.get();
-				if (!match) return;
-				if (match.status === "pending" || match.isFetching === "loader") this.cancelMatch(matchId);
-			});
+			const routeParams = Object.create(null);
+			const match = require_new_process_route_tree.findRouteMatch(require_path.trimPathRight(pathname), this.processedTree, true);
+			if (match) Object.assign(routeParams, match.rawParams);
+			return {
+				matchedRoutes: match?.branch || [this.routesById["__root__"]],
+				routeParams,
+				foundRoute: match?.route
+			};
 		};
 		this.buildLocation = (opts) => {
 			const build = (dest = {}) => {
-				const currentLocation = dest._fromLocation || this.pendingBuiltLocation || this.latestLocation;
+				const currentLocation = dest._fromLocation || this._pendingLocation || this.latestLocation;
 				const lightweightResult = this.matchRoutesLightweight(currentLocation);
 				if (dest.from && process.env.NODE_ENV !== "production" && dest._isNavigate) {
 					const allFromMatches = this.getMatchedRoutes(dest.from).matchedRoutes;
@@ -264,7 +271,7 @@ var RouterCore = class {
 				const fromParams = Object.assign(Object.create(null), lightweightResult.params);
 				const sourcePath = destTo?.charCodeAt(0) === 47 ? "/" : this.resolvePathWithBase(defaultedFromPath, ".");
 				const nextTo = destTo ? this.resolvePathWithBase(sourcePath, destTo) : sourcePath;
-				const nextParams = dest.params === false || dest.params === null ? Object.create(null) : (dest.params ?? true) === true ? fromParams : Object.assign(fromParams, require_utils.functionalUpdate(dest.params, fromParams));
+				const nextParams = resolveNextParams(dest.params, fromParams);
 				const destRoute = this.routesByPath[require_path.trimPathRight(nextTo)];
 				let destRoutes;
 				if (destRoute) destRoutes = this.getRouteBranch(destRoute);
@@ -303,12 +310,7 @@ var RouterCore = class {
 					});
 					nextSearch = validatedSearch;
 				}
-				nextSearch = applySearchMiddleware({
-					search: nextSearch,
-					dest,
-					destRoutes,
-					_includeValidateSearch: opts._includeValidateSearch
-				});
+				nextSearch = applySearchMiddleware(nextSearch, dest, destRoutes, opts._includeValidateSearch);
 				nextSearch = require_utils.nullReplaceEqualDeep(fromSearch, nextSearch);
 				const searchStr = this.options.stringifySearch(nextSearch);
 				const hash = dest.hash === true ? currentLocation.hash : dest.hash ? require_utils.functionalUpdate(dest.hash, currentLocation.hash) : void 0;
@@ -353,7 +355,7 @@ var RouterCore = class {
 						if (match) {
 							Object.assign(params, match.rawParams);
 							const { from: _from, params: maskParams, ...maskProps } = match.route;
-							const nextParams = maskParams === false || maskParams === null ? Object.create(null) : (maskParams ?? true) === true ? params : Object.assign(params, require_utils.functionalUpdate(maskParams, params));
+							const nextParams = resolveNextParams(maskParams, params);
 							maskedDest = {
 								from: opts.from,
 								...maskProps,
@@ -374,29 +376,18 @@ var RouterCore = class {
 		};
 		this.commitLocation = async ({ viewTransition, ignoreBlocker, ...next }) => {
 			let historyAction;
-			const isSameState = () => {
-				const ignoredProps = [
-					"key",
-					"__TSR_key",
-					"__TSR_index",
-					"__hashScrollIntoViewOptions"
-				];
-				ignoredProps.forEach((prop) => {
-					next.state[prop] = this.latestLocation.state[prop];
-				});
-				const isEqual = require_utils.deepEqual(next.state, this.latestLocation.state);
-				ignoredProps.forEach((prop) => {
-					delete next.state[prop];
-				});
-				return isEqual;
-			};
-			const isSameUrl = require_path.trimPathRight(this.latestLocation.href) === require_path.trimPathRight(next.href);
-			let previousCommitPromise = this.commitLocationPromise;
-			this.commitLocationPromise = require_utils.createControlledPromise(() => {
-				previousCommitPromise?.resolve();
-				previousCommitPromise = void 0;
+			const isSameLocation = require_path.trimPathRight(this.latestLocation.href) === require_path.trimPathRight(next.href) && require_utils.deepEqual(_getUserHistoryState(next.state), _getUserHistoryState(this.latestLocation.state));
+			const previousCommitPromise = this._commitPromise;
+			let resolve;
+			const commitPromise = new Promise((done) => {
+				resolve = done;
 			});
-			if (isSameUrl && isSameState()) this.load();
+			commitPromise.resolve = () => {
+				resolve();
+				previousCommitPromise?.resolve();
+			};
+			this._commitPromise = commitPromise;
+			if (isSameLocation) this.load();
 			else {
 				let { maskedLocation, hashScrollIntoView, ...nextHistory } = next;
 				if (maskedLocation) {
@@ -424,12 +415,12 @@ var RouterCore = class {
 				this.shouldViewTransition = viewTransition;
 				historyAction = next.replace ? "REPLACE" : "PUSH";
 				this.history[historyAction === "REPLACE" ? "replace" : "push"](nextHistory.publicHref, nextHistory.state, { ignoreBlocker });
+				if (!this.history.subscribers.size) this.load({ action: { type: historyAction } });
 			}
 			this._scroll.next = next.resetScroll ?? true;
-			if (!this.history.subscribers.size) this.load(historyAction ? { action: { type: historyAction } } : void 0);
-			return this.commitLocationPromise;
+			return this._commitPromise;
 		};
-		this.buildAndCommitLocation = ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest } = {}) => {
+		this.buildAndCommitLocation = ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, _redirects, href, ...rest } = {}) => {
 			if (href) {
 				const currentIndex = this.history.location.state.__TSR_index;
 				const parsed = (0, _tanstack_history.parseHref)(href, { __TSR_index: replace ? currentIndex : currentIndex + 1 });
@@ -442,7 +433,8 @@ var RouterCore = class {
 				...rest,
 				_includeValidateSearch: true
 			});
-			this.pendingBuiltLocation = location;
+			if (_redirects) location._redirects = _redirects;
+			this._pendingLocation = location;
 			const commitPromise = this.commitLocation({
 				...location,
 				viewTransition,
@@ -452,7 +444,7 @@ var RouterCore = class {
 				ignoreBlocker
 			});
 			queueMicrotask(() => {
-				if (this.pendingBuiltLocation === location) this.pendingBuiltLocation = void 0;
+				if (this._pendingLocation === location) this._pendingLocation = void 0;
 			});
 			return commitPromise;
 		};
@@ -498,216 +490,76 @@ var RouterCore = class {
 				_isNavigate: true
 			});
 		};
-		this.beforeLoad = () => {
-			this.cancelMatches();
-			this.updateLatestLocation();
-			if (_tanstack_router_core_isServer.isServer ?? this.isServer) {
-				const nextLocation = this.buildLocation({
-					to: this.latestLocation.pathname,
-					search: true,
-					params: true,
-					hash: true,
-					state: true,
-					_includeValidateSearch: true
-				});
-				if (this.latestLocation.publicHref !== nextLocation.publicHref) {
-					const href = this.getParsedLocationHref(nextLocation);
-					if (nextLocation.external) throw require_redirect.redirect({ href });
-					else throw require_redirect.redirect({
-						href,
-						_builtLocation: nextLocation
-					});
-				}
-			}
-			const pendingMatches = this.matchRoutes(this.latestLocation);
-			const nextCachedMatches = this.stores.cachedMatches.get().filter((d) => !pendingMatches.some((e) => e.id === d.id));
-			this.batch(() => {
-				this.stores.status.set("pending");
-				this.stores.statusCode.set(200);
-				this.stores.isLoading.set(true);
-				this.stores.location.set(this.latestLocation);
-				this.stores.setPending(pendingMatches);
-				this.stores.setCached(nextCachedMatches);
-			});
-		};
 		this.load = async (opts) => {
-			const historyAction = opts?.action?.type;
-			let redirect;
-			let notFound;
-			let loadPromise;
-			const previousLocation = this.stores.resolvedLocation.get() ?? this.stores.location.get();
-			loadPromise = new Promise((resolve) => {
-				this.startTransition(async () => {
-					try {
-						this.beforeLoad();
-						if (historyAction) this._scroll.hash = historyAction === "PUSH" || historyAction === "REPLACE";
-						const next = this.latestLocation;
-						const locationChangeInfo = getLocationChangeInfo(next, this.stores.resolvedLocation.get());
-						if (!this.stores.redirect.get()) this.emit({
-							type: "onBeforeNavigate",
-							...locationChangeInfo
-						});
-						this.emit({
-							type: "onBeforeLoad",
-							...locationChangeInfo
-						});
-						await require_load_matches.loadMatches({
-							router: this,
-							sync: opts?.sync,
-							forceStaleReload: previousLocation.href === next.href,
-							matches: this.stores.pendingMatches.get(),
-							location: next,
-							updateMatch: this.updateMatch,
-							onReady: async () => {
-								this.startTransition(() => {
-									this.startViewTransition(async () => {
-										let exitingMatches = null;
-										let hookExitingMatches = null;
-										let hookEnteringMatches = null;
-										let hookStayingMatches = null;
-										this.batch(() => {
-											const pendingMatches = this.stores.pendingMatches.get();
-											const mountPending = pendingMatches.length;
-											const currentMatches = this.stores.matches.get();
-											exitingMatches = mountPending ? currentMatches.filter((match) => !this.stores.pendingMatchStores.has(match.id)) : null;
-											const pendingRouteIds = /* @__PURE__ */ new Set();
-											for (const s of this.stores.pendingMatchStores.values()) if (s.routeId) pendingRouteIds.add(s.routeId);
-											const activeRouteIds = /* @__PURE__ */ new Set();
-											for (const s of this.stores.matchStores.values()) if (s.routeId) activeRouteIds.add(s.routeId);
-											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.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
-											* deliberately excluded from `cachedMatches` so that subsequent invalidations
-											* or reloads re-run their loaders instead of reusing the failed/not-found data.
-											*/
-											if (mountPending) {
-												this.stores.setMatches(pendingMatches);
-												this.stores.setPending([]);
-												this.stores.setCached([...this.stores.cachedMatches.get(), ...exitingMatches.filter((d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected")]);
-												this.clearExpiredCache();
-											}
-										});
-										for (const [matches, hook] of [
-											[hookExitingMatches, "onLeave"],
-											[hookEnteringMatches, "onEnter"],
-											[hookStayingMatches, "onStay"]
-										]) {
-											if (!matches) continue;
-											for (const match of matches) this.looseRoutesById[match.routeId].options[hook]?.(match);
-										}
-									});
-								});
-							}
-						});
-					} catch (err) {
-						if (require_redirect.isRedirect(err)) {
-							redirect = err;
-							if (!(_tanstack_router_core_isServer.isServer ?? this.isServer)) this.navigate({
-								...redirect.options,
-								replace: true,
-								ignoreBlocker: true
-							});
-						} else if (require_not_found.isNotFound(err)) notFound = err;
-						const nextStatusCode = redirect ? redirect.status : notFound ? 404 : this.stores.matches.get().some((d) => d.status === "error") ? 500 : 200;
-						this.batch(() => {
-							this.stores.statusCode.set(nextStatusCode);
-							this.stores.redirect.set(redirect);
-						});
-					}
-					if (this.latestLoadPromise === loadPromise) {
-						this.commitLocationPromise?.resolve();
-						this.latestLoadPromise = void 0;
-						this.commitLocationPromise = void 0;
-					}
-					resolve();
-				});
-			});
-			this.latestLoadPromise = loadPromise;
-			await loadPromise;
-			while (this.latestLoadPromise && loadPromise !== this.latestLoadPromise) await this.latestLoadPromise;
-			let newStatusCode = void 0;
-			if (this.hasNotFoundMatch()) newStatusCode = 404;
-			else if (this.stores.matches.get().some((d) => d.status === "error")) newStatusCode = 500;
-			if (newStatusCode !== void 0) this.stores.statusCode.set(newStatusCode);
+			if (_tanstack_router_core_isServer.isServer ?? this.isServer) return (0, _tanstack_router_core_isServer.loadServerRoute)(this, opts);
+			this.updateLatestLocation();
+			if (opts?.action) this._scroll.hash = opts.action.type === "PUSH" || opts.action.type === "REPLACE";
+			await require_load_client.loadClientRoute(this, opts);
 		};
 		this.startViewTransition = (fn) => {
 			const shouldViewTransition = this.shouldViewTransition ?? this.options.defaultViewTransition;
 			this.shouldViewTransition = void 0;
-			if (shouldViewTransition && typeof document !== "undefined" && "startViewTransition" in document && typeof document.startViewTransition === "function") {
+			if (shouldViewTransition && !(_tanstack_router_core_isServer.isServer ?? typeof document === "undefined") && typeof document.startViewTransition === "function") {
 				let startViewTransitionParams;
-				if (typeof shouldViewTransition === "object" && this.isViewTransitionTypesSupported) {
+				if (typeof shouldViewTransition === "object" && window.CSS?.supports?.("selector(:active-view-transition-type(a))")) {
 					const next = this.latestLocation;
 					const prevLocation = this.stores.resolvedLocation.get();
 					const resolvedViewTransitionTypes = typeof shouldViewTransition.types === "function" ? shouldViewTransition.types(getLocationChangeInfo(next, prevLocation)) : shouldViewTransition.types;
-					if (resolvedViewTransitionTypes === false) {
-						fn();
-						return;
-					}
+					if (resolvedViewTransitionTypes === false) return fn();
 					startViewTransitionParams = {
 						update: fn,
 						types: resolvedViewTransitionTypes
 					};
 				} else startViewTransitionParams = fn;
-				document.startViewTransition(startViewTransitionParams);
-			} else fn();
-		};
-		this.updateMatch = (id, updater) => {
-			this.startTransition(() => {
-				const pendingMatch = this.stores.pendingMatchStores.get(id);
-				if (pendingMatch) {
-					pendingMatch.set(updater);
-					return;
-				}
-				const activeMatch = this.stores.matchStores.get(id);
-				if (activeMatch) {
-					activeMatch.set(updater);
-					return;
-				}
-				const cachedMatch = this.stores.cachedMatchStores.get(id);
-				if (cachedMatch) {
-					const next = updater(cachedMatch.get());
-					if (next.status === "redirected") {
-						if (this.stores.cachedMatchStores.delete(id)) this.stores.cachedIds.set((prev) => prev.filter((matchId) => matchId !== id));
-					} else cachedMatch.set(next);
-				}
-			});
-		};
-		this.getMatch = (matchId) => {
-			return this.stores.cachedMatchStores.get(matchId)?.get() ?? this.stores.pendingMatchStores.get(matchId)?.get() ?? this.stores.matchStores.get(matchId)?.get();
+				return document.startViewTransition(startViewTransitionParams).updateCallbackDone;
+			}
+			return fn();
 		};
 		this.invalidate = (opts) => {
+			const committedMatches = this._committed;
+			const filter = opts?.filter;
+			const preloads = this._preloads;
+			const invalidIds = new Set([
+				...committedMatches,
+				...this._cache.values(),
+				...[...preloads?.values() ?? []].flat(),
+				...this._tx?.[3] ?? []
+			].filter((match) => !filter || filter(match)).map((match) => match.id));
+			const discardedPreloads = [];
+			for (const [controller, matches] of preloads ?? []) if (matches.some((match) => invalidIds.has(match.id))) {
+				preloads.delete(controller);
+				discardedPreloads.push(controller);
+			}
 			const invalidate = (d) => {
-				if (opts?.filter?.(d) ?? true) return {
-					...d,
-					invalid: true,
-					...opts?.forcePending || d.status === "error" || d.status === "notFound" ? {
-						status: "pending",
-						error: void 0
-					} : void 0
-				};
+				if (invalidIds.has(d.id)) {
+					const route = this.routesById[d.routeId];
+					const next = {
+						...d,
+						invalid: true,
+						...(opts?.forcePending || d.status === "error" || d.status === "notFound") && routeNeedsLoad(route) ? {
+							status: "pending",
+							error: void 0
+						} : void 0
+					};
+					d._flight = void 0;
+					return next;
+				}
 				return d;
 			};
-			this.batch(() => {
-				this.stores.setMatches(this.stores.matches.get().map(invalidate));
-				this.stores.setCached(this.stores.cachedMatches.get().map(invalidate));
-				this.stores.setPending(this.stores.pendingMatches.get().map(invalidate));
-			});
+			this._committed = committedMatches.map(invalidate);
+			for (const [id, match] of this._cache) if (invalidIds.has(id)) {
+				match.invalid = true;
+				if (opts?.forcePending) match.status = "pending";
+			}
+			for (const id of invalidIds) this._flights?.delete(id);
+			for (const controller of discardedPreloads) controller.abort();
 			this.shouldViewTransition = false;
 			return this.load({ sync: opts?.sync });
 		};
-		this.getParsedLocationHref = (location) => {
-			return location.publicHref || "/";
-		};
 		this.resolveRedirect = (redirect) => {
 			const locationHeader = redirect.headers.get("Location");
 			if (!redirect.options.href || redirect.options._builtLocation) {
-				const location = redirect.options._builtLocation ?? this.buildLocation(redirect.options);
-				const href = this.getParsedLocationHref(location);
+				const href = (redirect.options._builtLocation ?? this.buildLocation(redirect.options)).publicHref || "/";
 				redirect.options.href = href;
 				redirect.headers.set("Location", href);
 			} else if (locationHeader) try {
@@ -723,60 +575,34 @@ var RouterCore = class {
 			return redirect;
 		};
 		this.clearCache = (opts) => {
+			const cached = this._cache;
+			const preloads = this._preloads;
 			const filter = opts?.filter;
-			if (filter !== void 0) this.stores.setCached(this.stores.cachedMatches.get().filter((m) => !filter(m)));
-			else this.stores.setCached([]);
-		};
-		this.clearExpiredCache = () => {
-			const now = Date.now();
-			const filter = (d) => {
-				const route = this.looseRoutesById[d.routeId];
-				if (!route.options.loader) return true;
-				const gcTime = (d.preload ? route.options.preloadGcTime ?? this.options.defaultPreloadGcTime : route.options.gcTime ?? this.options.defaultGcTime) ?? 300 * 1e3;
-				if (d.status === "error") return true;
-				return now - d.updatedAt >= gcTime;
-			};
-			this.clearCache({ filter });
-		};
-		this.loadRouteChunk = require_load_matches.loadRouteChunk;
-		this.preloadRoute = async (opts) => {
-			const next = opts._builtLocation ?? this.buildLocation(opts);
-			let matches = this.matchRoutes(next, {
-				throwOnError: true,
-				preload: true,
-				dest: opts
-			});
-			const activeMatchIds = new Set([...this.stores.matchesId.get(), ...this.stores.pendingIds.get()]);
-			const loadedMatchIds = new Set([...activeMatchIds, ...this.stores.cachedIds.get()]);
-			const matchesToCache = matches.filter((match) => !loadedMatchIds.has(match.id));
-			if (matchesToCache.length) {
-				const cachedMatches = this.stores.cachedMatches.get();
-				this.stores.setCached([...cachedMatches, ...matchesToCache]);
+			const discarded = [];
+			const discardedIds = [];
+			for (const [id, match] of cached) if (!filter || filter(match)) {
+				discardedIds.push(id);
+				discarded.push(match);
 			}
-			try {
-				matches = await require_load_matches.loadMatches({
-					router: this,
-					matches,
-					location: next,
-					preload: true,
-					updateMatch: (id, updater) => {
-						if (activeMatchIds.has(id)) matches = matches.map((d) => d.id === id ? updater(d) : d);
-						else this.updateMatch(id, updater);
-					}
-				});
-				return matches;
-			} catch (err) {
-				if (require_redirect.isRedirect(err)) {
-					if (err.options.reloadDocument) return;
-					return await this.preloadRoute({
-						...err.options,
-						_fromLocation: next
-					});
+			const abort = [];
+			for (const [controller, matches] of preloads ?? []) if (!filter || matches.some(filter)) {
+				abort.push(controller);
+				discarded.push(...matches);
+			}
+			for (const id of discardedIds) cached.delete(id);
+			for (const controller of abort) preloads.delete(controller);
+			for (const match of discarded) {
+				const flight = match._flight;
+				match._flight = void 0;
+				if (flight && !--flight[2]) {
+					if (this._flights?.get(match.id) === flight) this._flights.delete(match.id);
+					abort.push(flight[1]);
 				}
-				if (!require_not_found.isNotFound(err)) console.error(err);
-				return;
 			}
+			for (const controller of abort) controller.abort();
 		};
+		this.loadRouteChunk = require_load_client.loadRouteChunk;
+		this.preloadRoute = (opts) => require_load_client.preloadClientRoute(this, opts);
 		this.matchRoute = (location, opts) => {
 			const matchLocation = {
 				...location,
@@ -785,8 +611,9 @@ var RouterCore = class {
 				leaveParams: true
 			};
 			const next = this.buildLocation(matchLocation);
-			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 isPending = this.stores.status.get() === "pending";
+			if (opts?.pending && !isPending) return false;
+			const baseLocation = opts?.pending ?? !isPending ? this.latestLocation : this.stores.resolvedLocation.get() || this.stores.location.get();
 			const match = require_new_process_route_tree.findSingleMatch(next.pathname, opts?.caseSensitive ?? false, opts?.fuzzy ?? false, baseLocation.pathname, this.processedTree);
 			if (!match) return false;
 			if (location.params) {
@@ -795,9 +622,6 @@ var RouterCore = class {
 			if (opts?.includeSearch ?? true) return require_utils.deepEqual(baseLocation.search, next.search, { partial: true }) ? match.rawParams : false;
 			return match.rawParams;
 		};
-		this.hasNotFoundMatch = () => {
-			return this.stores.matches.get().some((d) => d.status === "notFound" || d.globalNotFound);
-		};
 		this.getStoreConfig = getStoreConfig;
 		this.update({
 			defaultPreloadDelay: 50,
@@ -811,14 +635,11 @@ var RouterCore = class {
 			parseSearch: options.parseSearch ?? require_searchParams.defaultParseSearch,
 			protocolAllowlist: options.protocolAllowlist ?? require_utils.DEFAULT_PROTOCOL_ALLOWLIST
 		});
-		if (typeof document !== "undefined") self.__TSR_ROUTER__ = this;
+		if (!(_tanstack_router_core_isServer.isServer ?? typeof document === "undefined")) self.__TSR_ROUTER__ = this;
 	}
 	isShell() {
 		return !!this.options.isShell;
 	}
-	isPrerendering() {
-		return !!this.options.isPrerendering;
-	}
 	get state() {
 		return this.stores.__store.get();
 	}
@@ -840,12 +661,6 @@ var RouterCore = class {
 		}
 		return branch;
 	}
-	get looseRoutesById() {
-		return this.routesById;
-	}
-	getParentContext(parentMatch) {
-		return !parentMatch?.id ? this.options.context ?? void 0 : parentMatch.context ?? this.options.context ?? void 0;
-	}
 	matchRoutesInternal(next, opts) {
 		const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
 		const { foundRoute, routeParams } = matchedRoutesResult;
@@ -853,10 +668,13 @@ var RouterCore = class {
 		let isGlobalNotFound = false;
 		if (foundRoute ? foundRoute.path !== "/" && routeParams["**"] : require_path.trimPathRight(next.pathname)) if (this.options.notFoundRoute) matchedRoutes = [...matchedRoutes, this.options.notFoundRoute];
 		else isGlobalNotFound = true;
-		const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
+		const _notFoundRouteId = 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.matchStores.values()) if (store.routeId) previousActiveMatchesByRouteId.set(store.routeId, store.get());
+		const committed = this._committed;
+		const previousAt = (route, index) => {
+			const match = committed[index];
+			return match?.routeId === route.id ? match : route === this.options.notFoundRoute ? committed.find((candidate) => candidate.routeId === route.id) : void 0;
+		};
 		for (let index = 0; index < matchedRoutes.length; index++) {
 			const route = matchedRoutes[index];
 			const parentMatch = matches[index - 1];
@@ -876,7 +694,6 @@ var RouterCore = class {
 						...parentStrictSearch,
 						...strictSearch
 					};
-					searchError = void 0;
 				} catch (err) {
 					let searchParamError = err;
 					if (!(err instanceof SearchParamError)) searchParamError = new SearchParamError(err.message, { cause: err });
@@ -886,8 +703,15 @@ var RouterCore = class {
 					searchError = searchParamError;
 				}
 			}
-			const loaderDeps = route.options.loaderDeps?.({ search: preMatchSearch }) ?? "";
-			const loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) : "";
+			let loaderDeps = "";
+			let loaderDepsHash = "";
+			try {
+				loaderDeps = route.options.loaderDeps?.({ search: preMatchSearch }) ?? "";
+				loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) || "" : "";
+			} catch (cause) {
+				if (opts?.throwOnError) throw cause;
+				searchError ??= cause;
+			}
 			const { interpolatedPath, usedParams } = require_path.interpolatePath({
 				path: route.fullPath,
 				params: routeParams,
@@ -895,10 +719,10 @@ var RouterCore = class {
 				server: this.isServer
 			});
 			const matchId = route.id + interpolatedPath + loaderDepsHash;
-			const existingMatch = this.getMatch(matchId);
-			const previousMatch = previousActiveMatchesByRouteId.get(route.id);
+			const previousMatch = previousAt(route, index);
+			const existingMatch = process.env.NODE_ENV !== "production" && opts?._rematerialize ? void 0 : this._cache.get(matchId) ?? (previousMatch?.id === matchId ? previousMatch : void 0);
 			const strictParams = existingMatch?._strictParams ?? usedParams;
-			let paramsError = void 0;
+			let paramsError;
 			if (!existingMatch) try {
 				extractStrictParams(route, strictParams);
 			} catch (err) {
@@ -915,10 +739,11 @@ var RouterCore = class {
 				params: previousMatch?.params ?? routeParams,
 				_strictParams: strictParams,
 				search: previousMatch ? require_utils.nullReplaceEqualDeep(previousMatch.search, preMatchSearch) : require_utils.nullReplaceEqualDeep(existingMatch.search, preMatchSearch),
-				_strictSearch: strictMatchSearch
+				_strictSearch: strictMatchSearch,
+				searchError
 			};
 			else {
-				const status = route.options.loader || route.options.beforeLoad || route.lazyFn || require_load_matches.routeNeedsPreload(route) ? "pending" : "success";
+				const status = routeNeedsLoad(route) ? "pending" : "success";
 				match = {
 					id: matchId,
 					ssr: _tanstack_router_core_isServer.isServer ?? this.isServer ? void 0 : route.options.ssr,
@@ -930,83 +755,42 @@ var RouterCore = class {
 					updatedAt: Date.now(),
 					search: previousMatch ? require_utils.nullReplaceEqualDeep(previousMatch.search, preMatchSearch) : preMatchSearch,
 					_strictSearch: strictMatchSearch,
-					searchError: void 0,
+					searchError,
 					status,
 					isFetching: false,
 					error: void 0,
 					paramsError,
-					__routeContext: void 0,
-					_nonReactive: { loadPromise: require_utils.createControlledPromise() },
-					__beforeLoadContext: void 0,
 					context: {},
-					abortController: new AbortController(),
-					fetchCount: 0,
+					abortController: opts?._controller ?? new AbortController(),
 					cause,
 					loaderDeps: previousMatch ? require_utils.replaceEqualDeep(previousMatch.loaderDeps, loaderDeps) : loaderDeps,
 					invalid: false,
 					preload: false,
-					links: void 0,
-					scripts: void 0,
-					headScripts: void 0,
-					meta: void 0,
 					staticData: route.options.staticData || {},
 					fullPath: route.fullPath
 				};
 			}
-			if (!opts?.preload) match.globalNotFound = globalNotFoundRouteId === route.id;
-			match.searchError = searchError;
-			const parentContext = this.getParentContext(parentMatch);
-			match.context = {
-				...parentContext,
-				...match.__routeContext,
-				...match.__beforeLoadContext
-			};
+			const _notFound = _notFoundRouteId === route.id;
+			if (match._notFound && !_notFound) match.error = void 0;
+			match._notFound = _notFound;
 			matches[index] = match;
 		}
 		for (let index = 0; index < matches.length; index++) {
 			const match = matches[index];
-			const route = this.looseRoutesById[match.routeId];
-			const existingMatch = this.getMatch(match.id);
-			const previousMatch = previousActiveMatchesByRouteId.get(match.routeId);
-			match.params = previousMatch ? require_utils.nullReplaceEqualDeep(previousMatch.params, routeParams) : routeParams;
-			if (!existingMatch) {
-				const parentMatch = matches[index - 1];
-				const parentContext = this.getParentContext(parentMatch);
-				if (route.options.context) {
-					const contextFnContext = {
-						deps: match.loaderDeps,
-						params: match.params,
-						context: parentContext ?? {},
-						location: next,
-						navigate: (opts) => this.navigate({
-							...opts,
-							_fromLocation: next
-						}),
-						buildLocation: this.buildLocation,
-						cause: match.cause,
-						abortController: match.abortController,
-						preload: !!match.preload,
-						matches,
-						routeId: route.id
-					};
-					match.__routeContext = route.options.context(contextFnContext) ?? void 0;
-				}
-				match.context = {
-					...parentContext,
-					...match.__routeContext,
-					...match.__beforeLoadContext
-				};
-			}
+			match.params = match.cause === "stay" ? require_utils.nullReplaceEqualDeep(match.params, routeParams) : routeParams;
+			if (opts?._controller) match.context = {};
 		}
 		return matches;
 	}
 	/**
 	* Lightweight route matching for buildLocation.
 	* Only computes fullPath, accumulated search, and params - skipping expensive
-	* operations like AbortController, ControlledPromise, loaderDeps, and full match objects.
+	* operations like AbortController, loaderDeps, and full match objects.
 	*/
 	matchRoutesLightweight(location) {
-		const lastStateMatchId = require_utils.last(this.stores.matchesId.get());
+		const lastRouteId = require_utils.last(this.stores.ids.get());
+		const lastStateMatch = lastRouteId ? this.stores.byRoute.get(lastRouteId).get() : void 0;
+		const lastStateMatchId = lastStateMatch?.id;
 		const cached = this.lightweightCache.get(location);
 		if (cached && cached[0] === lastStateMatchId) return cached[1];
 		const { matchedRoutes, routeParams } = this.getMatchedRoutes(location.pathname);
@@ -1015,7 +799,6 @@ var RouterCore = class {
 		for (const route of matchedRoutes) try {
 			Object.assign(accumulatedSearch, validateSearch(route.options.validateSearch, accumulatedSearch));
 		} catch {}
-		const lastStateMatch = lastStateMatchId && this.stores.matchStores.get(lastStateMatchId)?.get();
 		const canReuseParams = lastStateMatch && lastStateMatch.routeId === lastRoute.id && lastStateMatch.pathname === location.pathname;
 		let params;
 		if (canReuseParams) params = lastStateMatch.params;
@@ -1036,6 +819,19 @@ var RouterCore = class {
 		return result;
 	}
 };
+/**
+* In non-production environments,
+* augment the RouterCore class with a `_refreshRoute` method
+* dedicated to HMR.
+*/
+if (process.env.NODE_ENV !== "production") {
+	RouterCore.prototype._replaceRouteChunk = require_load_client.replaceRouteChunk;
+	RouterCore.prototype._refreshRoute = async function() {
+		this._serverResult = void 0;
+		this.updateLatestLocation();
+		await require_load_client.refreshClientRoute(this);
+	};
+}
 /** Error thrown when search parameter validation fails. */
 var SearchParamError = class extends Error {};
 /** Error thrown when path parameter parsing/validation fails. */
@@ -1056,14 +852,11 @@ function lazyFn(fn, key) {
 /** Create an initial RouterState from a parsed location. */
 function getInitialRouterState(location) {
 	return {
-		loadedAt: 0,
 		isLoading: false,
-		isTransitioning: false,
 		status: "idle",
 		resolvedLocation: void 0,
 		location,
-		matches: [],
-		statusCode: 200
+		matches: []
 	};
 }
 function validateSearch(validateSearch, input) {
@@ -1078,35 +871,7 @@ function validateSearch(validateSearch, input) {
 	if (typeof validateSearch === "function") return validateSearch(input);
 	return {};
 }
-/**
-* Build the matched route chain and extract params for a pathname.
-* Falls back to the root route if no specific route is found.
-*/
-function getMatchedRoutes({ pathname, routesById, processedTree }) {
-	const routeParams = Object.create(null);
-	const trimmedPath = require_path.trimPathRight(pathname);
-	let foundRoute = void 0;
-	const match = require_new_process_route_tree.findRouteMatch(trimmedPath, processedTree, true);
-	if (match) {
-		foundRoute = match.route;
-		Object.assign(routeParams, match.rawParams);
-	}
-	return {
-		matchedRoutes: match?.branch || [routesById["__root__"]],
-		routeParams,
-		foundRoute
-	};
-}
-/**
-* TODO: once caches are persisted across requests on the server,
-* we can cache the built middleware chain using `last(destRoutes)` as the key
-*/
-function applySearchMiddleware({ search, dest, destRoutes, _includeValidateSearch }) {
-	return buildMiddlewareChain(destRoutes)(search, dest, _includeValidateSearch ?? false);
-}
-function buildMiddlewareChain(destRoutes) {
-	let dest;
-	let includeValidateSearch;
+function applySearchMiddleware(search, dest, destRoutes, includeValidateSearch) {
 	const middlewares = [];
 	for (const route of destRoutes) {
 		const routeOptions = route.options;
@@ -1162,26 +927,26 @@ function buildMiddlewareChain(destRoutes) {
 			meta
 		});
 	};
-	return function middleware(search, nextDest, _includeValidateSearch) {
-		dest = nextDest;
-		includeValidateSearch = _includeValidateSearch;
-		return applyNext(0, search);
-	};
+	return applyNext(0, search);
 }
 function findGlobalNotFoundRouteId(notFoundMode, routes) {
-	if (notFoundMode !== "root") for (let i = routes.length - 1; i >= 0; i--) {
-		const route = routes[i];
-		if (route.children) return route.id;
+	if (notFoundMode !== "root") {
+		let fallback;
+		for (let i = routes.length - 1; i >= 0; i--) {
+			const route = routes[i];
+			if (route.options.notFoundComponent) return route.id;
+			fallback ||= route.children && route.id;
+		}
+		if (fallback) return fallback;
 	}
 	return require_root.rootRouteId;
 }
+function resolveNextParams(spec, base) {
+	return spec === false || spec === null ? Object.create(null) : (spec ?? true) === true ? base : Object.assign(base, require_utils.functionalUpdate(spec, base));
+}
 function extractStrictParams(route, accumulatedParams) {
 	const parseParams = route.options.params?.parse ?? route.options.parseParams;
-	if (parseParams) {
-		const result = parseParams(accumulatedParams);
-		if (result === false) throw new Error("Route params.parse returned false for a matched route");
-		Object.assign(accumulatedParams, result);
-	}
+	if (parseParams) Object.assign(accumulatedParams, parseParams(accumulatedParams));
 }
 //#endregion
 exports.PathParamError = PathParamError;
@@ -1190,8 +955,8 @@ exports.SearchParamError = SearchParamError;
 exports.defaultSerializeError = defaultSerializeError;
 exports.getInitialRouterState = getInitialRouterState;
 exports.getLocationChangeInfo = getLocationChangeInfo;
-exports.getMatchedRoutes = getMatchedRoutes;
 exports.lazyFn = lazyFn;
+exports.runRouteLifecycle = runRouteLifecycle;
 exports.trailingSlashOptions = trailingSlashOptions;
 
 //# sourceMappingURL=router.cjs.map