@tanstack/router-core 1.128.6 → 1.128.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.128.6",
+  "version": "1.128.7",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/path.ts

@@ -578,9 +578,6 @@ function isMatch(
     const baseSegment = baseSegments[baseIndex]
     const routeSegment = routeSegments[routeIndex]
 
-    const isLastBaseSegment = baseIndex >= baseSegments.length - 1
-    const isLastRouteSegment = routeIndex >= routeSegments.length - 1
-
     if (routeSegment) {
       if (routeSegment.type === SEGMENT_TYPE_WILDCARD) {
         // Capture all remaining segments for a wildcard
@@ -805,16 +802,12 @@ function isMatch(
       }
     }
 
-    if (!isLastBaseSegment && isLastRouteSegment) {
+    // If we have base segments left but no route segments, it's a fuzzy match
+    if (baseIndex < baseSegments.length && routeIndex >= routeSegments.length) {
       params['**'] = joinPaths(
-        baseSegments.slice(baseIndex + 1).map((d) => d.value),
+        baseSegments.slice(baseIndex).map((d) => d.value),
       )
-      return !!fuzzy && routeSegment?.value !== '/'
-    }
-
-    // If we have base segments left but no route segments, it's not a match
-    if (baseIndex < baseSegments.length && routeIndex >= routeSegments.length) {
-      return false
+      return !!fuzzy && routeSegments[routeSegments.length - 1]?.value !== '/'
     }
 
     // If we have route segments left but no base segments, check if remaining are optional

package/src/router.ts

@@ -3393,7 +3393,8 @@ export function getMatchedRoutes<TRouteLike extends RouteLike>({
     const result = matchPathname(basepath, trimmedPath, {
       to: route.fullPath,
       caseSensitive: route.options?.caseSensitive ?? caseSensitive,
-      fuzzy: false,
+      // we need fuzzy matching for `notFoundMode: 'fuzzy'`
+      fuzzy: true,
     })
     return result
   }
@@ -3403,16 +3404,34 @@ export function getMatchedRoutes<TRouteLike extends RouteLike>({
   if (foundRoute) {
     routeParams = getMatchedParams(foundRoute)!
   } else {
-    foundRoute = flatRoutes.find((route) => {
+    // iterate over flatRoutes to find the best match
+    // if we find a fuzzy matching route, keep looking for a perfect fit
+    let fuzzyMatch:
+      | { foundRoute: TRouteLike; routeParams: Record<string, string> }
+      | undefined = undefined
+    for (const route of flatRoutes) {
       const matchedParams = getMatchedParams(route)
 
       if (matchedParams) {
-        routeParams = matchedParams
-        return true
+        if (
+          route.path !== '/' &&
+          (matchedParams as Record<string, string>)['**']
+        ) {
+          if (!fuzzyMatch) {
+            fuzzyMatch = { foundRoute: route, routeParams: matchedParams }
+          }
+        } else {
+          foundRoute = route
+          routeParams = matchedParams
+          break
+        }
       }
-
-      return false
-    })
+    }
+    // did not find a perfect fit, so take the fuzzy matching route if it exists
+    if (!foundRoute && fuzzyMatch) {
+      foundRoute = fuzzyMatch.foundRoute
+      routeParams = fuzzyMatch.routeParams
+    }
   }
 
   let routeCursor: TRouteLike = foundRoute || routesById[rootRouteId]!