@tanstack/react-router 1.71.0 → 1.72.0

package/dist/cjs/router.cjs

@@ -323,7 +323,24 @@ class Router {
           leaveWildcards: false,
           leaveParams: opts.leaveParams
         });
-        const applyMiddlewares = () => {
+        let search = fromSearch;
+        if (opts._includeValidateSearch) {
+          let validatedSearch = ((_f = this.options.search) == null ? void 0 : _f.strict) ? {} : search;
+          matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.forEach((route) => {
+            try {
+              if (route.options.validateSearch) {
+                const validator = typeof route.options.validateSearch === "object" ? route.options.validateSearch.parse : route.options.validateSearch;
+                validatedSearch = {
+                  ...validatedSearch,
+                  ...validator({ ...validatedSearch, ...search })
+                };
+              }
+            } catch (e) {
+            }
+          });
+          search = validatedSearch;
+        }
+        const applyMiddlewares = (search2) => {
           const allMiddlewares = (stayingMatches == null ? void 0 : stayingMatches.reduce(
             (acc, route) => {
               var _a2;
@@ -334,14 +351,14 @@ class Router {
                 }
               } else if (route.options.preSearchFilters || route.options.postSearchFilters) {
                 const legacyMiddleware = ({
-                  search: search2,
+                  search: search3,
                   next
                 }) => {
-                  let nextSearch = search2;
+                  let nextSearch = search3;
                   if ("preSearchFilters" in route.options && route.options.preSearchFilters) {
                     nextSearch = route.options.preSearchFilters.reduce(
                       (prev, next2) => next2(prev),
-                      search2
+                      search3
                     );
                   }
                   const result = next(nextSearch);
@@ -359,14 +376,14 @@ class Router {
             },
             []
           )) ?? [];
-          const final = ({ search: search2 }) => {
+          const final = ({ search: search3 }) => {
             if (!dest.search) {
               return {};
             }
             if (dest.search === true) {
-              return search2;
+              return search3;
             }
-            return utils.functionalUpdate(dest.search, search2);
+            return utils.functionalUpdate(dest.search, search3);
           };
           allMiddlewares.push(final);
           const applyNext = (index, currentSearch) => {
@@ -379,25 +396,9 @@ class Router {
             };
             return middleware({ search: currentSearch, next });
           };
-          return applyNext(0, fromSearch);
+          return applyNext(0, search2);
         };
-        let search = applyMiddlewares();
-        if (opts._includeValidateSearch) {
-          let validatedSearch = ((_f = this.options.search) == null ? void 0 : _f.strict) ? {} : search;
-          matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.forEach((route) => {
-            try {
-              if (route.options.validateSearch) {
-                const validator = typeof route.options.validateSearch === "object" ? route.options.validateSearch.parse : route.options.validateSearch;
-                validatedSearch = {
-                  ...validatedSearch,
-                  ...validator({ ...validatedSearch, ...search })
-                };
-              }
-            } catch (e) {
-            }
-          });
-          search = validatedSearch;
-        }
+        search = applyMiddlewares(search);
         search = utils.replaceEqualDeep(fromSearch, search);
         const searchStr = this.options.stringifySearch(search);
         const hash = dest.hash === true ? this.latestLocation.hash : dest.hash ? utils.functionalUpdate(dest.hash, this.latestLocation.hash) : void 0;