@tanstack/react-router 0.0.1-beta.157 → 0.0.1-beta.159

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "7589-167",
+            "uid": "3b6d-167",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,19 +15,19 @@
             "children": [
               {
                 "name": "store/build/esm/index.js",
-                "uid": "7589-169"
+                "uid": "3b6d-169"
               },
               {
                 "name": "react-store/build/esm/index.js",
-                "uid": "7589-171"
+                "uid": "3b6d-171"
               },
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "7589-177"
+                "uid": "3b6d-177"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "7589-179"
+                "uid": "3b6d-179"
               }
             ]
           },
@@ -36,11 +36,11 @@
             "children": [
               {
                 "name": "tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
-                "uid": "7589-173"
+                "uid": "3b6d-173"
               },
               {
                 "name": "tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
-                "uid": "7589-175"
+                "uid": "3b6d-175"
               }
             ]
           }
@@ -50,194 +50,194 @@
     "isRoot": true
   },
   "nodeParts": {
-    "7589-167": {
+    "3b6d-167": {
       "renderedLength": 429,
       "gzipLength": 238,
       "brotliLength": 0,
-      "mainUid": "7589-166"
+      "mainUid": "3b6d-166"
     },
-    "7589-169": {
+    "3b6d-169": {
       "renderedLength": 1843,
       "gzipLength": 644,
       "brotliLength": 0,
-      "mainUid": "7589-168"
+      "mainUid": "3b6d-168"
     },
-    "7589-171": {
+    "3b6d-171": {
       "renderedLength": 1006,
       "gzipLength": 479,
       "brotliLength": 0,
-      "mainUid": "7589-170"
+      "mainUid": "3b6d-170"
     },
-    "7589-173": {
+    "3b6d-173": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "7589-172"
+      "mainUid": "3b6d-172"
     },
-    "7589-175": {
+    "3b6d-175": {
       "renderedLength": 44,
       "gzipLength": 62,
       "brotliLength": 0,
-      "mainUid": "7589-174"
+      "mainUid": "3b6d-174"
     },
-    "7589-177": {
-      "renderedLength": 56618,
-      "gzipLength": 13404,
+    "3b6d-177": {
+      "renderedLength": 56305,
+      "gzipLength": 13276,
       "brotliLength": 0,
-      "mainUid": "7589-176"
+      "mainUid": "3b6d-176"
     },
-    "7589-179": {
+    "3b6d-179": {
       "renderedLength": 17095,
       "gzipLength": 3814,
       "brotliLength": 0,
-      "mainUid": "7589-178"
+      "mainUid": "3b6d-178"
     }
   },
   "nodeMetas": {
-    "7589-166": {
+    "3b6d-166": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "7589-167"
+        "index.production.js": "3b6d-167"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         }
       ]
     },
-    "7589-168": {
+    "3b6d-168": {
       "id": "/packages/store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "7589-169"
+        "index.production.js": "3b6d-169"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-170"
+          "uid": "3b6d-170"
         }
       ]
     },
-    "7589-170": {
+    "3b6d-170": {
       "id": "/packages/react-store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "7589-171"
+        "index.production.js": "3b6d-171"
       },
       "imported": [
         {
-          "uid": "7589-181"
+          "uid": "3b6d-181"
         },
         {
-          "uid": "7589-168"
+          "uid": "3b6d-168"
         }
       ],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         },
         {
-          "uid": "7589-176"
+          "uid": "3b6d-176"
         }
       ]
     },
-    "7589-172": {
+    "3b6d-172": {
       "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "7589-173"
+        "index.production.js": "3b6d-173"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         },
         {
-          "uid": "7589-176"
+          "uid": "3b6d-176"
         }
       ]
     },
-    "7589-174": {
+    "3b6d-174": {
       "id": "/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
       "moduleParts": {
-        "index.production.js": "7589-175"
+        "index.production.js": "3b6d-175"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         },
         {
-          "uid": "7589-176"
+          "uid": "3b6d-176"
         }
       ]
     },
-    "7589-176": {
+    "3b6d-176": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "7589-177"
+        "index.production.js": "3b6d-177"
       },
       "imported": [
         {
-          "uid": "7589-172"
+          "uid": "3b6d-172"
         },
         {
-          "uid": "7589-174"
+          "uid": "3b6d-174"
         },
         {
-          "uid": "7589-170"
+          "uid": "3b6d-170"
         }
       ],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         }
       ]
     },
