@tanstack/react-router 1.111.3 → 1.111.7

package/src/useLoaderData.tsx

@@ -4,8 +4,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { AllLoaderData, Expand, RouteById } from '@tanstack/router-core'
-import type { StrictOrFrom } from './utils'
+import type {
+  ResolveUseLoaderData,
+  StrictOrFrom,
+  UseLoaderDataResult,
+} from '@tanstack/router-core'
 
 export interface UseLoaderDataBaseOptions<
   TRouter extends AnyRouter,
@@ -15,7 +18,7 @@ export interface UseLoaderDataBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    match: ResolveLoaderData<TRouter, TFrom, TStrict>,
+    match: ResolveUseLoaderData<TRouter, TFrom, TStrict>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
 }
 
@@ -35,23 +38,6 @@ export type UseLoaderDataOptions<
   > &
   StructuralSharingOption<TRouter, TSelected, TStructuralSharing>
 
-export type ResolveLoaderData<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-> = TStrict extends false
-  ? AllLoaderData<TRouter['routeTree']>
-  : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['loaderData']>
-
-export type UseLoaderDataResult<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-  TSelected,
-> = unknown extends TSelected
-  ? ResolveLoaderData<TRouter, TFrom, TStrict>
-  : TSelected
-
 export type UseLoaderDataRoute<out TId> = <
   TRouter extends AnyRouter = RegisteredRouter,
   TSelected = unknown,

package/src/useLoaderDeps.tsx

@@ -4,8 +4,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
-import type { Expand, RouteById } from '@tanstack/router-core'
+import type {
+  ResolveUseLoaderDeps,
+  StrictOrFrom,
+  UseLoaderDepsResult,
+} from '@tanstack/router-core'
 
 export interface UseLoaderDepsBaseOptions<
   TRouter extends AnyRouter,
@@ -14,7 +17,7 @@ export interface UseLoaderDepsBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    deps: ResolveLoaderDeps<TRouter, TFrom>,
+    deps: ResolveUseLoaderDeps<TRouter, TFrom>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
 }
 
@@ -27,16 +30,6 @@ export type UseLoaderDepsOptions<
   UseLoaderDepsBaseOptions<TRouter, TFrom, TSelected, TStructuralSharing> &
   StructuralSharingOption<TRouter, TSelected, TStructuralSharing>
 
-export type ResolveLoaderDeps<TRouter extends AnyRouter, TFrom> = Expand<
-  RouteById<TRouter['routeTree'], TFrom>['types']['loaderDeps']
->
-
-export type UseLoaderDepsResult<
-  TRouter extends AnyRouter,
-  TFrom,
-  TSelected,
-> = unknown extends TSelected ? ResolveLoaderDeps<TRouter, TFrom> : TSelected
-
 export type UseLoaderDepsRoute<out TId> = <
   TRouter extends AnyRouter = RegisteredRouter,
   TSelected = unknown,

package/src/useMatch.tsx

@@ -7,9 +7,12 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { MakeRouteMatch, MakeRouteMatchUnion } from './Matches'
-import type { StrictOrFrom } from './utils'
-import type { ThrowOrOptional } from '@tanstack/router-core'
+import type {
+  MakeRouteMatch,
+  MakeRouteMatchUnion,
+  StrictOrFrom,
+  ThrowOrOptional,
+} from '@tanstack/router-core'
 
 export interface UseMatchBaseOptions<
   TRouter extends AnyRouter,

package/src/useNavigate.tsx

@@ -1,19 +1,12 @@
 import * as React from 'react'
 import { useRouter } from './useRouter'
-import type { FromPathOption, NavigateOptions } from '@tanstack/router-core'
+import type {
+  FromPathOption,
+  NavigateOptions,
+  UseNavigateResult,
+} from '@tanstack/router-core'
 import type { AnyRouter, RegisteredRouter } from './router'
 
-export type UseNavigateResult<TDefaultFrom extends string> = <
-  TRouter extends RegisteredRouter,
-  TTo extends string | undefined,
-  TFrom extends string = TDefaultFrom,
-  TMaskFrom extends string = TFrom,
-  TMaskTo extends string = '',
->({
-  from,
-  ...rest
-}: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>
-
 export function useNavigate<
   TRouter extends AnyRouter = RegisteredRouter,
   TDefaultFrom extends string = string,

package/src/useParams.tsx

@@ -5,12 +5,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
-  AllParams,
-  Expand,
-  RouteById,
+  ResolveUseParams,
+  StrictOrFrom,
   ThrowOrOptional,
+  UseParamsResult,
 } from '@tanstack/router-core'
 
 export interface UseParamsBaseOptions<
