@tanstack/router-core 1.157.8 → 1.157.10

package/dist/cjs/router.cjs

@@ -335,25 +335,21 @@ class RouterCore {
         const interpolatedNextTo = path.interpolatePath({
           path: nextTo,
           params: nextParams,
+          decoder: this.pathParamsDecoder,
           server: this.isServer
         }).interpolatedPath;
         const destMatchResult = this.getMatchedRoutes(interpolatedNextTo);
         let destRoutes = destMatchResult.matchedRoutes;
         const isGlobalNotFound = destMatchResult.foundRoute ? destMatchResult.foundRoute.path !== "/" && destMatchResult.routeParams["**"] : path.trimPathRight(interpolatedNextTo);
-        if (isGlobalNotFound) {
-          if (this.options.notFoundRoute) {
-            destRoutes = [...destRoutes, this.options.notFoundRoute];
-          } else {
-            findGlobalNotFoundRouteId(
-              this.options.notFoundMode,
-              destRoutes
-            );
-          }
+        if (isGlobalNotFound && this.options.notFoundRoute) {
+          destRoutes = [...destRoutes, this.options.notFoundRoute];
         }
+        let changedParams = false;
         if (Object.keys(nextParams).length > 0) {
           for (const route of destRoutes) {
             const fn = route.options.params?.stringify ?? route.options.stringifyParams;
             if (fn) {
+              changedParams = true;
               Object.assign(nextParams, fn(nextParams));
             }
           }
@@ -363,7 +359,7 @@ class RouterCore {
           // This preserves the original parameter syntax including optional parameters
           nextTo
         ) : utils.decodePath(
-          path.interpolatePath({
+          !changedParams ? interpolatedNextTo : path.interpolatePath({
             path: nextTo,
             params: nextParams,
             decoder: this.pathParamsDecoder,