@tanstack/router-core 0.0.1-beta.157 → 0.0.1-beta.158

package/build/umd/index.development.js

@@ -1061,42 +1061,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
@@ -1114,7 +1108,7 @@
             id: matchId,
             key: stringifiedKey,
             routeId: route.id,
-            params: allParams,
+            params: routeParams,
             pathname: joinPaths([this.basepath, interpolatedPath]),
             updatedAt: Date.now(),
             invalidAt: Infinity,
@@ -1125,7 +1119,7 @@
             isFetching: false,
             invalid: false,
             error: undefined,
-            paramsError: parsedParamsError,
+            paramsError: parseErrors[index],
             searchError: undefined,
             loaderData: undefined,
             loadPromise: Promise.resolve(),