@tanstack/router-core 0.0.1-beta.191 → 0.0.1-beta.193

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.191",
+  "version": "0.0.1-beta.193",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/fileRoute.ts

@@ -85,6 +85,7 @@ export class FileRoute<
   constructor(public path: TFilePath) {}
 
   createRoute = <
+    TLoaderContext extends RouteConstraints['TLoaderContext'] = {},
     TLoader = unknown,
     TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
     TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
@@ -99,7 +100,7 @@ export class FileRoute<
       TParams
     >,
     TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],
-    TAllParentContext extends RouteConstraints['TId'] = TParentRoute['types']['context'],
+    TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'],
     TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
     TContext extends RouteConstraints['TAllContext'] = MergeFromFromParent<
       TParentRoute['types']['context'],
@@ -114,8 +115,8 @@ export class FileRoute<
         TParentRoute,
         string,
         string,
+        TLoaderContext,
         TLoader,
-        InferFullSearchSchema<TParentRoute>,
         TSearchSchema,
         TFullSearchSchema,
         TParams,
@@ -141,6 +142,7 @@ export class FileRoute<
     TFullPath,
     TFilePath,
     TId,
+    TLoaderContext,
     TLoader,
     TSearchSchema,
     TFullSearchSchema,

package/src/link.ts

@@ -1,7 +1,13 @@
 import { Trim } from './fileRoute'
 import { AnyRoute } from './route'
-import { AllParams, RouteByPath, RouteIds, RoutePaths } from './routeInfo'
-import { LocationState, ParsedLocation } from './router'
+import {
+  AllParams,
+  FullSearchSchema,
+  RouteByPath,
+  RouteIds,
+  RoutePaths,
+} from './routeInfo'
+import { LocationState, ParsedLocation, RegisteredRouter } from './router'
 import {
   Expand,
   NoInfer,
@@ -119,7 +125,7 @@ export type RelativeToPathAutoComplete<
       | AllPaths
 
 export type NavigateOptions<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = TFrom,
@@ -131,7 +137,7 @@ export type NavigateOptions<
 }
 
 export type ToOptions<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = '/',
@@ -141,7 +147,7 @@ export type ToOptions<
 }
 
 export type ToMaskOptions<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TMaskFrom extends RoutePaths<TRouteTree> = '/',
   TMaskTo extends string = '',
 > = ToSubOptions<TRouteTree, TMaskFrom, TMaskTo> & {
@@ -149,7 +155,7 @@ export type ToMaskOptions<
 }
 
 export type ToSubOptions<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
   TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>,
@@ -164,21 +170,28 @@ export type ToSubOptions<
   // // When using relative route paths, this option forces resolution from the current path, instead of the route API's path or `from` path
   // fromCurrent?: boolean
 } & CheckPath<TRouteTree, NoInfer<TResolved>, {}> &
-  SearchParamOptions<TRouteTree, TFrom, TResolved> &
+  SearchParamOptions<TRouteTree, TFrom, TTo, TResolved> &
   PathParamOptions<TRouteTree, TFrom, TResolved>
 
 export type SearchParamOptions<
   TRouteTree extends AnyRoute,
   TFrom,
   TTo,
-  TFromSearchEnsured = Expand<
-    UnionToIntersection<
-      PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>
-    >
-  >,
+  TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>,
+  TFromSearchEnsured = '/' extends TFrom
+    ? FullSearchSchema<TRouteTree>
+    : Expand<
+        UnionToIntersection<
+          PickRequired<
+            RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
+          >
+        >
+      >,
   TFromSearchOptional = Omit<AllParams<TRouteTree>, keyof TFromSearchEnsured>,
   TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>,
-  TToSearch = Expand<RouteByPath<TRouteTree, TTo>['types']['fullSearchSchema']>,
+  TToSearch = '' extends TTo
+    ? FullSearchSchema<TRouteTree>
+    : Expand<RouteByPath<TRouteTree, TResolved>['types']['fullSearchSchema']>,
 > = keyof PickRequired<TToSearch> extends never
   ? {
       search?: true | SearchReducer<TFromSearch, TToSearch>
@@ -246,7 +259,7 @@ export interface ActiveOptions {
 }
 
 export type LinkOptions<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = TFrom,

package/src/route.ts

@@ -3,6 +3,8 @@ import { RoutePaths } from './routeInfo'
 import { joinPaths, trimPath } from './path'
 import { AnyRouter, RouteMatch, AnyRouteMatch } from './router'
 import {
+  DeepMerge,
+  DeepMergeAll,
   Expand,
   IsAny,
   NoInfer,
@@ -20,63 +22,63 @@ export interface RouteMeta {}
 export interface RouteContext {}
 export interface RegisterRouteComponent<
   TLoader = unknown,
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteComponent: unknown // This is registered by the framework
 }
 export interface RegisterErrorRouteComponent<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteComponent: unknown // This is registered by the framework
 }
 export interface RegisterPendingRouteComponent<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteComponent: unknown // This is registered by the framework
 }
 
 export interface RegisterRouteProps<
   TLoader = unknown,
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteProps: unknown // This is registered by the framework
 }
 export interface RegisterErrorRouteProps<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteProps: unknown // This is registered by the framework
 }
 
 export interface RegisterPendingRouteProps<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteProps: unknown // This is registered by the framework
 }
 
 export type RegisteredRouteComponent<
   TLoader = unknown,
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteComponent<
   TLoader,
   TFullSearchSchema,
