@tanstack/router-core 1.171.17 → 1.171.18

package/src/router.ts

@@ -750,13 +750,12 @@ export type ParseLocationFn<TRouteTree extends AnyRoute> = (
   previousLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>,
 ) => ParsedLocation<FullSearchSchema<TRouteTree>>
 
-export type GetMatchRoutesFn = (pathname: string) => {
-  matchedRoutes: ReadonlyArray<AnyRoute>
+export type GetMatchRoutesFn = (pathname: string) => [
+  matchedRoutes: ReadonlyArray<AnyRoute>,
   /** exhaustive params, still in their string form */
-  routeParams: Record<string, string>
-  foundRoute: AnyRoute | undefined
-  parseError?: unknown
-}
+  rawParams: Record<string, string>,
+  foundRoute: AnyRoute | undefined,
+]
 
 export type EmitFn = (routerEvent: RouterEvent) => void
 
@@ -964,12 +963,12 @@ export function runRouteLifecycle(
   }
 }
 
-type LightweightRouteMatchResult = {
-  matchedRoutes: ReadonlyArray<AnyRoute>
-  fullPath: string
-  search: Record<string, unknown>
-  params: Record<string, unknown>
-}
+type LightweightRouteMatchResult = [
+  matchedRoutes: ReadonlyArray<AnyRoute>,
+  fullPath: string,
+  search: Record<string, unknown>,
+  params: Record<string, unknown>,
+]
 
 type LightweightRouteMatchCacheEntry = [
   lastMatchId: string | undefined,
@@ -1512,16 +1511,17 @@ export class RouterCore<
     next: ParsedLocation,
     opts?: MatchRoutesOpts,
   ): Array<AnyRouteMatch> {
-    const matchedRoutesResult = this.getMatchedRoutes(next.pathname)
-    const { foundRoute, routeParams } = matchedRoutesResult
-    let { matchedRoutes } = matchedRoutesResult
+    const [initialMatchedRoutes, rawParams, foundRoute] = this.getMatchedRoutes(
+      next.pathname,
+    )
+    let matchedRoutes = initialMatchedRoutes
     let isGlobalNotFound = false
 
     // Check to see if the route needs a 404 entry
     if (
       // If we found a route, and it's not an index route and we have left over path
       foundRoute
-        ? foundRoute.path !== '/' && routeParams['**']
+        ? foundRoute.path !== '/' && rawParams['**']
         : // Or if we didn't find a route and we have left over path
           trimPathRight(next.pathname)
     ) {
@@ -1549,6 +1549,7 @@ export class RouterCore<
           : undefined
     }
 
+    let strictParams: AnyRouteMatch['_strictParams'] | undefined
     for (let index = 0; index < matchedRoutes.length; index++) {
       const route = matchedRoutes[index]!
       // Take each matched route and resolve + validate its search params
@@ -1614,9 +1615,10 @@ export class RouterCore<
         }
         searchError ??= cause
       }
+      // Match identity must only use the raw params captured from the URL.
       const { interpolatedPath, usedParams } = interpolatePath({
         path: route.fullPath,
-        params: routeParams,
+        params: rawParams,
         decoder: this.pathParamsDecoder,
         server: this.isServer,
       })
@@ -1639,7 +1641,9 @@ export class RouterCore<
           : (this._cache.get(matchId) ??
             (previousMatch?.id === matchId ? previousMatch : undefined))
 
-      const strictParams = existingMatch?._strictParams ?? usedParams
+      // Carry parsed ancestors forward without mutating the raw route params.
+      strictParams =
+        existingMatch?._strictParams ?? Object.assign(usedParams, strictParams)
 
       let paramsError: unknown
 
@@ -1661,8 +1665,6 @@ export class RouterCore<
         }
       }
 
-      Object.assign(routeParams, strictParams)
-
       const cause = previousMatch ? 'stay' : 'enter'
 
       let match: AnyRouteMatch
@@ -1671,8 +1673,6 @@ export class RouterCore<
         match = {
           ...existingMatch,
           cause,
-          params: previousMatch?.params ?? routeParams,
-          _strictParams: strictParams,
           search: previousMatch
             ? nullReplaceEqualDeep(previousMatch.search, preMatchSearch)
             : nullReplaceEqualDeep(existingMatch.search, preMatchSearch),
@@ -1687,7 +1687,7 @@ export class RouterCore<
           ssr: (isServer ?? this.isServer) ? undefined : route.options.ssr,
           index,
           routeId: route.id,
-          params: previousMatch?.params ?? routeParams,
+          params: previousMatch?.params ?? strictParams,
           _strictParams: strictParams,
           pathname: interpolatedPath,
           updatedAt: Date.now(),
@@ -1727,8 +1727,8 @@ export class RouterCore<
       const match = matches[index]!
       match.params =
         match.cause === 'stay'
-          ? nullReplaceEqualDeep(match.params, routeParams)
-          : routeParams
+          ? nullReplaceEqualDeep(match.params, strictParams)
+          : strictParams!
       if (opts?._controller) {
         match.context = {}
       }
@@ -1738,20 +1738,20 @@ export class RouterCore<
   }
 
   getMatchedRoutes: GetMatchRoutesFn = (pathname) => {
-    const routeParams: Record<string, string> = Object.create(null)
+    const rawParams: Record<string, string> = Object.create(null)
     const match = findRouteMatch(
       trimPathRight(pathname),
       this.processedTree,
       true,
     )
     if (match) {
-      Object.assign(routeParams, match.rawParams)
-    }
-    return {
-      matchedRoutes: match?.branch || [this.routesById[rootRouteId]!],
-      routeParams,
-      foundRoute: match?.route,
+      Object.assign(rawParams, match.rawParams)
     }
+    return [
+      match?.branch || [this.routesById[rootRouteId]!],
+      rawParams,
+      match?.route,
+    ]
   }
 
   /**
@@ -1772,9 +1772,7 @@ export class RouterCore<
       return cached[1 /* result */]
     }
 
