@tanstack/router-core 1.131.37 → 1.131.38

package/src/router.ts

@@ -1111,33 +1111,6 @@ export class RouterCore<
       return rootRouteId
     })()
 
-    const parseErrors = matchedRoutes.map((route) => {
-      let parsedParamsError
-
-      const parseParams =
-        route.options.params?.parse ?? route.options.parseParams
-
-      if (parseParams) {
-        try {
-          const parsedParams = parseParams(routeParams)
-          // Add the parsed params to the accumulated params bag
-          Object.assign(routeParams, parsedParams)
-        } catch (err: any) {
-          parsedParamsError = new PathParamError(err.message, {
-            cause: err,
-          })
-
-          if (opts?.throwOnError) {
-            throw parsedParamsError
-          }
-
-          return parsedParamsError
-        }
-      }
-
-      return
-    })
-
     const matches: Array<AnyRouteMatch> = []
 
     const getParentContext = (parentMatch?: AnyRouteMatch) => {
@@ -1224,20 +1197,36 @@ export class RouterCore<
         parseCache: this.parsePathnameCache,
       })
 
-      const strictParams = interpolatePathResult.usedParams
+      // Waste not, want not. If we already have a match for this route,
+      // reuse it. This is important for layout routes, which might stick
+      // around between navigation actions that only change leaf routes.
+
+      // Existing matches are matches that are already loaded along with
+      // pending matches that are still loading
+      const matchId = interpolatePathResult.interpolatedPath + loaderDepsHash
+
+      const existingMatch = this.getMatch(matchId)
 
-      let paramsError = parseErrors[index]
+      const previousMatch = this.state.matches.find(
+        (d) => d.routeId === route.id,
+      )
 
-      const strictParseParams =
-        route.options.params?.parse ?? route.options.parseParams
+      const strictParams =
+        existingMatch?._strictParams ?? interpolatePathResult.usedParams
 
-      if (strictParseParams) {
-        try {
-          Object.assign(strictParams, strictParseParams(strictParams as any))
-        } catch (err: any) {
-          // any param errors should already have been dealt with above, if this
-          // somehow differs, let's report this in the same manner
-          if (!paramsError) {
+      let paramsError: PathParamError | undefined = undefined
+
+      if (!existingMatch) {
+        const strictParseParams =
+          route.options.params?.parse ?? route.options.parseParams
+
+        if (strictParseParams) {
+          try {
+            Object.assign(
+              strictParams,
+              strictParseParams(strictParams as Record<string, string>),
+            )
+          } catch (err: any) {
             paramsError = new PathParamError(err.message, {
               cause: err,
             })
@@ -1249,19 +1238,7 @@ export class RouterCore<
         }
       }
 
-      // Waste not, want not. If we already have a match for this route,
-      // reuse it. This is important for layout routes, which might stick
-      // around between navigation actions that only change leaf routes.
-
-      // Existing matches are matches that are already loaded along with
-      // pending matches that are still loading
-      const matchId = interpolatePathResult.interpolatedPath + loaderDepsHash
-
-      const existingMatch = this.getMatch(matchId)
-
-      const previousMatch = this.state.matches.find(
-        (d) => d.routeId === route.id,
-      )
+      Object.assign(routeParams, strictParams)
 
       const cause = previousMatch ? 'stay' : 'enter'