@tanstack/react-router 0.0.1-beta.2 → 0.0.1-beta.21

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

@@ -944,6 +944,12 @@ function functionalUpdate(updater, previous) {
 
   return updater;
 }
+function pick(parent, keys) {
+  return keys.reduce((obj, key) => {
+    obj[key] = parent[key];
+    return obj;
+  }, {});
+}
 
 function joinPaths(paths) {
   return cleanPath(paths.filter(Boolean).join('/'));
@@ -1170,6 +1176,7 @@ function toValue(mix) {
   var str = decodeURIComponent(mix);
   if (str === 'false') return false;
   if (str === 'true') return true;
+  if (str.charAt(0) === '0') return str;
   return +str * 0 === 0 ? +str : str;
 }
 
@@ -1220,7 +1227,7 @@ function createRoute(routeConfig, options, parent, router) {
 
   const action = router.state.actions[id] || (() => {
     router.state.actions[id] = {
-      pending: [],
+      submissions: [],
       submit: async (submission, actionOpts) => {
         var _actionOpts$invalidat;
 
@@ -1229,18 +1236,20 @@ function createRoute(routeConfig, options, parent, router) {
         }
 
         const invalidate = (_actionOpts$invalidat = actionOpts == null ? void 0 : actionOpts.invalidate) != null ? _actionOpts$invalidat : true;
+
+        if (!(actionOpts != null && actionOpts.multi)) {
+          action.submissions = action.submissions.filter(d => d.isMulti);
+        }
+
         const actionState = {
           submittedAt: Date.now(),
           status: 'pending',
-          submission
+          submission,
+          isMulti: !!(actionOpts != null && actionOpts.multi)
         };
         action.current = actionState;
         action.latest = actionState;
-        action.pending.push(actionState);
-        router.state = _extends({}, router.state, {
-          currentAction: actionState,
-          latestAction: actionState
-        });
+        action.submissions.push(actionState);
         router.notify();
 
         try {
@@ -1262,11 +1271,6 @@ function createRoute(routeConfig, options, parent, router) {
           actionState.error = err;
           actionState.status = 'error';
         } finally {
-          action.pending = action.pending.filter(d => d !== actionState);
-          router.removeActionQueue.push({
-            action,
-            actionState
-          });
           router.notify();
         }
       }
@@ -1341,15 +1345,6 @@ function createRoute(routeConfig, options, parent, router) {
   });
   return route;
 }
-function cascadeLoaderData(matches) {
-  matches.forEach((match, index) => {
-    const parent = matches[index - 1];
-
-    if (parent) {
-      match.loaderData = replaceEqualDeep(match.loaderData, _extends({}, parent.loaderData, match.routeLoaderData));
-    }
-  });
-}
 
 const rootRouteId = '__root__';
 const createRouteConfig = function createRouteConfig(options, children, isRoot, parentId, parentPath) {
@@ -1401,7 +1396,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,
@@ -1411,10 +1406,10 @@ function createRouteMatch(router, route, opts) {
     status: 'idle',
     routeLoaderData: {},
     loaderData: {},
-    isPending: false,
     isFetching: false,
     isInvalid: false,
     invalidAt: Infinity,
+    // pendingActions: [],
     getIsInvalid: () => {
       const now = Date.now();
       return routeMatch.isInvalid || routeMatch.invalidAt < now;
@@ -1428,43 +1423,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;
-      },
-      // setParentMatch: (parentMatch?: RouteMatch) => {
-      //   routeMatch.parentMatch = parentMatch
-      // },
-      // addChildMatch: (childMatch: RouteMatch) => {
-      //   if (
-      //     routeMatch.childMatches.find((d) => d.matchId === childMatch.matchId)
-      //   ) {
-      //     return
-      //   }
-      //   routeMatch.childMatches.push(childMatch)
-      // },
       validate: () => {
         var _routeMatch$parentMat, _routeMatch$parentMat2;
 
@@ -1472,9 +1430,11 @@ function createRouteMatch(router, route, opts) {
         const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.location.search;
 
         try {
+          var _validator;
+
           const prevSearch = routeMatch.routeSearch;
           const validator = typeof routeMatch.options.validateSearch === 'object' ? routeMatch.options.validateSearch.parse : routeMatch.options.validateSearch;
-          let nextSearch = replaceEqualDeep(prevSearch, validator == null ? void 0 : validator(parentSearch)); // Invalidate route matches when search param stability changes
+          let nextSearch = replaceEqualDeep(prevSearch, (_validator = validator == null ? void 0 : validator(parentSearch)) != null ? _validator : {}); // Invalidate route matches when search param stability changes
 
           if (prevSearch !== nextSearch) {
             routeMatch.isInvalid = true;
@@ -1482,6 +1442,13 @@ function createRouteMatch(router, route, opts) {
 
           routeMatch.routeSearch = nextSearch;
           routeMatch.search = replaceEqualDeep(parentSearch, _extends({}, parentSearch, nextSearch));
+          componentTypes.map(async type => {
+            const component = routeMatch.options[type];
+
+            if (typeof routeMatch.__[type] !== 'function') {
+              routeMatch.__[type] = component;
+            }
+          });
         } catch (err) {
           console.error(err);
           const error = new Error('Invalid search params found', {
@@ -1499,14 +1466,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();
@@ -1527,17 +1496,25 @@ function createRouteMatch(router, route, opts) {
 
       if (routeMatch.status === 'success' && routeMatch.getIsInvalid() || routeMatch.status === 'error' || routeMatch.status === 'idle') {
         const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
-        routeMatch.fetch({
+        await routeMatch.fetch({
           maxAge
         });
       }
     },
     fetch: async opts => {
-      const id = '' + Date.now() + Math.random();
-      routeMatch.__.latestId = id; // If the match was in an error state, set it
+      const loadId = '' + Date.now() + Math.random();
+      routeMatch.__.latestId = loadId;
+
+      const checkLatest = async () => {
+        if (loadId !== routeMatch.__.latestId) {
+          // warning(true, 'Data loader is out of date!')
+          return new Promise(() => {});
+        }
+      }; // If the match was in an error state, set it
       // to a loading state again. Otherwise, keep it
       // as loading or resolved
 
+
       if (routeMatch.status === 'idle') {
         routeMatch.status = 'loading';
       } // We started loading the route, so it's no longer invalid
@@ -1550,94 +1527,66 @@ function createRouteMatch(router, route, opts) {
         routeMatch.isFetching = true;
         routeMatch.__.resolve = resolve;
 
-        const loaderPromise = (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 (routeMatch.__[type]) {
-                return;
-              }
+            const component = routeMatch.options[type];
 
-              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.__.loaderPromise;
-                }
-
-                routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-              }
-
-              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;
-              }
-
-              if (process.env.NODE_ENV !== 'production') {
-                console.error(err);
-              }
-
-              routeMatch.error = err;
-              routeMatch.status = 'error';
-              routeMatch.updatedAt = Date.now();
+            if ((_routeMatch$__$type = routeMatch.__[type]) != null && _routeMatch$__$type.preload) {
+              routeMatch.__[type] = await router.options.loadComponent(component);
             }
-          });
+          }));
+        })();
 
+        routeMatch.__.dataPromise = Promise.resolve().then(async () => {
           try {
-            await Promise.all([routeMatch.__.elementsPromise, routeMatch.__.dataPromise]);
+            var _ref, _ref2, _opts$maxAge;
 
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loaderPromise;
+            if (routeMatch.options.loader) {
+              const data = await router.loadMatchData(routeMatch);
+              await checkLatest();
+              routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
             }
 
-            if (routeMatch.__.pendingMinPromise) {
-              await routeMatch.__.pendingMinPromise;
-              delete routeMatch.__.pendingMinPromise;
-            }
-          } finally {
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loaderPromise;
-            }
-
-            routeMatch.__.cancelPending();
+            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);
+            return routeMatch.routeLoaderData;
+          } catch (err) {
+            await checkLatest();
 
-            routeMatch.isPending = false;
-            routeMatch.isFetching = false;
+            if (process.env.NODE_ENV !== 'production') {
+              console.error(err);
+            }
 
-            routeMatch.__.notify();
+            routeMatch.error = err;
+            routeMatch.status = 'error';
+            routeMatch.updatedAt = Date.now();
+            throw err;
           }
-        })();
+        });
 
-        routeMatch.__.loaderPromise = loaderPromise;
-        await loaderPromise;
+        const after = async () => {
+          await checkLatest();
+          routeMatch.isFetching = false;
+          delete routeMatch.__.loadPromise;
 
-        if (id !== routeMatch.__.latestId) {
-          return routeMatch.__.loaderPromise;
-        }
+          routeMatch.__.notify();
+        };
 
-        delete routeMatch.__.loaderPromise;
+        try {
+          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
+          after();
+        } catch (_unused) {
+          after();
+        }
       });
-      return await routeMatch.__.loadPromise;
+      await routeMatch.__.loadPromise;
+      await checkLatest();
     }
   });
 
