@tanstack/router-core 1.125.1 → 1.125.4

package/package.json

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

package/src/path.ts

@@ -330,6 +330,21 @@ export function interpolatePath({
         usedParams._splat = params._splat
         const segmentPrefix = segment.prefixSegment || ''
         const segmentSuffix = segment.suffixSegment || ''
+
+        // Check if _splat parameter is missing
+        if (!('_splat' in params)) {
+          isMissingParams = true
+          // For missing splat parameters, just return the prefix and suffix without the wildcard
+          if (leaveWildcards) {
+            return `${segmentPrefix}${segment.value}${segmentSuffix}`
+          }
+          // If there is a prefix or suffix, return them joined, otherwise omit the segment
+          if (segmentPrefix || segmentSuffix) {
+            return `${segmentPrefix}${segmentSuffix}`
+          }
+          return undefined
+        }
+
         const value = encodeParam('_splat')
         if (leaveWildcards) {
           return `${segmentPrefix}${segment.value}${value ?? ''}${segmentSuffix}`

package/src/router.ts

@@ -1406,6 +1406,10 @@ export class RouterCore<
     })
   }
 
+  private comparePaths(path1: string, path2: string) {
+    return path1.replace(/(.+)\/$/, '$1') === path2.replace(/(.+)\/$/, '$1')
+  }
+
   buildLocation: BuildLocationFn = (opts) => {
     const build = (
       dest: BuildNextOptions & {
@@ -1424,11 +1428,14 @@ export class RouterCore<
       // First let's find the starting pathname
       // By default, start with the current location
       let fromPath = lastMatch.fullPath
+      const toPath = dest.to
+        ? this.resolvePathWithBase(fromPath, `${dest.to}`)
+        : this.resolvePathWithBase(fromPath, '.')
 
       const routeIsChanging =
         !!dest.to &&
-        dest.to !== fromPath &&
-        this.resolvePathWithBase(fromPath, `${dest.to}`) !== fromPath
+        !this.comparePaths(dest.to.toString(), fromPath) &&
+        !this.comparePaths(toPath, fromPath)
 
       // If the route is changing we need to find the relative fromPath
       if (dest.unsafeRelative === 'path') {
@@ -1436,13 +1443,11 @@ export class RouterCore<
       } else if (routeIsChanging && dest.from) {
         fromPath = dest.from
         const existingFrom = [...allFromMatches].reverse().find((d) => {
-          return (
-            d.fullPath === fromPath || d.fullPath === joinPaths([fromPath, '/'])
-          )
+          return this.comparePaths(d.fullPath, fromPath)
         })
 
         if (!existingFrom) {
-          console.warn(`Could not find match for from: ${dest.from}`)
+          console.warn(`Could not find match for from: ${fromPath}`)
         }
       }