@tanstack/react-router 1.69.1 → 1.70.1

package/dist/cjs/router.cjs

@@ -272,7 +272,7 @@ class Router {
     };
     this.buildLocation = (opts) => {
       const build = (dest = {}, matchedRoutesResult) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const fromMatches = dest._fromLocation ? this.matchRoutes(dest._fromLocation, { _buildLocation: true }) : this.state.matches;
         const fromMatch = dest.from != null ? fromMatches.find(
           (d) => path.matchPathname(this.basepath, path.trimPathRight(d.pathname), {
@@ -383,15 +383,20 @@ class Router {
         };
         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;
-                search = { ...search, ...validator(search) };
+                validatedSearch = {
+                  ...validatedSearch,
+                  ...validator({ ...validatedSearch, ...search })
+                };
               }
             } catch (e) {
             }
           });
+          search = validatedSearch;
         }
         search = utils.replaceEqualDeep(fromSearch, search);
         const searchStr = this.options.stringifySearch(search);
@@ -959,24 +964,31 @@ class Router {
                             }
                           };
                           try {
-                            route._lazyPromise = route._lazyPromise || (route.lazyFn ? route.lazyFn().then((lazyRoute) => {
-                              const { id, ...options2 } = lazyRoute.options;
-                              Object.assign(route.options, options2);
-                            }) : Promise.resolve());
-                            const componentsPromise = this.getMatch(matchId).componentsPromise || route._lazyPromise.then(
-                              () => Promise.all(
-                                componentTypes.map(async (type) => {
-                                  const component = route.options[type];
-                                  if (component == null ? void 0 : component.preload) {
-                                    await component.preload();
-                                  }
-                                })
-                              )
-                            );
+                            if (route._lazyPromise === void 0) {
+                              if (route.lazyFn) {
+                                route._lazyPromise = route.lazyFn().then((lazyRoute) => {
+                                  const { id: _id, ...options2 } = lazyRoute.options;
+                                  Object.assign(route.options, options2);
+                                });
+                              } else {
+                                route._lazyPromise = Promise.resolve();
+                              }
+                            }
+                            if (route._componentsPromise === void 0) {
+                              route._componentsPromise = route._lazyPromise.then(
+                                () => Promise.all(
+                                  componentTypes.map(async (type) => {
+                                    const component = route.options[type];
+                                    if (component == null ? void 0 : component.preload) {
+                                      await component.preload();
+                                    }
+                                  })
+                                )
+                              );
+                            }
                             updateMatch(matchId, (prev) => ({
                               ...prev,
-                              isFetching: "loader",
-                              componentsPromise
+                              isFetching: "loader"
                             }));
                             let loaderData = await ((_b2 = (_a2 = route.options).loader) == null ? void 0 : _b2.call(_a2, getLoaderContext()));
                             if (this.serializeLoaderData) {
@@ -1034,7 +1046,7 @@ class Router {
                               isFetching: false
                             }));
                           }
-                          await this.getMatch(matchId).componentsPromise;
+                          await route._componentsPromise;
                         } catch (err) {
                           handleRedirectAndNotFound(this.getMatch(matchId), err);
                         }
@@ -1084,12 +1096,18 @@ class Router {
       }
       return matches;
     };
-    this.invalidate = () => {
-      const invalidate = (d) => ({
-        ...d,
-        invalid: true,
-        ...d.status === "error" ? { status: "pending", error: void 0 } : {}
-      });
+    this.invalidate = (opts) => {
+      const invalidate = (d) => {
+        var _a;
+        if (((_a = opts == null ? void 0 : opts.filter) == null ? void 0 : _a.call(opts, d)) ?? true) {
+          return {
+            ...d,
+            invalid: true,
+            ...d.status === "error" ? { status: "pending", error: void 0 } : {}
+          };
+        }
+        return d;
+      };
       this.__store.setState((s) => {
         var _a;
         return {