@@ -1698,9 +1647,22 @@ function stringifySearchWith(stringify) {
 
 var _window$document;
 // Detect if we're in the DOM
-const isServer = Boolean(typeof window === 'undefined' || !((_window$document = window.document) != null && _window$document.createElement)); // This is the default history object if none is defined
+const isServer = typeof window === 'undefined' || !((_window$document = window.document) != null && _window$document.createElement); // This is the default history object if none is defined
 
-const createDefaultHistory = () => !isServer ? createBrowserHistory() : createMemoryHistory();
+const createDefaultHistory = () => isServer ? createMemoryHistory() : createBrowserHistory();
+
+function getInitialRouterState() {
+  return {
+    status: 'idle',
+    location: null,
+    matches: [],
+    actions: {},
+    loaders: {},
+    lastUpdated: Date.now(),
+    isFetching: false,
+    isPreloading: false
+  };
+}
 
 function createRouter(userOptions) {
   var _userOptions$stringif, _userOptions$parseSea;
@@ -1718,30 +1680,24 @@ function createRouter(userOptions) {
   });
 
   let router = {
+    types: undefined,
+    // public api
     history,
     options: originalOptions,
     listeners: [],
-    removeActionQueue: [],
     // Resolved after construction
     basepath: '',
     routeTree: undefined,
     routesById: {},
     location: undefined,
-    allRouteInfo: undefined,
     //
     navigationPromise: Promise.resolve(),
     resolveNavigation: () => {},
     matchCache: {},
-    state: {
-      status: 'idle',
-      location: null,
-      matches: [],
-      actions: {},
-      loaders: {},
-      loaderData: {},
-      lastUpdated: Date.now(),
-      isFetching: false,
-      isPreloading: false
+    state: getInitialRouterState(),
+    reset: () => {
+      router.state = getInitialRouterState();
+      router.notify();
     },
     startedLoadingAt: Date.now(),
     subscribe: listener => {
@@ -1754,13 +1710,39 @@ function createRouter(userOptions) {
       return router.routesById[id];
     },
     notify: () => {
-      router.state = _extends({}, router.state, {
-        isFetching: router.state.status === 'loading' || router.state.matches.some(d => d.isFetching),
-        isPreloading: Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId))
-      });
+      const isFetching = router.state.status === 'loading' || router.state.matches.some(d => d.isFetching);
+      const isPreloading = Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId));
+
+      if (router.state.isFetching !== isFetching || router.state.isPreloading !== isPreloading) {
+        router.state = _extends({}, router.state, {
+          isFetching,
+          isPreloading
+        });
+      }
+
       cascadeLoaderData(router.state.matches);
       router.listeners.forEach(listener => listener(router));
     },
