fix: do not allow relative pathing without from (#1589)

Co-authored-by: Dominik Dorfmeister <office@dorfmeister.cc>
TanStack · May 13, 2024 · fd956c9 · fd956c9
1 parent 43a26a6
commit fd956c9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 131 deletions.
diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx
@@ -149,7 +149,7 @@ export type AbsolutePathAutoComplete<
   | (TFrom extends '/'
       ? never
       : string extends TFrom
-        ? RemoveLeadingSlashes<RouteToPath<TRouter, TRouter['routeTree']>>
+        ? never
         : RemoveLeadingSlashes<SearchPaths<TRouter, TFrom>>)
 
 export type RelativeToPathAutoComplete<

diff --git a/packages/react-router/tests/Matches.test-d.tsx b/packages/react-router/tests/Matches.test-d.tsx
@@ -50,30 +50,14 @@ test('when matching a route with params', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
-      | '/'
-      | './'
-      | '../'
-      | '/invoices'
-      | '/invoices/$invoiceId'
-      | 'invoices'
-      | 'invoices/$invoiceId'
-      | undefined
+      '/' | './' | '../' | '/invoices' | '/invoices/$invoiceId' | undefined
     >()
 
   expectTypeOf(MatchRoute<DefaultRouter, any, '/invoices/$invoiceId'>)
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
-      | '/'
-      | './'
-      | '../'
-      | '/invoices'
-      | '/invoices/$invoiceId'
-      | 'invoices'
-      | 'invoices/$invoiceId'
-      | undefined
+      '/' | './' | '../' | '/invoices' | '/invoices/$invoiceId' | undefined
     >()
 
   expectTypeOf(

diff --git a/packages/react-router/tests/link.test-d.tsx b/packages/react-router/tests/link.test-d.tsx
@@ -120,7 +120,6 @@ test('when navigating to the root', () => {
     .toEqualTypeOf<
       | '../'
       | './'
-      | ''
       | '/'
       | '/invoices'
       | '/invoices/$invoiceId'
@@ -129,13 +128,6 @@ test('when navigating to the root', () => {
       | '/invoices/$invoiceId/edit'
       | '/posts'
       | '/posts/$postId'
-      | 'invoices'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/edit'
-      | 'posts'
-      | 'posts/$postId'
       | undefined
     >()
 
@@ -145,7 +137,6 @@ test('when navigating to the root', () => {
     .toEqualTypeOf<
       | '../'
       | './'
-      | ''
       | '/'
       | '/invoices'
       | '/invoices/$invoiceId'
@@ -154,13 +145,6 @@ test('when navigating to the root', () => {
       | '/invoices/$invoiceId/edit'
       | '/posts'
       | '/posts/$postId'
-      | 'invoices'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/edit'
-      | 'posts'
-      | 'posts/$postId'
       | undefined
     >()
 
@@ -170,7 +154,6 @@ test('when navigating to the root', () => {
     .toEqualTypeOf<
       | '../'
       | './'
-      | ''
       | '/'
       | '/invoices/'
       | '/invoices/$invoiceId/'
@@ -179,13 +162,6 @@ test('when navigating to the root', () => {
       | '/invoices/$invoiceId/edit/'
       | '/posts/'
       | '/posts/$postId/'
-      | 'invoices/'
-      | 'invoices/$invoiceId/'
-      | 'invoices/$invoiceId/details/$detailId/'
-      | 'invoices/$invoiceId/details/'
-      | 'invoices/$invoiceId/edit/'
-      | 'posts/'
-      | 'posts/$postId/'
       | undefined
     >()
 
@@ -195,7 +171,6 @@ test('when navigating to the root', () => {
     .toEqualTypeOf<
       | '../'
       | './'
-      | ''
       | '/'
       | '/invoices'
       | '/invoices/$invoiceId'
@@ -204,13 +179,6 @@ test('when navigating to the root', () => {
       | '/invoices/$invoiceId/edit'
       | '/posts'
       | '/posts/$postId'
-      | 'invoices'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/edit'
-      | 'posts'
-      | 'posts/$postId'
       | undefined
     >()
 
@@ -220,7 +188,6 @@ test('when navigating to the root', () => {
     .toEqualTypeOf<
       | '../'
       | './'
-      | ''
       | '/'
       | '/invoices'
       | '/invoices/'
@@ -236,20 +203,6 @@ test('when navigating to the root', () => {
       | '/posts/'
       | '/posts/$postId'
       | '/posts/$postId/'
-      | 'invoices'
-      | 'invoices/'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/'
-      | 'invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details/$detailId/'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/details/'
-      | 'invoices/$invoiceId/edit'
-      | 'invoices/$invoiceId/edit/'
-      | 'posts'
-      | 'posts/'
-      | 'posts/$postId'
-      | 'posts/$postId/'
       | undefined
     >()
 })
@@ -476,22 +429,14 @@ test('cannot navigate to a branch with an index', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '/'
-      | 'posts'
       | '/posts'
       | '/posts/$postId'
-      | 'posts/$postId'
-      | 'invoices'
       | '/invoices'
       | '/invoices/$invoiceId'
       | '/invoices/$invoiceId/edit'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/edit'
       | '/invoices/$invoiceId/details'
       | '/invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/details/$detailId'
       | './'
       | '../'
       | undefined
@@ -501,22 +446,14 @@ test('cannot navigate to a branch with an index', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '/'
-      | 'posts'
       | '/posts'
       | '/posts/$postId'
-      | 'posts/$postId'
-      | 'invoices'
       | '/invoices'
       | '/invoices/$invoiceId'
       | '/invoices/$invoiceId/edit'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/edit'
       | '/invoices/$invoiceId/details'
       | '/invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/details/$detailId'
       | './'
       | '../'
       | undefined
@@ -528,22 +465,14 @@ test('cannot navigate to a branch with an index', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '/'
-      | 'posts/'
       | '/posts/'
       | '/posts/$postId/'
-      | 'posts/$postId/'
-      | 'invoices/'
       | '/invoices/'
       | '/invoices/$invoiceId/'
       | '/invoices/$invoiceId/edit/'
-      | 'invoices/$invoiceId/'
-      | 'invoices/$invoiceId/edit/'
       | '/invoices/$invoiceId/details/'
       | '/invoices/$invoiceId/details/$detailId/'
-      | 'invoices/$invoiceId/details/'
-      | 'invoices/$invoiceId/details/$detailId/'
       | './'
       | '../'
       | undefined
@@ -553,22 +482,14 @@ test('cannot navigate to a branch with an index', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '/'
-      | 'posts'
       | '/posts'
       | '/posts/$postId'
-      | 'posts/$postId'
-      | 'invoices'
       | '/invoices'
       | '/invoices/$invoiceId'
       | '/invoices/$invoiceId/edit'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/edit'
       | '/invoices/$invoiceId/details'
       | '/invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/details/$detailId'
       | './'
       | '../'
       | undefined
@@ -580,36 +501,21 @@ test('cannot navigate to a branch with an index', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '/'
-      | 'posts'
-      | 'posts/'
       | '/posts'
       | '/posts/'
       | '/posts/$postId'
       | '/posts/$postId/'
-      | 'posts/$postId'
-      | 'posts/$postId/'
-      | 'invoices'
-      | 'invoices/'
       | '/invoices'
       | '/invoices/'
       | '/invoices/$invoiceId'
       | '/invoices/$invoiceId/'
       | '/invoices/$invoiceId/edit'
       | '/invoices/$invoiceId/edit/'
-      | 'invoices/$invoiceId'
-      | 'invoices/$invoiceId/'
-      | 'invoices/$invoiceId/edit'
-      | 'invoices/$invoiceId/edit/'
       | '/invoices/$invoiceId/details'
       | '/invoices/$invoiceId/details/'
       | '/invoices/$invoiceId/details/$detailId'
       | '/invoices/$invoiceId/details/$detailId/'
-      | 'invoices/$invoiceId/details'
-      | 'invoices/$invoiceId/details/'
-      | 'invoices/$invoiceId/details/$detailId'
-      | 'invoices/$invoiceId/details/$detailId/'
       | './'
       | '../'
       | undefined

diff --git a/packages/react-router/tests/redirects.test.-d.tsx b/packages/react-router/tests/redirects.test.-d.tsx
@@ -40,14 +40,6 @@ test('can redirect to valid route', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
-      | '/'
-      | 'invoices'
-      | '/invoices'
-      | '/invoices/$invoiceId'
-      | 'invoices/$invoiceId'
-      | './'
-      | '../'
-      | undefined
+      '/' | '/invoices' | '/invoices/$invoiceId' | './' | '../' | undefined
     >()
 })
diff --git a/packages/react-router/tests/useNavigate.test-d.tsx b/packages/react-router/tests/useNavigate.test-d.tsx
@@ -42,14 +42,6 @@ test('can redirect to valid route', () => {
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
-      | '/'
-      | 'invoices'
-      | '/invoices'
-      | '/invoices/$invoiceId'
-      | 'invoices/$invoiceId'
-      | './'
-      | '../'
-      | undefined
+      '/' | '/invoices' | '/invoices/$invoiceId' | './' | '../' | undefined
     >()
 })