@tanstack/router-core 0.0.1-beta.10 → 0.0.1-beta.13

package/build/esm/index.js

@@ -1382,7 +1382,7 @@ const createRouteConfig = function createRouteConfig(options, children, isRoot,
   };
 };
 
-const elementTypes = ['element', 'errorElement', 'catchElement', 'pendingElement'];
+const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
 function createRouteMatch(router, route, opts) {
   const routeMatch = _extends({}, route, opts, {
     router,
@@ -1392,7 +1392,6 @@ function createRouteMatch(router, route, opts) {
     status: 'idle',
     routeLoaderData: {},
     loaderData: {},
-    isPending: false,
     isFetching: false,
     isInvalid: false,
     invalidAt: Infinity,
@@ -1410,32 +1409,6 @@ function createRouteMatch(router, route, opts) {
 
         routeMatch.router.notify();
       },
-      startPending: () => {
-        var _routeMatch$options$p, _routeMatch$options$p2;
-
-        const pendingMs = (_routeMatch$options$p = routeMatch.options.pendingMs) != null ? _routeMatch$options$p : router.options.defaultPendingMs;
-        const pendingMinMs = (_routeMatch$options$p2 = routeMatch.options.pendingMinMs) != null ? _routeMatch$options$p2 : router.options.defaultPendingMinMs;
-
-        if (routeMatch.__.pendingTimeout || routeMatch.status !== 'loading' || typeof pendingMs === 'undefined') {
-          return;
-        }
-
-        routeMatch.__.pendingTimeout = setTimeout(() => {
-          routeMatch.isPending = true;
-
-          routeMatch.__.resolve();
-
-          if (typeof pendingMinMs !== 'undefined') {
-            routeMatch.__.pendingMinPromise = new Promise(r => routeMatch.__.pendingMinTimeout = setTimeout(r, pendingMinMs));
-          }
-        }, pendingMs);
-      },
-      cancelPending: () => {
-        routeMatch.isPending = false;
-        clearTimeout(routeMatch.__.pendingTimeout);
-        clearTimeout(routeMatch.__.pendingMinTimeout);
-        delete routeMatch.__.pendingMinPromise;
-      },
       validate: () => {
         var _routeMatch$parentMat, _routeMatch$parentMat2;
 
@@ -1455,11 +1428,11 @@ function createRouteMatch(router, route, opts) {
 
           routeMatch.routeSearch = nextSearch;
           routeMatch.search = replaceEqualDeep(parentSearch, _extends({}, parentSearch, nextSearch));
-          elementTypes.map(async type => {
-            const routeElement = routeMatch.options[type];
+          componentTypes.map(async type => {
+            const component = routeMatch.options[type];
 
             if (typeof routeMatch.__[type] !== 'function') {
-              routeMatch.__[type] = routeElement;
+              routeMatch.__[type] = component;
             }
           });
         } catch (err) {
@@ -1479,14 +1452,16 @@ function createRouteMatch(router, route, opts) {
       var _routeMatch$__$abortC;
 
       (_routeMatch$__$abortC = routeMatch.__.abortController) == null ? void 0 : _routeMatch$__$abortC.abort();
-
-      routeMatch.__.cancelPending();
     },
     invalidate: () => {
       routeMatch.isInvalid = true;
     },
     hasLoaders: () => {
-      return !!(route.options.loader || elementTypes.some(d => typeof route.options[d] === 'function'));
+      return !!(route.options.loader || componentTypes.some(d => {
+        var _route$options$d;
+
+        return (_route$options$d = route.options[d]) == null ? void 0 : _route$options$d.preload;
+      }));
     },
     load: async loaderOpts => {
       const now = Date.now();
@@ -1530,91 +1505,79 @@ function createRouteMatch(router, route, opts) {
         routeMatch.isFetching = true;
         routeMatch.__.resolve = resolve;
 
-        routeMatch.__.loaderDataPromise = (async () => {
-          // Load the elements and data in parallel
-          routeMatch.__.elementsPromise = (async () => {
-            // then run all element and data loaders in parallel
-            // For each element type, potentially load it asynchronously
-            await Promise.all(elementTypes.map(async type => {
-              const routeElement = routeMatch.options[type];
+        routeMatch.__.componentsPromise = (async () => {
+          // then run all component and data loaders in parallel
+          // For each component type, potentially load it asynchronously
+          await Promise.all(componentTypes.map(async type => {
+            var _routeMatch$__$type;
 
-              if (typeof routeMatch.__[type] === 'function') {
-                routeMatch.__[type] = await router.options.createElement(routeElement);
-              }
-            }));
-          })();
-
-          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,
-                  search: routeMatch.routeSearch,
-                  signal: routeMatch.__.abortController.signal
-                });
-
-                if (id !== routeMatch.__.latestId) {
-                  return routeMatch.__.loadPromise;
-                }
+            const component = routeMatch.options[type];
 
-                routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-              }
+            if ((_routeMatch$__$type = routeMatch.__[type]) != null && _routeMatch$__$type.preload) {
+              routeMatch.__[type] = await router.options.loadComponent(component);
+            }
+          }));
+        })();
+
+        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,
+                search: routeMatch.routeSearch,
+                signal: routeMatch.__.abortController.signal
+              });
 
-              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.__.loadPromise;
               }
 
-              if (process.env.NODE_ENV !== 'production') {
-                console.error(err);
-              }
-
-              routeMatch.error = err;
-              routeMatch.status = 'error';
-              routeMatch.updatedAt = Date.now();
+              routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
             }
-          });
-
-          try {
-            await Promise.all([routeMatch.__.elementsPromise, routeMatch.__.dataPromise]);
 
+            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.__.loadPromise;
             }
 
-            if (routeMatch.__.pendingMinPromise) {
-              await routeMatch.__.pendingMinPromise;
-              delete routeMatch.__.pendingMinPromise;
-            }
-          } finally {
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loadPromise;
+            if (process.env.NODE_ENV !== 'production') {
+              console.error(err);
             }
 
-            routeMatch.__.cancelPending();
+            routeMatch.error = err;
+            routeMatch.status = 'error';
+            routeMatch.updatedAt = Date.now();
+          }
+        });
 
