@tanstack/react-router 1.63.5 → 1.64.1

package/dist/cjs/router.cjs

@@ -226,6 +226,38 @@ class Router {
       });
       return resolvedPath;
     };
+    this.getMatchedRoutes = (next, dest) => {
+      let routeParams = {};
+      const trimmedPath = path.trimPathRight(next.pathname);
+      const getMatchedParams = (route) => {
+        const result = path.matchPathname(this.basepath, trimmedPath, {
+          to: route.fullPath,
+          caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
+          fuzzy: true
+        });
+        return result;
+      };
+      let foundRoute = (dest == null ? void 0 : dest.to) !== void 0 ? this.routesByPath[dest.to] : void 0;
+      if (foundRoute) {
+        routeParams = getMatchedParams(foundRoute);
+      } else {
+        foundRoute = this.flatRoutes.find((route) => {
+          const matchedParams = getMatchedParams(route);
+          if (matchedParams) {
+            routeParams = matchedParams;
+            return true;
+          }
+          return false;
+        });
+      }
+      let routeCursor = foundRoute || this.routesById[root.rootRouteId];
+      const matchedRoutes = [routeCursor];
+      while (routeCursor.parentRoute) {
+        routeCursor = routeCursor.parentRoute;
+        matchedRoutes.unshift(routeCursor);
+      }
+      return { matchedRoutes, routeParams, foundRoute };
+    };
     this.cancelMatch = (id) => {
       const match = this.getMatch(id);
       if (!match) return;
@@ -239,7 +271,7 @@ class Router {
       });
     };
     this.buildLocation = (opts) => {
-      const build = (dest = {}, matches) => {
+      const build = (dest = {}, matchedRoutesResult) => {
         var _a, _b, _c, _d, _e;
         const fromMatches = dest._fromLocation ? this.matchRoutes(dest._fromLocation, { _buildLocation: true }) : this.state.matches;
         const fromMatch = dest.from != null ? fromMatches.find(
@@ -255,21 +287,32 @@ class Router {
           "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 = matches == null ? void 0 : matches.filter(
-          (d) => fromMatches.find((e) => e.routeId === d.routeId)
-        );
-        const fromRouteByFromPathRouteId = this.routesById[(_d = stayingMatches == null ? void 0 : stayingMatches.find((d) => d.pathname === fromPath)) == null ? void 0 : _d.routeId];
-        let pathname = dest.to ? this.resolvePathWithBase(fromPath, `${dest.to}`) : this.resolvePathWithBase(
-          fromPath,
-          (fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
+        const stayingMatches = matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.filter(
+          (d) => fromMatches.find((e) => e.routeId === d.id)
         );
+        let pathname;
+        if (dest.to) {
+          pathname = this.resolvePathWithBase(fromPath, `${dest.to}`);
+        } else {
+          const fromRouteByFromPathRouteId = this.routesById[(_d = stayingMatches == null ? void 0 : stayingMatches.find((route) => {
+            const interpolatedPath = path.interpolatePath({
+              path: route.fullPath,
+              params: (matchedRoutesResult == null ? void 0 : matchedRoutesResult.routeParams) ?? {}
+            });
+            const pathname2 = path.joinPaths([this.basepath, interpolatedPath]);
+            return pathname2 === fromPath;
+          })) == null ? void 0 : _d.id];
+          pathname = this.resolvePathWithBase(
+            fromPath,
+            (fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
+          );
+        }
         const prevParams = { ...(_e = utils.last(fromMatches)) == null ? void 0 : _e.params };
         let nextParams = (dest.params ?? true) === true ? prevParams : { ...prevParams, ...utils.functionalUpdate(dest.params, prevParams) };
         if (Object.keys(nextParams).length > 0) {
-          matches == null ? void 0 : matches.map((d) => {
+          matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.map((route) => {
             var _a2;
-            const route = this.looseRoutesById[d.routeId];
-            return ((_a2 = route == null ? void 0 : route.options.params) == null ? void 0 : _a2.stringify) ?? route.options.stringifyParams;
+            return ((_a2 = route.options.params) == null ? void 0 : _a2.stringify) ?? route.options.stringifyParams;
           }).filter(Boolean).forEach((fn) => {
             nextParams = { ...nextParams, ...fn(nextParams) };
           });
@@ -280,12 +323,8 @@ class Router {
           leaveWildcards: false,
           leaveParams: opts.leaveParams
         });
-        const preSearchFilters = (stayingMatches == null ? void 0 : stayingMatches.map(
-          (match) => this.looseRoutesById[match.routeId].options.preSearchFilters ?? []
-        ).flat().filter(Boolean)) ?? [];
-        const postSearchFilters = (stayingMatches == null ? void 0 : stayingMatches.map(
-          (match) => this.looseRoutesById[match.routeId].options.postSearchFilters ?? []
-        ).flat().filter(Boolean)) ?? [];
+        const preSearchFilters = (stayingMatches == null ? void 0 : stayingMatches.map((route) => route.options.preSearchFilters ?? []).flat().filter(Boolean)) ?? [];
+        const postSearchFilters = (stayingMatches == null ? void 0 : stayingMatches.map((route) => route.options.postSearchFilters ?? []).flat().filter(Boolean)) ?? [];
         const preFilteredSearch = preSearchFilters.length ? preSearchFilters.reduce((prev, next) => next(prev), fromSearch) : fromSearch;
         const destSearch = dest.search === true ? preFilteredSearch : dest.search ? utils.functionalUpdate(dest.search, preFilteredSearch) : preSearchFilters.length ? preFilteredSearch : {};
         const postFilteredSearch = postSearchFilters.length ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
@@ -333,11 +372,11 @@ class Router {
             maskedNext = build(maskedDest);
           }
         }
-        const nextMatches = this.matchRoutes(next, { _buildLocation: true });
-        const maskedMatches = maskedNext ? this.matchRoutes(maskedNext, { _buildLocation: true }) : void 0;
-        const maskedFinal = maskedNext ? build(maskedDest, maskedMatches) : void 0;
+        const nextMatches = this.getMatchedRoutes(next, dest);
         const final = build(dest, nextMatches);
-        if (maskedFinal) {
+        if (maskedNext) {
+          const maskedMatches = this.getMatchedRoutes(maskedNext, maskedDest);
+          const maskedFinal = build(maskedDest, maskedMatches);
           final.maskedLocation = maskedFinal;
         }
         return final;
@@ -1020,7 +1059,8 @@ class Router {
       const next = this.buildLocation(opts);
       let matches = this.matchRoutes(next, {
         throwOnError: true,
-        preload: true
+        preload: true,
+        dest: opts
       });
       const loadedMatchIds = Object.fromEntries(
         [
@@ -1265,25 +1305,10 @@ class Router {
     }
   }
   matchRoutesInternal(next, opts) {
-    let routeParams = {};
-    const foundRoute = this.flatRoutes.find((route) => {
-      const matchedParams = path.matchPathname(
-        this.basepath,
-        path.trimPathRight(next.pathname),
-        {
-          to: route.fullPath,
-          caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
-          fuzzy: true
-        }
-      );
-      if (matchedParams) {
-        routeParams = matchedParams;
-        return true;
-      }
-      return false;
-    });
-    let routeCursor = foundRoute || this.routesById[root.rootRouteId];
-    const matchedRoutes = [routeCursor];
+    const { foundRoute, matchedRoutes, routeParams } = this.getMatchedRoutes(
+      next,
+      opts == null ? void 0 : opts.dest
+    );
     let isGlobalNotFound = false;
     if (
       // If we found a route, and it's not an index route and we have left over path
@@ -1298,10 +1323,6 @@ class Router {
         isGlobalNotFound = true;
       }
     }
-    while (routeCursor.parentRoute) {
-      routeCursor = routeCursor.parentRoute;
-      matchedRoutes.unshift(routeCursor);
-    }
     const globalNotFoundRouteId = (() => {
       if (!isGlobalNotFound) {
         return void 0;