@tanstack/router-core 1.131.23 → 1.131.24

package/dist/esm/router.js

@@ -229,7 +229,7 @@ class RouterCore {
     };
     this.buildLocation = (opts) => {
       const build = (dest = {}) => {
-        var _a;
+        var _a, _b;
         const currentLocation = dest._fromLocation || this.latestLocation;
         const allCurrentLocationMatches = this.matchRoutes(currentLocation, {
           _buildLocation: true
@@ -262,51 +262,51 @@ class RouterCore {
         const fromSearch = lastMatch.search;
         const fromParams = { ...lastMatch.params };
         const nextTo = dest.to ? this.resolvePathWithBase(fromPath, `${dest.to}`) : this.resolvePathWithBase(fromPath, ".");
-        let nextParams = dest.params === false || dest.params === null ? {} : (dest.params ?? true) === true ? fromParams : {
-          ...fromParams,
-          ...functionalUpdate(dest.params, fromParams)
-        };
+        const nextParams = dest.params === false || dest.params === null ? {} : (dest.params ?? true) === true ? fromParams : Object.assign(
+          fromParams,
+          functionalUpdate(dest.params, fromParams)
+        );
         const interpolatedNextTo = interpolatePath({
           path: nextTo,
-          params: nextParams ?? {},
+          params: nextParams,
           parseCache: this.parsePathnameCache
         }).interpolatedPath;
         const destRoutes = this.matchRoutes(interpolatedNextTo, void 0, {
           _buildLocation: true
         }).map((d) => this.looseRoutesById[d.routeId]);
         if (Object.keys(nextParams).length > 0) {
-          destRoutes.map((route) => {
-            var _a2;
-            return ((_a2 = route.options.params) == null ? void 0 : _a2.stringify) ?? route.options.stringifyParams;
-          }).filter(Boolean).forEach((fn) => {
-            nextParams = { ...nextParams, ...fn(nextParams) };
-          });
+          for (const route of destRoutes) {
+            const fn = ((_a = route.options.params) == null ? void 0 : _a.stringify) ?? route.options.stringifyParams;
+            if (fn) {
+              Object.assign(nextParams, fn(nextParams));
+            }
+          }
         }
         const nextPathname = interpolatePath({
           // Use the original template path for interpolation
           // This preserves the original parameter syntax including optional parameters
           path: nextTo,
-          params: nextParams ?? {},
+          params: nextParams,
           leaveWildcards: false,
           leaveParams: opts.leaveParams,
           decodeCharMap: this.pathParamsDecodeCharMap,
           parseCache: this.parsePathnameCache
         }).interpolatedPath;
         let nextSearch = fromSearch;
-        if (opts._includeValidateSearch && ((_a = this.options.search) == null ? void 0 : _a.strict)) {
-          let validatedSearch = {};
+        if (opts._includeValidateSearch && ((_b = this.options.search) == null ? void 0 : _b.strict)) {
+          const validatedSearch = {};
           destRoutes.forEach((route) => {
-            try {
-              if (route.options.validateSearch) {
-                validatedSearch = {
-                  ...validatedSearch,
-                  ...validateSearch(route.options.validateSearch, {
+            if (route.options.validateSearch) {
+              try {
+                Object.assign(
+                  validatedSearch,
+                  validateSearch(route.options.validateSearch, {
                     ...validatedSearch,
                     ...nextSearch
-                  }) ?? {}
-                };
+                  })
+                );
+              } catch {
               }
-            } catch {
             }
           });
           nextSearch = validatedSearch;