@tanstack/react-router 1.109.2 → 1.111.6

package/src/route.ts

@@ -12,38 +12,46 @@ import type {
   AnyPathParams,
   AnySchema,
   AnyValidator,
-  Assign,
+  BeforeLoadContextParameter,
+  BuildLocationFn,
   Constrain,
   ConstrainLiteral,
-  ContextAsyncReturnType,
-  ContextReturnType,
+  RootRoute as CoreRootRoute,
+  Route as CoreRoute,
   DefaultValidator,
   ErrorComponentProps,
   Expand,
-  InferAllContext,
-  InferAllParams,
-  InferFullSearchSchema,
-  InferFullSearchSchemaInput,
-  IntersectAssign,
+  FullSearchSchemaOption,
+  NavigateFn,
+  NavigateOptions,
   NoInfer,
   NotFoundRouteProps,
   ParamsOptions,
   ParsedLocation,
+  RemountDepsOptions,
+  ResolveAllContext,
+  ResolveAllParamsFromParent,
+  ResolveFullPath,
+  ResolveFullSearchSchema,
+  ResolveFullSearchSchemaInput,
   ResolveId,
   ResolveLoaderData,
   ResolveParams,
-  ResolveRouteContext,
-  ResolveSearchValidatorInput,
-  ResolveValidatorOutput,
   RootRouteId,
+  RouteById,
   RouteContext,
+  RouteContextParameter,
+  RouteIds,
   RoutePathOptions,
   RoutePathOptionsIntersection,
-  RoutePrefix,
+  RoutePaths,
+  RouteTypes,
   SearchFilter,
   SearchMiddleware,
+  ToMaskOptions,
   TrimPathRight,
   UpdatableStaticRouteOption,
+  UseNavigateResult,
 } from '@tanstack/router-core'
 import type { UseLoaderDataRoute } from './useLoaderData'
 import type { UseMatchRoute } from './useMatch'
@@ -51,20 +59,15 @@ import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseParamsRoute } from './useParams'
 import type { UseSearchRoute } from './useSearch'
 import type * as React from 'react'
-import type { UseNavigateResult } from './useNavigate'
 import type {
   AnyRouteMatch,
   MakeRouteMatchFromRoute,
   MakeRouteMatchUnion,
   RouteMatch,
 } from './Matches'
-import type { NavigateOptions, ToMaskOptions } from './link'
-import type { ParseRoute, RouteById, RouteIds, RoutePaths } from './routeInfo'
 import type { AnyRouter, RegisteredRouter, Router } from './router'
-import type { BuildLocationFn, NavigateFn } from './RouterProvider'
 import type { NotFoundError } from './not-found'
 import type { LazyRoute } from './fileRoute'
-
 import type { UseRouteContextRoute } from './useRouteContext'
 
 export type RouteOptions<
@@ -106,13 +109,6 @@ export type RouteOptions<
     NoInfer<TBeforeLoadFn>
   >
 
-export interface FullSearchSchemaOption<
-  in out TParentRoute extends AnyRoute,
-  in out TSearchValidator,
-> {
-  search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
-}
-
 export type RouteContextFn<
   in out TParentRoute extends AnyRoute,
   in out TSearchValidator,
@@ -288,30 +284,6 @@ export interface RouteContextOptions<
   context: Expand<RouteContextParameter<TParentRoute, TRouterContext>>
 }
 
-export interface RemountDepsOptions<
-  in out TRouteId,
-  in out TFullSearchSchema,
-  in out TAllParams,
-  in out TLoaderDeps,
-> {
-  routeId: TRouteId
-  search: TFullSearchSchema
-  params: TAllParams
-  loaderDeps: TLoaderDeps
-}
-
-export type MakeRemountDepsOptionsUnion<
-  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TRoute extends AnyRoute = ParseRoute<TRouteTree>,
-> = TRoute extends any
-  ? RemountDepsOptions<
-      TRoute['id'],
-      TRoute['types']['fullSearchSchema'],
-      TRoute['types']['allParams'],
-      TRoute['types']['loaderDeps']
-    >
-  : never
-
 export interface BeforeLoadContextOptions<
   in out TParentRoute extends AnyRoute,
   in out TSearchValidator,
