@tanstack/react-router 0.0.1-beta.281 → 0.0.1-beta.283

package/build/types/Matches.d.ts

@@ -26,6 +26,7 @@ export interface RouteMatch<TRouteTree extends AnyRoute = AnyRoute, TRouteId ext
     abortController: AbortController;
     cause: 'preload' | 'enter' | 'stay';
     loaderDeps: RouteById<TRouteTree, TRouteId>['types']['loaderDeps'];
+    preload: boolean;
     invalid: boolean;
 }
 export type AnyRouteMatch = RouteMatch<any, any>;

package/build/types/link.d.ts

@@ -43,7 +43,7 @@ export type ToSubOptions<TRouteTree extends AnyRoute = RegisteredRouter['routeTr
     state?: true | NonNullableUpdater<HistoryState>;
     from?: TFrom;
 } & CheckPath<TRouteTree, NoInfer<TResolved>, {}> & SearchParamOptions<TRouteTree, TFrom, TTo, TResolved> & PathParamOptions<TRouteTree, TFrom, TResolved>;
-export type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>, TFromSearchEnsured = '/' extends TFrom ? FullSearchSchema<TRouteTree> : Expand<UnionToIntersection<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>>>, TFromSearchOptional = Omit<AllParams<TRouteTree>, keyof TFromSearchEnsured>, TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>, TToSearch = '' extends TTo ? FullSearchSchema<TRouteTree> : Expand<RouteByPath<TRouteTree, TResolved>['types']['fullSearchSchema']>> = keyof PickRequired<TToSearch> extends never ? {
+export type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>, TFromSearchEnsured = '/' extends TFrom ? FullSearchSchema<TRouteTree> : Expand<UnionToIntersection<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>>>, TFromSearchOptional = Omit<FullSearchSchema<TRouteTree>, keyof TFromSearchEnsured>, TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>, TToSearch = '' extends TTo ? FullSearchSchema<TRouteTree> : Expand<RouteByPath<TRouteTree, TResolved>['types']['fullSearchSchema']>> = keyof PickRequired<TToSearch> extends never ? {
     search?: true | SearchReducer<TFromSearch, TToSearch>;
 } : {
     search: TFromSearchEnsured extends PickRequired<TToSearch> ? true | SearchReducer<TFromSearch, TToSearch> : SearchReducer<TFromSearch, TToSearch>;

package/build/types/router.d.ts

@@ -169,6 +169,7 @@ export declare class Router<TRouteTree extends AnyRoute = AnyRoute, TDehydrated
     }) => Promise<RouteMatch[]>;
     invalidate: () => void;
     load: () => Promise<void>;
+    cleanCache: () => void;
     preloadRoute: (navigateOpts?: ToOptions<TRouteTree>) => Promise<RouteMatch<AnyRoute, any>[]>;
     matchRoute: MatchRouteFn<TRouteTree>;
     injectHtml: (html: string | (() => Promise<string> | string)) => Promise<void>;

package/build/umd/index.development.js

@@ -2327,7 +2327,8 @@
           fetchCount: 0,
           cause,
           loaderDeps,
-          invalid: false
+          invalid: false,
+          preload: false
         };
 
         // Regardless of whether we're reusing an existing match or creating
@@ -2740,6 +2741,10 @@
           // Allow shouldReload to get the last say,
           // if provided.
           shouldReload = typeof shouldReloadOption === 'function' ? shouldReloadOption(loaderContext) : shouldReloadOption;
+          matches[index] = match = {
+            ...match,
+            preload: !!preload && !this.state.matches.find(d => d.id === match.id)
+          };
           if (match.status !== 'success') {
             // If we need to potentially show the pending component,
             // start a timer to show it after the pendingMs
@@ -2799,16 +2804,7 @@
         let pendingMatches;
         const previousMatches = this.state.matches;
         this.__store.batch(() => {
-          // This is where all of the garbage collection magic happens
-          this.__store.setState(s => {
-            return {
-              ...s,
-              cachedMatches: s.cachedMatches.filter(d => {
-                const route = this.looseRoutesById[d.routeId];
-                return d.status !== 'error' && Date.now() - d.updatedAt < (route.options.gcTime ?? this.options.defaultGcTime ?? 5 * 60 * 1000);
-              })
-            };
-          });
+          this.cleanCache();
 
           // Match the routes
           pendingMatches = this.matchRoutes(next.pathname, next.search, {
@@ -2849,13 +2845,16 @@
 
           // Commit the pending matches. If a previous match was
           // removed, place it in the cachedMatches
-          this.__store.setState(s => ({
-            ...s,
-            isLoading: false,
-            matches: pendingMatches,
-            pendingMatches: undefined,
-            cachedMatches: [...s.cachedMatches, ...exitingMatches.filter(d => d.status !== 'error')]
-          }))
+          this.__store.batch(() => {
+            this.__store.setState(s => ({
+              ...s,
+              isLoading: false,
+              matches: s.pendingMatches,
+              pendingMatches: undefined,
+              cachedMatches: [...s.cachedMatches, ...exitingMatches.filter(d => d.status !== 'error')]
+            }));
+            this.cleanCache();
+          })
 
           //
           ;
@@ -2882,6 +2881,25 @@
       this.latestLoadPromise = promise;
       return this.latestLoadPromise;
     };
+    cleanCache = () => {
+      // This is where all of the garbage collection magic happens
+      this.__store.setState(s => {
+        return {
+          ...s,
+          cachedMatches: s.cachedMatches.filter(d => {
+            const route = this.looseRoutesById[d.routeId];
+            if (!route.options.loader) {
+              return false;
+            }
+
+            // If the route was preloaded, use the preloadGcTime
+            // otherwise, use the gcTime
+            const gcTime = (d.preload ? route.options.preloadGcTime ?? this.options.defaultPreloadGcTime : route.options.gcTime ?? this.options.defaultGcTime) ?? 5 * 60 * 1000;
+            return d.status !== 'error' && Date.now() - d.updatedAt < gcTime;
+          })
+        };
+      });
+    };
     preloadRoute = async (navigateOpts = this.state.location) => {
       let next = this.buildLocation(navigateOpts);
       let matches = this.matchRoutes(next.pathname, next.search, {