@tanstack/react-router 1.112.11 → 1.112.13

package/src/fileRoute.ts

@@ -10,21 +10,20 @@ import { useNavigate } from './useNavigate'
 import type { UseParamsRoute } from './useParams'
 import type { UseMatchRoute } from './useMatch'
 import type { UseSearchRoute } from './useSearch'
-
-import type { AnyRoute, Route, RouteConstraints } from './route'
-import type { RegisteredRouter } from './router'
 import type {
   AnyContext,
-  AnyRoute as AnyCoreRoute,
-  AnyPathParams,
+  AnyRoute,
   AnyRouter,
-  AnyValidator,
   Constrain,
   ConstrainLiteral,
   FileBaseRouteOptions,
   FileRoutesByPath,
+  LazyRouteOptions,
+  RegisteredRouter,
   ResolveParams,
+  Route,
   RouteById,
+  RouteConstraints,
   RouteIds,
   RouteLoaderFn,
   UpdatableRouteOptions,
@@ -115,7 +114,8 @@ export class FileRoute<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TChildren
+    TChildren,
+    unknown
   > => {
     warning(
       this.silent,
@@ -158,23 +158,7 @@ export function FileRouteLoader<
   return (loaderFn) => loaderFn as any
 }
 
-export type LazyRouteOptions = Pick<
-  UpdatableRouteOptions<
-    AnyRoute,
-    string,
-    string,
-    AnyPathParams,
-    AnyValidator,
-    {},
-    AnyContext,
-    AnyContext,
-    AnyContext,
-    AnyContext
-  >,
-  'component' | 'errorComponent' | 'pendingComponent' | 'notFoundComponent'
->
-
-export class LazyRoute<TRoute extends AnyCoreRoute> {
+export class LazyRoute<TRoute extends AnyRoute> {
   options: {
     id: string
   } & LazyRouteOptions
@@ -237,7 +221,7 @@ export class LazyRoute<TRoute extends AnyCoreRoute> {
 export function createLazyRoute<
   TRouter extends AnyRouter = RegisteredRouter,
   TId extends string = string,
-  TRoute extends AnyCoreRoute = RouteById<TRouter['routeTree'], TId>,
+  TRoute extends AnyRoute = RouteById<TRouter['routeTree'], TId>,
 >(id: ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>) {
   return (opts: LazyRouteOptions) => {
     return new LazyRoute<TRoute>({

package/src/index.tsx

@@ -38,6 +38,7 @@ export {
 } from '@tanstack/router-core'
 
 export type {
+  AnyRoute,
   StartSerializer,
   Serializable,
   SerializerParse,
@@ -154,7 +155,6 @@ export {
   createLazyRoute,
   createLazyFileRoute,
 } from './fileRoute'
-export type { LazyRouteOptions } from './fileRoute'
 
 export * from './history'
 
@@ -215,6 +215,24 @@ export type {
   UpdatableRouteOptions,
   RouteLoaderFn,
   LoaderFnContext,
+  LazyRouteOptions,
+  AnyRouter,
+  RegisteredRouter,
+  RouterContextOptions,
+  ControllablePromise,
+  InjectedHtmlEntry,
+  RouterOptions,
+  RouterErrorSerializer,
+  RouterState,
+  ListenerFn,
+  BuildNextOptions,
+  RouterConstructorOptions,
+  RouterEvents,
+  RouterEvent,
+  RouterListener,
+  RouteConstraints,
+  RouteMask,
+  MatchRouteOptions,
 } from '@tanstack/router-core'
 export type {
   UseLinkPropsOptions,
@@ -234,11 +252,7 @@ export {
   useChildMatches,
 } from './Matches'
 
-export type {
-  MatchRouteOptions,
-  UseMatchRouteOptions,
-  MakeMatchRouteOptions,
-} from './Matches'
+export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches'
 
 export { matchContext } from './matchContext'
 export { Match, Outlet } from './Match'
@@ -262,10 +276,7 @@ export {
   NotFoundRoute,
 } from './route'
 export type {
-  AnyRoute,
-  RouteConstraints,
   AnyRootRoute,
-  RouteMask,
   ReactNode,
   SyncRouteComponent,
   AsyncRouteComponent,
@@ -284,23 +295,6 @@ export {
   getInitialRouterState,
 } from './router'
 
-export type {
-  AnyRouter,
-  RegisteredRouter,
-  RouterContextOptions,
-  RouterOptions,
-  RouterErrorSerializer,
-  RouterState,
-  ListenerFn,
-  BuildNextOptions,
-  RouterConstructorOptions,
-  RouterEvents,
-  RouterEvent,
-  RouterListener,
-  ControllablePromise,
-  InjectedHtmlEntry,
-} from './router'
-
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type { RouterProps } from './RouterProvider'
 

package/src/link.tsx

@@ -18,13 +18,13 @@ import {
 
 import { useMatch } from './useMatch'
 import type {
+  AnyRouter,
   Constrain,
   LinkCurrentTargetElement,
   LinkOptions,
+  RegisteredRouter,
   RoutePaths,
 } from '@tanstack/router-core'
-
-import type { AnyRouter, RegisteredRouter } from './router'
 import type { ReactNode } from 'react'
 import type {
   ValidateLinkOptions,

package/src/not-found.tsx

@@ -2,8 +2,7 @@ import * as React from 'react'
 import { CatchBoundary } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import type { ErrorInfo } from 'react'
-import type { RegisteredRouter } from './router'
-import type { RouteIds } from '@tanstack/router-core'
+import type { RegisteredRouter, RouteIds } from '@tanstack/router-core'
 
 export type NotFoundError = {
   /**

package/src/redirects.ts

@@ -1,9 +1,9 @@
 import type {
   AnyRedirect,
   Redirect,
+  RegisteredRouter,
   ResolvedRedirect,
 } from '@tanstack/router-core'
-import type { RegisteredRouter } from './router'
 
 export function redirect<
   TRouter extends RegisteredRouter,

package/src/renderRouteNotFound.tsx

@@ -1,8 +1,7 @@
 import * as React from 'react'
 import warning from 'tiny-warning'
 import { DefaultGlobalNotFound } from './not-found'
-import type { AnyRouter } from './router'
-import type { AnyRoute } from './route'
+import type { AnyRoute, AnyRouter } from '@tanstack/router-core'
 
 export function renderRouteNotFound(
   router: AnyRouter,

package/src/route.ts

@@ -9,26 +9,33 @@ import { useNavigate } from './useNavigate'
 import { useMatch } from './useMatch'
 import type {
   AnyContext,
-  AnySchema,
+  AnyRoute,
+  AnyRouter,
   Constrain,
   ConstrainLiteral,
-  RootRoute as CoreRootRoute,
+  LazyRoute as CoreLazyRoute,
   Route as CoreRoute,
   ErrorComponentProps,
   NotFoundRouteProps,
+  RegisteredRouter,
   ResolveFullPath,
   ResolveId,
   ResolveParams,
   RootRouteId,
   RootRouteOptions,
-  RouteById,
-  RouteContext,
+  RouteAddChildrenFn,
+  RouteAddFileChildrenFn,
+  RouteAddFileTypesFn,
+  RouteConstraints,
   RouteIds,
+  RouteLazyFn,
   RouteLoaderFn,
+  RouteMask,
   RouteOptions,
   RoutePathOptionsIntersection,
-  RoutePaths,
   RouteTypes,
+  RouteTypesById,
+  Router,
   ToMaskOptions,
   TrimPathRight,
   UpdatableRouteOptions,
@@ -40,10 +47,7 @@ import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseParamsRoute } from './useParams'
 import type { UseSearchRoute } from './useSearch'
 import type * as React from 'react'
-import type {} from './Matches'
-import type { AnyRouter, RegisteredRouter, Router } from './router'
 import type { NotFoundError } from './not-found'
-import type { LazyRoute } from './fileRoute'
 import type { UseRouteContextRoute } from './useRouteContext'
 
 declare module '@tanstack/router-core' {
@@ -53,49 +57,21 @@ declare module '@tanstack/router-core' {
     notFoundComponent?: NotFoundRouteComponent
     pendingComponent?: RouteComponent
   }
-}
 
-export interface AnyRoute
-  extends Route<
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any
-  > {}
-
-export type RouteConstraints = {
-  TParentRoute: AnyRoute
-  TPath: string
-  TFullPath: string
-  TCustomId: string
-  TId: string
-  TSearchSchema: AnySchema
-  TFullSearchSchema: AnySchema
-  TParams: Record<string, any>
-  TAllParams: Record<string, any>
-  TParentContext: AnyContext
-  TRouteContext: RouteContext
-  TAllContext: AnyContext
-  TRouterContext: AnyContext
-  TChildren: unknown
-  TRouteTree: AnyRoute
+  export interface RouteExtensions<
+    TId extends string,
+    TFullPath extends string,
+  > {
+    useMatch: UseMatchRoute<TId>
+    useRouteContext: UseRouteContextRoute<TId>
+    useSearch: UseSearchRoute<TId>
+    useParams: UseParamsRoute<TId>
+    useLoaderDeps: UseLoaderDepsRoute<TId>
+    useLoaderData: UseLoaderDataRoute<TId>
+    useNavigate: () => UseNavigateResult<TFullPath>
+  }
 }
 
-export type RouteTypesById<TRouter extends AnyRouter, TId> = RouteById<
-  TRouter['routeTree'],
-  TId
->['types']
-
 export function getRouteApi<
   const TId,
   TRouter extends AnyRouter = RegisteredRouter,
@@ -205,7 +181,7 @@ export class Route<
       TFileRouteTypes
     >
 {
-  isRoot: TParentRoute extends Route<any> ? true : false
+  isRoot: TParentRoute extends AnyRoute ? true : false
   options: RouteOptions<
     TParentRoute,
     TId,
@@ -270,7 +246,7 @@ export class Route<
   children?: TChildren
   originalIndex?: number
   rank!: number
-  lazyFn?: () => Promise<LazyRoute<any>>
+  lazyFn?: () => Promise<CoreLazyRoute>
   _lazyPromise?: Promise<void>
   _componentsPromise?: Promise<Array<void>>
 
@@ -391,12 +367,7 @@ export class Route<
     this._ssr = options?.ssr ?? opts.defaultSsr ?? true
   }
 
-  addChildren<const TNewChildren>(
-    children: Constrain<
-      TNewChildren,
-      ReadonlyArray<AnyRoute> | Record<string, AnyRoute>
-    >,
-  ): Route<
+  addChildren: RouteAddChildrenFn<
     TParentRoute,
     TPath,
     TFullPath,
@@ -409,30 +380,12 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren,
     TFileRouteTypes
-  > {
-    return this._addFileChildren(children) as Route<
-      TParentRoute,
-      TPath,
-      TFullPath,
-      TCustomId,
-      TId,
-      TSearchValidator,
-      TParams,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn,
-      TLoaderDeps,
-      TLoaderFn,
-      TNewChildren,
-      TFileRouteTypes
-    >
+  > = (children) => {
+    return this._addFileChildren(children) as any
   }
 
-  _addFileChildren<const TNewChildren>(
-    children: TNewChildren,
-  ): Route<
+  _addFileChildren: RouteAddFileChildrenFn<
     TParentRoute,
     TPath,
     TFullPath,
@@ -445,9 +398,8 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren,
     TFileRouteTypes
-  > {
+  > = (children) => {
     if (Array.isArray(children)) {
       this.children = children as TChildren
     }
@@ -456,22 +408,25 @@ export class Route<
       this.children = Object.values(children) as TChildren
     }
 
-    return this as unknown as Route<
-      TParentRoute,
-      TPath,
-      TFullPath,
-      TCustomId,
-      TId,
-      TSearchValidator,
-      TParams,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn,
-      TLoaderDeps,
-      TLoaderFn,
-      TNewChildren,
-      TFileRouteTypes
-    >
+    return this as any
+  }
+
+  _addFileTypes: RouteAddFileTypesFn<
+    TParentRoute,
+    TPath,
+    TFullPath,
+    TCustomId,
+    TId,
+    TSearchValidator,
+    TParams,
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren
+  > = () => {
+    return this as any
   }
 
   updateLoader = <TNewLoaderFn>(options: {
@@ -525,7 +480,7 @@ export class Route<
     return this
   }
 
-  lazy = (lazyFn: () => Promise<LazyRoute<any>>): this => {
+  lazy: RouteLazyFn<this> = (lazyFn) => {
     this.lazyFn = lazyFn
     return this
   }
@@ -612,7 +567,22 @@ export function createRoute<
     TRouteContextFn,
     TBeforeLoadFn
   >,
-) {
+): CoreRoute<
+  TParentRoute,
+  TPath,
+  TFullPath,
+  TCustomId,
+  TId,
+  TSearchValidator,
+  TParams,
+  AnyContext,
+  TRouteContextFn,
+  TBeforeLoadFn,
+  TLoaderDeps,
+  TLoaderFn,
+  TChildren,
+  unknown
+> {
   return new Route<
     TParentRoute,
     TPath,
@@ -666,43 +636,30 @@ 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
-    TFileRouteTypes
-  >
-  implements
-    CoreRootRoute<
-      TSearchValidator,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn,
-      TLoaderDeps,
-      TLoaderFn,
-      TChildren,
-      TFileRouteTypes
-    >
-{
+  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
+> {
   /**
    * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
    */
@@ -718,72 +675,6 @@ export class RootRoute<
   ) {
     super(options as any)
   }
-
-  addChildren<const TNewChildren>(
-    children: Constrain<
-      TNewChildren,
-      ReadonlyArray<AnyRoute> | Record<string, AnyRoute>
-    >,
-  ): RootRoute<
-    TSearchValidator,
-    TRouterContext,
-    TRouteContextFn,
-    TBeforeLoadFn,
-    TLoaderDeps,
-    TLoaderFn,
-    TNewChildren,
-    TFileRouteTypes
-  > {
-    super.addChildren(children)
-    return this as unknown as RootRoute<
-      TSearchValidator,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn,
-      TLoaderDeps,
-      TLoaderFn,
-      TNewChildren,
-      TFileRouteTypes
-    >
-  }
-
-  _addFileChildren<const TNewChildren>(
-    children: TNewChildren,
-  ): RootRoute<
-    TSearchValidator,
-    TRouterContext,
-    TRouteContextFn,
-    TBeforeLoadFn,
-    TLoaderDeps,
-    TLoaderFn,
-    TNewChildren,
-    TFileRouteTypes
-  > {
-    super._addFileChildren(children)
-    return this as unknown as RootRoute<
-      TSearchValidator,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn,
-      TLoaderDeps,
-      TLoaderFn,
-      TNewChildren,
-      TFileRouteTypes
-    >
-  }
-
-  _addFileTypes<TFileRouteTypes>(): RootRoute<
-    TSearchValidator,
-    TRouterContext,
-    TRouteContextFn,
-    TBeforeLoadFn,
-    TLoaderDeps,
-    TLoaderFn,
-    TChildren,
-    TFileRouteTypes
-  > {
-    return this as any
-  }
 }
 
 export function createRootRoute<
@@ -813,17 +704,6 @@ export function createRootRoute<
   >(options)
 }
 
-export type RouteMask<TRouteTree extends AnyRoute> = {
-  routeTree: TRouteTree
-  from: RoutePaths<TRouteTree>
-  to?: any
-  params?: any
-  search?: any
-  hash?: any
-  state?: any
-  unmaskOnReload?: boolean
-}
-
 export function createRouteMask<
   TRouteTree extends AnyRoute,
   TFrom extends string,