@tanstack/router-core 1.154.8 → 1.154.12

package/dist/cjs/router.cjs

@@ -316,14 +316,21 @@ class RouterCore {
           path: nextTo,
           params: nextParams
         }).interpolatedPath;
-        const { matches: destMatches, rawParams } = this.matchRoutesInternal(
-          { pathname: interpolatedNextTo },
-          { _buildLocation: true }
-        );
-        const destRoutes = destMatches.map(
-          (d) => this.looseRoutesById[d.routeId]
-        );
-        const globalNotFoundMatch = destMatches.find((m) => m.globalNotFound);
+        const destMatchResult = this.getMatchedRoutes(interpolatedNextTo);
+        let destRoutes = destMatchResult.matchedRoutes;
+        const rawParams = destMatchResult.routeParams;
+        const isGlobalNotFound = destMatchResult.foundRoute ? destMatchResult.foundRoute.path !== "/" && destMatchResult.routeParams["**"] : path.trimPathRight(interpolatedNextTo);
+        let globalNotFoundRouteId;
+        if (isGlobalNotFound) {
+          if (this.options.notFoundRoute) {
+            destRoutes = [...destRoutes, this.options.notFoundRoute];
+          } else {
+            globalNotFoundRouteId = findGlobalNotFoundRouteId(
+              this.options.notFoundMode,
+              destRoutes
+            );
+          }
+        }
         if (Object.keys(nextParams).length > 0) {
           for (const route of destRoutes) {
             const fn = route.options.params?.stringify ?? route.options.stringifyParams;
@@ -382,7 +389,7 @@ class RouterCore {
           routes: destRoutes,
           params: snapshotParams,
           searchStr,
-          globalNotFoundRouteId: globalNotFoundMatch?.routeId
+          globalNotFoundRouteId
         });
         const fullPath = `${nextPathname}${searchStr}${hashStr}`;
         const url = new URL(fullPath, this.origin);
@@ -1106,20 +1113,7 @@ class RouterCore {
           isGlobalNotFound = true;
         }
       }
-      globalNotFoundRouteId = (() => {
-        if (!isGlobalNotFound) {
-          return void 0;
-        }
-        if (this.options.notFoundMode !== "root") {
-          for (let i = matchedRoutes.length - 1; i >= 0; i--) {
-            const route = matchedRoutes[i];
-            if (route.children) {
-              return route.id;
-            }
-          }
-        }
-        return root.rootRouteId;
-      })();
+      globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
     }
     const matches = [];
     const getParentContext = (parentMatch) => {
@@ -1519,6 +1513,17 @@ function applySearchMiddleware({
   };
   return applyNext(0, search);
 }
+function findGlobalNotFoundRouteId(notFoundMode, routes) {
+  if (notFoundMode !== "root") {
+    for (let i = routes.length - 1; i >= 0; i--) {
+      const route = routes[i];
+      if (route.children) {
+        return route.id;
+      }
+    }
+  }
+  return root.rootRouteId;
+}
 exports.PathParamError = PathParamError;
 exports.RouterCore = RouterCore;
 exports.SearchParamError = SearchParamError;