@tanstack/router-core 1.171.16-pre.0 → 1.171.16

package/dist/esm/router.d.ts

@@ -1,8 +1,8 @@
-import { loadRouteChunk, ActivePreload, LoadTransaction, LoaderFlight, PendingSession } from './load-client.js';
 import { LRUCache } from './lru-cache.js';
 import { ProcessRouteTreeResult, ProcessedTree } from './new-process-route-tree.js';
 import { SearchParser, SearchSerializer } from './searchParams.js';
 import { AnyRedirect, ResolvedRedirect } from './redirect.js';
+import { LoadTransaction, LoaderFlight, PendingSession } from './load-client.js';
 import { ServerLoadResult } from './load-server.js';
 import { HistoryAction, HistoryLocation, HistoryState, ParsedHistoryState, RouterHistory } from '@tanstack/history';
 import { Awaitable, Constrain, NoInfer, NonNullableUpdater, PickAsRequired, Updater } from './utils.js';
@@ -482,10 +482,9 @@ export type LoadFn = (opts?: {
         type: HistoryAction;
     };
     _signal?: AbortSignal;
-    _dedupe?: boolean;
 }) => Promise<void>;
 export type CommitLocationFn = ({ viewTransition, ignoreBlocker, ...next }: ParsedLocation & CommitLocationOptions) => Promise<void>;
-export type StartTransitionFn = (fn: () => void, expected: Array<AnyRouteMatch>, urgent?: boolean) => Promise<boolean>;
+export type StartTransitionFn = (fn: () => void, expected: Array<AnyRouteMatch>) => Promise<boolean>;
 export interface MatchRoutesFn {
     (pathname: string, locationSearch?: AnySchema, opts?: MatchRoutesOpts): Array<MakeRouteMatchUnion>;
     /**
@@ -602,8 +601,8 @@ export interface RouterCore<in out TRouteTree extends AnyRoute, in out TTrailing
     _tx?: LoadTransaction;
     /** Joinable in-flight loader generations keyed by match ID. */
     _flights?: Map<string, LoaderFlight>;
-    /** Whole speculative lanes that an identical navigation may adopt. */
-    _preloads?: Map<string, ActivePreload>;
+    /** Active speculative lanes retained for cancellation, invalidation, and cache clearing. */
+    _preloads?: Map<AbortController, Array<AnyRouteMatch>>;
     /** Owns cancellable work before a client transaction publishes. */
     _preflight?: AbortController;
     /** Transfers one reconstructed SSR prefix into its initial client load. */
@@ -612,8 +611,11 @@ export interface RouterCore<in out TRouteTree extends AnyRoute, in out TTrailing
     _pending?: PendingSession;
     /** Result of the latest server load, used to render or redirect. */
     _serverResult?: ServerLoadResult;
-    /** Framework callback that acknowledges an exact matches publication. */
-    _rendered?: (matches: Array<AnyRouteMatch>) => void;
+    /** Framework publication waiting for an exact render acknowledgement. */
+    _rendered?: [
+        offered?: Array<AnyRouteMatch>,
+        settle?: (rendered: boolean) => void
+    ];
     /** Development-only HMR reload for a route and its descendants. */
     _refreshRoute: (() => Promise<void>) | undefined;
     /** Development-only replacement for a route's lazy chunk owner. */
@@ -733,9 +735,11 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     load: LoadFn;
     startViewTransition: (fn: () => Promise<void>) => any;
     /**
-     * Invalidate the current matches and optionally force them back into a pending state.
+     * Invalidate selected match generations and optionally force current matches
+     * back into a pending state.
      *
-     * - Marks all matches that pass the optional `filter` as `invalid: true`.
+     * - Marks committed and cached matches whose IDs are selected as invalid.
+     * - Retires selected active preloads so older work cannot publish fresh data.
      *
      * The next load decides when to publish pending UI, so invalidation does not
      * mutate the currently rendered status.
@@ -743,7 +747,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     invalidate: InvalidateFn<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>>;
     resolveRedirect: (redirect: AnyRedirect) => AnyRedirect;
     clearCache: ClearCacheFn<this>;
-    loadRouteChunk: typeof loadRouteChunk;
+    loadRouteChunk: (route: AnyRoute, componentType?: 'errorComponent' | 'notFoundComponent' | false) => Promise<void> | undefined;
     preloadRoute: PreloadRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
     matchRoute: MatchRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
     ssr?: {

package/dist/esm/router.js

@@ -7,7 +7,7 @@ import { setupScrollRestoration } from "./scroll-restoration.js";
 import { defaultParseSearch, defaultStringifySearch } from "./searchParams.js";
 import { rootRouteId } from "./root.js";
 import { isRedirect } from "./redirect.js";
-import { loadClientRoute, loadRouteChunk, preloadClientRoute, refreshClientRoute, replaceRouteChunk, transferMatchResources } from "./load-client.js";
+import { loadClientRoute, loadRouteChunk, preloadClientRoute, refreshClientRoute, replaceRouteChunk } from "./load-client.js";
 import { composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath } from "./rewrite.js";
 import { createRouterStores } from "./stores.js";
 import { createBrowserHistory, parseHref } from "@tanstack/history";
@@ -387,7 +387,7 @@ var RouterCore = class {
 				previousCommitPromise?.resolve();
 			};
 			this._commitPromise = commitPromise;
-			if (isSameLocation) this.load({ _dedupe: true });
+			if (isSameLocation) this.load();
 			else {
 				let { maskedLocation, hashScrollIntoView, ...nextHistory } = next;
 				if (maskedLocation) {
@@ -518,9 +518,20 @@ var RouterCore = class {
 		this.invalidate = (opts) => {
 			const committedMatches = this._committed;
 			const filter = opts?.filter;
-			const invalidIds = filter ? new Set([...committedMatches, ...this._cache.values()].filter((match) => filter(match)).map((match) => match.id)) : void 0;
+			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 (!invalidIds || invalidIds.has(d.id)) {
+				if (invalidIds.has(d.id)) {
 					const route = this.routesById[d.routeId];
 					const next = {
 						...d,
@@ -535,11 +546,13 @@ var RouterCore = class {
 				}
 				return d;
 			};
-			const committed = committedMatches.map(invalidate);
-			this._committed = committed;
-			const cache = /* @__PURE__ */ new Map();
-			for (const [id, match] of this._cache) cache.set(id, invalidate(match));
-			this._cache = cache;
+			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 });
 		};
