@tanstack/router-core 1.158.1 → 1.159.4

package/dist/cjs/router.cjs

@@ -234,14 +234,14 @@ class RouterCore {
           return {
             href: pathname + searchStr2 + hash,
             publicHref: href,
-            pathname: utils.decodePath(pathname),
+            pathname: utils.decodePath(pathname).path,
             external: false,
             searchStr: searchStr2,
             search: utils.replaceEqualDeep(
               previousLocation?.search,
               parsedSearch2
             ),
-            hash: utils.decodePath(hash.slice(1)),
+            hash: utils.decodePath(hash.slice(1)).path,
             state: utils.replaceEqualDeep(previousLocation?.state, state)
           };
         }
@@ -254,11 +254,11 @@ class RouterCore {
         return {
           href: fullPath,
           publicHref: href,
-          pathname: utils.decodePath(url.pathname),
+          pathname: utils.decodePath(url.pathname).path,
           external: !!this.rewrite && url.origin !== this.origin,
           searchStr,
           search: utils.replaceEqualDeep(previousLocation?.search, parsedSearch),
-          hash: utils.decodePath(url.hash.slice(1)),
+          hash: utils.decodePath(url.hash.slice(1)).path,
           state: utils.replaceEqualDeep(previousLocation?.state, state)
         };
       };
@@ -385,7 +385,7 @@ class RouterCore {
             decoder: this.pathParamsDecoder,
             server: this.isServer
           }).interpolatedPath
-        );
+        ).path;
         let nextSearch = fromSearch;
         if (opts._includeValidateSearch && this.options.search?.strict) {
           const validatedSearch = {};
@@ -1129,6 +1129,9 @@ class RouterCore {
     }
     const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
     const matches = new Array(matchedRoutes.length);
+    const previousMatchesByRouteId = new Map(
+      this.state.matches.map((match) => [match.routeId, match])
+    );
     for (let index = 0; index < matchedRoutes.length; index++) {
       const route = matchedRoutes[index];
       const parentMatch = matches[index - 1];
@@ -1178,9 +1181,7 @@ class RouterCore {
         loaderDepsHash
       );
       const existingMatch = this.getMatch(matchId);
-      const previousMatch = this.state.matches.find(
-        (d) => d.routeId === route.id
-      );
+      const previousMatch = previousMatchesByRouteId.get(route.id);
       const strictParams = existingMatch?._strictParams ?? usedParams;
       let paramsError = void 0;
       if (!existingMatch) {
@@ -1206,7 +1207,7 @@ class RouterCore {
         match = {
           ...existingMatch,
           cause,
-          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          params: previousMatch?.params ?? routeParams,
           _strictParams: strictParams,
           search: previousMatch ? utils.replaceEqualDeep(previousMatch.search, preMatchSearch) : utils.replaceEqualDeep(existingMatch.search, preMatchSearch),
           _strictSearch: strictMatchSearch
@@ -1218,7 +1219,7 @@ class RouterCore {
           ssr: isServer.isServer ?? this.isServer ? void 0 : route.options.ssr,
           index,
           routeId: route.id,
-          params: previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          params: previousMatch?.params ?? routeParams,
           _strictParams: strictParams,
           pathname: interpolatedPath,
           updatedAt: Date.now(),
@@ -1265,6 +1266,8 @@ class RouterCore {
       const match = matches[index];
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
+      const previousMatch = previousMatchesByRouteId.get(match.routeId);
+      match.params = previousMatch ? utils.replaceEqualDeep(previousMatch.params, routeParams) : routeParams;
       if (!existingMatch) {
         const parentMatch = matches[index - 1];
         const parentContext = this.getParentContext(parentMatch);