@tanstack/react-router 1.48.4 → 1.49.0

package/dist/cjs/route.d.cts

@@ -5,7 +5,7 @@ import { NavigateOptions, ParsePathParams, ToMaskOptions } from './link.cjs';
 import { ParsedLocation } from './location.cjs';
 import { RouteById, RouteIds, RoutePaths } from './routeInfo.cjs';
 import { AnyRouter, RegisteredRouter, Router } from './router.cjs';
-import { Assign, Expand, NoInfer, PickRequired } from './utils.cjs';
+import { Assign, Constrain, Expand, NoInfer, PickRequired } from './utils.cjs';
 import { BuildLocationFn, NavigateFn } from './RouterProvider.cjs';
 import { NotFoundError } from './not-found.cjs';
 import { LazyRoute } from './fileRoute.cjs';
@@ -32,7 +32,7 @@ export type RoutePathOptionsIntersection<TCustomId, TPath> = {
     path: TPath;
     id: TCustomId;
 };
-export type RouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TParams = AnyPathParams, TAllParams = TParams, TRouteContextReturn = RouteContext, TRouteContext = RouteContext, TParentAllContext = AnyContext, TAllContext = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>> = BaseRouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TParentAllContext, TAllContext, TLoaderDeps, TLoaderDataReturn> & UpdatableRouteOptions<NoInfer<TParentRoute>, NoInfer<TCustomId>, NoInfer<TAllParams>, NoInfer<TSearchValidator>, NoInfer<TLoaderData>, NoInfer<TAllContext>, NoInfer<TRouteContext>, NoInfer<TLoaderDeps>>;
+export type RouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TParams = AnyPathParams, TAllParams = TParams, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext> = BaseRouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TLoaderDeps, TLoaderDataReturn, TRouterContext, TRouteContextFn, TBeforeLoadFn> & UpdatableRouteOptions<NoInfer<TParentRoute>, NoInfer<TCustomId>, NoInfer<TAllParams>, NoInfer<TSearchValidator>, NoInfer<TLoaderData>, NoInfer<TLoaderDeps>, NoInfer<TRouterContext>, NoInfer<TRouteContextFn>, NoInfer<TBeforeLoadFn>>;
 export type ParseParamsFn<TPath extends string, TParams> = (rawParams: Record<ParsePathParams<TPath>, string>) => TParams extends Record<ParsePathParams<TPath>, any> ? TParams : Record<ParsePathParams<TPath>, any>;
 export type StringifyParamsFn<TPath extends string, TParams> = (params: TParams) => Record<ParsePathParams<TPath>, string>;
 export type ParamsOptions<TPath extends string, TParams> = {
@@ -49,24 +49,26 @@ export type ParamsOptions<TPath extends string, TParams> = {
     */
     stringifyParams?: StringifyParamsFn<TPath, TParams>;
 };
-export interface FullSearchSchemaOption<TFullSearchSchema> {
-    search: TFullSearchSchema;
+export interface FullSearchSchemaOption<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator> {
+    search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>;
 }
-export type FileBaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TPath extends string = string, TSearchValidator extends AnySearchValidator = undefined, TParams = {}, TAllParams = {}, TRouteContextReturn = RouteContext, TParentAllContext = AnyContext, TAllContext = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}> = {
+export type RouteContextFn<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator, in out TParams, in out TRouterContext> = (ctx: RouteContextOptions<TParentRoute, TSearchValidator, TParams, TRouterContext>) => any;
+export type BeforeLoadFn<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator, in out TParams, in out TRouterContext, in out TRouteContextFn> = (ctx: BeforeLoadContextOptions<TParentRoute, TSearchValidator, TParams, TRouterContext, TRouteContextFn>) => any;
+export type FileBaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TPath extends string = string, TSearchValidator extends AnySearchValidator = undefined, TParams = {}, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext> = ParamsOptions<TPath, TParams> & {
     validateSearch?: TSearchValidator;
-    shouldReload?: boolean | ((match: LoaderFnContext<TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TAllContext>) => any);
-    beforeLoad?: (ctx: BeforeLoadContext<ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TAllParams, TParentAllContext>) => Promise<TRouteContextReturn> | TRouteContextReturn | void;
-    loaderDeps?: (opts: FullSearchSchemaOption<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>) => TLoaderDeps;
-    loader?: (ctx: LoaderFnContext<TAllParams, TLoaderDeps, TAllContext>) => TLoaderDataReturn | Promise<TLoaderDataReturn>;
-} & ParamsOptions<TPath, TParams>;
-export type BaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchValidator extends AnySearchValidator = undefined, TParams = {}, TAllParams = {}, TRouteContextReturn = RouteContext, TParentAllContext = AnyContext, TAllContext = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}> = RoutePathOptions<TCustomId, TPath> & FileBaseRouteOptions<TParentRoute, TPath, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TParentAllContext, TAllContext, TLoaderDeps, TLoaderDataReturn> & {
+    shouldReload?: boolean | ((match: LoaderFnContext<TParentRoute, TParams, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn>) => any);
+    context?: Constrain<TRouteContextFn, RouteContextFn<TParentRoute, TSearchValidator, TParams, TRouterContext>>;
+    beforeLoad?: Constrain<TBeforeLoadFn, BeforeLoadFn<TParentRoute, TSearchValidator, TParams, TRouterContext, TRouteContextFn>>;
+    loaderDeps?: (opts: FullSearchSchemaOption<TParentRoute, TSearchValidator>) => TLoaderDeps;
+    loader?: (ctx: LoaderFnContext<TParentRoute, TParams, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn>) => TLoaderDataReturn | Promise<TLoaderDataReturn>;
+};
+export type BaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchValidator extends AnySearchValidator = undefined, TParams = {}, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext> = RoutePathOptions<TCustomId, TPath> & FileBaseRouteOptions<TParentRoute, TPath, TSearchValidator, TParams, TLoaderDeps, TLoaderDataReturn, TRouterContext, TRouteContextFn, TBeforeLoadFn> & {
     getParentRoute: () => TParentRoute;
 };
-export interface BeforeLoadContext<TFullSearchSchema, TAllParams, TParentAllContext> extends FullSearchSchemaOption<TFullSearchSchema> {
+export interface ContextOptions<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator, in out TParams> extends FullSearchSchemaOption<TParentRoute, TSearchValidator> {
     abortController: AbortController;
     preload: boolean;
-    params: Expand<TAllParams>;
-    context: TParentAllContext;
+    params: Expand<ResolveAllParamsFromParent<TParentRoute, TParams>>;
     location: ParsedLocation;
     /**
      * @deprecated Use `throw redirect({ to: '/somewhere' })` instead
@@ -75,7 +77,13 @@ export interface BeforeLoadContext<TFullSearchSchema, TAllParams, TParentAllCont
     buildLocation: BuildLocationFn;
     cause: 'preload' | 'enter' | 'stay';
 }
-export type UpdatableRouteOptions<TParentRoute extends AnyRoute, TRouteId, TAllParams, TSearchValidator extends AnySearchValidator, TLoaderData, TAllContext, TRouteContext, TLoaderDeps> = {
+export interface RouteContextOptions<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator, in out TParams, in out TRouterContext> extends ContextOptions<TParentRoute, TSearchValidator, TParams> {
+    context: Expand<RouteContextParameter<TParentRoute, TRouterContext>>;
+}
+export interface BeforeLoadContextOptions<in out TParentRoute extends AnyRoute, in out TSearchValidator extends AnySearchValidator, in out TParams, in out TRouterContext, in out TRouteContextFn> extends ContextOptions<TParentRoute, TSearchValidator, TParams> {
+    context: Expand<BeforeLoadContextParameter<TParentRoute, TRouterContext, TRouteContextFn>>;
+}
+export type UpdatableRouteOptions<TParentRoute extends AnyRoute, TRouteId, TAllParams, TSearchValidator extends AnySearchValidator, TLoaderData, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn> = {
     caseSensitive?: boolean;
     wrapInSuspense?: boolean;
     component?: RouteComponent;
@@ -86,18 +94,19 @@ export type UpdatableRouteOptions<TParentRoute extends AnyRoute, TRouteId, TAllP
     pendingMinMs?: number;
     staleTime?: number;
     gcTime?: number;
+    preload?: boolean;
     preloadStaleTime?: number;
     preloadGcTime?: number;
     preSearchFilters?: Array<SearchFilter<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>>;
     postSearchFilters?: Array<SearchFilter<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>>;
     onCatch?: (error: Error, errorInfo: React.ErrorInfo) => void;
     onError?: (err: any) => void;
-    onEnter?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>) => void;
-    onStay?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>) => void;
-    onLeave?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>) => void;
+    onEnter?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>) => void;
+    onStay?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>) => void;
+    onLeave?: (match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>) => void;
     meta?: (ctx: {
-        matches: Array<RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>>;
-        match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>;
+        matches: Array<RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>>;
+        match: RouteMatch<TRouteId, TAllParams, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, TLoaderData, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>;
         params: TAllParams;
         loaderData: TLoaderData;
     }) => Array<React.JSX.IntrinsicElements['meta']>;
@@ -157,13 +166,13 @@ export type SearchValidatorFn<TInput, TOutput> = (input: TInput) => TOutput;
 export type SearchValidator<TInput, TOutput> = SearchValidatorObj<TInput, TOutput> | SearchValidatorFn<TInput, TOutput> | SearchValidatorAdapter<TInput, TOutput> | undefined;
 export type AnySearchValidator = SearchValidator<any, any>;
 export type DefaultSearchValidator = SearchValidator<Record<string, unknown>, AnySearchSchema>;
-export type RouteLoaderFn<in out TAllParams = {}, in out TLoaderDeps extends Record<string, any> = {}, in out TAllContext = AnyContext, TLoaderData = undefined> = (match: LoaderFnContext<TAllParams, TLoaderDeps, TAllContext>) => TLoaderData | Promise<TLoaderData>;
-export interface LoaderFnContext<in out TAllParams = {}, in out TLoaderDeps = {}, in out TAllContext = AnyContext> {
+export type RouteLoaderFn<in out TParentRoute extends AnyRoute = AnyRoute, in out TParams = {}, in out TLoaderDeps = {}, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, in out TBeforeLoadFn = AnyContext, TLoaderData = undefined> = (match: LoaderFnContext<TParentRoute, TParams, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn>) => TLoaderData | Promise<TLoaderData>;
+export interface LoaderFnContext<in out TParentRoute extends AnyRoute = AnyRoute, in out TParams = {}, in out TLoaderDeps = {}, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, in out TBeforeLoadFn = AnyContext> {
     abortController: AbortController;
     preload: boolean;
-    params: Expand<TAllParams>;
+    params: Expand<ResolveAllParamsFromParent<TParentRoute, TParams>>;
     deps: TLoaderDeps;
-    context: TAllContext;
+    context: Expand<ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>>;
     location: ParsedLocation;
     /**
      * @deprecated Use `throw redirect({ to: '/somewhere' })` instead
@@ -192,7 +201,7 @@ export type InferAllParams<TRoute> = TRoute extends {
         allParams: infer TAllParams;
     };
 } ? TAllParams : {};
-export type InferAllContext<TRoute> = TRoute extends {
+export type InferAllContext<TRoute> = unknown extends TRoute ? TRoute : TRoute extends {
     types: {
         allContext: infer TAllContext;
     };
@@ -203,16 +212,24 @@ export type ResolveSearchSchemaFn<TSearchValidator extends AnySearchValidator> =
 export type ResolveSearchSchema<TSearchValidator extends AnySearchValidator> = unknown extends TSearchValidator ? TSearchValidator : TSearchValidator extends AnySearchValidatorAdapter ? TSearchValidator['types']['output'] : TSearchValidator extends AnySearchValidatorObj ? ResolveSearchSchemaFn<TSearchValidator['parse']> : ResolveSearchSchemaFn<TSearchValidator>;
 export type ResolveFullSearchSchema<TParentRoute extends AnyRoute, TSearchValidator extends AnySearchValidator> = unknown extends TParentRoute ? ResolveSearchSchema<TSearchValidator> : Assign<InferFullSearchSchema<TParentRoute>, ResolveSearchSchema<TSearchValidator>>;
 export type ResolveFullSearchSchemaInput<TParentRoute extends AnyRoute, TSearchValidator extends AnySearchValidator> = Assign<InferFullSearchSchemaInput<TParentRoute>, ResolveSearchSchemaInput<TSearchValidator>>;
-export type ResolveRouteContext<TRouteContextReturn> = [
-    TRouteContextReturn
-] extends [never] ? RouteContext : TRouteContextReturn;
-export type ResolveAllContext<TParentRoute extends AnyRoute, TRouteContext> = Assign<InferAllContext<TParentRoute>, TRouteContext>;
+export type LooseReturnType<T> = T extends (...args: Array<any>) => infer TReturn ? TReturn : never;
+export type LooseAsyncReturnType<T> = T extends (...args: Array<any>) => infer TReturn ? TReturn extends Promise<infer TReturn> ? TReturn : TReturn : never;
+export type ContextReturnType<TContextFn> = unknown extends TContextFn ? TContextFn : LooseReturnType<TContextFn> extends never ? AnyContext : LooseReturnType<TContextFn>;
+export type ContextAsyncReturnType<TContextFn> = unknown extends TContextFn ? TContextFn : LooseAsyncReturnType<TContextFn> extends never ? AnyContext : LooseAsyncReturnType<TContextFn>;
+export type RouteContextParameter<TParentRoute extends AnyRoute, TRouterContext> = unknown extends TParentRoute ? TRouterContext : Assign<TRouterContext, InferAllContext<TParentRoute>>;
+export type ResolveRouteContext<TRouteContextFn, TBeforeLoadFn> = Assign<ContextReturnType<TRouteContextFn>, ContextAsyncReturnType<TBeforeLoadFn>>;
+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 type ResolveLoaderData<TLoaderDataReturn> = [TLoaderDataReturn] extends [
     never
 ] ? undefined : TLoaderDataReturn;
 export interface AnyRoute extends Route<any, any, any, any, any, any, any, any, any, any, any, any, any, any, any> {
 }
-export type AnyRouteWithContext<TContext> = Route<any, any, any, any, any, any, any, any, any, any, any, any, TContext, 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;
@@ -261,9 +278,9 @@ export declare class RouteApi<TId extends RouteIds<RegisteredRouter['routeTree']
     useNavigate: () => UseNavigateResult<TRoute["fullPath"]>;
     notFound: (opts?: NotFoundError) => NotFoundError;
 }
-export declare class Route<in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, in out TPath extends RouteConstraints['TPath'] = '/', in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, TPath>, in out TCustomId extends RouteConstraints['TCustomId'] = string, in out TId extends RouteConstraints['TId'] = ResolveId<TParentRoute, TCustomId, TPath>, in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator, in out TParams = Record<ParsePathParams<TPath>, string>, in out TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>, TRouteContextReturn = RouteContext, in out TRouteContext = ResolveRouteContext<TRouteContextReturn>, in out TAllContext = ResolveAllContext<TParentRoute, TRouteContext>, in out TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, in out TLoaderData = ResolveLoaderData<TLoaderDataReturn>, in out TChildren = unknown> {
+export declare class Route<in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, in out TPath extends RouteConstraints['TPath'] = '/', in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, TPath>, in out TCustomId extends RouteConstraints['TCustomId'] = string, in out TId extends RouteConstraints['TId'] = ResolveId<TParentRoute, TCustomId, TPath>, in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator, in out TParams = Record<ParsePathParams<TPath>, string>, in out TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>, in out TRouterContext = AnyContext, in out TRouteContextFn = AnyContext, in out TBeforeLoadFn = AnyContext, in out TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, in out TLoaderData = ResolveLoaderData<TLoaderDataReturn>, in out TChildren = unknown> {
     isRoot: TParentRoute extends Route<any> ? true : false;
-    options: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, InferAllContext<TParentRoute>, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>;
+    options: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TLoaderDeps, TLoaderDataReturn, TLoaderData, TRouterContext, TRouteContextFn, TBeforeLoadFn>;
     parentRoute: TParentRoute;
     id: TId;
     path: TPath;
@@ -278,7 +295,7 @@ export declare class Route<in out TParentRoute extends RouteConstraints['TParent
     /**
      * @deprecated Use the `createRoute` function instead.
      */
-    constructor(options?: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, InferAllContext<TParentRoute>, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>);
+    constructor(options?: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TLoaderDeps, TLoaderDataReturn, TLoaderData, TRouterContext, TRouteContextFn, TBeforeLoadFn>);
     types: {
         parentRoute: TParentRoute;
         path: TPath;
@@ -293,8 +310,11 @@ export declare class Route<in out TParentRoute extends RouteConstraints['TParent
         fullSearchSchemaInput: ResolveFullSearchSchemaInput<TParentRoute, TSearchValidator>;
         params: TParams;
         allParams: TAllParams;
-        routeContext: TRouteContext;
-        allContext: TAllContext;
+        routerContext: TRouterContext;
+        routeContext: ResolveRouteContext<TRouteContextFn, TBeforeLoadFn>;
+        routeContextFn: TRouteContextFn;
+        beforeLoadFn: TBeforeLoadFn;
+        allContext: ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>;
         children: TChildren;
         loaderData: TLoaderData;
         loaderDeps: TLoaderDeps;
@@ -302,17 +322,17 @@ export declare class Route<in out TParentRoute extends RouteConstraints['TParent
     init: (opts: {
         originalIndex: number;
     }) => void;
-    addChildren<const TNewChildren extends Record<string, AnyRoute> | ReadonlyArray<AnyRoute>>(children: TNewChildren): Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData, TNewChildren>;
+    addChildren<const TNewChildren extends Record<string, AnyRoute> | ReadonlyArray<AnyRoute>>(children: TNewChildren): Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, TNewChildren>;
     updateLoader: <TNewLoaderData = unknown>(options: {
-        loader: RouteLoaderFn<TAllParams, TLoaderDeps, TAllContext, TNewLoaderData>;
-    }) => Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, TAllContext, TLoaderDeps, TNewLoaderData, TChildren>;
-    update: (options: UpdatableRouteOptions<TParentRoute, TCustomId, TAllParams, TSearchValidator, TLoaderData, TAllContext, TRouteContext, TLoaderDeps>) => this;
+        loader: RouteLoaderFn<TParentRoute, TParams, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn, TNewLoaderData>;
+    }) => Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TNewLoaderData, TChildren>;
+    update: (options: UpdatableRouteOptions<TParentRoute, TCustomId, TAllParams, TSearchValidator, TLoaderData, TLoaderDeps, TRouterContext, TRouteContextFn, TBeforeLoadFn>) => this;
     lazy: (lazyFn: () => Promise<LazyRoute<any>>) => this;
     useMatch: <TRouter extends AnyRouter = AnyRouter, TRouteTree extends AnyRoute = TRouter["routeTree"], TRouteMatch = MakeRouteMatch<TRouteTree, TId>, TSelected = TRouteMatch>(opts?: {
         select?: (match: TRouteMatch) => TSelected;
     }) => TSelected;
-    useRouteContext: <TSelected = Expand<TAllContext>>(opts?: {
-        select?: (search: Expand<TAllContext>) => TSelected;
+    useRouteContext: <TSelected = Expand<Assign<Assign<RouteContextParameter<TParentRoute, TRouterContext>, ContextReturnType<TRouteContextFn>>, ContextAsyncReturnType<TBeforeLoadFn>>>>(opts?: {
+        select?: (search: Expand<ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>>) => TSelected;
     }) => TSelected;
     useSearch: <TSelected = Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>>(opts?: {
         select?: (search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>) => TSelected;
@@ -328,25 +348,22 @@ export declare class Route<in out TParentRoute extends RouteConstraints['TParent
     }) => TSelected;
     useNavigate: () => UseNavigateResult<TFullPath>;
 }
-export declare function createRoute<TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, TPath extends RouteConstraints['TPath'] = '/', TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, TPath>, TCustomId extends RouteConstraints['TCustomId'] = string, TId extends RouteConstraints['TId'] = ResolveId<TParentRoute, TCustomId, TPath>, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TParams = Record<ParsePathParams<TPath>, string>, TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>, TRouteContextReturn = RouteContext, TRouteContext = ResolveRouteContext<TRouteContextReturn>, TAllContext = ResolveAllContext<TParentRoute, TRouteContext>, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown>(options: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, InferAllContext<TParentRoute>, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>): Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, TRouteContextReturn, TRouteContext, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren>;
+export declare function createRoute<TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, TPath extends RouteConstraints['TPath'] = '/', TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, TPath>, TCustomId extends RouteConstraints['TCustomId'] = string, TId extends RouteConstraints['TId'] = ResolveId<TParentRoute, TCustomId, TPath>, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TParams = Record<ParsePathParams<TPath>, string>, TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown>(options: RouteOptions<TParentRoute, TCustomId, TPath, TSearchValidator, TParams, TAllParams, TLoaderDeps, TLoaderDataReturn, TLoaderData, AnyContext, TRouteContextFn, TBeforeLoadFn>): Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchValidator, TParams, TAllParams, AnyContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren>;
 export type AnyRootRoute = RootRoute<any, any, any, any, any, any, any, any>;
-export type RootRouteOptions<TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouteContextReturn = RouteContext, TRouteContext = ResolveRouteContext<TRouteContextReturn>, TRouterContext = {}, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>> = Omit<RouteOptions<any, // TParentRoute
+export type RootRouteOptions<TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>> = Omit<RouteOptions<any, // TParentRoute
 RootRouteId, // TCustomId
 '', // TPath
 TSearchValidator, {}, // TParams
 {}, // TAllParams
-TRouteContextReturn, // TRouteContextReturn
-TRouteContext, // TRouteContext
-TRouterContext, // TParentAllContext
-Assign<TRouterContext, TRouteContext>, // TAllContext
 TLoaderDeps, TLoaderDataReturn, // TLoaderDataReturn,
-TLoaderData>, 'path' | 'id' | 'getParentRoute' | 'caseSensitive' | 'parseParams' | 'stringifyParams' | 'params'>;
-export declare function createRootRouteWithContext<TRouterContext extends {}>(): <TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouteContextReturn extends RouteContext = RouteContext, TRouteContext extends RouteContext = ResolveRouteContext<TRouteContextReturn>, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>>(options?: RootRouteOptions<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>) => RootRoute<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderData, ResolveLoaderData<TLoaderData>, unknown>;
+TLoaderData, // TLoaderData,
+TRouterContext, TRouteContextFn, TBeforeLoadFn>, 'path' | 'id' | 'getParentRoute' | 'caseSensitive' | 'parseParams' | 'stringifyParams' | 'params'>;
+export declare function createRootRouteWithContext<TRouterContext extends {}>(): <TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>>(options?: RootRouteOptions<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData>) => RootRoute<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderData, ResolveLoaderData<TLoaderData>, unknown>;
 /**
  * @deprecated Use the `createRootRouteWithContext` function instead.
  */
 export declare const rootRouteWithContext: typeof createRootRouteWithContext;
-export declare class RootRoute<in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouteContextReturn = RouteContext, in out TRouteContext = ResolveRouteContext<TRouteContextReturn>, in out TRouterContext = {}, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, in out TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown> extends Route<any, // TParentRoute
+export declare class RootRoute<in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, in out TBeforeLoadFn = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, in out TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown> extends Route<any, // TParentRoute
 '/', // TPath
 '/', // TFullPath
 string, // TCustomId
@@ -354,17 +371,14 @@ RootRouteId, // TId
 TSearchValidator, // TSearchValidator
 {}, // TParams
 {}, // TAllParams
-TRouteContextReturn, // TRouteContextReturn
-TRouteContext, // TRouteContext
-Assign<TRouterContext, TRouteContext>, // TAllContext
-TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren> {
+TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren> {
     /**
      * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
      */
-    constructor(options?: RootRouteOptions<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>);
-    addChildren<const TNewChildren extends Record<string, AnyRoute> | ReadonlyArray<AnyRoute>>(children: TNewChildren): RootRoute<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderDataReturn, TLoaderData, TNewChildren>;
+    constructor(options?: RootRouteOptions<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData>);
+    addChildren<const TNewChildren extends Record<string, AnyRoute> | ReadonlyArray<AnyRoute>>(children: TNewChildren): RootRoute<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, TNewChildren>;
 }
-export declare function createRootRoute<TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouteContextReturn = RouteContext, TRouteContext = ResolveRouteContext<TRouteContextReturn>, TRouterContext = {}, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>>(options?: RootRouteOptions<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>): RootRoute<TSearchValidator, TRouteContextReturn, TRouteContext, TRouterContext, TLoaderDeps, TLoaderDataReturn, TLoaderData, unknown>;
+export declare function createRootRoute<TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>>(options?: RootRouteOptions<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData>): RootRoute<TSearchValidator, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, unknown>;
 export type ResolveFullPath<TParentRoute extends AnyRoute, TPath extends string, TPrefixed = RoutePrefix<TParentRoute['fullPath'], TPath>> = TPrefixed extends RootRouteId ? '/' : TPrefixed;
 type RoutePrefix<TPrefix extends string, TPath extends string> = string extends TPath ? RootRouteId : TPath extends string ? TPrefix extends RootRouteId ? TPath extends '/' ? '/' : `/${TrimPath<TPath>}` : `${TPrefix}/${TPath}` extends '/' ? '/' : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}` : never;
 export type TrimPath<T extends string> = '' extends T ? '' : TrimPathRight<TrimPathLeft<T>>;
@@ -411,7 +425,7 @@ export type AsyncRouteComponent<TProps> = SyncRouteComponent<TProps> & {
 export type RouteComponent<TProps = any> = AsyncRouteComponent<TProps>;
 export type ErrorRouteComponent = RouteComponent<ErrorComponentProps>;
 export type NotFoundRouteComponent = SyncRouteComponent<NotFoundRouteProps>;
-export declare class NotFoundRoute<TParentRoute extends AnyRootRoute, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TRouteContextReturn = AnyContext, TRouteContext = RouteContext, TAllContext = ResolveAllContext<TParentRoute, TRouteContext>, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown> extends Route<TParentRoute, '/404', '/404', '404', '404', TSearchValidator, {}, {}, TRouteContextReturn, TRouteContext, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren> {
-    constructor(options: Omit<RouteOptions<TParentRoute, string, string, TSearchValidator, {}, {}, TRouteContextReturn, TRouteContext, InferAllContext<TParentRoute>, TAllContext, TLoaderDeps, TLoaderDataReturn, TLoaderData>, 'caseSensitive' | 'parseParams' | 'stringifyParams' | 'path' | 'id' | 'params'>);
+export declare class NotFoundRoute<TParentRoute extends AnyRootRoute, TRouterContext = AnyContext, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TSearchValidator extends AnySearchValidator = DefaultSearchValidator, TLoaderDeps extends Record<string, any> = {}, TLoaderDataReturn = {}, TLoaderData = ResolveLoaderData<TLoaderDataReturn>, TChildren = unknown> extends Route<TParentRoute, '/404', '/404', '404', '404', TSearchValidator, {}, {}, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderDataReturn, TLoaderData, TChildren> {
+    constructor(options: Omit<RouteOptions<TParentRoute, string, string, TSearchValidator, {}, {}, TLoaderDeps, TLoaderDataReturn, TLoaderData, TRouterContext, TRouteContextFn, TBeforeLoadFn>, 'caseSensitive' | 'parseParams' | 'stringifyParams' | 'path' | 'id' | 'params'>);
 }
 export {};

package/dist/cjs/router.cjs

@@ -10,6 +10,7 @@ const utils = require("./utils.cjs");
 const path = require("./path.cjs");
 const redirects = require("./redirects.cjs");
 const notFound = require("./not-found.cjs");
+const transformer = require("./transformer.cjs");
 const componentTypes = [
   "component",
   "errorComponent",
@@ -210,12 +211,12 @@ class Router {
       });
       return resolvedPath;
     };
-    this.matchRoutes = (pathname, locationSearch, opts) => {
+    this.matchRoutes = (next, opts) => {
       let routeParams = {};
       const foundRoute = this.flatRoutes.find((route) => {
         const matchedParams = path.matchPathname(
           this.basepath,
-          path.trimPathRight(pathname),
+          path.trimPathRight(next.pathname),
           {
             to: route.fullPath,
             caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
@@ -235,7 +236,7 @@ class Router {
         // If we found a route, and it's not an index route and we have left over path
         foundRoute ? foundRoute.path !== "/" && routeParams["**"] : (
           // Or if we didn't find a route and we have left over path
-          path.trimPathRight(pathname)
+          path.trimPathRight(next.pathname)
         )
       ) {
         if (this.options.notFoundRoute) {
@@ -284,10 +285,10 @@ class Router {
       });
       const matches = [];
       matchedRoutes.forEach((route, index) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         const parentMatch = matches[index - 1];
         const [preMatchSearch, searchError] = (() => {
-          const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? locationSearch;
+          const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? next.search;
           try {
             const validator = typeof route.options.validateSearch === "object" ? route.options.validateSearch.parse : route.options.validateSearch;
             const search = (validator == null ? void 0 : validator(parentSearch)) ?? {};
@@ -345,8 +346,9 @@ class Router {
             isFetching: false,
             error: void 0,
             paramsError: parseErrors[index],
-            routeContext: void 0,
-            context: void 0,
+            __routeContext: {},
+            __beforeLoadContext: {},
+            context: {},
             abortController: new AbortController(),
             fetchCount: 0,
             cause,
@@ -375,6 +377,30 @@ class Router {
         }
         match.search = utils.replaceEqualDeep(match.search, preMatchSearch);
         match.searchError = searchError;
+        const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
+        const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};
+        match.context = {
+          ...parentContext,
+          ...match.__routeContext,
+          ...match.__beforeLoadContext
+        };
+        const contextFnContext = {
+          search: match.search,
+          params: match.params,
+          context: match.context,
+          location: next,
+          navigate: (opts2) => this.navigate({ ...opts2, _fromLocation: next }),
+          buildLocation: this.buildLocation,
+          cause: match.cause,
+          abortController: match.abortController,
+          preload: !!match.preload
+        };
+        match.__routeContext = ((_l = (_k = route.options).context) == null ? void 0 : _l.call(_k, contextFnContext)) ?? {};
+        match.context = {
+          ...parentContext,
+          ...match.__routeContext,
+          ...match.__beforeLoadContext
+        };
         matches.push(match);
       });
       return matches;
@@ -394,10 +420,10 @@ class Router {
     this.buildLocation = (opts) => {
       const build = (dest = {}, matches) => {
         var _a, _b, _c;
-        const fromMatches = dest._fromLocation != null ? this.matchRoutes(
-          dest._fromLocation.pathname,
-          dest.fromSearch || dest._fromLocation.search
-        ) : this.state.matches;
+        const fromMatches = dest._fromLocation != null ? this.matchRoutes({
+          ...dest._fromLocation,
+          search: dest.fromSearch || dest._fromLocation.search
+        }) : this.state.matches;
         const fromMatch = dest.from != null ? fromMatches.find(
           (d) => path.matchPathname(this.basepath, path.trimPathRight(d.pathname), {
             to: dest.from,
@@ -489,8 +515,8 @@ class Router {
             maskedNext = build(maskedDest);
           }
         }
-        const nextMatches = this.matchRoutes(next.pathname, next.search);
-        const maskedMatches = maskedNext ? this.matchRoutes(maskedNext.pathname, maskedNext.search) : void 0;
+        const nextMatches = this.matchRoutes(next);
+        const maskedMatches = maskedNext ? this.matchRoutes(maskedNext) : void 0;
         const maskedFinal = maskedNext ? build(maskedDest, maskedMatches) : void 0;
         const final = build(dest, nextMatches);
         if (maskedFinal) {
@@ -568,6 +594,13 @@ class Router {
       ignoreBlocker,
       ...rest
     } = {}) => {
+      const href = rest.href;
+      if (href) {
+        const parsed = history.parseHref(href, {});
+        rest.to = parsed.pathname;
+        rest.search = this.options.parseSearch(parsed.search);
+        rest.hash = parsed.hash;
+      }
       const location = this.buildLocation(rest);
       return this.commitLocation({
         ...location,
@@ -577,7 +610,7 @@ class Router {
         ignoreBlocker
       });
     };
-    this.navigate = ({ from, to, __isRedirect, ...rest }) => {
+    this.navigate = ({ to, __isRedirect, ...rest }) => {
       const toString = String(to);
       let isExternal;
       try {
@@ -591,7 +624,6 @@ class Router {
       );
       return this.buildAndCommitLocation({
         ...rest,
-        from,
         to
         // to: toString,
       });
@@ -604,7 +636,8 @@ class Router {
       }));
       let redirect;
       let notFound$1;
-      const loadPromise = new Promise((resolve) => {
+      let loadPromise;
+      loadPromise = new Promise((resolve) => {
         this.startReactTransition(async () => {
           var _a;
           try {
@@ -614,7 +647,7 @@ class Router {
             this.cancelMatches();
             let pendingMatches;
             this.__store.batch(() => {
-              pendingMatches = this.matchRoutes(next.pathname, next.search);
+              pendingMatches = this.matchRoutes(next);
               this.__store.setState((s) => ({
                 ...s,
                 status: "pending",
@@ -834,6 +867,7 @@ class Router {
               };
               for (const [index, { id: matchId, routeId }] of matches.entries()) {
                 const existingMatch = this.getMatch(matchId);
+                const parentMatchId = (_a = matches[index - 1]) == null ? void 0 : _a.id;
                 if (
                   // If we are in the middle of a load, either of these will be present
                   // (not to be confused with `loadPromise`, which is always defined)
@@ -852,13 +886,6 @@ class Router {
                     }));
                     const route = this.looseRoutesById[routeId];
                     const abortController = new AbortController();
-                    const parentMatchId = (_a = matches[index - 1]) == null ? void 0 : _a.id;
-                    const getParentContext = () => {
-                      if (!parentMatchId) {
-                        return this.options.context ?? {};
-                      }
-                      return this.getMatch(parentMatchId).context ?? this.options.context ?? {};
-                    };
                     const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
                     const shouldPending = !!(onReady && !this.isServer && !preload && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
                     let pendingTimeout;
@@ -877,47 +904,54 @@ class Router {
                     if (searchError) {
                       handleSerialError(index, searchError, "VALIDATE_SEARCH");
                     }
-                    const parentContext = getParentContext();
+                    const getParentMatchContext = () => parentMatchId ? this.getMatch(parentMatchId).context : this.options.context ?? {};
                     updateMatch(matchId, (prev) => ({
                       ...prev,
                       isFetching: "beforeLoad",
                       fetchCount: prev.fetchCount + 1,
-                      routeContext: utils.replaceEqualDeep(
-                        prev.routeContext,
-                        parentContext
-                      ),
-                      context: utils.replaceEqualDeep(prev.context, parentContext),
                       abortController,
-                      pendingTimeout
+                      pendingTimeout,
+                      context: {
+                        ...getParentMatchContext(),
+                        ...prev.__routeContext,
+                        ...prev.__beforeLoadContext
+                      }
                     }));
-                    const { search, params, routeContext, cause } = this.getMatch(matchId);
+                    const { search, params, context, cause } = this.getMatch(matchId);
                     const beforeLoadFnContext = {
                       search,
                       abortController,
                       params,
                       preload: !!preload,
-                      context: routeContext,
+                      context,
                       location,
                       navigate: (opts) => this.navigate({ ...opts, _fromLocation: location }),
                       buildLocation: this.buildLocation,
                       cause: preload ? "preload" : cause
                     };
-                    const beforeLoadContext = await ((_c = (_b = route.options).beforeLoad) == null ? void 0 : _c.call(_b, beforeLoadFnContext)) ?? {};
+                    let beforeLoadContext = await ((_c = (_b = route.options).beforeLoad) == null ? void 0 : _c.call(_b, beforeLoadFnContext)) ?? {};
+                    if (this.serializeLoaderData) {
+                      beforeLoadContext = this.serializeLoaderData(
+                        "__beforeLoadContext",
+                        beforeLoadContext,
+                        {
+                          router: this,
+                          match: this.getMatch(matchId)
+                        }
+                      );
+                    }
                     if (redirects.isRedirect(beforeLoadContext) || notFound.isNotFound(beforeLoadContext)) {
                       handleSerialError(index, beforeLoadContext, "BEFORE_LOAD");
                     }
                     updateMatch(matchId, (prev) => {
-                      const routeContext2 = {
-                        ...prev.routeContext,
-                        ...beforeLoadContext
-                      };
                       return {
                         ...prev,
-                        routeContext: utils.replaceEqualDeep(
-                          prev.routeContext,
-                          routeContext2
-                        ),
-                        context: utils.replaceEqualDeep(prev.context, routeContext2),
+                        __beforeLoadContext: beforeLoadContext,
+                        context: {
+                          ...getParentMatchContext(),
+                          ...prev.__routeContext,
+                          ...beforeLoadContext
+                        },
                         abortController
                       };
                     });
@@ -1010,10 +1044,14 @@ class Router {
                             await route._lazyPromise;
                             let loaderData = await ((_b2 = (_a2 = route.options).loader) == null ? void 0 : _b2.call(_a2, getLoaderContext()));
                             if (this.serializeLoaderData) {
-                              loaderData = this.serializeLoaderData(loaderData, {
-                                router: this,
-                                match: this.getMatch(matchId)
-                              });
+                              loaderData = this.serializeLoaderData(
+                                "loaderData",
+                                loaderData,
+                                {
+                                  router: this,
+                                  match: this.getMatch(matchId)
+                                }
+                              );
                             }
                             handleRedirectAndNotFound(
                               this.getMatch(matchId),
@@ -1065,7 +1103,8 @@ class Router {
                         }
                       };
                       const { status, invalid } = this.getMatch(matchId);
-                      if (status === "success" && (invalid || (shouldReload ?? age > staleAge))) {
+                      if (preload && route.options.preload === false) {
+                      } else if (status === "success" && (invalid || (shouldReload ?? age > staleAge))) {
                         ;
                         (async () => {
                           try {
@@ -1147,7 +1186,7 @@ class Router {
     };
     this.preloadRoute = async (opts) => {
       const next = this.buildLocation(opts);
-      let matches = this.matchRoutes(next.pathname, next.search, {
+      let matches = this.matchRoutes(next, {
         throwOnError: true,
         preload: true
       });
@@ -1265,10 +1304,7 @@ class Router {
       this.dehydratedData = ctx.payload;
       (_c = (_b = this.options).hydrate) == null ? void 0 : _c.call(_b, ctx.payload);
       const dehydratedState = ctx.router.state;
-      const matches = this.matchRoutes(
-        this.state.location.pathname,
-        this.state.location.search
-      ).map((match) => {
+      const matches = this.matchRoutes(this.state.location).map((match) => {
         const dehydratedMatch = dehydratedState.dehydratedMatches.find(
           (d) => d.id === match.id
         );
@@ -1368,10 +1404,7 @@ class Router {
       notFoundMode: options.notFoundMode ?? "fuzzy",
       stringifySearch: options.stringifySearch ?? searchParams.defaultStringifySearch,
       parseSearch: options.parseSearch ?? searchParams.defaultParseSearch,
-      transformer: options.transformer ?? {
-        parse: JSON.parse,
-        stringify: JSON.stringify
-      }
+      transformer: options.transformer ?? transformer.defaultTransformer
     });
     if (typeof document !== "undefined") {
       window.__TSR__ROUTER__ = this;