@tanstack/router-core 0.0.1-beta.192 → 0.0.1-beta.194

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,28 +200,24 @@ 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,
   TRouteContext extends RouteContext = RouteContext,
-  TAllContext extends AnyContext = AnyContext,
+  TAllContext extends Record<string, any> = AnyContext,
 > = BaseRouteOptions<
   TParentRoute,
   TCustomId,
   TPath,
+  TLoaderContext,
   TLoader,
-  TParentSearchSchema,
   TSearchSchema,
   TFullSearchSchema,
   TParams,
   TAllParams,
-  TParentContext,
-  TAllParentContext,
   TRouteContext,
   TAllContext
 > &
@@ -245,27 +243,18 @@ 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,
   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 +264,7 @@ export type BaseRouteOptions<
         beforeLoad?: BeforeLoadFn<
           TParentRoute,
           TAllParams,
-          TSearchSchema,
-          TFullSearchSchema,
-          TParentContext,
-          TAllParentContext,
+          NoInfer<TLoaderContext>,
           TRouteContext
         >
       }
@@ -286,14 +272,18 @@ 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.'
       }
@@ -317,40 +307,25 @@ export type BaseRouteOptions<
   )
 
 type BeforeLoadFn<
-  TParentRoute,
+  TParentRoute extends AnyRoute,
   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<TParentRoute['types']['context'] & 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 +414,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 +452,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<
@@ -526,7 +480,6 @@ export interface AnyRoute
     any,
     any,
     any,
-    any,
     any
   > {}
 
@@ -565,12 +518,12 @@ export type RouteConstraints = {
   TFullPath: string
   TCustomId: string
   TId: string
+  TLoaderContext: Record<string, any>
   TSearchSchema: AnySearchSchema
   TFullSearchSchema: AnySearchSchema
   TParams: Record<string, any>
   TAllParams: Record<string, any>
   TParentContext: AnyContext
-  TAllParentContext: AnyContext
   TRouteContext: RouteContext
   TAllContext: AnyContext
   TRouterContext: AnyContext
@@ -591,6 +544,7 @@ export class Route<
     TCustomId,
     TPath
   >,
+  TLoaderContext extends RouteConstraints['TLoaderContext'] = {},
   TLoader = unknown,
   TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
   TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
@@ -604,12 +558,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,
@@ -627,8 +584,6 @@ export class Route<
     fullSearchSchema: TFullSearchSchema
     params: TParams
     allParams: TAllParams
-    parentContext: TParentContext
-    allParentContext: TAllParentContext
     routeContext: TRouteContext
     context: TAllContext
     children: TChildren
@@ -640,14 +595,12 @@ export class Route<
     TParentRoute,
     TCustomId,
     TPath,
+    TLoaderContext,
     TLoader,
-    InferFullSearchSchema<TParentRoute>,
     TSearchSchema,
     TFullSearchSchema,
     TParams,
     TAllParams,
-    TParentContext,
-    TAllParentContext,
     TRouteContext,
     TAllContext
   >
@@ -671,14 +624,12 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
+      TLoaderContext,
       TLoader,
-      InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
       TFullSearchSchema,
       TParams,
       TAllParams,
-      TParentContext,
-      TAllParentContext,
       TRouteContext,
       TAllContext
     > &
@@ -704,9 +655,14 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
-      InferFullSearchSchema<TParentRoute>,
+      TLoaderContext,
+      TLoader,
       TSearchSchema,
-      TParams
+      TFullSearchSchema,
+      TParams,
+      TAllParams,
+      TRouteContext,
+      TAllContext
     > &
       RoutePathOptionsIntersection<TCustomId, TPath>
 
@@ -768,13 +724,12 @@ export class Route<
     TFullPath,
     TCustomId,
     TId,
+    TLoaderContext,
     TLoader,
     TSearchSchema,
     TFullSearchSchema,
     TParams,
     TAllParams,
-    TParentContext,
-    TAllParentContext,
     TRouteContext,
     TAllContext,
     TRouterContext,
@@ -811,25 +766,24 @@ 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<
       RouteOptions<
-        AnyRoute,
-        RootRouteId,
-        '',
-        TLoader,
-        TSearchSchema,
-        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'
@@ -838,51 +792,55 @@ 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<
-  any,
-  '/',
-  '/',
-  string,
-  RootRouteId,
-  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,
-        '',
-        TLoader,
-        TSearchSchema,
-        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

@@ -1,5 +1,5 @@
 import { AnyRoute, Route } from './route'
-import { UnionToIntersection } from './utils'
+import { Expand, UnionToIntersection } from './utils'
 
 export type ParseRoute<TRouteTree extends AnyRoute> =
   | TRouteTree
@@ -21,7 +21,6 @@ export type ParseRouteChildren<TRouteTree extends AnyRoute> =
     any,
     any,
     any,
-    any,
     infer TChildren,
     any
   >
@@ -60,10 +59,14 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
   | ParseRoute<TRouteTree>['fullPath']
   | '/'
 
-export type FullSearchSchema<TRouteTree extends AnyRoute> = UnionToIntersection<
-  ParseRoute<TRouteTree>['types']['fullSearchSchema']
-> & {}
+export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<
+  Expand<
+    UnionToIntersection<
+      ParseRoute<TRouteTree>['types']['fullSearchSchema']
+    > & {}
+  >
+>
 
-export type AllParams<TRouteTree extends AnyRoute> = UnionToIntersection<
-  ParseRoute<TRouteTree>['types']['allParams']
+export type AllParams<TRouteTree extends AnyRoute> = Expand<
+  UnionToIntersection<ParseRoute<TRouteTree>['types']['allParams']>
 >