@tanstack/react-router 1.53.1 → 1.56.1

package/src/router.ts

@@ -1336,7 +1336,8 @@ export class Router<
 
       const fromRouteByFromPathRouteId =
         this.routesById[
-          stayingMatches?.find((d) => d.pathname === fromPath)?.routeId
+          stayingMatches?.find((d) => d.pathname === fromPath)
+            ?.routeId as keyof this['routesById']
         ]
 
       let pathname = dest.to
@@ -1634,7 +1635,7 @@ export class Router<
 
     return this.buildAndCommitLocation({
       ...rest,
-      to,
+      to: to as string,
       // to: toString,
     })
   }
@@ -2447,7 +2448,7 @@ export class Router<
 
   preloadRoute = async <
     TFrom extends RoutePaths<TRouteTree> | string = string,
-    TTo extends string = '',
+    TTo extends string | undefined = undefined,
     TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom,
     TMaskTo extends string = '',
   >(
@@ -2521,7 +2522,7 @@ export class Router<
 
   matchRoute = <
     TFrom extends RoutePaths<TRouteTree> = '/',
-    TTo extends string = '',
+    TTo extends string | undefined = undefined,
     TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>,
   >(
     location: ToOptions<
@@ -2534,7 +2535,10 @@ export class Router<
     const matchLocation = {
       ...location,
       to: location.to
-        ? this.resolvePathWithBase((location.from || '') as string, location.to)
+        ? this.resolvePathWithBase(
+            (location.from || '') as string,
+            location.to as string,
+          )
         : undefined,
       params: location.params || {},
       leaveParams: true,

package/src/useLoaderData.tsx

@@ -3,7 +3,7 @@ import type { RegisteredRouter } from './router'
 import type { AnyRoute } from './route'
 import type { MakeRouteMatch } from './Matches'
 import type { RouteIds } from './routeInfo'
-import type { StrictOrFrom } from './utils'
+import type { Constrain, StrictOrFrom } from './utils'
 
 export type UseLoaderDataOptions<
   TRouteTree extends AnyRoute,
@@ -11,13 +11,13 @@ export type UseLoaderDataOptions<
   TStrict extends boolean,
   TRouteMatch extends MakeRouteMatch<TRouteTree, TFrom, TStrict>,
   TSelected,
-> = StrictOrFrom<TFrom, TStrict> & {
+> = StrictOrFrom<Constrain<TFrom, RouteIds<TRouteTree>>, TStrict> & {
   select?: (match: Required<TRouteMatch>['loaderData']) => TSelected
 }
 
 export function useLoaderData<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TStrict extends boolean = true,
   TRouteMatch extends MakeRouteMatch<
     TRouteTree,

package/src/useLoaderDeps.tsx

@@ -3,18 +3,18 @@ import type { RegisteredRouter } from './router'
 import type { AnyRoute } from './route'
 import type { MakeRouteMatch } from './Matches'
 import type { RouteIds } from './routeInfo'
-import type { StrictOrFrom } from './utils'
+import type { Constrain, StrictOrFrom } from './utils'
 
 export function useLoaderDeps<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TRouteMatch extends MakeRouteMatch<TRouteTree, TFrom> = MakeRouteMatch<
     TRouteTree,
     TFrom
   >,
   TSelected = Required<TRouteMatch>['loaderDeps'],
 >(
-  opts: StrictOrFrom<TFrom> & {
+  opts: StrictOrFrom<Constrain<TFrom, RouteIds<TRouteTree>>> & {
     select?: (match: TRouteMatch) => TSelected
   },
 ): TSelected {

package/src/useMatch.tsx

@@ -6,7 +6,7 @@ import type { RegisteredRouter } from './router'
 import type { AnyRoute } from './route'
 import type { MakeRouteMatch } from './Matches'
 import type { RouteIds } from './routeInfo'
-import type { StrictOrFrom } from './utils'
+import type { Constrain, StrictOrFrom } from './utils'
 
 export type UseMatchOptions<
   TFrom,
@@ -21,13 +21,19 @@ export type UseMatchOptions<
 
 export function useMatch<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TStrict extends boolean = true,
   TRouteMatch = MakeRouteMatch<TRouteTree, TFrom, TStrict>,
   TSelected = TRouteMatch,
   TThrow extends boolean = true,
 >(
-  opts: UseMatchOptions<TFrom, TStrict, TRouteMatch, TSelected, TThrow>,
+  opts: UseMatchOptions<
+    Constrain<TFrom, RouteIds<TRouteTree>>,
+    TStrict,
+    TRouteMatch,
+    TSelected,
+    TThrow
+  >,
 ): TThrow extends true ? TSelected : TSelected | undefined {
   const nearestMatchId = React.useContext(matchContext)
 

package/src/useNavigate.tsx

@@ -5,10 +5,10 @@ import type { RoutePaths } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
 
 export type UseNavigateResult<TDefaultFrom extends string> = <
-  TTo extends string,
-  TRouter extends AnyRouter = RegisteredRouter,
-  TFrom extends RoutePaths<TRouter['routeTree']> | string = TDefaultFrom,
-  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,
+  TRouter extends RegisteredRouter,
+  TTo extends string | undefined,
+  TFrom extends string = TDefaultFrom,
+  TMaskFrom extends string = TFrom,
   TMaskTo extends string = '',
 >({
   from,
@@ -51,7 +51,7 @@ export function useNavigate<
 export function Navigate<
   TRouter extends AnyRouter = RegisteredRouter,
   TFrom extends RoutePaths<TRouter['routeTree']> | string = string,
-  TTo extends string = '',
+  TTo extends string | undefined = undefined,
   TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,
   TMaskTo extends string = '',
 >(props: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): null {

package/src/useParams.tsx

@@ -2,7 +2,7 @@ import { useMatch } from './useMatch'
 import type { AnyRoute } from './route'
 import type { AllParams, RouteById, RouteIds } from './routeInfo'
 import type { RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
+import type { Constrain, StrictOrFrom } from './utils'
 
 export type UseParamsOptions<
   TFrom,
@@ -15,13 +15,20 @@ export type UseParamsOptions<
 
 export function useParams<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TStrict extends boolean = true,
   TParams = TStrict extends false
     ? AllParams<TRouteTree>
     : RouteById<TRouteTree, TFrom>['types']['allParams'],
   TSelected = TParams,
->(opts: UseParamsOptions<TFrom, TStrict, TParams, TSelected>): TSelected {
+>(
+  opts: UseParamsOptions<
+    Constrain<TFrom, RouteIds<TRouteTree>>,
+    TStrict,
+    TParams,
+    TSelected
+  >,
+): TSelected {
   return useMatch({
     ...opts,
     select: (match) => {

package/src/useRouteContext.ts

@@ -3,7 +3,7 @@ import type { MakeRouteMatch } from './Matches'
 import type { AnyRoute } from './route'
 import type { AllContext, RouteById, RouteIds } from './routeInfo'
 import type { RegisteredRouter } from './router'
-import type { Expand, StrictOrFrom } from './utils'
+import type { Constrain, Expand, StrictOrFrom } from './utils'
 
 export type UseRouteContextOptions<
   TFrom,
@@ -16,14 +16,19 @@ export type UseRouteContextOptions<
 
 export function useRouteContext<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TStrict extends boolean = true,
   TRouteContext = TStrict extends false
     ? AllContext<TRouteTree>
     : Expand<RouteById<TRouteTree, TFrom>['types']['allContext']>,
   TSelected = TRouteContext,
 >(
-  opts: UseRouteContextOptions<TFrom, TStrict, TRouteContext, TSelected>,
+  opts: UseRouteContextOptions<
+    Constrain<TFrom, RouteIds<TRouteTree>>,
+    TStrict,
+    TRouteContext,
+    TSelected
+  >,
 ): TSelected {
   return useMatch({
     ...(opts as any),

package/src/useSearch.tsx

@@ -3,7 +3,7 @@ import type { AnyRoute } from './route'
 import type { FullSearchSchema, RouteById, RouteIds } from './routeInfo'
 import type { RegisteredRouter } from './router'
 import type { MakeRouteMatch } from './Matches'
-import type { Expand, StrictOrFrom } from './utils'
+import type { Constrain, Expand, StrictOrFrom } from './utils'
 
 export type UseSearchOptions<
   TFrom,
@@ -16,16 +16,23 @@ export type UseSearchOptions<
 
 export function useSearch<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
+  TFrom extends string | undefined = undefined,
   TStrict extends boolean = true,
   TSearch = TStrict extends false
     ? FullSearchSchema<TRouteTree>
     : Expand<RouteById<TRouteTree, TFrom>['types']['fullSearchSchema']>,
   TSelected = TSearch,
->(opts: UseSearchOptions<TFrom, TStrict, TSearch, TSelected>): TSelected {
+>(
+  opts: UseSearchOptions<
+    Constrain<TFrom, RouteIds<TRouteTree>>,
+    TStrict,
+    TSearch,
+    TSelected
+  >,
+): TSelected {
   return useMatch({
     ...opts,
-    select: (match: MakeRouteMatch<TRouteTree, TFrom>) => {
+    select: (match) => {
       return opts.select ? opts.select(match.search) : match.search
     },
   })