@@ -565,20 +578,28 @@ var RouterCore = class {
 			const cached = this._cache;
 			const preloads = this._preloads;
 			const filter = opts?.filter;
-			const retained = /* @__PURE__ */ new Map();
 			const discarded = [];
-			for (const [id, match] of cached) if (filter && !filter(match)) retained.set(id, match);
-			else discarded.push(match);
-			const retainedPreloads = /* @__PURE__ */ new Map();
-			const discardedPreloads = [];
-			for (const [href, preload] of preloads ?? []) if (!filter || preload[0].some(filter)) {
-				discardedPreloads.push(preload);
-				discarded.push(...preload[0]);
-			} else retainedPreloads.set(href, preload);
-			this._cache = retained;
-			this._preloads = retainedPreloads;
-			transferMatchResources(this, discarded);
-			for (const preload of discardedPreloads) preload[1].abort();
+			const discardedIds = [];
+			for (const [id, match] of cached) if (!filter || filter(match)) {
+				discardedIds.push(id);
+				discarded.push(match);
+			}
+			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]);
+				}
+			}
+			for (const controller of abort) controller.abort();
 		};
 		this.loadRouteChunk = loadRouteChunk;
 		this.preloadRoute = (opts) => preloadClientRoute(this, opts);
@@ -928,6 +949,6 @@ function extractStrictParams(route, accumulatedParams) {
 	if (parseParams) Object.assign(accumulatedParams, parseParams(accumulatedParams));
 }
 //#endregion
-export { PathParamError, RouterCore, SearchParamError, _getUserHistoryState, defaultSerializeError, getInitialRouterState, getLocationChangeInfo, lazyFn, runRouteLifecycle, trailingSlashOptions };
+export { PathParamError, RouterCore, SearchParamError, defaultSerializeError, getInitialRouterState, getLocationChangeInfo, lazyFn, runRouteLifecycle, trailingSlashOptions };
 
 //# sourceMappingURL=router.js.map