@tanstack/router-core 0.0.1-alpha.4 → 0.0.1-alpha.6

package/build/stats-html.html

@@ -4014,7 +4014,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"c4e0-1","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"node_modules","children":[{"name":"@babel/runtime/helpers/esm/extends.js","uid":"c4e0-3"},{"name":"history/index.js","uid":"c4e0-5"},{"name":"tiny-invariant/dist/esm/tiny-invariant.js","uid":"c4e0-7"}]},{"name":"packages/router-core/src","children":[{"uid":"c4e0-9","name":"qss.ts"},{"uid":"c4e0-11","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"c4e0-1":{"renderedLength":437,"gzipLength":243,"brotliLength":0,"mainUid":"c4e0-0"},"c4e0-3":{"renderedLength":431,"gzipLength":240,"brotliLength":0,"mainUid":"c4e0-2"},"c4e0-5":{"renderedLength":20618,"gzipLength":3797,"brotliLength":0,"mainUid":"c4e0-4"},"c4e0-7":{"renderedLength":181,"gzipLength":129,"brotliLength":0,"mainUid":"c4e0-6"},"c4e0-9":{"renderedLength":1241,"gzipLength":523,"brotliLength":0,"mainUid":"c4e0-8"},"c4e0-11":{"renderedLength":46465,"gzipLength":10249,"brotliLength":0,"mainUid":"c4e0-10"}},"nodeMetas":{"c4e0-0":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"c4e0-1"},"imported":[],"importedBy":[{"uid":"c4e0-10"}]},"c4e0-2":{"id":"/node_modules/@babel/runtime/helpers/esm/extends.js","moduleParts":{"index.production.js":"c4e0-3"},"imported":[],"importedBy":[{"uid":"c4e0-4"}]},"c4e0-4":{"id":"/node_modules/history/index.js","moduleParts":{"index.production.js":"c4e0-5"},"imported":[{"uid":"c4e0-2"}],"importedBy":[{"uid":"c4e0-10"}]},"c4e0-6":{"id":"/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","moduleParts":{"index.production.js":"c4e0-7"},"imported":[],"importedBy":[{"uid":"c4e0-10"}]},"c4e0-8":{"id":"/packages/router-core/src/qss.ts","moduleParts":{"index.production.js":"c4e0-9"},"imported":[],"importedBy":[{"uid":"c4e0-10"}]},"c4e0-10":{"id":"/packages/router-core/src/index.ts","moduleParts":{"index.production.js":"c4e0-11"},"imported":[{"uid":"c4e0-0"},{"uid":"c4e0-4"},{"uid":"c4e0-6"},{"uid":"c4e0-8"}],"importedBy":[],"isEntry":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"19e6-1","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"node_modules","children":[{"name":"@babel/runtime/helpers/esm/extends.js","uid":"19e6-3"},{"name":"history/index.js","uid":"19e6-5"},{"name":"tiny-invariant/dist/esm/tiny-invariant.js","uid":"19e6-7"}]},{"name":"packages/router-core/src","children":[{"uid":"19e6-9","name":"qss.ts"},{"uid":"19e6-11","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"19e6-1":{"renderedLength":437,"gzipLength":243,"brotliLength":0,"mainUid":"19e6-0"},"19e6-3":{"renderedLength":431,"gzipLength":240,"brotliLength":0,"mainUid":"19e6-2"},"19e6-5":{"renderedLength":20618,"gzipLength":3797,"brotliLength":0,"mainUid":"19e6-4"},"19e6-7":{"renderedLength":181,"gzipLength":129,"brotliLength":0,"mainUid":"19e6-6"},"19e6-9":{"renderedLength":1241,"gzipLength":523,"brotliLength":0,"mainUid":"19e6-8"},"19e6-11":{"renderedLength":46842,"gzipLength":10342,"brotliLength":0,"mainUid":"19e6-10"}},"nodeMetas":{"19e6-0":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"19e6-1"},"imported":[],"importedBy":[{"uid":"19e6-10"}]},"19e6-2":{"id":"/node_modules/@babel/runtime/helpers/esm/extends.js","moduleParts":{"index.production.js":"19e6-3"},"imported":[],"importedBy":[{"uid":"19e6-4"}]},"19e6-4":{"id":"/node_modules/history/index.js","moduleParts":{"index.production.js":"19e6-5"},"imported":[{"uid":"19e6-2"}],"importedBy":[{"uid":"19e6-10"}]},"19e6-6":{"id":"/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","moduleParts":{"index.production.js":"19e6-7"},"imported":[],"importedBy":[{"uid":"19e6-10"}]},"19e6-8":{"id":"/packages/router-core/src/qss.ts","moduleParts":{"index.production.js":"19e6-9"},"imported":[],"importedBy":[{"uid":"19e6-10"}]},"19e6-10":{"id":"/packages/router-core/src/index.ts","moduleParts":{"index.production.js":"19e6-11"},"imported":[{"uid":"19e6-0"},{"uid":"19e6-4"},{"uid":"19e6-6"},{"uid":"19e6-8"}],"importedBy":[],"isEntry":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "c4e0-13",
+            "uid": "19e6-13",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,15 +15,15 @@
             "children": [
               {
                 "name": "@babel/runtime/helpers/esm/extends.js",
-                "uid": "c4e0-15"
+                "uid": "19e6-15"
               },
               {
                 "name": "history/index.js",
-                "uid": "c4e0-17"
+                "uid": "19e6-17"
               },
               {
                 "name": "tiny-invariant/dist/esm/tiny-invariant.js",
-                "uid": "c4e0-19"
+                "uid": "19e6-19"
               }
             ]
           },
