@tanstack/router-core 1.121.0-alpha.1 → 1.121.0-alpha.5

package/dist/cjs/router.cjs

@@ -196,9 +196,8 @@ class RouterCore {
           },
           opts
         );
-      } else {
-        return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
       }
+      return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
     };
     this.getMatchedRoutes = (pathname, routePathname) => {
       return getMatchedRoutes({
@@ -224,173 +223,90 @@ class RouterCore {
       });
     };
     this.buildLocation = (opts) => {
-      const build = (dest = {}, matchedRoutesResult) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        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), {
-            to: dest.from,
-            caseSensitive: false,
-            fuzzy: false
-          })
-        ) : void 0;
-        const fromPath = (fromMatch == null ? void 0 : fromMatch.pathname) || this.latestLocation.pathname;
-        invariant(
-          dest.from == null || fromMatch != null,
-          "Could not find match for from: " + dest.from
-        );
-        const fromSearch = ((_a = this.state.pendingMatches) == null ? void 0 : _a.length) ? (_b = utils.last(this.state.pendingMatches)) == null ? void 0 : _b.search : ((_c = utils.last(fromMatches)) == null ? void 0 : _c.search) || this.latestLocation.search;
-        const stayingMatches = matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.filter(
-          (d) => fromMatches.find((e) => e.routeId === d.id)
-        );
-        let pathname;
-        if (dest.to) {
-          const resolvePathTo = (fromMatch == null ? void 0 : fromMatch.fullPath) || ((_d = utils.last(fromMatches)) == null ? void 0 : _d.fullPath) || this.latestLocation.pathname;
-          pathname = this.resolvePathWithBase(resolvePathTo, `${dest.to}`);
-        } else {
-          const fromRouteByFromPathRouteId = this.routesById[(_e = stayingMatches == null ? void 0 : stayingMatches.find((route) => {
-            const interpolatedPath = path.interpolatePath({
-              path: route.fullPath,
-              params: (matchedRoutesResult == null ? void 0 : matchedRoutesResult.routeParams) ?? {},
-              decodeCharMap: this.pathParamsDecodeCharMap
-            }).interpolatedPath;
-            const pathname2 = path.joinPaths([this.basepath, interpolatedPath]);
-            return pathname2 === fromPath;
-          })) == null ? void 0 : _e.id];
-          pathname = this.resolvePathWithBase(
-            fromPath,
-            (fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
-          );
+      const build = (dest = {}) => {
+        var _a;
+        const currentLocation = dest._fromLocation || this.latestLocation;
+        const allFromMatches = this.matchRoutes(currentLocation, {
+          _buildLocation: true
+        });
+        const lastMatch = utils.last(allFromMatches);
+        let fromId = lastMatch.fullPath;
+        if (dest.to && dest.from) {
+          fromId = dest.from;
+        }
+        const existingFrom = [...allFromMatches].reverse().find((d) => {
+          return d.fullPath === fromId || d.fullPath === path.joinPaths([fromId, "/"]);
+        });
+        if (!existingFrom) {
+          console.warn(`Could not find match for from: ${dest.from}`);
         }
-        const prevParams = { ...(_f = utils.last(fromMatches)) == null ? void 0 : _f.params };
-        let nextParams = (dest.params ?? true) === true ? prevParams : {
-          ...prevParams,
-          ...utils.functionalUpdate(dest.params, prevParams)
+        const fromSearch = lastMatch.search;
+        const fromParams = { ...lastMatch.params };
+        const nextTo = dest.to ? this.resolvePathWithBase(fromId, `${dest.to}`) : fromId;
+        let nextParams = (dest.params ?? true) === true ? fromParams : {
+          ...fromParams,
+          ...utils.functionalUpdate(dest.params, fromParams)
         };
+        const destRoutes = this.matchRoutes(
+          nextTo,
+          {},
+          {
+            _buildLocation: true
+          }
+        ).map((d) => this.looseRoutesById[d.routeId]);
         if (Object.keys(nextParams).length > 0) {
-          matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.map((route) => {
+          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) };
           });
         }
-        pathname = path.interpolatePath({
-          path: pathname,
+        const nextPathname = path.interpolatePath({
+          path: nextTo,
           params: nextParams ?? {},
           leaveWildcards: false,
           leaveParams: opts.leaveParams,
           decodeCharMap: this.pathParamsDecodeCharMap
         }).interpolatedPath;
-        let search = fromSearch;
-        if (opts._includeValidateSearch && ((_g = this.options.search) == null ? void 0 : _g.strict)) {
+        let nextSearch = fromSearch;
+        if (opts._includeValidateSearch && ((_a = this.options.search) == null ? void 0 : _a.strict)) {
           let validatedSearch = {};
-          matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.forEach((route) => {
+          destRoutes.forEach((route) => {
             try {
               if (route.options.validateSearch) {
                 validatedSearch = {
                   ...validatedSearch,
                   ...validateSearch(route.options.validateSearch, {
                     ...validatedSearch,
-                    ...search
+                    ...nextSearch
                   }) ?? {}
                 };
               }
             } catch {
             }
           });
-          search = validatedSearch;
+          nextSearch = validatedSearch;
         }
-        const applyMiddlewares = (search2) => {
-          const allMiddlewares = (matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.reduce(
-            (acc, route) => {
-              var _a2;
-              const middlewares = [];
-              if ("search" in route.options) {
-                if ((_a2 = route.options.search) == null ? void 0 : _a2.middlewares) {
-                  middlewares.push(...route.options.search.middlewares);
-                }
-              } else if (route.options.preSearchFilters || route.options.postSearchFilters) {
-                const legacyMiddleware = ({
-                  search: search3,
-                  next
-                }) => {
-                  let nextSearch = search3;
-                  if ("preSearchFilters" in route.options && route.options.preSearchFilters) {
-                    nextSearch = route.options.preSearchFilters.reduce(
-                      (prev, next2) => next2(prev),
-                      search3
-                    );
-                  }
-                  const result = next(nextSearch);
-                  if ("postSearchFilters" in route.options && route.options.postSearchFilters) {
-                    return route.options.postSearchFilters.reduce(
-                      (prev, next2) => next2(prev),
-                      result
-                    );
-                  }
-                  return result;
-                };
-                middlewares.push(legacyMiddleware);
-              }
-              if (opts._includeValidateSearch && route.options.validateSearch) {
-                const validate = ({ search: search3, next }) => {
-                  const result = next(search3);
-                  try {
-                    const validatedSearch = {
-                      ...result,
-                      ...validateSearch(
-                        route.options.validateSearch,
-                        result
-                      ) ?? {}
-                    };
-                    return validatedSearch;
-                  } catch {
-                    return result;
-                  }
-                };
-                middlewares.push(validate);
-              }
-              return acc.concat(middlewares);
-            },
-            []
-          )) ?? [];
-          const final = ({ search: search3 }) => {
-            if (!dest.search) {
-              return {};
-            }
-            if (dest.search === true) {
-              return search3;
-            }
-            return utils.functionalUpdate(dest.search, search3);
-          };
-          allMiddlewares.push(final);
-          const applyNext = (index, currentSearch) => {
-            if (index >= allMiddlewares.length) {
-              return currentSearch;
-            }
-            const middleware = allMiddlewares[index];
-            const next = (newSearch) => {
-              return applyNext(index + 1, newSearch);
-            };
-            return middleware({ search: currentSearch, next });
-          };
-          return applyNext(0, search2);
-        };
-        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;
+        nextSearch = applySearchMiddleware({
+          search: nextSearch,
+          dest,
+          destRoutes,
+          _includeValidateSearch: opts._includeValidateSearch
+        });
+        nextSearch = utils.replaceEqualDeep(fromSearch, nextSearch);
+        const searchStr = this.options.stringifySearch(nextSearch);
+        const hash = dest.hash === true ? currentLocation.hash : dest.hash ? utils.functionalUpdate(dest.hash, currentLocation.hash) : void 0;
         const hashStr = hash ? `#${hash}` : "";
-        let nextState = dest.state === true ? this.latestLocation.state : dest.state ? utils.functionalUpdate(dest.state, this.latestLocation.state) : {};
-        nextState = utils.replaceEqualDeep(this.latestLocation.state, nextState);
+        let nextState = dest.state === true ? currentLocation.state : dest.state ? utils.functionalUpdate(dest.state, currentLocation.state) : {};
+        nextState = utils.replaceEqualDeep(currentLocation.state, nextState);
         return {
-          pathname,
-          search,
+          pathname: nextPathname,
+          search: nextSearch,
           searchStr,
           state: nextState,
           hash: hash ?? "",
-          href: `${pathname}${searchStr}${hashStr}`,
+          href: `${nextPathname}${searchStr}${hashStr}`,
           unmaskOnReload: dest.unmaskOnReload
         };
       };
@@ -422,20 +338,11 @@ class RouterCore {
             maskedNext = build(maskedDest);
           }
         }
-        const nextMatches = this.getMatchedRoutes(
-          next.pathname,
-          dest.to
-        );
-        const final = build(dest, nextMatches);
         if (maskedNext) {
-          const maskedMatches = this.getMatchedRoutes(
-            maskedNext.pathname,
-            maskedDest == null ? void 0 : maskedDest.to
-          );
-          const maskedFinal = build(maskedDest, maskedMatches);
-          final.maskedLocation = maskedFinal;
+          const maskedFinal = build(maskedDest);
+          next.maskedLocation = maskedFinal;
         }
-        return final;
+        return next;
       };
       if (opts.mask) {
         return buildWithMatches(opts, {
@@ -1007,7 +914,7 @@ class RouterCore {
                         loaderPromise: utils.createControlledPromise(),
                         preload: !!preload && !this.state.matches.find((d) => d.id === matchId)
                       }));
-                      const executeHead = () => {
+                      const executeHead = async () => {
                         var _a2, _b2, _c2, _d2, _e, _f;
                         const match = this.getMatch(matchId);
                         if (!match) {
@@ -1019,20 +926,13 @@ class RouterCore {
                           params: match.params,
                           loaderData: match.loaderData
                         };
-                        const headFnContent = (_b2 = (_a2 = route.options).head) == null ? void 0 : _b2.call(_a2, assetContext);
+                        const headFnContent = await ((_b2 = (_a2 = route.options).head) == null ? void 0 : _b2.call(_a2, assetContext));
                         const meta = headFnContent == null ? void 0 : headFnContent.meta;
                         const links = headFnContent == null ? void 0 : headFnContent.links;
                         const headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
-                        const scripts = (_d2 = (_c2 = route.options).scripts) == null ? void 0 : _d2.call(_c2, assetContext);
-                        const headers = (_f = (_e = route.options).headers) == null ? void 0 : _f.call(_e, assetContext);
-                        updateMatch(matchId, (prev) => ({
-                          ...prev,
-                          meta,
-                          links,
-                          headScripts,
-                          headers,
-                          scripts
-                        }));
+                        const scripts = await ((_d2 = (_c2 = route.options).scripts) == null ? void 0 : _d2.call(_c2, assetContext));
+                        const headers = await ((_f = (_e = route.options).headers) == null ? void 0 : _f.call(_e, assetContext));
+                        return { meta, links, headScripts, headers, scripts };
                       };
                       const runLoader = async () => {
                         var _a2, _b2, _c2, _d2, _e;
@@ -1057,17 +957,19 @@ class RouterCore {
                             await route._lazyPromise;
                             await potentialPendingMinPromise();
                             await route._componentsPromise;
-                            store.batch(() => {
-                              updateMatch(matchId, (prev) => ({
-                                ...prev,
-                                error: void 0,
-                                status: "success",
-                                isFetching: false,
-                                updatedAt: Date.now(),
-                                loaderData
-                              }));
-                              executeHead();
-                            });
+                            updateMatch(matchId, (prev) => ({
+                              ...prev,
+                              error: void 0,
+                              status: "success",
+                              isFetching: false,
+                              updatedAt: Date.now(),
+                              loaderData
+                            }));
+                            const head = await executeHead();
+                            updateMatch(matchId, (prev) => ({
+                              ...prev,
+                              ...head
+                            }));
                           } catch (e) {
                             let error = e;
                             await potentialPendingMinPromise();
@@ -1081,28 +983,26 @@ class RouterCore {
                                 onErrorError
                               );
                             }
-                            store.batch(() => {
-                              updateMatch(matchId, (prev) => ({
-                                ...prev,
-                                error,
-                                status: "error",
-                                isFetching: false
-                              }));
-                              executeHead();
-                            });
+                            const head = await executeHead();
+                            updateMatch(matchId, (prev) => ({
+                              ...prev,
+                              error,
+                              status: "error",
+                              isFetching: false,
+                              ...head
+                            }));
                           }
                           (_e = this.serverSsr) == null ? void 0 : _e.onMatchSettled({
                             router: this,
                             match: this.getMatch(matchId)
                           });
                         } catch (err) {
-                          store.batch(() => {
-                            updateMatch(matchId, (prev) => ({
-                              ...prev,
-                              loaderPromise: void 0
-                            }));
-                            executeHead();
-                          });
+                          const head = await executeHead();
+                          updateMatch(matchId, (prev) => ({
+                            ...prev,
+                            loaderPromise: void 0,
+                            ...head
+                          }));
                           handleRedirectAndNotFound(this.getMatch(matchId), err);
                         }
                       };
@@ -1130,7 +1030,11 @@ class RouterCore {
                       } else if (status !== "success" || loaderShouldRunAsync && sync) {
                         await runLoader();
                       } else {
-                        executeHead();
+                        const head = await executeHead();
+                        updateMatch(matchId, (prev) => ({
+                          ...prev,
+                          ...head
+                        }));
                       }
                     }
                     if (!loaderIsRunningAsync) {
@@ -1794,6 +1698,84 @@ function getMatchedRoutes({
   }
   return { matchedRoutes, routeParams, foundRoute };
 }
+function applySearchMiddleware({
+  search,
+  dest,
+  destRoutes,
+  _includeValidateSearch
+}) {
+  const allMiddlewares = destRoutes.reduce(
+    (acc, route) => {
+      var _a;
+      const middlewares = [];
+      if ("search" in route.options) {
+        if ((_a = route.options.search) == null ? void 0 : _a.middlewares) {
+          middlewares.push(...route.options.search.middlewares);
+        }
+      } else if (route.options.preSearchFilters || route.options.postSearchFilters) {
+        const legacyMiddleware = ({
+          search: search2,
+          next
+        }) => {
+          let nextSearch = search2;
+          if ("preSearchFilters" in route.options && route.options.preSearchFilters) {
+            nextSearch = route.options.preSearchFilters.reduce(
+              (prev, next2) => next2(prev),
+              search2
+            );
+          }
+          const result = next(nextSearch);
+          if ("postSearchFilters" in route.options && route.options.postSearchFilters) {
+            return route.options.postSearchFilters.reduce(
+              (prev, next2) => next2(prev),
+              result
+            );
+          }
+          return result;
+        };
+        middlewares.push(legacyMiddleware);
+      }
+      if (_includeValidateSearch && route.options.validateSearch) {
+        const validate = ({ search: search2, next }) => {
+          const result = next(search2);
+          try {
+            const validatedSearch = {
+              ...result,
+              ...validateSearch(route.options.validateSearch, result) ?? {}
+            };
+            return validatedSearch;
+          } catch {
+            return result;
+          }
+        };
+        middlewares.push(validate);
+      }
+      return acc.concat(middlewares);
+    },
+    []
+  ) ?? [];
+  const final = ({ search: search2 }) => {
+    if (!dest.search) {
+      return {};
+    }
+    if (dest.search === true) {
+      return search2;
+    }
+    return utils.functionalUpdate(dest.search, search2);
+  };
+  allMiddlewares.push(final);
+  const applyNext = (index, currentSearch) => {
+    if (index >= allMiddlewares.length) {
+      return currentSearch;
+    }
+    const middleware = allMiddlewares[index];
+    const next = (newSearch) => {
+      return applyNext(index + 1, newSearch);
+    };
+    return middleware({ search: currentSearch, next });
+  };
+  return applyNext(0, search);
+}
 exports.PathParamError = PathParamError;
 exports.RouterCore = RouterCore;
 exports.SearchParamError = SearchParamError;