@@ -570,50 +542,6 @@ export interface LoaderFnContext<
   route: Route
 }
 
-export type ResolveFullSearchSchema<
-  TParentRoute extends AnyRoute,
-  TSearchValidator,
-> = unknown extends TParentRoute
-  ? ResolveValidatorOutput<TSearchValidator>
-  : IntersectAssign<
-      InferFullSearchSchema<TParentRoute>,
-      ResolveValidatorOutput<TSearchValidator>
-    >
-
-export type ResolveFullSearchSchemaInput<
-  TParentRoute extends AnyRoute,
-  TSearchValidator,
-> = IntersectAssign<
-  InferFullSearchSchemaInput<TParentRoute>,
-  ResolveSearchValidatorInput<TSearchValidator>
->
-
-export type RouteContextParameter<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-> = unknown extends TParentRoute
-  ? TRouterContext
-  : Assign<TRouterContext, InferAllContext<TParentRoute>>
-
-export type BeforeLoadContextParameter<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-  TRouteContextFn,
-> = Assign<
-  RouteContextParameter<TParentRoute, TRouterContext>,
-  ContextReturnType<TRouteContextFn>
->
-
-export type ResolveAllContext<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-> = Assign<
-  BeforeLoadContextParameter<TParentRoute, TRouterContext, TRouteContextFn>,
-  ContextAsyncReturnType<TBeforeLoadFn>
->
-
 export interface AnyRoute
   extends Route<
     any,
@@ -628,18 +556,10 @@ export interface AnyRoute
     any,
     any,
     any,
+    any,
     any
   > {}
 