@@ -31,11 +31,11 @@
             "name": "packages/router-core/src",
             "children": [
               {
-                "uid": "c4e0-21",
+                "uid": "19e6-21",
                 "name": "qss.ts"
               },
               {
-                "uid": "c4e0-23",
+                "uid": "19e6-23",
                 "name": "index.ts"
               }
             ]
@@ -46,125 +46,125 @@
     "isRoot": true
   },
   "nodeParts": {
-    "c4e0-13": {
+    "19e6-13": {
       "renderedLength": 437,
       "gzipLength": 243,
       "brotliLength": 0,
-      "mainUid": "c4e0-12"
+      "mainUid": "19e6-12"
     },
-    "c4e0-15": {
+    "19e6-15": {
       "renderedLength": 431,
       "gzipLength": 240,
       "brotliLength": 0,
-      "mainUid": "c4e0-14"
+      "mainUid": "19e6-14"
     },
-    "c4e0-17": {
+    "19e6-17": {
       "renderedLength": 20618,
       "gzipLength": 3797,
       "brotliLength": 0,
-      "mainUid": "c4e0-16"
+      "mainUid": "19e6-16"
     },
-    "c4e0-19": {
+    "19e6-19": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "c4e0-18"
+      "mainUid": "19e6-18"
     },
-    "c4e0-21": {
+    "19e6-21": {
       "renderedLength": 1241,
       "gzipLength": 523,
       "brotliLength": 0,
-      "mainUid": "c4e0-20"
+      "mainUid": "19e6-20"
     },
-    "c4e0-23": {
-      "renderedLength": 46465,
-      "gzipLength": 10249,
+    "19e6-23": {
+      "renderedLength": 46842,
+      "gzipLength": 10342,
       "brotliLength": 0,
-      "mainUid": "c4e0-22"
+      "mainUid": "19e6-22"
     }
   },
   "nodeMetas": {
-    "c4e0-12": {
+    "19e6-12": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "c4e0-13"
+        "index.production.js": "19e6-13"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-22"
+          "uid": "19e6-22"
         }
       ]
     },
-    "c4e0-14": {
+    "19e6-14": {
       "id": "/node_modules/@babel/runtime/helpers/esm/extends.js",
       "moduleParts": {
-        "index.production.js": "c4e0-15"
+        "index.production.js": "19e6-15"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-16"
+          "uid": "19e6-16"
         }
       ]
     },
-    "c4e0-16": {
+    "19e6-16": {
       "id": "/node_modules/history/index.js",
       "moduleParts": {
-        "index.production.js": "c4e0-17"
+        "index.production.js": "19e6-17"
       },
       "imported": [
         {
-          "uid": "c4e0-14"
+          "uid": "19e6-14"
         }
       ],
       "importedBy": [
         {
-          "uid": "c4e0-22"
+          "uid": "19e6-22"
         }
       ]
     },
-    "c4e0-18": {
+    "19e6-18": {
       "id": "/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "c4e0-19"
+        "index.production.js": "19e6-19"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-22"
+          "uid": "19e6-22"
         }
       ]
     },
-    "c4e0-20": {
+    "19e6-20": {
       "id": "/packages/router-core/src/qss.ts",
       "moduleParts": {
-        "index.production.js": "c4e0-21"
+        "index.production.js": "19e6-21"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-22"
+          "uid": "19e6-22"
         }
       ]
     },
-    "c4e0-22": {
+    "19e6-22": {
       "id": "/packages/router-core/src/index.ts",
       "moduleParts": {
-        "index.production.js": "c4e0-23"
+        "index.production.js": "19e6-23"
       },
       "imported": [
         {
-          "uid": "c4e0-12"
+          "uid": "19e6-12"
         },
         {
-          "uid": "c4e0-16"
+          "uid": "19e6-16"
         },
         {
-          "uid": "c4e0-18"
+          "uid": "19e6-18"
         },
         {
-          "uid": "c4e0-20"
+          "uid": "19e6-20"
         }
       ],
       "importedBy": [],

package/build/types/index.d.ts

@@ -231,7 +231,8 @@ interface RouterState {
     matches: RouteMatch[];
     lastUpdated: number;
     loaderData: unknown;
-    action?: ActionState;
+    currentAction?: ActionState;
+    latestAction?: ActionState;
     actions: Record<string, Action>;
     pending?: PendingState;
 }
@@ -318,7 +319,8 @@ interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
 }
 interface Action<TPayload = unknown, TResponse = unknown> {
     submit: (submission?: TPayload) => Promise<TResponse>;
-    latest?: ActionState;
+    current?: ActionState<TPayload, TResponse>;
+    latest?: ActionState<TPayload, TResponse>;
     pending: ActionState<TPayload, TResponse>[];
 }
 interface ActionState<TPayload = unknown, TResponse = unknown> {
@@ -344,6 +346,10 @@ interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInf
     routeTree: Route<TAllRouteInfo, RouteInfo>;
     routesById: RoutesById<TAllRouteInfo>;
     navigationPromise: Promise<void>;
+    removeActionQueue: {
+        action: Action;
+        actionState: ActionState;
+    }[];
     startedLoadingAt: number;
     destroy: () => void;
     resolveNavigation: () => void;
@@ -451,7 +457,9 @@ declare type SearchParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TT
 } : {
     search: SearchReducer<TFromSchema, TToSchema>;
 };
-declare type SearchReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo);
+declare type SearchReducer<TFrom, TTo> = {
+    [TKey in keyof TTo]: TTo[TKey];
+} | ((current: TFrom) => TTo);
 declare type PathParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo, TFromParams = RouteInfoByPath<TAllRouteInfo, TFrom>['allParams'], TToParams = RouteInfoByPath<TAllRouteInfo, TTo>['allParams']> = StartsWith<TFrom, TTo> extends true ? {
     params?: ParamsReducer<TFromParams, TToParams>;
 } : AnyPathParams extends TToParams ? {
@@ -495,8 +503,6 @@ interface RouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo
         }) => void);
         abortController: AbortController;
         latestId: string;
-        setParentMatch: (parentMatch: RouteMatch) => void;
-        addChildMatch: (childMatch: RouteMatch) => void;
         validate: () => void;
         startPending: () => void;
         cancelPending: () => void;
@@ -505,6 +511,7 @@ interface RouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo
     };
     cancel: () => void;
     load: () => Promise<void>;
+    invalidate: () => void;
 }
 declare function createRouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TRouteInfo extends AnyRouteInfo = RouteInfo>(router: Router<any, any>, route: Route<TAllRouteInfo, TRouteInfo>, opts: {
     matchId: string;

package/build/umd/index.development.js

@@ -968,6 +968,7 @@
     let router = {
       options: originalOptions,
       listeners: [],
+      removeActionQueue: [],
       // Resolved after construction
       basepath: '',
       routeTree: undefined,
@@ -1091,12 +1092,14 @@
           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));
           });
         }
 