+    dehydrateState: () => {
+      return _extends({}, pick(router.state, ['status', 'location', 'lastUpdated']), {
+        matches: router.state.matches.map(match => pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
+      });
+    },
+    hydrateState: dehydratedState => {
+      // Match the routes
+      const matches = router.matchRoutes(router.location.pathname, {
+        strictParseParams: true
+      });
+      matches.forEach((match, index) => {
+        const dehydratedMatch = dehydratedState.matches[index];
+        invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
+        Object.assign(match, dehydratedMatch);
+      });
+      matches.forEach(match => match.__.validate());
+      router.state = _extends({}, router.state, dehydratedState, {
+        matches
+      });
+    },
     mount: () => {
       const next = router.__.buildLocation({
         to: '.',
@@ -1772,12 +1754,14 @@ function createRouter(userOptions) {
 
       if (next.href !== router.location.href) {
         router.__.commitLocation(next, true);
-      } else {
-        router.loadLocation();
       }
 
-      const unsub = history.listen(event => {
-        router.loadLocation(router.__.parseLocation(event.location, router.location));
+      if (!router.state.matches.length) {
+        router.load();
+      }
+
+      const unsub = router.history.listen(event => {
+        router.load(router.__.parseLocation(event.location, router.location));
       }); // addEventListener does not exist in React Native, but window does
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 
@@ -1788,16 +1772,30 @@ function createRouter(userOptions) {
       }
 
       return () => {
-        unsub(); // Be sure to unsubscribe if a new handler is set
+        unsub();
 
-        window.removeEventListener('visibilitychange', router.onFocus);
-        window.removeEventListener('focus', router.onFocus);
+        if (!isServer && window.removeEventListener) {
+          // Be sure to unsubscribe if a new handler is set
+          window.removeEventListener('visibilitychange', router.onFocus);
+          window.removeEventListener('focus', router.onFocus);
+        }
       };
     },
     onFocus: () => {
-      router.loadLocation();
+      router.load();
     },
     update: opts => {
+      const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
+
+      if (!router.location || newHistory) {
+        if (opts != null && opts.history) {
+          router.history = opts.history;
+        }
+
+        router.location = router.__.parseLocation(router.history.location);
+        router.state.location = router.location;
+      }
+
       Object.assign(router.options, opts);
       const {
         basepath,
@@ -1818,49 +1816,41 @@ function createRouter(userOptions) {
         match.cancel();
       });
     },
-    loadLocation: async next => {
+    load: async next => {
       const id = Math.random();
       router.startedLoadingAt = id;
 
       if (next) {
         // Ingest the new location
         router.location = next;
-      } // Clear out old actions
+      } // Cancel any pending matches
 
 
-      router.removeActionQueue.forEach(_ref => {
-        let {
-          action,
-          actionState
-        } = _ref;
-
-        if (router.state.currentAction === actionState) {
-          router.state.currentAction = undefined;
-        }
-
-        if (action.current === actionState) {
-          action.current = undefined;
-        }
-      });
-      router.removeActionQueue = []; // Cancel any pending matches
-
       router.cancelMatches(); // Match the routes
 
-      const matches = router.matchRoutes(location.pathname, {
+      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
@@ -1877,9 +1867,12 @@ 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 _ref2, _d$options$loaderGcMa, _ref3, _d$options$loaderMaxA;
+        var _ref, _d$options$loaderGcMa, _ref2, _d$options$loaderMaxA;
 
         d.__.onExit == null ? void 0 : d.__.onExit({
           params: d.params,
@@ -1891,7 +1884,7 @@ function createRouter(userOptions) {
           d.error = undefined;
         }
 
-        const gc = Math.max((_ref2 = (_d$options$loaderGcMa = d.options.loaderGcMaxAge) != null ? _d$options$loaderGcMa : router.options.defaultLoaderGcMaxAge) != null ? _ref2 : 0, (_ref3 = (_d$options$loaderMaxA = d.options.loaderMaxAge) != null ? _d$options$loaderMaxA : router.options.defaultLoaderMaxAge) != null ? _ref3 : 0);
+        const gc = Math.max((_ref = (_d$options$loaderGcMa = d.options.loaderGcMaxAge) != null ? _d$options$loaderGcMa : router.options.defaultLoaderGcMaxAge) != null ? _ref : 0, (_ref2 = (_d$options$loaderMaxA = d.options.loaderMaxAge) != null ? _d$options$loaderMaxA : router.options.defaultLoaderMaxAge) != null ? _ref2 : 0);
 
         if (gc > 0) {
           router.matchCache[d.matchId] = {
@@ -1906,9 +1899,6 @@ 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,
@@ -1917,16 +1907,18 @@ function createRouter(userOptions) {
         delete router.matchCache[d.matchId];
       });
 
-      if (matches.some(d => d.status === 'loading')) {
-        router.notify();
-        await Promise.all(matches.map(d => d.__.loaderPromise || Promise.resolve()));
-      }
-
       if (router.startedLoadingAt !== id) {
         // Ignore side-effects of match loading
         return;
       }
 
+      matches.forEach(match => {
+        // Clear actions
+        if (match.action) {
+          match.action.current = undefined;
+          match.action.submissions = [];
+        }
+      });
       router.state = _extends({}, router.state, {
         location: router.location,
         matches,
@@ -1967,7 +1959,7 @@ function createRouter(userOptions) {
       return matches;
     },
     preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
-      var _ref4, _ref5, _loaderOpts$maxAge, _ref6, _ref7, _loaderOpts$gcMaxAge;
+      var _ref3, _ref4, _loaderOpts$maxAge, _ref5, _ref6, _loaderOpts$gcMaxAge;
 
       if (navigateOpts === void 0) {
         navigateOpts = router.location;
@@ -1979,8 +1971,8 @@ function createRouter(userOptions) {
       });
       await router.loadMatches(matches, {
         preload: true,
-        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
+        maxAge: (_ref3 = (_ref4 = (_loaderOpts$maxAge = loaderOpts.maxAge) != null ? _loaderOpts$maxAge : router.options.defaultPreloadMaxAge) != null ? _ref4 : router.options.defaultLoaderMaxAge) != null ? _ref3 : 0,
+        gcMaxAge: (_ref5 = (_ref6 = (_loaderOpts$gcMaxAge = loaderOpts.gcMaxAge) != null ? _loaderOpts$gcMaxAge : router.options.defaultPreloadGcMaxAge) != null ? _ref6 : router.options.defaultLoaderGcMaxAge) != null ? _ref5 : 0
       });
       return matches;
     },
@@ -2056,6 +2048,7 @@ function createRouter(userOptions) {
           const interpolatedPath = interpolatePath(foundRoute.routePath, params);
           const matchId = interpolatePath(foundRoute.routeId, params, true);
           const match = existingMatches.find(d => d.matchId === matchId) || ((_router$matchCache$ma = router.matchCache[matchId]) == null ? void 0 : _router$matchCache$ma.match) || createRouteMatch(router, foundRoute, {
+            parentMatch,
             matchId,
             params,
             pathname: joinPaths([pathname, interpolatedPath])
@@ -2079,18 +2072,51 @@ function createRouter(userOptions) {
         match.__.validate();
 
         match.load(loaderOpts);
+        const search = match.search;
 
-        if (match.status === 'loading') {
-          // If requested, start the pending timers
-          if (loaderOpts != null && loaderOpts.withPending) match.__.startPending(); // Wait for the first sign of activity from the match
-          // This might be completion, error, or a pending state
+        if (search.__data && search.__data.matchId !== match.matchId) {
+          return;
+        }
 
+        if (match.__.loadPromise) {
+          // Wait for the first sign of activity from the match
           await match.__.loadPromise;
         }
       });
       router.notify();
       await Promise.all(matchPromises);
     },
+    loadMatchData: async routeMatch => {
+      if (isServer || !router.options.useServerData) {
+        var _await$routeMatch$opt;
+
+        return (_await$routeMatch$opt = await (routeMatch.options.loader == null ? void 0 : routeMatch.options.loader({
+          // parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,
+          params: routeMatch.params,
+          search: routeMatch.routeSearch,
+          signal: routeMatch.__.abortController.signal
+        }))) != null ? _await$routeMatch$opt : {};
+      } else {
+        const next = router.buildNext({
+          to: '.',
+          search: d => _extends({}, d != null ? d : {}, {
+            __data: {
+              matchId: routeMatch.matchId
+            }
+          })
+        });
+        const res = await fetch(next.href, {
+          method: 'GET' // signal: routeMatch.__.abortController.signal,
+
+        });
+
+        if (res.ok) {
+          return res.json();
+        }
+
+        throw new Error('Failed to fetch match data');
+      }
+    },
     invalidateRoute: opts => {
       var _router$state$pending5, _router$state$pending6;
 
@@ -2135,7 +2161,7 @@ function createRouter(userOptions) {
         to: next.pathname
       }));
     },
-    navigate: async _ref8 => {
+    navigate: async _ref7 => {
       let {
         from,
         to = '.',
@@ -2143,7 +2169,7 @@ function createRouter(userOptions) {
         hash,
         replace,
         params
-      } = _ref8;
+      } = _ref7;
       // 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
@@ -2167,8 +2193,8 @@ function createRouter(userOptions) {
         params
       });
     },
-    buildLink: _ref9 => {
-      var _preload, _ref10;
+    buildLink: _ref8 => {
+      var _preload, _ref9;
 
       let {
         from,
@@ -2184,7 +2210,7 @@ function createRouter(userOptions) {
         preloadGcMaxAge: userPreloadGcMaxAge,
         preloadDelay: userPreloadDelay,
         disabled
-      } = _ref9;
+      } = _ref8;
 
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
@@ -2208,7 +2234,7 @@ function createRouter(userOptions) {
       };
       const next = router.buildNext(nextOpts);
       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 preloadDelay = (_ref9 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultPreloadDelay) != null ? _ref9 : 0; // Compare path/hash for matches
 
       const pathIsEqual = router.state.location.pathname === next.pathname;
       const currentPathSplit = router.state.location.pathname.split('/');
@@ -2309,11 +2335,7 @@ function createRouter(userOptions) {
         const recurseRoutes = (routeConfigs, parent) => {
           return routeConfigs.map(routeConfig => {
             const routeOptions = routeConfig.options;
-            const route = createRoute(routeConfig, routeOptions, parent, router); // {
-            //   pendingMs: routeOptions.pendingMs ?? router.defaultPendingMs,
-            //   pendingMinMs: routeOptions.pendingMinMs ?? router.defaultPendingMinMs,
-            // }
-
+            const route = createRoute(routeConfig, routeOptions, parent, router);
             const existingRoute = router.routesById[route.routeId];
 
             if (existingRoute) {
@@ -2423,9 +2445,9 @@ function createRouter(userOptions) {
             pathname: next.pathname,
             hash: next.hash,
             search: next.searchStr
-          }, {
+          }, _extends({
             id
-          });
+          }, next.state));
         } else {
           history.push({
             pathname: next.pathname,
@@ -2448,8 +2470,6 @@ function createRouter(userOptions) {
       }
     }
   };
-  router.location = router.__.parseLocation(history.location);
-  router.state.location = router.location;
   router.update(userOptions); // Allow frameworks to hook into the router creation
 
   router.options.createRouter == null ? void 0 : router.options.createRouter(router);
@@ -2460,7 +2480,16 @@ function isCtrlEvent(e) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
 
-exports.cascadeLoaderData = cascadeLoaderData;
+function cascadeLoaderData(matches) {
+  matches.forEach((match, index) => {
+    const parent = matches[index - 1];
+
+    if (parent) {
+      match.loaderData = replaceEqualDeep(match.loaderData, _extends({}, parent.loaderData, match.routeLoaderData));
+    }
+  });
+}
+
 exports.cleanPath = cleanPath;
 exports.createBrowserHistory = createBrowserHistory;
 exports.createHashHistory = createHashHistory;
@@ -2482,6 +2511,7 @@ exports.matchByPath = matchByPath;
 exports.matchPathname = matchPathname;
 exports.parsePathname = parsePathname;
 exports.parseSearchWith = parseSearchWith;
+exports.pick = pick;
 exports.replaceEqualDeep = replaceEqualDeep;
 exports.resolvePath = resolvePath;
 exports.rootRouteId = rootRouteId;