-            routeMatch.isPending = false;
-            routeMatch.isFetching = false;
+        try {
+          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise]);
 
-            routeMatch.__.notify();
+          if (id !== routeMatch.__.latestId) {
+            return routeMatch.__.loadPromise;
+          }
+        } finally {
+          if (id !== routeMatch.__.latestId) {
+            return routeMatch.__.loadPromise;
           }
-        })();
 
-        await routeMatch.__.loaderDataPromise;
+          routeMatch.isFetching = false;
 
-        if (id !== routeMatch.__.latestId) {
-          return routeMatch.__.loadPromise;
+          routeMatch.__.notify();
         }
-
-        delete routeMatch.__.loaderDataPromise;
       });
       await routeMatch.__.loadPromise;
+
+      if (id !== routeMatch.__.latestId) {
+        return routeMatch.__.loadPromise;
+      }
+
       delete routeMatch.__.loadPromise;
     }
   });
@@ -1850,18 +1813,26 @@ function createRouter(userOptions) {
       const matches = router.matchRoutes(router.location.pathname, {
         strictParseParams: true
       });
-      router.state = _extends({}, router.state, {
-        pending: {
+
+      if (typeof document !== 'undefined') {
+        router.state = _extends({}, router.state, {
+          pending: {
+            matches: matches,
+            location: router.location
+          },
+          status: 'loading'
+        });
+      } else {
+        router.state = _extends({}, router.state, {
           matches: matches,
-          location: router.location
-        },
-        status: 'loading'
-      });
+          location: router.location,
+          status: 'loading'
+        });
+      }
+
       router.notify(); // Load the matches
 
-      await router.loadMatches(matches, {
-        withPending: true
-      });
+      await router.loadMatches(matches);
 
       if (router.startedLoadingAt !== id) {
         // Ignore side-effects of match loading
@@ -1878,6 +1849,9 @@ function createRouter(userOptions) {
           exiting.push(d);
         }
       });
+      const entering = matches.filter(d => {
+        return !previousMatches.find(dd => dd.matchId === d.matchId);
+      });
       const now = Date.now();
       exiting.forEach(d => {
         var _ref, _d$options$loaderGcMa, _ref2, _d$options$loaderMaxA;
@@ -1885,12 +1859,7 @@ function createRouter(userOptions) {
         d.__.onExit == null ? void 0 : d.__.onExit({
           params: d.params,
           search: d.routeSearch
-        }); // // Clear actions
-        // if (d.action) {
-        //   d.action.current = undefined
-        //   d.action.submissions = []
-        // }
-        // Clear idle error states when match leaves
+        }); // Clear idle error states when match leaves
 
         if (d.status === 'error' && !d.isFetching) {
           d.status = 'idle';
@@ -1912,16 +1881,13 @@ function createRouter(userOptions) {
           search: d.routeSearch
         });
       });
-      const entering = matches.filter(d => {
-        return !previousMatches.find(dd => dd.matchId === d.matchId);
-      });
       entering.forEach(d => {
         d.__.onExit = d.options.onMatch == null ? void 0 : d.options.onMatch({
           params: d.params,
           search: d.search
         });
         delete router.matchCache[d.matchId];
-      }); // router.notify()
+      });
 
       if (router.startedLoadingAt !== id) {
         // Ignore side-effects of match loading
@@ -2088,14 +2054,8 @@ function createRouter(userOptions) {
 
         match.load(loaderOpts);
 
-        if (match.status === 'loading') {
-          // If requested, start the pending timers
-          if (loaderOpts != null && loaderOpts.withPending) match.__.startPending();
-        }
-
         if (match.__.loadPromise) {
           // Wait for the first sign of activity from the match
-          // This might be completion, error, or a pending state
           await match.__.loadPromise;
         }
       });