@@ -1201,20 +1204,30 @@
         if (next) {
           // 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,
@@ -1395,6 +1408,7 @@
         };
 
         recurse([router.routeTree]);
+        cascadeLoaderData(matches);
         return matches;
       },
       loadMatches: async (resolvedMatches, loaderOpts) => {
@@ -1432,7 +1446,7 @@
         const unloadedMatchIds = router.matchRoutes(next.pathname).map(d => d.matchId);
         [...router.state.matches, ...((_router$state$pending5 = (_router$state$pending6 = router.state.pending) == null ? void 0 : _router$state$pending6.matches) != null ? _router$state$pending5 : [])].forEach(match => {
           if (unloadedMatchIds.includes(match.matchId)) {
-            match.isInvalid = true;
+            match.invalidate();
           }
         });
       },
@@ -1473,14 +1487,15 @@
         const next = router.buildNext(location);
         return router.commitLocation(next, location.replace);
       },
-      navigate: async _ref => {
+      navigate: async _ref2 => {
         let {
           from,
           to = '.',
           search,
           hash,
-          replace
-        } = _ref;
+          replace,
+          params
+        } = _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
@@ -1499,11 +1514,13 @@
           from: fromString,
           to: toString,
           search,
-          hash
+          hash,
+          replace,
+          params
         });
       },
-      buildLink: _ref2 => {
-        var _preload, _ref3, _ref4;
+      buildLink: _ref3 => {
+        var _preload, _ref4, _ref5;
 
         let {
           from,
@@ -1518,7 +1535,7 @@
           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
@@ -1542,8 +1559,8 @@
         };
         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('/');
@@ -1617,11 +1634,11 @@
       },
       __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
@@ -1671,10 +1688,12 @@
             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();
 
@@ -1698,11 +1717,10 @@
             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();
           }
         }
@@ -1789,16 +1807,17 @@
           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;
 
@@ -1835,6 +1854,9 @@
 
         routeMatch.__.cancelPending();
       },
+      invalidate: () => {
+        routeMatch.isInvalid = true;
+      },
       load: async () => {
         const id = '' + Date.now() + Math.random();
         routeMatch.__.latestId = id; // If the match was in an error state, set it
@@ -1902,7 +1924,6 @@
                 }
 
                 routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-                cascadeLoaderData(routeMatch);
                 routeMatch.error = undefined;
                 routeMatch.status = 'success';
                 routeMatch.updatedAt = Date.now();
@@ -1962,16 +1983,14 @@
     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) {