-    const { matchedRoutes, routeParams } = this.getMatchedRoutes(
-      location.pathname,
-    )
+    const [matchedRoutes, rawParams] = this.getMatchedRoutes(location.pathname)
     const lastRoute = last(matchedRoutes)!
 
     // I don't know if we should run the full search middleware chain, or just validateSearch
@@ -1812,7 +1810,7 @@ export class RouterCore<
       // Parse params through the route chain
       const strictParams: Record<string, unknown> = Object.assign(
         Object.create(null),
-        routeParams,
+        rawParams,
       )
       for (const route of matchedRoutes) {
         try {
@@ -1824,12 +1822,12 @@ export class RouterCore<
       params = strictParams
     }
 
-    const result = {
+    const result: LightweightRouteMatchResult = [
       matchedRoutes,
-      fullPath: lastRoute.fullPath,
-      search: accumulatedSearch,
+      lastRoute.fullPath,
+      accumulatedSearch,
       params,
-    }
+    ]
     this.lightweightCache.set(location, [lastStateMatchId, result])
     return result
   }
@@ -1862,14 +1860,17 @@ export class RouterCore<
         process.env.NODE_ENV !== 'production' &&
         dest._isNavigate
       ) {
-        const allFromMatches = this.getMatchedRoutes(dest.from).matchedRoutes
+        const [allFromMatches] = this.getMatchedRoutes(dest.from)
 
-        const matchedFrom = findLast(lightweightResult.matchedRoutes, (d) => {
-          return comparePaths(d.fullPath, dest.from!)
-        })
+        const matchedFrom = findLast(
+          lightweightResult[0 /* matchedRoutes */],
+          (d) => {
+            return comparePaths(d.fullPath, dest.from!)
+          },
+        )
 
         const matchedCurrent = findLast(allFromMatches, (d) => {
-          return comparePaths(d.fullPath, lightweightResult.fullPath)
+          return comparePaths(d.fullPath, lightweightResult[1 /* fullPath */])
         })
 
         // for from to be invalid it shouldn't just be unmatched to currentLocation
@@ -1882,15 +1883,15 @@ export class RouterCore<
       const defaultedFromPath =
         dest.unsafeRelative === 'path'
           ? currentLocation.pathname
-          : (dest.from ?? lightweightResult.fullPath)
+          : (dest.from ?? lightweightResult[1 /* fullPath */])
       const destTo = dest.to ? `${dest.to}` : undefined
 
       // From search should always use the current location
-      const fromSearch = lightweightResult.search
+      const fromSearch = lightweightResult[2 /* search */]
       // Same with params. It can't hurt to provide as many as possible
       const fromParams = Object.assign(
         Object.create(null),
-        lightweightResult.params,
+        lightweightResult[3 /* params */],
       )
 
       const isAbsoluteTo = destTo?.charCodeAt(0) === 47
@@ -1918,14 +1919,13 @@ export class RouterCore<
         // typed destination mismatch, not a concrete URL to route-match.
         destRoutes = []
       } else {
-        const destMatchResult = this.getMatchedRoutes(nextTo)
-        destRoutes = destMatchResult.matchedRoutes
+        const [matchedRoutes, rawParams, foundRoute] =
+          this.getMatchedRoutes(nextTo)
+        destRoutes = matchedRoutes
 
         if (
           this.options.notFoundRoute &&
-          (!destMatchResult.foundRoute ||
-            (destMatchResult.foundRoute.path !== '/' &&
-              destMatchResult.routeParams['**']))
+          (!foundRoute || (foundRoute.path !== '/' && rawParams['**']))
         ) {
           destRoutes = [...destRoutes, this.options.notFoundRoute]
         }
@@ -1968,10 +1968,10 @@ export class RouterCore<
         !opts.leaveParams
       ) {
         try {
-          const roundTrip = this.getMatchedRoutes(nextPathname)
-          if (roundTrip.foundRoute?.id !== destRoute.id) {
+          const foundRoute = this.getMatchedRoutes(nextPathname)[2]
+          if (foundRoute?.id !== destRoute.id) {
             console.warn(
-              `Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${roundTrip.foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`,
+              `Generated path "${nextPathname}" for route "${destRoute.id}" matched route "${foundRoute?.id}" instead. This can happen when multiple route templates resolve to the same URL. Use the route template that matches the intended route, or adjust params.stringify if it changed the target path.`,
             )
           }
         } catch {