@tanstack/react-router 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-25","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"c4e0-27"},{"name":"react-router/src/index.tsx","uid":"c4e0-29"}]}]}],"isRoot":true},"nodeParts":{"c4e0-25":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"c4e0-24"},"c4e0-27":{"renderedLength":69609,"gzipLength":14467,"brotliLength":0,"mainUid":"c4e0-26"},"c4e0-29":{"renderedLength":11456,"gzipLength":2963,"brotliLength":0,"mainUid":"c4e0-28"}},"nodeMetas":{"c4e0-24":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"c4e0-25"},"imported":[],"importedBy":[{"uid":"c4e0-28"}]},"c4e0-26":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"c4e0-27"},"imported":[],"importedBy":[{"uid":"c4e0-28"}]},"c4e0-28":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"c4e0-29"},"imported":[{"uid":"c4e0-24"},{"uid":"c4e0-30"},{"uid":"c4e0-31"},{"uid":"c4e0-26"}],"importedBy":[],"isEntry":true},"c4e0-30":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"c4e0-28"}],"isExternal":true},"c4e0-31":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"c4e0-28"}],"isExternal":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-25","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"19e6-27"},{"name":"react-router/src/index.tsx","uid":"19e6-29"}]}]}],"isRoot":true},"nodeParts":{"19e6-25":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"19e6-24"},"19e6-27":{"renderedLength":69986,"gzipLength":14566,"brotliLength":0,"mainUid":"19e6-26"},"19e6-29":{"renderedLength":11513,"gzipLength":2992,"brotliLength":0,"mainUid":"19e6-28"}},"nodeMetas":{"19e6-24":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"19e6-25"},"imported":[],"importedBy":[{"uid":"19e6-28"}]},"19e6-26":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"19e6-27"},"imported":[],"importedBy":[{"uid":"19e6-28"}]},"19e6-28":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"19e6-29"},"imported":[{"uid":"19e6-24"},{"uid":"19e6-30"},{"uid":"19e6-31"},{"uid":"19e6-26"}],"importedBy":[],"isEntry":true},"19e6-30":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"19e6-28"}],"isExternal":true},"19e6-31":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"19e6-28"}],"isExternal":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-33",
+            "uid": "19e6-33",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,11 +15,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "c4e0-35"
+                "uid": "19e6-35"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "c4e0-37"
+                "uid": "19e6-37"
               }
             ]
           }
@@ -29,90 +29,90 @@
     "isRoot": true
   },
   "nodeParts": {
-    "c4e0-33": {
+    "19e6-33": {
       "renderedLength": 798,
       "gzipLength": 366,
       "brotliLength": 0,
-      "mainUid": "c4e0-32"
+      "mainUid": "19e6-32"
     },
-    "c4e0-35": {
-      "renderedLength": 69609,
-      "gzipLength": 14467,
+    "19e6-35": {
+      "renderedLength": 69986,
+      "gzipLength": 14566,
       "brotliLength": 0,
-      "mainUid": "c4e0-34"
+      "mainUid": "19e6-34"
     },
-    "c4e0-37": {
-      "renderedLength": 11456,
-      "gzipLength": 2963,
+    "19e6-37": {
+      "renderedLength": 11513,
+      "gzipLength": 2992,
       "brotliLength": 0,
-      "mainUid": "c4e0-36"
+      "mainUid": "19e6-36"
     }
   },
   "nodeMetas": {
-    "c4e0-32": {
+    "19e6-32": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "c4e0-33"
+        "index.production.js": "19e6-33"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-36"
+          "uid": "19e6-36"
         }
       ]
     },
-    "c4e0-34": {
+    "19e6-34": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "c4e0-35"
+        "index.production.js": "19e6-35"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-36"
+          "uid": "19e6-36"
         }
       ]
     },
-    "c4e0-36": {
+    "19e6-36": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "c4e0-37"
+        "index.production.js": "19e6-37"
       },
       "imported": [
         {
-          "uid": "c4e0-32"
+          "uid": "19e6-32"
         },
         {
-          "uid": "c4e0-38"
+          "uid": "19e6-38"
         },
         {
-          "uid": "c4e0-39"
+          "uid": "19e6-39"
         },
         {
-          "uid": "c4e0-34"
+          "uid": "19e6-34"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "c4e0-38": {
+    "19e6-38": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-36"
+          "uid": "19e6-36"
         }
       ],
       "isExternal": true
     },