@@ -90,10 +92,10 @@ export type RegisteredRouteComponent<
   : () => unknown
 
 export type RegisteredErrorRouteComponent<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterErrorRouteComponent<
   TFullSearchSchema,
   TAllParams,
@@ -106,10 +108,10 @@ export type RegisteredErrorRouteComponent<
   : () => unknown
 
 export type RegisteredPendingRouteComponent<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterPendingRouteComponent<
   TFullSearchSchema,
   TAllParams,
@@ -123,10 +125,10 @@ export type RegisteredPendingRouteComponent<
 
 export type RegisteredRouteProps<
   TLoader = unknown,
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteProps<
   TLoader,
   TFullSearchSchema,
@@ -140,10 +142,10 @@ export type RegisteredRouteProps<
   : {}
 
 export type RegisteredErrorRouteProps<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteProps<
   TFullSearchSchema,
   TAllParams,
@@ -156,10 +158,10 @@ export type RegisteredErrorRouteProps<
   : {}
 
 export type RegisteredPendingRouteProps<
-  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteProps<
   TFullSearchSchema,
   TAllParams,
@@ -198,22 +200,22 @@ export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
   TPath extends string = string,
+  TLoaderContext extends Record<string, any> = AnyContext,
   TLoader = unknown,
-  TParentSearchSchema extends AnySearchSchema = {},
-  TSearchSchema extends AnySearchSchema = {},
-  TFullSearchSchema extends AnySearchSchema = TSearchSchema,
+  TSearchSchema extends Record<string, any> = {},
+  TFullSearchSchema extends Record<string, any> = TSearchSchema,
   TParams extends AnyPathParams = AnyPathParams,
   TAllParams extends AnyPathParams = TParams,
-  TParentContext extends AnyContext = AnyContext,
-  TAllParentContext extends AnyContext = AnyContext,
+  TParentContext extends Record<string, any> = AnyContext,
+  TAllParentContext extends Record<string, any> = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
-  TAllContext extends AnyContext = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = BaseRouteOptions<
   TParentRoute,
   TCustomId,
   TPath,
+  TLoaderContext,
   TLoader,
-  TParentSearchSchema,
   TSearchSchema,
   TFullSearchSchema,
   TParams,
@@ -245,27 +247,20 @@ export type BaseRouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
   TPath extends string = string,
+  TLoaderContext extends Record<string, any> = AnyContext,
   TLoader = unknown,
-  TParentSearchSchema extends AnySearchSchema = {},
-  TSearchSchema extends AnySearchSchema = {},
-  TFullSearchSchema extends AnySearchSchema = TSearchSchema,
+  TSearchSchema extends Record<string, any> = {},
+  TFullSearchSchema extends Record<string, any> = TSearchSchema,
   TParams extends AnyPathParams = {},
   TAllParams = ParamsFallback<TPath, TParams>,
-  TParentContext extends AnyContext = AnyContext,
-  TAllParentContext extends AnyContext = AnyContext,
+  TParentContext extends Record<string, any> = AnyContext,
+  TAllParentContext extends Record<string, any> = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
-  TAllContext extends AnyContext = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = RoutePathOptions<TCustomId, TPath> & {
   getParentRoute: () => TParentRoute
   validateSearch?: SearchSchemaValidator<TSearchSchema>
-  loader?: LoaderFn<
-    TLoader,
-    TSearchSchema,
-    TFullSearchSchema,
-    TAllParams,
-    NoInfer<TRouteContext>,
-    TAllContext
-  >
+  loaderContext?: (opts: { search: TFullSearchSchema }) => TLoaderContext
 } & (keyof PickRequired<RouteContext> extends never
     ? // This async function is called before a route is loaded.
       // If an error is thrown here, the route's loader will not be called.
@@ -275,10 +270,8 @@ export type BaseRouteOptions<
         beforeLoad?: BeforeLoadFn<
           TParentRoute,
           TAllParams,
-          TSearchSchema,
-          TFullSearchSchema,
-          TParentContext,
           TAllParentContext,
+          NoInfer<TLoaderContext>,
           TRouteContext
         >
       }
