@tanstack/react-router 1.81.4 → 1.81.5

package/dist/cjs/router.cjs

@@ -350,8 +350,8 @@ class Router {
           decodeCharMap: this.pathParamsDecodeCharMap
         });
         let search = fromSearch;
-        if (opts._includeValidateSearch) {
-          let validatedSearch = ((_f = this.options.search) == null ? void 0 : _f.strict) ? {} : search;
+        if (opts._includeValidateSearch && ((_f = this.options.search) == null ? void 0 : _f.strict)) {
+          let validatedSearch = {};
           matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.forEach((route) => {
             try {
               if (route.options.validateSearch) {
@@ -372,10 +372,10 @@ class Router {
           const allMiddlewares = (matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.reduce(
             (acc, route) => {
               var _a2;
-              let middlewares = [];
+              const middlewares = [];
               if ("search" in route.options) {
                 if ((_a2 = route.options.search) == null ? void 0 : _a2.middlewares) {
-                  middlewares = route.options.search.middlewares;
+                  middlewares.push(...route.options.search.middlewares);
                 }
               } else if (route.options.preSearchFilters || route.options.postSearchFilters) {
                 const legacyMiddleware = ({
@@ -398,7 +398,24 @@ class Router {
                   }
                   return result;
                 };
-                middlewares = [legacyMiddleware];
+                middlewares.push(legacyMiddleware);
+              }
+              if (opts._includeValidateSearch && route.options.validateSearch) {
+                const validate = ({ search: search3, next }) => {
+                  try {
+                    const result = next(search3);
+                    const validatedSearch = {
+                      ...result,
+                      ...validateSearch(
+                        route.options.validateSearch,
+                        result
+                      ) ?? {}
+                    };
+                    return validatedSearch;
+                  } catch (e) {
+                  }
+                };
+                middlewares.push(validate);
               }
               return acc.concat(middlewares);
             },