@tanstack/react-router 0.0.1-alpha.8 → 0.0.1-alpha.9

package/build/cjs/router-core/build/esm/index.js

@@ -1379,12 +1379,10 @@ function createRouteMatch(router, route, opts) {
     isPending: false,
     isFetching: false,
     isInvalid: false,
+    invalidAt: Infinity,
     getIsInvalid: () => {
-      var _ref, _routeMatch$options$l;
-
       const now = Date.now();
-      const maxAge = (_ref = (_routeMatch$options$l = routeMatch.options.loaderMaxAge) != null ? _routeMatch$options$l : router.options.defaultLoaderMaxAge) != null ? _ref : 0;
-      return routeMatch.isInvalid || routeMatch.updatedAt + maxAge < now;
+      return routeMatch.isInvalid || routeMatch.invalidAt < now;
     },
     __: {
       abortController: new AbortController(),
@@ -1475,7 +1473,7 @@ function createRouteMatch(router, route, opts) {
     hasLoaders: () => {
       return !!(route.options.loader || route.options.import || elementTypes.some(d => typeof route.options[d] === 'function'));
     },
-    load: async () => {
+    load: async opts => {
       const id = '' + Date.now() + Math.random();
       routeMatch.__.latestId = id; // If the match was in an error state, set it
       // to a loading state again. Otherwise, keep it
@@ -1530,6 +1528,8 @@ function createRouteMatch(router, route, opts) {
 
           routeMatch.__.dataPromise = Promise.resolve().then(async () => {
             try {
+              var _ref, _ref2, _opts$maxAge;
+
               if (routeMatch.options.loader) {
                 const data = await routeMatch.options.loader({
                   params: routeMatch.params,
@@ -1547,6 +1547,7 @@ function createRouteMatch(router, route, opts) {
               routeMatch.error = undefined;
               routeMatch.status = 'success';
               routeMatch.updatedAt = Date.now();
+              routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
             } catch (err) {
               if (id !== routeMatch.__.latestId) {
                 return routeMatch.__.loaderPromise;
@@ -1669,7 +1670,8 @@ function createRouter(userOptions) {
   const originalOptions = _extends({
     defaultLoaderGcMaxAge: 5 * 60 * 1000,
     defaultLoaderMaxAge: 0,
-    defaultLinkPreloadDelay: 50
+    defaultPreloadMaxAge: 2000,
+    defaultPreloadDelay: 50
   }, userOptions, {
     stringifySearch: (_userOptions$stringif = userOptions == null ? void 0 : userOptions.stringifySearch) != null ? _userOptions$stringif : defaultStringifySearch,
     parseSearch: (_userOptions$parseSea = userOptions == null ? void 0 : userOptions.parseSearch) != null ? _userOptions$parseSea : defaultParseSearch
@@ -2066,7 +2068,21 @@ function createRouter(userOptions) {
         delete router.matchCache[matchId];
       });
     },
-    loadRoute: async function loadRoute(navigateOpts, loaderOpts) {
+    loadRoute: async function loadRoute(navigateOpts) {
+      if (navigateOpts === void 0) {
+        navigateOpts = router.location;
+      }
+
+      const next = router.buildNext(navigateOpts);
+      const matches = router.matchRoutes(next.pathname, {
+        strictParseParams: true
+      });
+      await router.loadMatches(matches);
+      return matches;
+    },
+    preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
+      var _ref4, _ref5, _loaderOpts$maxAge, _ref6, _ref7, _loaderOpts$gcMaxAge;
+
       if (navigateOpts === void 0) {
         navigateOpts = router.location;
       }
@@ -2077,7 +2093,8 @@ function createRouter(userOptions) {
       });
       await router.loadMatches(matches, {
         preload: true,
-        maxAge: loaderOpts.maxAge
+        maxAge: (_ref4 = (_ref5 = (_loaderOpts$maxAge = loaderOpts.maxAge) != null ? _loaderOpts$maxAge : router.options.defaultPreloadMaxAge) != null ? _ref5 : router.options.defaultLoaderMaxAge) != null ? _ref4 : 0,
+        gcMaxAge: (_ref6 = (_ref7 = (_loaderOpts$gcMaxAge = loaderOpts.gcMaxAge) != null ? _loaderOpts$gcMaxAge : router.options.defaultPreloadGcMaxAge) != null ? _ref7 : router.options.defaultLoaderGcMaxAge) != null ? _ref6 : 0
       });
       return matches;
     },
@@ -2172,31 +2189,30 @@ function createRouter(userOptions) {
     },
     loadMatches: async (resolvedMatches, loaderOpts) => {
       const now = Date.now();
+      const minMaxAge = loaderOpts != null && loaderOpts.preload ? Math.max(loaderOpts == null ? void 0 : loaderOpts.maxAge, loaderOpts == null ? void 0 : loaderOpts.gcMaxAge) : 0;
       const matchPromises = resolvedMatches.map(async match => {
         // Validate the match (loads search params etc)
-        match.__.validate(); // // If the match doesn't have a loader, don't attempt to load it
-        // if (!match.hasLoaders()) {
-        //   return
-        // }
-        // If this is a preload, add it to the preload cache
+        match.__.validate(); // If this is a preload, add it to the preload cache
 
 
-        if (loaderOpts != null && loaderOpts.preload && (loaderOpts == null ? void 0 : loaderOpts.maxAge) > 0) {
+        if (loaderOpts != null && loaderOpts.preload && minMaxAge > 0) {
           // If the match is currently active, don't preload it
           if (router.state.matches.find(d => d.matchId === match.matchId)) {
             return;
           }
 
           router.matchCache[match.matchId] = {
-            gc: now + loaderOpts.maxAge,
-            // TODO: Should this use the route's maxAge?
+            gc: now + loaderOpts.gcMaxAge,
             match
           };
         } // If the match is invalid, errored or idle, trigger it to load
 
 
         if (match.status === 'success' && match.getIsInvalid() || match.status === 'error' || match.status === 'idle') {
-          match.load();
+          const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
+          match.load({
+            maxAge
+          });
         }
 
         if (match.status === 'loading') {
@@ -2258,7 +2274,7 @@ function createRouter(userOptions) {
       const next = router.buildNext(location);
       return router.commitLocation(next, location.replace);
     },
-    navigate: async _ref4 => {
+    navigate: async _ref8 => {
       let {
         from,
         to = '.',
@@ -2266,7 +2282,7 @@ function createRouter(userOptions) {
         hash,
         replace,
         params
-      } = _ref4;
+      } = _ref8;
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
       // If this `to` is a valid external URL, return
@@ -2290,8 +2306,8 @@ function createRouter(userOptions) {
         params
       });
     },
-    buildLink: _ref5 => {
-      var _preload, _ref6, _ref7, _ref8;
+    buildLink: _ref9 => {
+      var _preload, _ref10;
 
       let {
         from,
@@ -2304,9 +2320,10 @@ function createRouter(userOptions) {
         activeOptions,
         preload,
         preloadMaxAge: userPreloadMaxAge,
+        preloadGcMaxAge: userPreloadGcMaxAge,
         preloadDelay: userPreloadDelay,
         disabled
-      } = _ref5;
+      } = _ref9;
 
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
@@ -2329,9 +2346,8 @@ function createRouter(userOptions) {
         replace
       };
       const next = router.buildNext(nextOpts);
-      preload = (_preload = preload) != null ? _preload : router.options.defaultLinkPreload;
-      const preloadMaxAge = (_ref6 = (_ref7 = userPreloadMaxAge != null ? userPreloadMaxAge : router.options.defaultLinkPreloadMaxAge) != null ? _ref7 : router.options.defaultLoaderGcMaxAge) != null ? _ref6 : 0;
-      const preloadDelay = (_ref8 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultLinkPreloadDelay) != null ? _ref8 : 0; // Compare path/hash for matches
+      preload = (_preload = preload) != null ? _preload : router.options.defaultPreload;
+      const preloadDelay = (_ref10 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultPreloadDelay) != null ? _ref10 : 0; // Compare path/hash for matches
 
       const pathIsEqual = router.state.location.pathname === next.pathname;
       const currentPathSplit = router.state.location.pathname.split('/');
@@ -2359,9 +2375,10 @@ function createRouter(userOptions) {
 
 
       const handleFocus = e => {
-        if (preload && preloadMaxAge > 0) {
-          router.loadRoute(nextOpts, {
-            maxAge: preloadMaxAge
+        if (preload) {
+          router.preloadRoute(nextOpts, {
+            maxAge: userPreloadMaxAge,
+            gcMaxAge: userPreloadGcMaxAge
           });
         }
       };
@@ -2369,15 +2386,16 @@ function createRouter(userOptions) {
       const handleEnter = e => {
         const target = e.target || {};
 
-        if (preload && preloadMaxAge > 0) {
+        if (preload) {
           if (target.preloadTimeout) {
             return;
           }
 
           target.preloadTimeout = setTimeout(() => {
             target.preloadTimeout = null;
-            router.loadRoute(nextOpts, {
-              maxAge: preloadMaxAge
+            router.preloadRoute(nextOpts, {
+              maxAge: userPreloadMaxAge,
+              gcMaxAge: userPreloadGcMaxAge
             });
           }, preloadDelay);
         }