@@ -286,14 +279,19 @@ export type BaseRouteOptions<
         beforeLoad: BeforeLoadFn<
           TParentRoute,
           TAllParams,
-          TSearchSchema,
-          TFullSearchSchema,
-          TParentContext,
           TAllParentContext,
+          NoInfer<TLoaderContext>,
           TRouteContext
         >
-      }) &
-  ([TLoader] extends [never]
+      }) & {
+    loader?: LoaderFn<
+      TLoader,
+      TAllParams,
+      NoInfer<TLoaderContext>,
+      NoInfer<TAllContext>,
+      NoInfer<TRouteContext>
+    >
+  } & ([TLoader] extends [never]
     ? {
         loader: 'Loaders must return a type other than never. If you are throwing a redirect() and not returning anything, return a redirect() instead.'
       }
@@ -319,38 +317,24 @@ export type BaseRouteOptions<
 type BeforeLoadFn<
   TParentRoute,
   TAllParams,
-  TSearchSchema,
-  TFullSearchSchema,
   TParentContext,
-  TAllParentContext,
+  TLoaderContext,
   TRouteContext,
-> = (
-  opts: {
-    params: TAllParams
-    routeSearch: TSearchSchema
-    search: TFullSearchSchema
-    abortController: AbortController
-    preload: boolean
-  } & (TParentRoute extends undefined
-    ? {
-        context?: TAllParentContext
-        parentContext?: TParentContext
-      }
-    : {
-        context: TAllParentContext
-        parentContext: TParentContext
-      }),
-) => Promise<TRouteContext> | TRouteContext | void
+> = (opts: {
+  abortController: AbortController
+  preload: boolean
+  params: TAllParams
+  context: Expand<TParentContext & TLoaderContext>
+}) => Promise<TRouteContext> | TRouteContext | void
 
 export type UpdatableRouteOptions<
   TLoader,
-  TSearchSchema extends AnySearchSchema,
-  TFullSearchSchema extends AnySearchSchema,
+  TSearchSchema extends Record<string, any>,
+  TFullSearchSchema extends Record<string, any>,
   TAllParams extends AnyPathParams,
-  TRouteContext extends AnyContext,
-  TAllContext extends AnyContext,
+  TRouteContext extends Record<string, any>,
+  TAllContext extends Record<string, any>,
 > = MetaOptions & {
-  key?: null | false | GetKeyFn<TFullSearchSchema, TAllParams>
   // If true, this route will be matched as case-sensitive
   caseSensitive?: boolean
   // If true, this route will be forcefully wrapped in a suspense boundary
@@ -439,48 +423,33 @@ export type ParentParams<TParentParams> = AnyPathParams extends TParentParams
 
 export type LoaderFn<
   TLoader = unknown,
-  TSearchSchema extends AnySearchSchema = {},
-  TFullSearchSchema extends AnySearchSchema = {},
   TAllParams = {},
-  TContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TLoaderContext extends Record<string, any> = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
 > = (
   match: LoaderContext<
-    TSearchSchema,
-    TFullSearchSchema,
     TAllParams,
-    TContext,
-    TAllContext
+    TLoaderContext,
+    TAllContext,
+    TRouteContext
   > & {
     parentMatchPromise?: Promise<void>
   },
 ) => Promise<TLoader> | TLoader
 
-export type GetKeyFn<
-  TFullSearchSchema extends AnySearchSchema = {},
-  TAllParams = {},
-> = (loaderContext: { params: TAllParams; search: TFullSearchSchema }) => any
-
 export interface LoaderContext<
-  TSearchSchema extends AnySearchSchema = {},
-  TFullSearchSchema extends AnySearchSchema = {},
   TAllParams = {},
-  TContext extends AnyContext = AnyContext,
-  TAllContext extends AnyContext = AnyContext,
+  TLoaderContext = {},
+  TAllContext extends Record<string, any> = AnyContext,
+  TRouteContext extends Record<string, any> = AnyContext,
 > {
-  params: TAllParams
-  routeSearch: TSearchSchema
-  search: TFullSearchSchema
   abortController: AbortController
   preload: boolean
-  routeContext: TContext
-  context: TAllContext
+  params: TAllParams
+  context: DeepMergeAll<[TAllContext, TLoaderContext, TRouteContext]>
 }
 
-export type UnloaderFn<TPath extends string> = (
-  routeMatch: RouteMatch<any, Route>,
-) => void
-
 export type SearchFilter<T, U = T> = (prev: T) => U
 
 export type ResolveId<
@@ -492,22 +461,16 @@ export type ResolveId<
   : RootRouteId
 
 export type InferFullSearchSchema<TRoute> = TRoute extends {
-  isRoot: true
   types: {
-    searchSchema: infer TSearchSchema
+    fullSearchSchema: infer TFullSearchSchema
   }
 }
-  ? TSearchSchema
-  : TRoute extends {
-      types: {
-        fullSearchSchema: infer TFullSearchSchema
-      }
-    }
   ? TFullSearchSchema
   : {}
 
-export type ResolveFullSearchSchema<TParentRoute, TSearchSchema> =
-  InferFullSearchSchema<TParentRoute> & TSearchSchema
+export type ResolveFullSearchSchema<TParentRoute, TSearchSchema> = Expand<
+  DeepMerge<InferFullSearchSchema<TParentRoute>, TSearchSchema>
+>
 
 export interface AnyRoute
   extends Route<
@@ -527,6 +490,7 @@ export interface AnyRoute
     any,
     any,
     any,
+    any,
     any
   > {}
 
@@ -565,6 +529,7 @@ export type RouteConstraints = {
   TFullPath: string
   TCustomId: string
   TId: string
+  TLoaderContext: Record<string, any>
   TSearchSchema: AnySearchSchema
   TFullSearchSchema: AnySearchSchema
   TParams: Record<string, any>
@@ -591,6 +556,7 @@ export class Route<
     TCustomId,
     TPath
   >,
+  TLoaderContext extends RouteConstraints['TLoaderContext'] = AnyContext,
   TLoader = unknown,
   TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
   TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
@@ -640,8 +606,8 @@ export class Route<
     TParentRoute,
     TCustomId,
     TPath,
+    TLoaderContext,
     TLoader,
-    InferFullSearchSchema<TParentRoute>,
     TSearchSchema,
     TFullSearchSchema,
     TParams,
@@ -671,8 +637,8 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
+      TLoaderContext,
       TLoader,
-      InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
       TFullSearchSchema,
       TParams,
@@ -704,9 +670,16 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
-      InferFullSearchSchema<TParentRoute>,
+      TLoaderContext,
+      TLoader,
       TSearchSchema,
-      TParams
+      TFullSearchSchema,
+      TParams,
+      TAllParams,
+      TParentContext,
+      TAllParentContext,
+      TRouteContext,
+      TAllContext
     > &
       RoutePathOptionsIntersection<TCustomId, TPath>
 
@@ -768,6 +741,7 @@ export class Route<
     TFullPath,
     TCustomId,
     TId,
+    TLoaderContext,
     TLoader,
     TSearchSchema,
     TFullSearchSchema,
@@ -811,8 +785,9 @@ export class RouterContext<TRouterContext extends {}> {
   constructor() {}
 
   createRootRoute = <
+    TLoaderContext extends Record<string, any> = AnyContext,
     TLoader = unknown,
-    TSearchSchema extends AnySearchSchema = {},
+    TSearchSchema extends Record<string, any> = {},
     TRouteContext extends RouteContext = RouteContext,
   >(
     options?: Omit<
@@ -820,10 +795,10 @@ export class RouterContext<TRouterContext extends {}> {
         AnyRoute,
         RootRouteId,
         '',
+        TLoaderContext,
         TLoader,
         TSearchSchema,
         TSearchSchema,
-        TSearchSchema,
         {},
         {},
         TRouterContext,
@@ -838,14 +813,21 @@ export class RouterContext<TRouterContext extends {}> {
       | 'parseParams'
       | 'stringifyParams'
     >,
-  ): RootRoute<TLoader, TSearchSchema, TRouteContext, TRouterContext> => {
+  ): RootRoute<
+    TLoaderContext,
+    TLoader,
+    TSearchSchema,
+    TRouteContext,
+    TRouterContext
+  > => {
     return new RootRoute(options) as any
   }
 }
 
 export class RootRoute<
+  TLoaderContext extends Record<string, any> = AnyContext,
   TLoader = unknown,
-  TSearchSchema extends AnySearchSchema = {},
+  TSearchSchema extends Record<string, any> = {},
   TRouteContext extends RouteContext = RouteContext,
   TRouterContext extends {} = {},
 > extends Route<
@@ -854,6 +836,7 @@ export class RootRoute<
   '/',
   string,
   RootRouteId,
+  TLoaderContext,
   TLoader,
   TSearchSchema,
   TSearchSchema,
@@ -873,10 +856,10 @@ export class RootRoute<
         AnyRoute,
         RootRouteId,
         '',
+        TLoaderContext,
         TLoader,
         TSearchSchema,
         TSearchSchema,
-        TSearchSchema,
         {},
         {},
         TRouterContext,