-    "c4e0-39": {
+    "19e6-39": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "c4e0-36"
+          "uid": "19e6-36"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -65,13 +65,9 @@ declare type RouterProps<TRouteConfig extends AnyRouteConfig = RouteConfig, TAll
     children?: React.ReactNode;
 };
 declare function RouterProvider<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo>({ children, router, ...rest }: RouterProps<TRouteConfig, TAllRouteInfo>): JSX.Element;
-declare function useRouter(): Router;
-declare function useMatches(): RouteMatch[];
-declare function useParentMatches(): RouteMatch[];
-declare function useMatch<T>(): RouteMatch;
 declare function Outlet(): JSX.Element | null;
 declare function DefaultCatchBoundary({ error }: {
     error: any;
 }): JSX.Element;
 
-export { DefaultCatchBoundary, MatchesProvider, MatchesProviderProps, Outlet, PromptProps, RouterProps, RouterProvider, createReactRouter, useMatch, useMatches, useParentMatches, useRouter };
+export { DefaultCatchBoundary, MatchesProvider, MatchesProviderProps, Outlet, PromptProps, RouterProps, RouterProvider, createReactRouter };

package/build/umd/index.development.js

@@ -1029,6 +1029,7 @@
     let router = {
       options: originalOptions,
       listeners: [],
+      removeActionQueue: [],
       // Resolved after construction
       basepath: '',
       routeTree: undefined,
@@ -1152,12 +1153,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));
           });
         }
 
@@ -1262,20 +1265,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,
@@ -1456,6 +1469,7 @@
         };
 
         recurse([router.routeTree]);
+        cascadeLoaderData(matches);
         return matches;
       },
       loadMatches: async (resolvedMatches, loaderOpts) => {
@@ -1493,7 +1507,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();
           }
         });
       },
@@ -1534,14 +1548,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
@@ -1560,11 +1575,13 @@
           from: fromString,
           to: toString,
           search,
-          hash
+          hash,
+          replace,
+          params
         });
       },
-      buildLink: _ref2 => {
-        var _preload, _ref3, _ref4;
+      buildLink: _ref3 => {
+        var _preload, _ref4, _ref5;
 
         let {
           from,
@@ -1579,7 +1596,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
@@ -1603,8 +1620,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('/');
@@ -1678,11 +1695,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
@@ -1732,10 +1749,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();
 
@@ -1759,11 +1778,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();
           }
         }
@@ -1850,16 +1868,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;
 
@@ -1896,6 +1915,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
@@ -1963,7 +1985,6 @@
                 }
 
                 routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-                cascadeLoaderData(routeMatch);
                 routeMatch.error = undefined;
                 routeMatch.status = 'success';
                 routeMatch.updatedAt = Date.now();
@@ -2023,16 +2044,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) {
@@ -2564,29 +2583,33 @@
       value: router.state.matches
     }, children != null ? children : /*#__PURE__*/React__namespace.createElement(Outlet, null)));
   }
+
   function useRouter() {
     const value = React__namespace.useContext(routerContext);
     warning(!value, 'useRouter must be used inside a <Router> component!');
     useRouterSubscription(value.router);
     return value.router;
   }
+
   function useMatches() {
     return React__namespace.useContext(matchesContext);
-  }
-  function useParentMatches() {
-    const router = useRouter();
-
-    const match = _useMatch();
+  } // function useParentMatches(): RouteMatch[] {
+  //   const router = useRouter()
+  //   const match = useMatch()
+  //   const matches = router.state.matches
+  //   return matches.slice(
+  //     0,
+  //     matches.findIndex((d) => d.matchId === match.matchId) - 1,
+  //   )
+  // }
 
-    const matches = router.state.matches;
-    return matches.slice(0, matches.findIndex(d => d.matchId === match.matchId) - 1);
-  }
 
   function _useMatch() {
     var _useMatches;
 
     return (_useMatches = useMatches()) == null ? void 0 : _useMatches[0];
   }
+
   function Outlet() {
     var _ref3, _childMatch$options$c;
 
@@ -2745,10 +2768,6 @@
   exports.resolvePath = _resolvePath;
   exports.rootRouteId = rootRouteId;
   exports.stringifySearchWith = stringifySearchWith;
-  exports.useMatch = _useMatch;
-  exports.useMatches = useMatches;
-  exports.useParentMatches = useParentMatches;
-  exports.useRouter = useRouter;
   exports.warning = warning;
 
   Object.defineProperty(exports, '__esModule', { value: true });