chore: fix build and further improve types

TanStack · Dec 29, 2024 · 1742e3e · 1742e3e
1 parent 4658afa
commit 1742e3e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 29 deletions.
diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx
@@ -22,11 +22,11 @@ import type {
   FullSearchSchema,
   FullSearchSchemaInput,
   ParentPath,
-  RootPath,
   RouteByPath,
   RouteByToPath,
   RoutePaths,
   RouteToPath,
+  ToPath,
   TrailingSlashOptionByRouter,
 } from './routeInfo'
 import type {
@@ -79,26 +79,27 @@ export type RemoveLeadingSlashes<T> = T extends `/${string}`
 export type FindDescendantPaths<
   TRouter extends AnyRouter,
   TPrefix extends string,
-  TCleanedPrefix extends string = RemoveTrailingSlashes<TPrefix>,
-> = (TPrefix | `${TCleanedPrefix}/${string}`) & RouteToPath<TRouter>
+> = `${TPrefix}/${string}` & RouteToPath<TRouter>
 
 export type SearchPaths<
   TRouter extends AnyRouter,
   TPrefix extends string,
   TPaths = FindDescendantPaths<TRouter, TPrefix>,
-  TCleanedPrefix extends string = RemoveTrailingSlashes<TPrefix>,
-  TRootPath = RootPath<TrailingSlashOptionByRouter<TRouter>>,
-> = TPaths extends TPrefix
-  ? TRootPath
-  : TPaths extends `${TCleanedPrefix}/${infer TRest}`
-    ? `/${TRest}`
-    : never
+> = TPaths extends `${TPrefix}/${infer TRest}`
+  ? TRest extends ''
+    ? never
+    : TRest
+  : never
 
 export type SearchRelativePathAutoComplete<
   TRouter extends AnyRouter,
   TTo extends string,
   TSearchPath extends string,
-> = `${TTo}${SearchPaths<TRouter, TSearchPath>}`
+> =
+  | (TSearchPath & RouteToPath<TRouter> extends never
+      ? never
+      : ToPath<TrailingSlashOptionByRouter<TRouter>, TTo>)
+  | `${TTo}/${SearchPaths<TRouter, RemoveTrailingSlashes<TSearchPath>>}`
 
 export type RelativeToParentPathAutoComplete<
   TRouter extends AnyRouter,
@@ -110,7 +111,10 @@ export type RelativeToParentPathAutoComplete<
   | (TTo extends `${string}..` | `${string}../`
       ? TResolvedPath extends '/' | ''
         ? never
-        : FindDescendantPaths<TRouter, TResolvedPath> extends never
+        : FindDescendantPaths<
+              TRouter,
+              RemoveTrailingSlashes<TResolvedPath>
+            > extends never
           ? never
           : `${TTo}/${ParentPath<TrailingSlashOptionByRouter<TRouter>>}`
       : never)
@@ -132,9 +136,7 @@ export type AbsolutePathAutoComplete<
       ? CurrentPath<TrailingSlashOptionByRouter<TRouter>>
       : TFrom extends `/`
         ? never
-        : FindDescendantPaths<TRouter, TFrom> extends never
-          ? never
-          : CurrentPath<TrailingSlashOptionByRouter<TRouter>>)
+        : CurrentPath<TrailingSlashOptionByRouter<TRouter>>)
   | (string extends TFrom
       ? ParentPath<TrailingSlashOptionByRouter<TRouter>>
       : TFrom extends `/`
@@ -145,9 +147,7 @@ export type AbsolutePathAutoComplete<
       ? never
       : string extends TFrom
         ? never
-        : RemoveLeadingSlashes<
-            SearchPaths<TRouter, RemoveTrailingSlashes<TFrom>>
-          >)
+        : SearchPaths<TRouter, RemoveTrailingSlashes<TFrom>>)
 
 export type RelativeToPathAutoComplete<
   TRouter extends AnyRouter,

diff --git a/packages/react-router/src/routeInfo.ts b/packages/react-router/src/routeInfo.ts
@@ -71,11 +71,11 @@ export type CurrentPath<TOption> = 'always' extends TOption
     ? '.'
     : './' | '.'
 
-export type RootPath<TOption> = 'always' extends TOption
-  ? '/'
+export type ToPath<TOption, TTo extends string> = 'always' extends TOption
+  ? `${TTo}/`
   : 'never' extends TOption
-    ? ''
-    : '' | '/'
+    ? TTo
+    : TTo | `${TTo}/`
 
 export type CatchAllPaths<TOption> = CurrentPath<TOption> | ParentPath<TOption>
 

diff --git a/packages/react-router/tests/link.test-d.tsx b/packages/react-router/tests/link.test-d.tsx
@@ -396,7 +396,6 @@ test('when navigating from a route with no params and no search to the root', ()
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '..'
       | '.'
       | '/'
@@ -416,7 +415,6 @@ test('when navigating from a route with no params and no search to the root', ()
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '..'
       | '.'
       | '/'
@@ -439,7 +437,6 @@ test('when navigating from a route with no params and no search to the root', ()
       | '../'
       | './'
       | '/'
-      | ''
       | '/invoices/'
       | '/invoices/$invoiceId/'
       | '/invoices/$invoiceId/edit/'
@@ -456,7 +453,6 @@ test('when navigating from a route with no params and no search to the root', ()
     .parameter(0)
     .toHaveProperty('to')
     .toEqualTypeOf<
-      | ''
       | '..'
       | '.'
       | '/'
@@ -479,10 +475,8 @@ test('when navigating from a route with no params and no search to the root', ()
       | '.'
       | '..'
       | '../'
-      | '../'
       | './'
       | '/'
-      | ''
       | '/invoices'
       | '/invoices/'
       | '/invoices/$invoiceId'

diff --git a/packages/react-router/tests/route.test-d.tsx b/packages/react-router/tests/route.test-d.tsx
@@ -1245,7 +1245,6 @@ test('when creating a child route with context, search, params and beforeLoad',
         .toHaveProperty('to')
         .toEqualTypeOf<
           | '.'
-          | './'
           | './invoices'
           | './invoices/$invoiceId'
           | './invoices/$invoiceId/details'