@tanstack/router-core 1.139.0 → 1.139.3

package/src/new-process-route-tree.ts

@@ -878,7 +878,7 @@ function getNodeMatch<T extends RouteLike>(
         }
 
         // perfect match, no need to continue
-        if (statics === partsLength) return bestMatch
+        if (statics === partsLength && node.isIndex) return bestMatch
       }
       // beyond the length of the path parts, only skipped optional segments or wildcard segments can match
       if (!node.optional && !node.wildcard) continue
@@ -1049,6 +1049,11 @@ function isFrameMoreSpecific(
     next.statics > prev.statics ||
     (next.statics === prev.statics &&
       (next.dynamics > prev.dynamics ||
-        (next.dynamics === prev.dynamics && next.optionals > prev.optionals)))
+        (next.dynamics === prev.dynamics &&
+          (next.optionals > prev.optionals ||
+            (next.optionals === prev.optionals &&
+              (next.node.isIndex > prev.node.isIndex ||
+                (next.node.isIndex === prev.node.isIndex &&
+                  next.depth > prev.depth)))))))
   )
 }

package/src/path.ts

@@ -320,22 +320,15 @@ export function interpolatePath({
 
     if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) {
       const key = path.substring(segment[2], segment[3])
-      const prefix = path.substring(start, segment[1])
-      const suffix = path.substring(segment[4], end)
       const valueRaw = params[key]
 
       // Check if optional parameter is missing or undefined
-      if (valueRaw == null) {
-        if (prefix || suffix) {
-          // For optional params with prefix/suffix, keep the prefix/suffix but omit the param
-          joined += '/' + prefix + suffix
-        }
-        // If no prefix/suffix, omit the entire segment
-        continue
-      }
+      if (valueRaw == null) continue
 
       usedParams[key] = valueRaw
 
+      const prefix = path.substring(start, segment[1])
+      const suffix = path.substring(segment[4], end)
       const value = encodeParam(key, params, decodeCharMap) ?? ''
       joined += '/' + prefix + value + suffix
       continue

package/src/router.ts

@@ -1974,7 +1974,7 @@ export class RouterCore<
    *
    * @link https://tanstack.com/router/latest/docs/framework/react/api/router/NavigateOptionsType
    */
-  navigate: NavigateFn = ({ to, reloadDocument, href, ...rest }) => {
+  navigate: NavigateFn = async ({ to, reloadDocument, href, ...rest }) => {
     if (!reloadDocument && href) {
       try {
         new URL(`${href}`)
@@ -1987,6 +1987,26 @@ export class RouterCore<
         const location = this.buildLocation({ to, ...rest } as any)
         href = location.url
       }
+
+      // Check blockers for external URLs unless ignoreBlocker is true
+      if (!rest.ignoreBlocker) {
+        // Cast to access internal getBlockers method
+        const historyWithBlockers = this.history as any
+        const blockers = historyWithBlockers.getBlockers?.() ?? []
+        for (const blocker of blockers) {
+          if (blocker?.blockerFn) {
+            const shouldBlock = await blocker.blockerFn({
+              currentLocation: this.latestLocation,
+              nextLocation: this.latestLocation, // External URLs don't have a next location in our router
+              action: 'PUSH',
+            })
+            if (shouldBlock) {
+              return Promise.resolve()
+            }
+          }
+        }
+      }
+
       if (rest.replace) {
         window.location.replace(href)
       } else {