@tanstack/react-router 0.0.1-alpha.4 → 0.0.1-alpha.5

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

@@ -982,6 +982,7 @@ function createRouter(userOptions) {
   let router = {
     options: originalOptions,
     listeners: [],
+    removeActionQueue: [],
     // Resolved after construction
     basepath: '',
     routeTree: undefined,
@@ -1105,12 +1106,14 @@ function createRouter(userOptions) {
         strictParseParams: true
       });
       const toMatches = router.matchRoutes(pathname);
-      const prevParams = (_last = last(fromMatches)) == null ? void 0 : _last.params;
+
+      const prevParams = _extends$1({}, (_last = last(fromMatches)) == null ? void 0 : _last.params);
+
       let nextParams = ((_dest$params = dest.params) != null ? _dest$params : true) === true ? prevParams : functionalUpdate(dest.params, prevParams);
 
       if (nextParams) {
         toMatches.map(d => d.options.stringifyParams).filter(Boolean).forEach(fn => {
-          Object.assign(nextParams, fn(nextParams));
+          Object.assign({}, nextParams, fn(nextParams));
         });
       }
 
@@ -1213,22 +1216,33 @@ function createRouter(userOptions) {
       router.startedLoadingAt = id;
 
       if (next) {
+        // If the location.href has changed
         // Ingest the new location
         router.location = next;
-      } // Cancel any pending matches
+      } // Clear out old actions
 
 
+      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 unloadedMatches = router.matchRoutes(location.pathname, {
         strictParseParams: true
       });
-      unloadedMatches.forEach((match, index) => {
-        const parent = unloadedMatches[index - 1];
-        const child = unloadedMatches[index + 1];
-        if (parent) match.__.setParentMatch(parent);
-        if (child) match.__.addChildMatch(child);
-      });
       router.state = _extends$1({}, router.state, {
         pending: {
           matches: unloadedMatches,
@@ -1409,6 +1423,7 @@ function createRouter(userOptions) {
       };
 
       recurse([router.routeTree]);
+      cascadeLoaderData(matches);
       return matches;
     },
     loadMatches: async (resolvedMatches, loaderOpts) => {
@@ -1487,14 +1502,14 @@ function createRouter(userOptions) {
       const next = router.buildNext(location);
       return router.commitLocation(next, location.replace);
     },
-    navigate: async _ref => {
+    navigate: async _ref2 => {
       let {
         from,
         to = '.',
         search,
         hash,
         replace
-      } = _ref;
+      } = _ref2;
       // 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
@@ -1516,8 +1531,8 @@ function createRouter(userOptions) {
         hash
       });
     },
-    buildLink: _ref2 => {
-      var _preload, _ref3, _ref4;
+    buildLink: _ref3 => {
+      var _preload, _ref4, _ref5;
 
       let {
         from,
@@ -1532,7 +1547,7 @@ function createRouter(userOptions) {
         preloadMaxAge: userPreloadMaxAge,
         preloadDelay: userPreloadDelay,
         disabled
-      } = _ref2;
+      } = _ref3;
 
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
@@ -1556,8 +1571,8 @@ function createRouter(userOptions) {
       };
       const next = router.buildNext(nextOpts);
       preload = (_preload = preload) != null ? _preload : router.options.defaultLinkPreload;
-      const preloadMaxAge = (_ref3 = userPreloadMaxAge != null ? userPreloadMaxAge : router.options.defaultLinkPreloadMaxAge) != null ? _ref3 : 2000;
-      const preloadDelay = (_ref4 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultLinkPreloadDelay) != null ? _ref4 : 50; // Compare path/hash for matches
+      const preloadMaxAge = (_ref4 = userPreloadMaxAge != null ? userPreloadMaxAge : router.options.defaultLinkPreloadMaxAge) != null ? _ref4 : 2000;
+      const preloadDelay = (_ref5 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultLinkPreloadDelay) != null ? _ref5 : 50; // Compare path/hash for matches
 
       const pathIsEqual = router.state.location.pathname === next.pathname;
       const currentPathSplit = router.state.location.pathname.split('/');
@@ -1631,11 +1646,11 @@ function createRouter(userOptions) {
     },
     __experimental__createSnapshot: () => {
       return _extends$1({}, router.state, {
-        matches: router.state.matches.map(_ref5 => {
+        matches: router.state.matches.map(_ref6 => {
           let {
             routeLoaderData: loaderData,
             matchId
-          } = _ref5;
+          } = _ref6;
           return {
             matchId,
             loaderData
@@ -1685,10 +1700,12 @@ function createRoute(routeConfig, options, parent, router) {
           status: 'pending',
           submission
         };
+        action.current = actionState;
         action.latest = actionState;
         action.pending.push(actionState);
         router.state = _extends$1({}, router.state, {
-          action: actionState
+          currentAction: actionState,
+          latestAction: actionState
         });
         router.notify();
 
@@ -1712,11 +1729,10 @@ function createRoute(routeConfig, options, parent, router) {
           actionState.status = 'error';
         } finally {
           action.pending = action.pending.filter(d => d !== actionState);
-
-          if (actionState === router.state.action) {
-            router.state.action = undefined;
-          }
-
+          router.removeActionQueue.push({
+            action,
+            actionState
+          });
           router.notify();
         }
       }
@@ -1803,16 +1819,17 @@ function createRouteMatch(router, route, opts) {
         clearTimeout(routeMatch.__.pendingMinTimeout);
         delete routeMatch.__.pendingMinPromise;
       },
-      setParentMatch: parentMatch => {
-        routeMatch.parentMatch = parentMatch;
-      },
-      addChildMatch: childMatch => {
-        if (routeMatch.childMatches.find(d => d.matchId === childMatch.matchId)) {
-          return;
-        }
-
-        routeMatch.childMatches.push(childMatch);
-      },
+      // 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;
 
@@ -1916,7 +1933,6 @@ function createRouteMatch(router, route, opts) {
               }
 
               routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-              cascadeLoaderData(routeMatch);
               routeMatch.error = undefined;
               routeMatch.status = 'success';
               routeMatch.updatedAt = Date.now();
@@ -1976,16 +1992,14 @@ function createRouteMatch(router, route, opts) {
   return routeMatch;
 }
 
-function cascadeLoaderData(routeMatch) {
-  if (routeMatch.parentMatch) {
-    routeMatch.loaderData = replaceEqualDeep(routeMatch.loaderData, _extends$1({}, routeMatch.parentMatch.loaderData, routeMatch.routeLoaderData));
-  }
+function cascadeLoaderData(matches) {
+  matches.forEach((match, index) => {
+    const parent = matches[index - 1];
 
-  if (routeMatch.childMatches.length) {
-    routeMatch.childMatches.forEach(childMatch => {
-      cascadeLoaderData(childMatch);
-    });
-  }
+    if (parent) {
+      match.loaderData = replaceEqualDeep(match.loaderData, _extends$1({}, parent.loaderData, match.routeLoaderData));
+    }
+  });
 }
 
 function matchPathname(currentPathname, matchLocation) {