-export type AnyRouteWithContext<TContext> = AnyRoute & {
-  types: { allContext: TContext }
-}
-
-export type ResolveAllParamsFromParent<
-  TParentRoute extends AnyRoute,
-  TParams,
-> = Assign<InferAllParams<TParentRoute>, TParams>
-
 export type RouteConstraints = {
   TParentRoute: AnyRoute
   TPath: string
@@ -753,7 +673,25 @@ export class Route<
   in out TLoaderDeps extends Record<string, any> = {},
   in out TLoaderFn = undefined,
   in out TChildren = unknown,
-> {
+  in out TFileRouteTypes = unknown,
+> implements
+    CoreRoute<
+      TParentRoute,
+      TPath,
+      TFullPath,
+      TCustomId,
+      TId,
+      TSearchValidator,
+      TParams,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   isRoot: TParentRoute extends Route<any> ? true : false
   options: RouteOptions<
     TParentRoute,
@@ -852,37 +790,22 @@ export class Route<
     ;(this as any).$$typeof = Symbol.for('react.memo')
   }
 
-  types!: {
-    parentRoute: TParentRoute
-    path: TPath
-    to: TrimPathRight<TFullPath>
-    fullPath: TFullPath
-    customId: TCustomId
-    id: TId
-    searchSchema: ResolveValidatorOutput<TSearchValidator>
-    searchSchemaInput: ResolveSearchValidatorInput<TSearchValidator>
-    searchValidator: TSearchValidator
-    fullSearchSchema: ResolveFullSearchSchema<TParentRoute, TSearchValidator>
-    fullSearchSchemaInput: ResolveFullSearchSchemaInput<
-      TParentRoute,
-      TSearchValidator
-    >
-    params: TParams
-    allParams: ResolveAllParamsFromParent<TParentRoute, TParams>
-    routerContext: TRouterContext
-    routeContext: ResolveRouteContext<TRouteContextFn, TBeforeLoadFn>
-    routeContextFn: TRouteContextFn
-    beforeLoadFn: TBeforeLoadFn
-    allContext: ResolveAllContext<
-      TParentRoute,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn
-    >
-    children: TChildren
-    loaderData: ResolveLoaderData<TLoaderFn>
-    loaderDeps: TLoaderDeps
-  }
+  types!: RouteTypes<
+    TParentRoute,
+    TPath,
+    TFullPath,
+    TCustomId,
+    TId,
+    TSearchValidator,
+    TParams,
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren,
+    TFileRouteTypes
+  >
 
   init = (opts: { originalIndex: number; defaultSsr?: boolean }): void => {
     this.originalIndex = opts.originalIndex
@@ -973,7 +896,8 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren
+    TNewChildren,
+    TFileRouteTypes
   > {
     return this._addFileChildren(children) as Route<
       TParentRoute,
@@ -988,7 +912,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TNewChildren
+      TNewChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1007,7 +932,8 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren
+    TNewChildren,
+    TFileRouteTypes
   > {
     if (Array.isArray(children)) {
       this.children = children as TChildren
@@ -1030,7 +956,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TNewChildren
+      TNewChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1062,7 +989,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TNewLoaderFn,
-      TChildren
+      TChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1256,29 +1184,43 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-  in out TSearchValidator = undefined,
-  in out TRouterContext = {},
-  in out TRouteContextFn = AnyContext,
-  in out TBeforeLoadFn = AnyContext,
-  in out TLoaderDeps extends Record<string, any> = {},
-  in out TLoaderFn = undefined,
-  in out TChildren = unknown,
-  in out TFileRouteTypes = unknown,
-> extends Route<
-  any, // TParentRoute
-  '/', // TPath
-  '/', // TFullPath
-  string, // TCustomId
-  RootRouteId, // TId
-  TSearchValidator, // TSearchValidator
-  {}, // TParams
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-  TLoaderDeps,
-  TLoaderFn,
-  TChildren // TChildren
-> {
+    in out TSearchValidator = undefined,
+    in out TRouterContext = {},
+    in out TRouteContextFn = AnyContext,
+    in out TBeforeLoadFn = AnyContext,
+    in out TLoaderDeps extends Record<string, any> = {},
+    in out TLoaderFn = undefined,
+    in out TChildren = unknown,
+    in out TFileRouteTypes = unknown,
+  >
+  extends Route<
+    any, // TParentRoute
+    '/', // TPath
+    '/', // TFullPath
+    string, // TCustomId
+    RootRouteId, // TId
+    TSearchValidator, // TSearchValidator
+    {}, // TParams
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren, // TChildren
+    TFileRouteTypes
+  >
+  implements
+    CoreRootRoute<
+      TSearchValidator,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   /**
    * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
    */
@@ -1389,12 +1331,6 @@ export function createRootRoute<
   >(options)
 }
 
-export type ResolveFullPath<
-  TParentRoute extends AnyRoute,
-  TPath extends string,
-  TPrefixed = RoutePrefix<TParentRoute['fullPath'], TPath>,
-> = TPrefixed extends RootRouteId ? '/' : TPrefixed
-
 export type RouteMask<TRouteTree extends AnyRoute> = {
   routeTree: TRouteTree
   from: RoutePaths<TRouteTree>

package/src/router.ts

@@ -41,30 +41,41 @@ import type { NoInfer } from '@tanstack/react-store'
 
 import type {
   AnyContext,
+  AnyRedirect,
   AnySchema,
   AnyValidator,
+  BuildLocationFn,
   CommitLocationOptions,
   ControlledPromise,
+  FullSearchSchema,
+  MakeRemountDepsOptionsUnion,
   Manifest,
+  NavigateFn,
+  NavigateOptions,
   NonNullableUpdater,
   ParsedLocation,
   PickAsRequired,
+  Register,
   ResolveRelativePath,
+  ResolvedRedirect,
+  RouteById,
+  RoutePaths,
+  RoutesById,
+  RoutesByPath,
   SearchMiddleware,
   SearchParser,
   SearchSerializer,
   StartSerializer,
+  ToOptions,
   TrailingSlashOption,
   Updater,
   ViewTransitionOptions,
 } from '@tanstack/router-core'
 import type {
   AnyRoute,
-  AnyRouteWithContext,
   BeforeLoadContextOptions,
   ErrorRouteComponent,
   LoaderFnContext,
-  MakeRemountDepsOptionsUnion,
   NotFoundRouteComponent,
   RootRoute,
   RouteComponent,
@@ -72,13 +83,6 @@ import type {
   RouteMask,
 } from './route'
 
-import type {
-  FullSearchSchema,
-  RouteById,
-  RoutePaths,
-  RoutesById,
-  RoutesByPath,
-} from './routeInfo'
 import type {
   AnyRouteMatch,
   MakeRouteMatch,
@@ -86,11 +90,7 @@ import type {
   MatchRouteOptions,
 } from './Matches'
 
-import type { BuildLocationFn, NavigateFn } from './RouterProvider'
-
-import type { AnyRedirect, ResolvedRedirect } from './redirects'
 import type { NotFoundError } from './not-found'
-import type { NavigateOptions, ToOptions } from './link'
 
 declare global {
   interface Window {
@@ -98,20 +98,8 @@ declare global {
   }
 }
 
-export interface Register {
-  // router: Router
-}
-
 export type AnyRouter = Router<any, any, any, any, any, any>
 
-export type AnyRouterWithContext<TContext> = Router<
-  AnyRouteWithContext<TContext>,
-  any,
-  any,
-  any,
-  any
->
-
 export type RegisteredRouter = Register extends {
   router: infer TRouter extends AnyRouter
 }

package/src/typePrimitives.ts

@@ -1,17 +1,21 @@
 import type {
+  Constrain,
+  ConstrainLiteral,
   FromPathOption,
-  LinkComponentProps,
   NavigateOptions,
   PathParamOptions,
+  Redirect,
+  RouteIds,
   SearchParamOptions,
   ToPathOption,
-} from './link'
-import type { Redirect } from './redirects'
-import type { RouteIds } from './routeInfo'
+  UseParamsResult,
+  UseSearchResult,
+} from '@tanstack/router-core'
+import type { LinkComponentProps } from './link'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { UseParamsOptions, UseParamsResult } from './useParams'
-import type { UseSearchOptions, UseSearchResult } from './useSearch'
-import type { Constrain, ConstrainLiteral } from '@tanstack/router-core'
+
+import type { UseParamsOptions } from './useParams'
+import type { UseSearchOptions } from './useSearch'
 
 export type ValidateFromPath<
   TRouter extends AnyRouter = RegisteredRouter,

package/src/useBlocker.tsx

@@ -6,7 +6,7 @@ import type {
   HistoryLocation,
 } from '@tanstack/history'
 import type { AnyRoute } from './route'
-import type { ParseRoute } from './routeInfo'
+import type { ParseRoute } from '@tanstack/router-core'
 import type { AnyRouter, RegisteredRouter } from './router'
 
 interface ShouldBlockFnLocation<

package/src/useLoaderData.tsx

@@ -4,9 +4,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { AllLoaderData, RouteById } from './routeInfo'
-import type { StrictOrFrom } from './utils'
-import type { Expand } from '@tanstack/router-core'
+import type {
+  ResolveUseLoaderData,
+  StrictOrFrom,
+  UseLoaderDataResult,
+} from '@tanstack/router-core'
 
 export interface UseLoaderDataBaseOptions<
   TRouter extends AnyRouter,
@@ -16,7 +18,7 @@ export interface UseLoaderDataBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    match: ResolveLoaderData<TRouter, TFrom, TStrict>,
+    match: ResolveUseLoaderData<TRouter, TFrom, TStrict>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
 }
 
@@ -36,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,9 +4,11 @@ import type {
   ValidateSelected,
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { RouteById } from './routeInfo'
-import type { StrictOrFrom } from './utils'
-import type { Expand } from '@tanstack/router-core'
+import type {
+  ResolveUseLoaderDeps,
+  StrictOrFrom,
+  UseLoaderDepsResult,
+} from '@tanstack/router-core'
 
 export interface UseLoaderDepsBaseOptions<
   TRouter extends AnyRouter,
@@ -15,7 +17,7 @@ export interface UseLoaderDepsBaseOptions<
   TStructuralSharing,
 > {
   select?: (
-    deps: ResolveLoaderDeps<TRouter, TFrom>,
+    deps: ResolveUseLoaderDeps<TRouter, TFrom>,
   ) => ValidateSelected<TRouter, TSelected, TStructuralSharing>
 }
 
@@ -28,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

@@ -8,8 +8,7 @@ import type {
 } 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 { 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 './link'
+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,