-    "7589-178": {
+    "3b6d-178": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "7589-179"
+        "index.production.js": "3b6d-179"
       },
       "imported": [
         {
-          "uid": "7589-166"
+          "uid": "3b6d-166"
         },
         {
-          "uid": "7589-180"
+          "uid": "3b6d-180"
         },
         {
-          "uid": "7589-170"
+          "uid": "3b6d-170"
         },
         {
-          "uid": "7589-172"
+          "uid": "3b6d-172"
         },
         {
-          "uid": "7589-174"
+          "uid": "3b6d-174"
         },
         {
-          "uid": "7589-176"
+          "uid": "3b6d-176"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "7589-180": {
+    "3b6d-180": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-178"
+          "uid": "3b6d-178"
         }
       ],
       "isExternal": true
     },
-    "7589-181": {
+    "3b6d-181": {
       "id": "use-sync-external-store/shim/with-selector",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "7589-170"
+          "uid": "3b6d-170"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -8,11 +8,12 @@
  *
  * @license MIT
  */
+import * as _tanstack_router_core from '@tanstack/router-core';
+import { RouteConstraints, AnyRoute, ResolveFullPath, ResolveId, ResolveFullSearchSchema, ParsePathParams, MergeParamsFromParent, RouteContext, AnyContext, UseLoaderResult, AnyRouteProps, RoutePaths, RegisteredRouter, LinkOptions, ToOptions, MatchRouteOptions, RouteByPath, ResolveRelativePath, NavigateOptions, RouterOptions, Router, RouteMatch, RouteIds, RouteById, ParseRoute, RoutesById, AllParams } from '@tanstack/router-core';
+export * from '@tanstack/router-core';
 import * as React from 'react';
 import { NoInfer } from '@tanstack/react-store';
 export { useStore } from '@tanstack/react-store';
-import { RouteConstraints, AnyRoute, ResolveFullPath, ResolveId, ResolveFullSearchSchema, ParsePathParams, MergeParamsFromParent, RouteContext, AnyContext, UseLoaderResult, AnyRouteProps, RoutePaths, RegisteredRouter, LinkOptions, ToOptions, MatchRouteOptions, RouteByPath, ResolveRelativePath, NavigateOptions, Router, RouterOptions, RouteMatch, RouteIds, RouteById, ParseRoute, RoutesById, AllParams } from '@tanstack/router-core';
-export * from '@tanstack/router-core';
 
 declare module '@tanstack/router-core' {
     interface RegisterRouteComponent<TProps extends Record<string, any>> {
@@ -90,15 +91,15 @@ interface LinkComponent<TProps extends Record<string, any> = {}> {
 declare const Link: LinkComponent;
 declare function Navigate<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''>(props: NavigateOptions<RegisteredRouter['routeTree'], TFrom, TTo>): null;
 declare const matchIdsContext: React.Context<string[]>;
-declare const routerContext: React.Context<Router<AnyRoute, Record<string, any>>>;
-type RouterProps<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {
+declare const routerContext: React.Context<_tanstack_router_core.AnyRouter>;
+type RouterProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {
     router: Router<TRouteTree>;
     context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>;
 };
 declare function useRouterState<TSelected = RegisteredRouter['state']>(opts?: {
     select: (state: RegisteredRouter['state']) => TSelected;
 }): TSelected;
-declare function RouterProvider<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): JSX.Element;
+declare function RouterProvider<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): JSX.Element;
 declare function useRouter(): RegisteredRouter;
 declare function useMatches<T = RouteMatch[]>(opts?: {
     select?: (matches: RouteMatch[]) => T;
@@ -135,7 +136,7 @@ declare function useParams<TFrom extends RouteIds<RegisteredRouter['routeTree']>
 }): TSelected;
 declare function useNavigate<TDefaultFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/'>(defaultOpts?: {
     from?: TDefaultFrom;
-}): <TFrom extends unknown = TDefaultFrom, TTo extends string = "">(opts?: NavigateOptions<AnyRoute, TFrom, TTo> | undefined) => Promise<void>;
+}): <TFrom extends unknown = TDefaultFrom, TTo extends string = "">(opts?: NavigateOptions<any, TFrom, TTo> | undefined) => Promise<void>;
 declare function useMatchRoute(): <TFrom extends string = "/", TTo extends string = "">(opts: MakeUseMatchRouteOptions<TFrom, TTo>) => any;
 declare function MatchRoute<TFrom extends string = '/', TTo extends string = ''>(props: MakeMatchRouteOptions<TFrom, TTo>): any;
 declare function Outlet(): JSX.Element | null;

