@tanstack/router-core 1.154.3 → 1.154.7

package/dist/cjs/router.cjs

@@ -250,9 +250,9 @@ class RouterCore {
             search: locationSearchOrOpts
           },
           opts
-        );
+        ).matches;
       }
-      return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
+      return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts).matches;
     };
     this.getMatchedRoutes = (pathname) => {
       return getMatchedRoutes({
@@ -316,9 +316,10 @@ class RouterCore {
           path: nextTo,
           params: nextParams
         }).interpolatedPath;
-        const destMatches = this.matchRoutes(interpolatedNextTo, void 0, {
-          _buildLocation: true
-        });
+        const { matches: destMatches, rawParams } = this.matchRoutesInternal(
+          { pathname: interpolatedNextTo },
+          { _buildLocation: true }
+        );
         const destRoutes = destMatches.map(
           (d) => this.looseRoutesById[d.routeId]
         );
@@ -373,9 +374,13 @@ class RouterCore {
         const hashStr = hash ? `#${hash}` : "";
         let nextState = dest.state === true ? currentLocation.state : dest.state ? utils.functionalUpdate(dest.state, currentLocation.state) : {};
         nextState = utils.replaceEqualDeep(currentLocation.state, nextState);
+        const snapshotParams = {
+          ...rawParams,
+          ...nextParams
+        };
         const matchSnapshot = buildMatchSnapshotFromRoutes({
           routes: destRoutes,
-          params: nextParams,
+          params: snapshotParams,
           searchStr,
           globalNotFoundRouteId: globalNotFoundMatch?.routeId
         });
@@ -1071,17 +1076,20 @@ class RouterCore {
     const snapshotValid = snapshot && snapshot.routeIds.length > 0 && snapshot.routeIds.every((id) => this.routesById[id]);
     let matchedRoutes;
     let routeParams;
+    let rawParams;
     let globalNotFoundRouteId;
     let parsedParams;
     if (snapshotValid) {
       matchedRoutes = snapshot.routeIds.map((id) => this.routesById[id]);
       routeParams = { ...snapshot.params };
+      rawParams = { ...snapshot.params };
       globalNotFoundRouteId = snapshot.globalNotFoundRouteId;
       parsedParams = snapshot.parsedParams;
     } else {
       const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
       const { foundRoute, routeParams: rp } = matchedRoutesResult;
       routeParams = rp;
+      rawParams = { ...rp };
       matchedRoutes = matchedRoutesResult.matchedRoutes;
       parsedParams = matchedRoutesResult.parsedParams;
       let isGlobalNotFound = false;
@@ -1307,7 +1315,7 @@ class RouterCore {
         };
       }
     });
-    return matches;
+    return { matches, rawParams };
   }
 }
 class SearchParamError extends Error {