fix: typesafe buildLocation

TanStack · Dec 15, 2023 · 85acbaa · 85acbaa
1 parent 8afcd1a
commit 85acbaa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/react-router/src/RouterProvider.tsx b/packages/react-router/src/RouterProvider.tsx
@@ -49,7 +49,7 @@ export type MatchRouteFn<TRouteTree extends AnyRoute> = <
 ) => false | RouteById<TRouteTree, TResolved>['types']['allParams']
 
 export type BuildLocationFn<TRouteTree extends AnyRoute> = (
-  opts: BuildNextOptions,
+  opts: ToOptions<TRouteTree>,
 ) => ParsedLocation
 
 export type InjectedHtmlEntry = string | (() => Promise<string> | string)

diff --git a/packages/react-router/src/route.ts b/packages/react-router/src/route.ts
@@ -169,7 +169,7 @@ type BeforeLoadFn<
   context: TParentRoute['types']['allContext']
   location: ParsedLocation
   navigate: NavigateFn<AnyRoute>
-  buildLocation: BuildLocationFn<AnyRoute>
+  buildLocation: BuildLocationFn<TParentRoute>
   cause: 'preload' | 'enter' | 'stay'
 }) => Promise<TRouteContext> | TRouteContext | void
 

diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts
@@ -59,6 +59,7 @@ import {
 } from './path'
 import invariant from 'tiny-invariant'
 import { isRedirect } from './redirects'
+import { ToOptions } from './link'
 // import warning from 'tiny-warning'
 
 //
@@ -937,7 +938,7 @@ export class Router<
     startTransition,
     ...rest
   }: BuildNextOptions & CommitLocationOptions = {}) => {
-    const location = this.buildLocation(rest)
+    const location = this.buildLocation(rest as any)
     return this.commitLocation({
       ...location,
       startTransition,
@@ -1461,9 +1462,9 @@ export class Router<
   }
 
   preloadRoute = async (
-    navigateOpts: BuildNextOptions = this.state.location,
+    navigateOpts: ToOptions<TRouteTree> = this.state.location as any,
   ) => {
-    let next = this.buildLocation(navigateOpts)
+    let next = this.buildLocation(navigateOpts as any)
 
     let matches = this.matchRoutes(next.pathname, next.search, {
       throwOnError: true,