package/build/umd/index.development.js

@@ -1141,42 +1141,36 @@
         if (routeCursor) matchedRoutes.unshift(routeCursor);
       }
 
-      // Alright, by now we should have all of our
-      // matching routes and their param pairs, let's
-      // Turn them into actual `Match` objects and
-      // accumulate the params into a single params bag
-      let allParams = {};
-
       // Existing matches are matches that are already loaded along with
       // pending matches that are still loading
 
-      const matches = matchedRoutes.map(route => {
-        let parsedParams;
+      const parseErrors = matchedRoutes.map(route => {
         let parsedParamsError;
-        try {
-          parsedParams = route.options.parseParams?.(routeParams) ?? routeParams;
-          // (typeof route.options.parseParams === 'object' &&
-          // route.options.parseParams.parse
-          //   ? route.options.parseParams.parse(routeParams)
-          //   : (route.options.parseParams as any)?.(routeParams!)) ?? routeParams
-        } catch (err) {
-          parsedParamsError = new PathParamError(err.message, {
-            cause: err
-          });
-          if (opts?.throwOnError) {
-            throw parsedParamsError;
+        if (route.options.parseParams) {
+          try {
+            const parsedParams = route.options.parseParams(routeParams);
+            // Add the parsed params to the accumulated params bag
+            Object.assign(routeParams, parsedParams);
+          } catch (err) {
+            parsedParamsError = new PathParamError(err.message, {
+              cause: err
+            });
+            if (opts?.throwOnError) {
+              throw parsedParamsError;
+            }
+            return parsedParamsError;
           }
         }
-
-        // Add the parsed params to the accumulated params bag
-        Object.assign(allParams, parsedParams);
-        const interpolatedPath = interpolatePath(route.path, allParams);
+        return;
+      });
+      const matches = matchedRoutes.map((route, index) => {
+        const interpolatedPath = interpolatePath(route.path, routeParams);
         const key = route.options.key ? route.options.key({
-          params: allParams,
+          params: routeParams,
           search: locationSearch
         }) ?? '' : '';
         const stringifiedKey = key ? JSON.stringify(key) : '';
-        const matchId = interpolatePath(route.id, allParams, true) + stringifiedKey;
+        const matchId = interpolatePath(route.id, routeParams, true) + stringifiedKey;
 
         // Waste not, want not. If we already have a match for this route,
         // reuse it. This is important for layout routes, which might stick
@@ -1194,7 +1188,7 @@
           id: matchId,
           key: stringifiedKey,
           routeId: route.id,
-          params: allParams,
+          params: routeParams,
           pathname: joinPaths([this.basepath, interpolatedPath]),
           updatedAt: Date.now(),
           invalidAt: Infinity,
@@ -1205,7 +1199,7 @@
           isFetching: false,
           invalid: false,
           error: undefined,
-          paramsError: parsedParamsError,
+          paramsError: parseErrors[index],
           searchError: undefined,
           loaderData: undefined,
           loadPromise: Promise.resolve(),