@@ -22,7 +21,7 @@ export interface UseParamsBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    params: ResolveParams<TRouter, TFrom, TStrict>,
+    params: ResolveUseParams<TRouter, TFrom, TStrict>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
   shouldThrow?: TThrow
 }
@@ -45,23 +44,6 @@ export type UseParamsOptions<
   > &
   StructuralSharingOption<TRouter, TSelected, TStructuralSharing>
 
-export type ResolveParams<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-> = TStrict extends false
-  ? AllParams<TRouter['routeTree']>
-  : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['allParams']>
-
-export type UseParamsResult<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-  TSelected,
-> = unknown extends TSelected
-  ? ResolveParams<TRouter, TFrom, TStrict>
-  : TSelected
-
 export type UseParamsRoute<out TFrom> = <
   TRouter extends AnyRouter = RegisteredRouter,
   TSelected = unknown,

package/src/useRouteContext.ts

@@ -1,41 +1,10 @@
 import { useMatch } from './useMatch'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
-import type { AllContext, Expand, RouteById } from '@tanstack/router-core'
-
-export interface UseRouteContextBaseOptions<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-  TSelected,
-> {
-  select?: (search: ResolveRouteContext<TRouter, TFrom, TStrict>) => TSelected
-}
-
-export type UseRouteContextOptions<
-  TRouter extends AnyRouter,
-  TFrom extends string | undefined,
-  TStrict extends boolean,
-  TSelected,
-> = StrictOrFrom<TRouter, TFrom, TStrict> &
-  UseRouteContextBaseOptions<TRouter, TFrom, TStrict, TSelected>
-
-export type ResolveRouteContext<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-> = TStrict extends false
-  ? AllContext<TRouter['routeTree']>
-  : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['allContext']>
-
-export type UseRouteContextResult<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-  TSelected,
-> = unknown extends TSelected
-  ? ResolveRouteContext<TRouter, TFrom, TStrict>
-  : TSelected
+import type {
+  UseRouteContextBaseOptions,
+  UseRouteContextOptions,
+  UseRouteContextResult,
+} from '@tanstack/router-core'
 
 export type UseRouteContextRoute<out TFrom> = <
   TRouter extends AnyRouter = RegisteredRouter,

package/src/useSearch.tsx

@@ -5,12 +5,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
-  Expand,
-  FullSearchSchema,
-  RouteById,
+  ResolveUseSearch,
+  StrictOrFrom,
   ThrowOrOptional,
+  UseSearchResult,
 } from '@tanstack/router-core'
 
 export interface UseSearchBaseOptions<
@@ -22,7 +21,7 @@ export interface UseSearchBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    state: ResolveSearch<TRouter, TFrom, TStrict>,
+    state: ResolveUseSearch<TRouter, TFrom, TStrict>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
   shouldThrow?: TThrow
 }
@@ -45,23 +44,6 @@ export type UseSearchOptions<
   > &
   StructuralSharingOption<TRouter, TSelected, TStructuralSharing>
 
-export type UseSearchResult<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-  TSelected,
-> = unknown extends TSelected
-  ? ResolveSearch<TRouter, TFrom, TStrict>
-  : TSelected
-
-export type ResolveSearch<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean,
-> = TStrict extends false
-  ? FullSearchSchema<TRouter['routeTree']>
-  : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['fullSearchSchema']>
-
 export type UseSearchRoute<out TFrom> = <
   TRouter extends AnyRouter = RegisteredRouter,
   TSelected = unknown,

package/src/utils.ts

@@ -1,9 +1,4 @@
 import * as React from 'react'
-import type {
-  AnyRouter,
-  ConstrainLiteral,
-  RouteIds,
-} from '@tanstack/router-core'
 
 export function useStableCallback<T extends (...args: Array<any>) => any>(
   fn: T,
@@ -15,20 +10,6 @@ export function useStableCallback<T extends (...args: Array<any>) => any>(
   return ref.current as T
 }
 
-export type StrictOrFrom<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean = true,
-> = TStrict extends false
-  ? {
-      from?: never
-      strict: TStrict
-    }
-  : {
-      from: ConstrainLiteral<TFrom, RouteIds<TRouter['routeTree']>>
-      strict?: TStrict
-    }
-
 export const useLayoutEffect =
   typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect