@tanstack/react-router 1.26.17 → 1.26.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.26.17",
+  "version": "1.26.19",
   "description": "",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/link.tsx

@@ -87,7 +87,9 @@ export type RemoveLeadingSlashes<T> = T extends `/${infer R}`
 export type SearchPaths<
   TPaths,
   TSearchPath extends string,
-> = TPaths extends `${TSearchPath}/${infer TRest}` ? TRest : never
+> = TPaths extends `${RemoveTrailingSlashes<TSearchPath>}/${infer TRest}`
+  ? TRest
+  : never
 
 export type SearchRelativePathAutoComplete<
   TTo extends string,
@@ -121,16 +123,12 @@ export type AbsolutePathAutoComplete<TFrom extends string, TPaths> =
       ? './'
       : TFrom extends `/`
         ? never
-        : SearchPaths<
-              TPaths,
-              RemoveTrailingSlashes<TFrom>
-            > extends infer SearchedPaths
-          ? SearchedPaths extends ''
-            ? never
-            : './'
-          : never)
+        : SearchPaths<TPaths, TFrom> extends ''
+          ? never
+          : './')
   | (string extends TFrom ? '../' : TFrom extends `/` ? never : '../')
   | TPaths
+  | (TFrom extends '/' ? never : SearchPaths<TPaths, TFrom>)
 
 export type RelativeToPathAutoComplete<
   TRouteTree extends AnyRoute,
@@ -352,6 +350,25 @@ export type ResolveRelativePath<TFrom, TTo = '.'> = TFrom extends string
     : never
   : never
 
+// type Test1 = ResolveRelativePath<'/', '/posts'>
+// //   ^?
+// type Test4 = ResolveRelativePath<'/posts/1/comments', '../..'>
+// //   ^?
+// type Test5 = ResolveRelativePath<'/posts/1/comments', '../../..'>
+// //   ^?
+// type Test6 = ResolveRelativePath<'/posts/1/comments', './1'>
+// //   ^?
+// type Test7 = ResolveRelativePath<'/posts/1/comments', './1/2'>
+// //   ^?
+// type Test8 = ResolveRelativePath<'/posts/1/comments', '../edit'>
+// //   ^?
+// type Test9 = ResolveRelativePath<'/posts/1/comments', '1'>
+// //   ^?
+// type Test10 = ResolveRelativePath<'/posts/1/comments', './1'>
+// //   ^?
+// type Test11 = ResolveRelativePath<'/posts/1/comments', './1/2'>
+// //   ^?
+
 type LinkCurrentTargetElement = {
   preloadTimeout?: null | ReturnType<typeof setTimeout>
 }

package/src/router.ts

@@ -1777,6 +1777,23 @@ export class Router<
       })
     })
 
+    // If the preload leaf match is the same as the current or pending leaf match,
+    // do not preload as it could cause a mutation of the current route.
+    // The user should specify proper loaderDeps (which are used to uniquely identify a route)
+    // to trigger preloads for routes with the same pathname, but different deps
+
+    const leafMatch = last(matches)
+    const currentLeafMatch = last(this.state.matches)
+    const pendingLeafMatch = last(this.state.pendingMatches ?? [])
+
+    if (
+      leafMatch &&
+      (currentLeafMatch?.id === leafMatch.id ||
+        pendingLeafMatch?.id === leafMatch.id)
+    ) {
+      return undefined
+    }
+
     try {
       matches = await this.loadMatches({
         matches,