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

package/src/route.ts

@@ -24,7 +24,6 @@ export interface RegisterRouteComponent<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteComponent: unknown // This is registered by the framework
@@ -32,7 +31,6 @@ export interface RegisterRouteComponent<
 export interface RegisterErrorRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteComponent: unknown // This is registered by the framework
@@ -40,7 +38,6 @@ export interface RegisterErrorRouteComponent<
 export interface RegisterPendingRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteComponent: unknown // This is registered by the framework
@@ -50,7 +47,6 @@ export interface RegisterRouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // RouteProps: unknown // This is registered by the framework
@@ -58,7 +54,6 @@ export interface RegisterRouteProps<
 export interface RegisterErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // ErrorRouteProps: unknown // This is registered by the framework
@@ -67,7 +62,6 @@ export interface RegisterErrorRouteProps<
 export interface RegisterPendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > {
   // PendingRouteProps: unknown // This is registered by the framework
@@ -77,13 +71,11 @@ export type RegisteredRouteComponent<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteComponent<
   TLoader,
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   RouteComponent: infer T
@@ -94,12 +86,10 @@ export type RegisteredRouteComponent<
 export type RegisteredErrorRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterErrorRouteComponent<
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   ErrorRouteComponent: infer T
@@ -110,12 +100,10 @@ export type RegisteredErrorRouteComponent<
 export type RegisteredPendingRouteComponent<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterPendingRouteComponent<
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   PendingRouteComponent: infer T
@@ -127,13 +115,11 @@ export type RegisteredRouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RegisterRouteProps<
   TLoader,
   TFullSearchSchema,
   TAllParams,
-  TRouteContext,
   TAllContext
 > extends {
   RouteProps: infer T
@@ -144,14 +130,8 @@ export type RegisteredRouteProps<
 export type RegisteredErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
-> = RegisterRouteProps<
-  TFullSearchSchema,
-  TAllParams,
-  TRouteContext,
-  TAllContext
-> extends {
+> = RegisterRouteProps<TFullSearchSchema, TAllParams, TAllContext> extends {
   ErrorRouteProps: infer T
 }
   ? T
@@ -160,14 +140,8 @@ export type RegisteredErrorRouteProps<
 export type RegisteredPendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
-> = RegisterRouteProps<
-  TFullSearchSchema,
-  TAllParams,
-  TRouteContext,
-  TAllContext
-> extends {
+> = RegisterRouteProps<TFullSearchSchema, TAllParams, TAllContext> extends {
   PendingRouteProps: infer T
 }
   ? T
@@ -194,7 +168,7 @@ export type MetaOptions = keyof PickRequired<RouteMeta> extends never
       meta: RouteMeta
     }
 
-export type AnyRouteProps = RegisteredRouteProps<any, any, any, any, any>
+export type AnyRouteProps = RegisteredRouteProps<any, any, any, any>
 
 export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
@@ -206,8 +180,6 @@ export type RouteOptions<
   TFullSearchSchema extends Record<string, any> = TSearchSchema,
   TParams extends AnyPathParams = AnyPathParams,
   TAllParams extends AnyPathParams = TParams,
-  TParentContext extends Record<string, any> = AnyContext,
-  TAllParentContext extends Record<string, any> = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = BaseRouteOptions<
@@ -220,19 +192,10 @@ export type RouteOptions<
   TFullSearchSchema,
   TParams,
   TAllParams,
-  TParentContext,
-  TAllParentContext,
   TRouteContext,
   TAllContext
 > &
-  UpdatableRouteOptions<
-    TLoader,
-    TSearchSchema,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >
+  UpdatableRouteOptions<TLoader, TFullSearchSchema, TAllParams, TAllContext>
 
 export type ParamsFallback<
   TPath extends string,
@@ -253,8 +216,6 @@ export type BaseRouteOptions<
   TFullSearchSchema extends Record<string, any> = TSearchSchema,
   TParams extends AnyPathParams = {},
   TAllParams = ParamsFallback<TPath, TParams>,
-  TParentContext extends Record<string, any> = AnyContext,
-  TAllParentContext extends Record<string, any> = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = RoutePathOptions<TCustomId, TPath> & {
@@ -270,7 +231,6 @@ export type BaseRouteOptions<
         beforeLoad?: BeforeLoadFn<
           TParentRoute,
           TAllParams,
-          TAllParentContext,
           NoInfer<TLoaderContext>,
           TRouteContext
         >
@@ -279,7 +239,6 @@ export type BaseRouteOptions<
         beforeLoad: BeforeLoadFn<
           TParentRoute,
           TAllParams,
-          TAllParentContext,
           NoInfer<TLoaderContext>,
           TRouteContext
         >
@@ -315,24 +274,21 @@ export type BaseRouteOptions<
   )
 
 type BeforeLoadFn<
-  TParentRoute,
+  TParentRoute extends AnyRoute,
   TAllParams,
-  TParentContext,
   TLoaderContext,
   TRouteContext,
 > = (opts: {
   abortController: AbortController
   preload: boolean
   params: TAllParams
-  context: Expand<TParentContext & TLoaderContext>
+  context: Expand<TParentRoute['types']['context'] & TLoaderContext>
 }) => Promise<TRouteContext> | TRouteContext | void
 
 export type UpdatableRouteOptions<
   TLoader,
-  TSearchSchema extends Record<string, any>,
   TFullSearchSchema extends Record<string, any>,
   TAllParams extends AnyPathParams,
-  TRouteContext extends Record<string, any>,
   TAllContext extends Record<string, any>,
 > = MetaOptions & {
   // If true, this route will be matched as case-sensitive
@@ -344,21 +300,18 @@ export type UpdatableRouteOptions<
     TLoader,
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   >
   // The content to be rendered when the route encounters an error
   errorComponent?: RegisteredErrorRouteComponent<
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   > //
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
   pendingComponent?: RegisteredPendingRouteComponent<
     TFullSearchSchema,
     TAllParams,
-    TRouteContext,
     TAllContext
   >
   // Filter functions that can manipulate search params *before* they are passed to links and navigate
@@ -447,7 +400,7 @@ export interface LoaderContext<
   abortController: AbortController
   preload: boolean
   params: TAllParams
-  context: DeepMergeAll<[TAllContext, TLoaderContext, TRouteContext]>
+  context: Expand<DeepMergeAll<[TAllContext, TLoaderContext, TRouteContext]>>
 }
 
 export type SearchFilter<T, U = T> = (prev: T) => U
@@ -489,8 +442,6 @@ export interface AnyRoute
     any,
     any,
     any,
-    any,
-    any,
     any
   > {}
 
@@ -535,7 +486,6 @@ export type RouteConstraints = {
   TParams: Record<string, any>
   TAllParams: Record<string, any>
   TParentContext: AnyContext
-  TAllParentContext: AnyContext
   TRouteContext: RouteContext
   TAllContext: AnyContext
   TRouterContext: AnyContext
@@ -556,7 +506,7 @@ export class Route<
     TCustomId,
     TPath
   >,
-  TLoaderContext extends RouteConstraints['TLoaderContext'] = AnyContext,
+  TLoaderContext extends RouteConstraints['TLoaderContext'] = {},
   TLoader = unknown,
   TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
   TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
@@ -570,12 +520,15 @@ export class Route<
     TParentRoute,
     TParams
   >,
-  TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],
-  TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'],
   TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
-  TAllContext extends RouteConstraints['TAllContext'] = MergeFromFromParent<
-    TParentRoute['types']['context'],
-    TRouteContext
+  TAllContext extends RouteConstraints['TAllContext'] = Expand<
+    DeepMergeAll<
+      [
+        IsAny<TParentRoute['types']['context'], {}>,
+        TLoaderContext,
+        TRouteContext,
+      ]
+    >
   >,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
   TChildren extends RouteConstraints['TChildren'] = unknown,
@@ -593,8 +546,6 @@ export class Route<
     fullSearchSchema: TFullSearchSchema
     params: TParams
     allParams: TAllParams
-    parentContext: TParentContext
-    allParentContext: TAllParentContext
     routeContext: TRouteContext
     context: TAllContext
     children: TChildren
@@ -612,8 +563,6 @@ export class Route<
     TFullSearchSchema,
     TParams,
     TAllParams,
-    TParentContext,
-    TAllParentContext,
     TRouteContext,
     TAllContext
   >
@@ -643,17 +592,13 @@ export class Route<
       TFullSearchSchema,
       TParams,
       TAllParams,
-      TParentContext,
-      TAllParentContext,
       TRouteContext,
       TAllContext
     > &
       UpdatableRouteOptions<
         TLoader,
-        TSearchSchema,
         TFullSearchSchema,
         TAllParams,
-        TRouteContext,
         TAllContext
       >,
   ) {
@@ -676,8 +621,6 @@ export class Route<
       TFullSearchSchema,
       TParams,
       TAllParams,
-      TParentContext,
-      TAllParentContext,
       TRouteContext,
       TAllContext
     > &
@@ -747,8 +690,6 @@ export class Route<
     TFullSearchSchema,
     TParams,
     TAllParams,
-    TParentContext,
-    TAllParentContext,
     TRouteContext,
     TAllContext,
     TRouterContext,
@@ -762,10 +703,8 @@ export class Route<
   update = (
     options: UpdatableRouteOptions<
       TLoader,
-      TSearchSchema,
       TFullSearchSchema,
       TAllParams,
-      TRouteContext,
       TAllContext
     >,
   ) => {
@@ -792,19 +731,17 @@ export class RouterContext<TRouterContext extends {}> {
   >(
     options?: Omit<
       RouteOptions<
-        AnyRoute,
-        RootRouteId,
-        '',
-        TLoaderContext,
-        TLoader,
-        TSearchSchema,
-        TSearchSchema,
-        {},
-        {},
-        TRouterContext,
-        TRouterContext,
-        TRouteContext,
-        MergeFromFromParent<TRouterContext, TRouteContext>
+        AnyRoute, // TParentRoute
+        RootRouteId, // TCustomId
+        '', // TPath
+        TLoaderContext, // TLoaderContext
+        TLoader, // TLoader
+        TSearchSchema, // TSearchSchema
+        TSearchSchema, // TFullSearchSchema
+        {}, // TParams
+        {}, // TAllParams
+        TRouteContext, // TRouteContext
+        DeepMergeAll<[TRouterContext, TLoaderContext, TRouteContext]> // TAllContext
       >,
       | 'path'
       | 'id'
@@ -831,41 +768,37 @@ export class RootRoute<
   TRouteContext extends RouteContext = RouteContext,
   TRouterContext extends {} = {},
 > extends Route<
-  any,
-  '/',
-  '/',
-  string,
-  RootRouteId,
-  TLoaderContext,
-  TLoader,
-  TSearchSchema,
-  TSearchSchema,
-  {},
-  {},
-  TRouterContext,
-  TRouterContext,
-  TRouteContext,
-  MergeFromFromParent<TRouterContext, TRouteContext>,
-  TRouterContext,
-  any,
-  any
+  any, // TParentRoute
+  '/', // TPath
+  '/', // TFullPath
+  string, // TCustomId
+  RootRouteId, // TId
+  TLoaderContext, // TLoaderContext
+  TLoader, // TLoader
+  TSearchSchema, // TSearchSchema
+  TSearchSchema, // TFullSearchSchema
+  {}, // TParams
+  {}, // TAllParams
+  TRouteContext, // TRouteContext
+  DeepMergeAll<[TRouterContext, TLoaderContext, TRouteContext]>, // TAllContext
+  TRouterContext, // TRouterContext
+  any, // TChildren
+  any // TRouteTree
 > {
   constructor(
     options?: Omit<
       RouteOptions<
-        AnyRoute,
-        RootRouteId,
-        '',
-        TLoaderContext,
-        TLoader,
-        TSearchSchema,
-        TSearchSchema,
-        {},
-        {},
-        TRouterContext,
-        TRouterContext,
-        TRouteContext,
-        MergeFromFromParent<TRouterContext, TRouteContext>
+        AnyRoute, // TParentRoute
+        RootRouteId, // TCustomId
+        '', // TPath
+        TLoaderContext, // TLoaderContext
+        TLoader, // TLoader
+        TSearchSchema, // TSearchSchema
+        TSearchSchema, // TFullSearchSchema
+        {}, // TParams
+        {}, // TAllParams
+        TRouteContext, // TRouteContext
+        DeepMergeAll<[TRouterContext, TLoaderContext, TRouteContext]> // TAllContext
       >,
       | 'path'
       | 'id'

package/src/routeInfo.ts

@@ -21,8 +21,6 @@ export type ParseRouteChildren<TRouteTree extends AnyRoute> =
     any,
     any,
     any,
-    any,
-    any,
     infer TChildren,
     any
   >
@@ -63,9 +61,7 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
 
 export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<
   Expand<
-    UnionToIntersection<
-      ParseRoute<TRouteTree>['types']['fullSearchSchema']
-    > & {}
+    UnionToIntersection<ParseRoute<TRouteTree>['types']['fullSearchSchema']>
   >
 >
 

package/src/router.ts

@@ -163,19 +163,16 @@ export interface RouterOptions<
     unknown,
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultErrorComponent?: RegisteredErrorRouteComponent<
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultPendingComponent?: RegisteredPendingRouteComponent<
     AnySearchSchema,
     AnyPathParams,
-    AnyContext,
     AnyContext
   >
   defaultMaxAge?: number
@@ -1050,7 +1047,7 @@ export class Router<
 
           this.setRouteMatch(match.id, (s) => ({
             ...s,
-            context,
+            context: replaceEqualDeep(s.context, context),
           }))
         } catch (err) {
           handleError(err, 'BEFORE_LOAD')

package/src/utils.ts

@@ -1,5 +1,5 @@
 export type NoInfer<T> = [T][T extends any ? 0 : never]
-export type IsAny<T, Y, N> = 1 extends 0 & T ? Y : N
+export type IsAny<T, Y, N = T> = 1 extends 0 & T ? Y : N
 export type IsAnyBoolean<T> = 1 extends 0 & T ? true : false
 export type IsKnown<T, Y, N> = unknown extends T ? N : Y
 export type PickAsRequired<T, K extends keyof T> = Omit<T, K> &
@@ -19,6 +19,7 @@ export type PickRequired<T> = {
   [K in keyof T as undefined extends T[K] ? never : K]: T[K]
 }
 
+// export type Expand<T> = T
 export type Expand<T> = T extends object
   ? T extends infer O
     ? { [K in keyof O]: O[K] }