@tanstack/router-core 0.0.1-beta.15 → 0.0.1-beta.19

package/build/types/index.d.ts

@@ -14,7 +14,7 @@ export { default as invariant } from 'tiny-invariant';
 
 interface FrameworkGenerics {
 }
-declare type GetFrameworkGeneric<U> = U extends keyof FrameworkGenerics ? FrameworkGenerics[U] : any;
+type GetFrameworkGeneric<U> = U extends keyof FrameworkGenerics ? FrameworkGenerics[U] : any;
 
 interface RouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TRouteInfo extends AnyRouteInfo = RouteInfo> extends Route<TAllRouteInfo, TRouteInfo> {
     matchId: string;
@@ -73,34 +73,34 @@ declare function createRouteMatch<TAllRouteInfo extends AnyAllRouteInfo = Defaul
     pathname: string;
 }): RouteMatch<TAllRouteInfo, TRouteInfo>;
 
-declare type NoInfer<T> = [T][T extends any ? 0 : never];
-declare type IsAny<T, Y, N> = 1 extends 0 & T ? Y : N;
-declare type IsAnyBoolean<T> = 1 extends 0 & T ? true : false;
-declare type IsKnown<T, Y, N> = unknown extends T ? N : Y;
-declare type PickAsRequired<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
-declare type PickAsPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-declare type PickUnsafe<T, K> = K extends keyof T ? Pick<T, K> : never;
-declare type PickExtra<T, K> = Expand<{
+type NoInfer<T> = [T][T extends any ? 0 : never];
+type IsAny<T, Y, N> = 1 extends 0 & T ? Y : N;
+type IsAnyBoolean<T> = 1 extends 0 & T ? true : false;
+type IsKnown<T, Y, N> = unknown extends T ? N : Y;
+type PickAsRequired<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
+type PickAsPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+type PickUnsafe<T, K> = K extends keyof T ? Pick<T, K> : never;
+type PickExtra<T, K> = Expand<{
     [TKey in keyof K as string extends TKey ? never : TKey extends keyof T ? never : TKey]: K[TKey];
 }>;
-declare type PickRequired<T> = {
+type PickRequired<T> = {
     [K in keyof T as undefined extends T[K] ? never : K]: T[K];
 };
-declare type Expand<T> = T extends object ? T extends infer O ? {
+type Expand<T> = T extends object ? T extends infer O ? {
     [K in keyof O]: O[K];
 } : never : T;
-declare type Values<O> = O[ValueKeys<O>];
-declare type ValueKeys<O> = Extract<keyof O, PropertyKey>;
-declare type DeepAwaited<T> = T extends Promise<infer A> ? DeepAwaited<A> : T extends Record<infer A, Promise<infer B>> ? {
+type Values<O> = O[ValueKeys<O>];
+type ValueKeys<O> = Extract<keyof O, PropertyKey>;
+type DeepAwaited<T> = T extends Promise<infer A> ? DeepAwaited<A> : T extends Record<infer A, Promise<infer B>> ? {
     [K in A]: DeepAwaited<B>;
 } : T;
-declare type PathParamMask<TRoutePath extends string> = TRoutePath extends `${infer L}/:${infer C}/${infer R}` ? PathParamMask<`${L}/${string}/${R}`> : TRoutePath extends `${infer L}/:${infer C}` ? PathParamMask<`${L}/${string}`> : TRoutePath;
-declare type Timeout = ReturnType<typeof setTimeout>;
-declare type Updater<TPrevious, TResult = TPrevious> = TResult | ((prev?: TPrevious) => TResult);
-declare type PickExtract<T, U> = {
+type PathParamMask<TRoutePath extends string> = TRoutePath extends `${infer L}/:${infer C}/${infer R}` ? PathParamMask<`${L}/${string}/${R}`> : TRoutePath extends `${infer L}/:${infer C}` ? PathParamMask<`${L}/${string}`> : TRoutePath;
+type Timeout = ReturnType<typeof setTimeout>;
+type Updater<TPrevious, TResult = TPrevious> = TResult | ((prev?: TPrevious) => TResult);
+type PickExtract<T, U> = {
     [K in keyof T as T[K] extends U ? K : never]: T[K];
 };
-declare type PickExclude<T, U> = {
+type PickExclude<T, U> = {
     [K in keyof T as T[K] extends U ? never : K]: T[K];
 };
 /**
@@ -131,9 +131,9 @@ interface FromLocation {
     key?: string;
     hash?: string;
 }
-declare type SearchSerializer = (searchObj: Record<string, any>) => string;
-declare type SearchParser = (searchStr: string) => Record<string, any>;
-declare type FilterRoutesFn = <TRoute extends Route<any, RouteInfo>>(routeConfigs: TRoute[]) => TRoute[];
+type SearchSerializer = (searchObj: Record<string, any>) => string;
+type SearchParser = (searchStr: string) => Record<string, any>;
+type FilterRoutesFn = <TRoute extends Route<any, RouteInfo>>(routeConfigs: TRoute[]) => TRoute[];
 interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
     history?: BrowserHistory | MemoryHistory | HashHistory;
     stringifySearch?: SearchSerializer;
@@ -143,7 +143,6 @@ interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
     defaultPreloadMaxAge?: number;
     defaultPreloadGcMaxAge?: number;
     defaultPreloadDelay?: number;
-    useErrorBoundary?: boolean;
     defaultComponent?: GetFrameworkGeneric<'Component'>;
     defaultErrorComponent?: GetFrameworkGeneric<'Component'>;
     defaultPendingComponent?: GetFrameworkGeneric<'Component'>;
@@ -152,6 +151,7 @@ interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
     caseSensitive?: boolean;
     routeConfig?: TRouteConfig;
     basepath?: string;
+    useServerData?: boolean;
     createRouter?: (router: Router<any, any>) => void;
     createRoute?: (opts: {
         route: AnyRoute;
@@ -195,9 +195,9 @@ interface Loader<TFullSearchSchema extends AnySearchSchema = {}, TAllParams exte
     latest?: LoaderState<TFullSearchSchema, TAllParams>;
     pending: LoaderState<TFullSearchSchema, TAllParams>[];
 }
-interface LoaderState<TFullSearchSchema = unknown, TAllParams = unknown> {
+interface LoaderState<TFullSearchSchema extends AnySearchSchema = {}, TAllParams extends AnyPathParams = {}> {
     loadedAt: number;
-    loaderContext: LoaderContext<TFullSearchSchema, TAllParams>;
+    loaderContext: LoaderContext<AnyLoaderData, TFullSearchSchema, TAllParams>;
 }
 interface RouterState {
     status: 'idle' | 'loading';
@@ -214,20 +214,21 @@ interface PendingState {
     location: Location;
     matches: RouteMatch[];
 }
-declare type Listener = (router: Router<any, any>) => void;
-declare type ListenerFn = () => void;
+type Listener = (router: Router<any, any>) => void;
+type ListenerFn = () => void;
 interface BuildNextOptions {
     to?: string | number | null;
     params?: true | Updater<Record<string, any>>;
     search?: true | Updater<unknown>;
     hash?: true | Updater<string>;
+    state?: LocationState;
     key?: string;
     from?: string;
     fromCurrent?: boolean;
     __preSearchFilters?: SearchFilter<any>[];
     __postSearchFilters?: SearchFilter<any>[];
 }
-declare type MatchCacheEntry = {
+type MatchCacheEntry = {
     gc: number;
     match: RouteMatch;
 };
@@ -248,10 +249,13 @@ interface DehydratedRouterState extends Pick<RouterState, 'status' | 'location'
 interface DehydratedRouteMatch extends Pick<RouteMatch<any, any>, 'matchId' | 'status' | 'routeLoaderData' | 'loaderData' | 'isInvalid' | 'invalidAt'> {
 }
 interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>> {
+    types: {
+        RouteConfig: TRouteConfig;
+        AllRouteInfo: TAllRouteInfo;
+    };
     history: BrowserHistory | MemoryHistory | HashHistory;
     options: PickAsRequired<RouterOptions<TRouteConfig>, 'stringifySearch' | 'parseSearch'>;
     basepath: string;
-    allRouteInfo: TAllRouteInfo;
     listeners: Listener[];
     location: Location;
     navigateTimeout?: Timeout;
@@ -291,6 +295,7 @@ interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInf
         maxAge?: never;
         gcMaxAge?: never;
     }) => Promise<void>;
+    loadMatchData: (routeMatch: RouteMatch<any, any>) => Promise<Record<string, unknown>>;
     invalidateRoute: (opts: MatchLocation) => void;
     reload: () => Promise<void>;
     resolvePath: (from: string, path: string) => string;
@@ -348,17 +353,21 @@ interface DefaultAllRouteInfo {
 }
 interface AllRouteInfo<TRouteConfig extends AnyRouteConfig = RouteConfig> extends RoutesInfoInner<TRouteConfig, ParseRouteConfig<TRouteConfig>> {
 }
-declare type ParseRouteConfig<TRouteConfig = AnyRouteConfig> = TRouteConfig extends AnyRouteConfig ? RouteConfigRoute<TRouteConfig> | ParseRouteChildren<TRouteConfig> : never;
-declare type ParseRouteChildren<TRouteConfig> = TRouteConfig extends AnyRouteConfigWithChildren<infer TChildren> ? unknown extends TChildren ? never : TChildren extends AnyRouteConfig[] ? Values<{
+type ParseRouteConfig<TRouteConfig = AnyRouteConfig> = TRouteConfig extends AnyRouteConfig ? RouteConfigRoute<TRouteConfig> | ParseRouteChildren<TRouteConfig> : never;
+type ParseRouteChildren<TRouteConfig> = TRouteConfig extends AnyRouteConfigWithChildren<infer TChildren> ? unknown extends TChildren ? never : TChildren extends AnyRouteConfig[] ? Values<{
     [TId in TChildren[number]['id']]: ParseRouteChild<TChildren[number], TId>;
 }> : never : never;
-declare type ParseRouteChild<TRouteConfig, TId> = TRouteConfig & {
+type ParseRouteChild<TRouteConfig, TId> = TRouteConfig & {
     id: TId;
 } extends AnyRouteConfig ? ParseRouteConfig<TRouteConfig> : never;
-declare type RouteConfigRoute<TRouteConfig> = TRouteConfig extends RouteConfig<infer TId, infer TRouteId, infer TPath, infer TFullPath, infer TParentLoaderData, infer TRouteLoaderData, infer TLoaderData, infer TActionPayload, infer TActionResponse, infer TParentSearchSchema, infer TSearchSchema, infer TFullSearchSchema, infer TParentParams, infer TParams, infer TAllParams, any> ? string extends TRouteId ? never : RouteInfo<TId, TRouteId, TPath, TFullPath, TParentLoaderData, TRouteLoaderData, TLoaderData, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, TFullSearchSchema, TParentParams, TParams, TAllParams> : never;
+type RouteConfigRoute<TRouteConfig> = TRouteConfig extends RouteConfig<infer TId, infer TRouteId, infer TPath, infer TFullPath, infer TParentLoaderData, infer TRouteLoaderData, infer TLoaderData, infer TActionPayload, infer TActionResponse, infer TParentSearchSchema, infer TSearchSchema, infer TFullSearchSchema, infer TParentParams, infer TParams, infer TAllParams, any> ? string extends TRouteId ? never : RouteInfo<TId, TRouteId, TPath, TFullPath, TParentLoaderData, TRouteLoaderData, TLoaderData, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, TFullSearchSchema, TParentParams, TParams, TAllParams> : never;
 interface RoutesInfoInner<TRouteConfig extends AnyRouteConfig, TRouteInfo extends RouteInfo<string, string, any, any, any, any, any, any, any, any, any, any, any, any, any> = RouteInfo, TRouteInfoById = {
+    '/': TRouteInfo;
+} & {
     [TInfo in TRouteInfo as TInfo['id']]: TInfo;
 }, TRouteInfoByFullPath = {
+    '/': TRouteInfo;
+} & {
     [TInfo in TRouteInfo as TInfo['fullPath'] extends RootRouteId ? never : string extends TInfo['fullPath'] ? never : TInfo['fullPath']]: TInfo;
 }> {
     routeConfig: TRouteConfig;
@@ -387,41 +396,40 @@ interface RouteInfo<TId extends string = string, TRouteId extends string = strin
     allParams: TAllParams;
     options: RouteOptions<TRouteId, TPath, TParentRouteLoaderData, TRouteLoaderData, TLoaderData, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, TFullSearchSchema, TParentParams, TParams, TAllParams>;
 }
-declare type RoutesById<TAllRouteInfo extends AnyAllRouteInfo> = {
+type RoutesById<TAllRouteInfo extends AnyAllRouteInfo> = {
     [K in keyof TAllRouteInfo['routeInfoById']]: Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][K]>;
 };
-declare type RouteInfoById<TAllRouteInfo extends AnyAllRouteInfo, TId> = TId extends keyof TAllRouteInfo['routeInfoById'] ? IsAny<TAllRouteInfo['routeInfoById'][TId]['id'], RouteInfo, TAllRouteInfo['routeInfoById'][TId]> : never;
-declare type RouteInfoByPath<TAllRouteInfo extends AnyAllRouteInfo, TPath> = TPath extends keyof TAllRouteInfo['routeInfoByFullPath'] ? IsAny<TAllRouteInfo['routeInfoByFullPath'][TPath]['id'], RouteInfo, TAllRouteInfo['routeInfoByFullPath'][TPath]> : never;
+type RouteInfoById<TAllRouteInfo extends AnyAllRouteInfo, TId> = TId extends keyof TAllRouteInfo['routeInfoById'] ? IsAny<TAllRouteInfo['routeInfoById'][TId]['id'], RouteInfo, TAllRouteInfo['routeInfoById'][TId]> : never;
+type RouteInfoByPath<TAllRouteInfo extends AnyAllRouteInfo, TPath> = TPath extends keyof TAllRouteInfo['routeInfoByFullPath'] ? IsAny<TAllRouteInfo['routeInfoByFullPath'][TPath]['id'], RouteInfo, TAllRouteInfo['routeInfoByFullPath'][TPath]> : never;
 
 declare const rootRouteId: "__root__";
-declare type RootRouteId = typeof rootRouteId;
-declare type AnyLoaderData = {};
-declare type AnyPathParams = {};
-declare type AnySearchSchema = {};
+type RootRouteId = typeof rootRouteId;
+type AnyLoaderData = {};
+type AnyPathParams = {};
+type AnySearchSchema = {};
 interface RouteMeta {
 }
-declare type SearchSchemaValidator<TReturn, TParentSchema> = SearchSchemaValidatorObj<TReturn, TParentSchema> | SearchSchemaValidatorFn<TReturn, TParentSchema>;
-declare type SearchSchemaValidatorObj<TReturn, TParentSchema> = {
+type SearchSchemaValidator<TReturn, TParentSchema> = SearchSchemaValidatorObj<TReturn, TParentSchema> | SearchSchemaValidatorFn<TReturn, TParentSchema>;
+type SearchSchemaValidatorObj<TReturn, TParentSchema> = {
     parse?: SearchSchemaValidatorFn<TReturn, TParentSchema>;
 };
-declare type SearchSchemaValidatorFn<TReturn, TParentSchema> = (searchObj: Record<string, unknown>) => {} extends TParentSchema ? TReturn : keyof TReturn extends keyof TParentSchema ? {
+type SearchSchemaValidatorFn<TReturn, TParentSchema> = (searchObj: Record<string, unknown>) => {} extends TParentSchema ? TReturn : keyof TReturn extends keyof TParentSchema ? {
     error: 'Top level search params cannot be redefined by child routes!';
     keys: keyof TReturn & keyof TParentSchema;
 } : TReturn;
-declare type DefinedPathParamWarning = 'Path params cannot be redefined by child routes!';
-declare type ParentParams<TParentParams> = AnyPathParams extends TParentParams ? {} : {
+type DefinedPathParamWarning = 'Path params cannot be redefined by child routes!';
+type ParentParams<TParentParams> = AnyPathParams extends TParentParams ? {} : {
     [Key in keyof TParentParams]?: DefinedPathParamWarning;
 };
-declare type LoaderFn<TParentRouteLoaderData extends AnyLoaderData = {}, TRouteLoaderData extends AnyLoaderData = {}, TFullSearchSchema extends AnySearchSchema = {}, TAllParams extends AnyPathParams = {}> = (loaderContext: LoaderContext<TParentRouteLoaderData, TFullSearchSchema, TAllParams>) => Promise<TRouteLoaderData>;
+type LoaderFn<TParentRouteLoaderData extends AnyLoaderData = {}, TRouteLoaderData extends AnyLoaderData = {}, TFullSearchSchema extends AnySearchSchema = {}, TAllParams extends AnyPathParams = {}> = (loaderContext: LoaderContext<TParentRouteLoaderData, TFullSearchSchema, TAllParams>) => Promise<TRouteLoaderData>;
 interface LoaderContext<TParentRouteLoaderData extends AnyLoaderData = {}, TFullSearchSchema extends AnySearchSchema = {}, TAllParams extends AnyPathParams = {}> {
     params: TAllParams;
     search: TFullSearchSchema;
     signal?: AbortSignal;
-    parentLoaderPromise?: Promise<TParentRouteLoaderData>;
 }
-declare type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (submission: TActionPayload) => TActionResponse | Promise<TActionResponse>;
-declare type UnloaderFn<TPath extends string> = (routeMatch: RouteMatch<any, RouteInfo<string, TPath>>) => void;
-declare type RouteOptions<TRouteId extends string = string, TPath extends string = string, TParentRouteLoaderData extends AnyLoaderData = {}, TRouteLoaderData extends AnyLoaderData = {}, TLoaderData extends AnyLoaderData = {}, TActionPayload = unknown, TActionResponse = unknown, TParentSearchSchema extends {} = {}, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = TSearchSchema, TParentParams extends AnyPathParams = {}, TParams extends Record<ParsePathParams<TPath>, unknown> = Record<ParsePathParams<TPath>, string>, TAllParams extends AnyPathParams = {}> = ({
+type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (submission: TActionPayload) => TActionResponse | Promise<TActionResponse>;
+type UnloaderFn<TPath extends string> = (routeMatch: RouteMatch<any, RouteInfo<string, TPath>>) => void;
+type RouteOptions<TRouteId extends string = string, TPath extends string = string, TParentRouteLoaderData extends AnyLoaderData = {}, TRouteLoaderData extends AnyLoaderData = {}, TLoaderData extends AnyLoaderData = {}, TActionPayload = unknown, TActionResponse = unknown, TParentSearchSchema extends {} = {}, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = TSearchSchema, TParentParams extends AnyPathParams = {}, TParams extends Record<ParsePathParams<TPath>, unknown> = Record<ParsePathParams<TPath>, string>, TAllParams extends AnyPathParams = {}> = ({
     path: TPath;
 } | {
     id: TRouteId;
@@ -437,7 +445,6 @@ declare type RouteOptions<TRouteId extends string = string, TPath extends string
     loaderMaxAge?: number;
     loaderGcMaxAge?: number;
     action?: ActionFn<TActionPayload, TActionResponse>;
-    useErrorBoundary?: boolean;
     onMatch?: (matchContext: {
         params: TAllParams;
         search: TFullSearchSchema;
@@ -457,7 +464,7 @@ declare type RouteOptions<TRouteId extends string = string, TPath extends string
     parseParams: (rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>) => TParams;
     stringifyParams: (params: TParams) => Record<ParsePathParams<TPath>, string>;
 }) & (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never ? {} : 'Cannot redefined path params in child routes!');
-declare type SearchFilter<T, U = T> = (prev: T) => U;
+type SearchFilter<T, U = T> = (prev: T) => U;
 interface RouteConfig<TId extends string = string, TRouteId extends string = string, TPath extends string = string, TFullPath extends string = string, TParentRouteLoaderData extends AnyLoaderData = AnyLoaderData, TRouteLoaderData extends AnyLoaderData = AnyLoaderData, TLoaderData extends AnyLoaderData = AnyLoaderData, TActionPayload = unknown, TActionResponse = unknown, TParentSearchSchema extends {} = {}, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = {}, TParentParams extends AnyPathParams = {}, TParams extends Record<ParsePathParams<TPath>, unknown> = Record<ParsePathParams<TPath>, string>, TAllParams extends AnyPathParams = {}, TKnownChildren = unknown> {
     id: TId;
     routeId: TRouteId;
@@ -475,21 +482,21 @@ interface RouteConfig<TId extends string = string, TRouteId extends string = str
     }) => RouteConfig<TId, TRouteId, TPath, TFullPath, TParentRouteLoaderData, TRouteLoaderData, TLoaderData, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, TFullSearchSchema, TParentParams, TParams, TAllParams, TNewChildren>>;
     createRoute: CreateRouteConfigFn<false, TId, TFullPath, TRouteLoaderData, TLoaderData, TFullSearchSchema, TAllParams>;
 }
-declare type CreateRouteConfigFn<TIsRoot extends boolean = false, TParentId extends string = string, TParentPath extends string = string, TParentRouteLoaderData extends AnyLoaderData = {}, TParentLoaderData extends AnyLoaderData = {}, TParentSearchSchema extends AnySearchSchema = {}, TParentParams extends AnyPathParams = {}> = <TRouteId extends string, TPath extends string, TRouteLoaderData extends AnyLoaderData, TActionPayload, TActionResponse, TSearchSchema extends AnySearchSchema = AnySearchSchema, TParams extends Record<ParsePathParams<TPath>, unknown> = Record<ParsePathParams<TPath>, string>, TAllParams extends AnyPathParams extends TParams ? Record<ParsePathParams<TPath>, string> : NoInfer<TParams> = AnyPathParams extends TParams ? Record<ParsePathParams<TPath>, string> : NoInfer<TParams>, TKnownChildren extends RouteConfig[] = RouteConfig[], TResolvedId extends string = string extends TRouteId ? string extends TPath ? string : TPath : TRouteId>(options?: TIsRoot extends true ? Omit<RouteOptions<TRouteId, TPath, TParentRouteLoaderData, TRouteLoaderData, Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, Expand<TParentSearchSchema & TSearchSchema>, TParentParams, TParams, Expand<TParentParams & TAllParams>>, 'path'> & {
+type CreateRouteConfigFn<TIsRoot extends boolean = false, TParentId extends string = string, TParentPath extends string = string, TParentRouteLoaderData extends AnyLoaderData = {}, TParentLoaderData extends AnyLoaderData = {}, TParentSearchSchema extends AnySearchSchema = {}, TParentParams extends AnyPathParams = {}> = <TRouteId extends string, TPath extends string, TRouteLoaderData extends AnyLoaderData, TActionPayload, TActionResponse, TSearchSchema extends AnySearchSchema = AnySearchSchema, TParams extends Record<ParsePathParams<TPath>, unknown> = Record<ParsePathParams<TPath>, string>, TAllParams extends AnyPathParams extends TParams ? Record<ParsePathParams<TPath>, string> : NoInfer<TParams> = AnyPathParams extends TParams ? Record<ParsePathParams<TPath>, string> : NoInfer<TParams>, TKnownChildren extends RouteConfig[] = RouteConfig[], TResolvedId extends string = string extends TRouteId ? string extends TPath ? string : TPath : TRouteId>(options?: TIsRoot extends true ? Omit<RouteOptions<TRouteId, TPath, TParentRouteLoaderData, TRouteLoaderData, Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, Expand<TParentSearchSchema & TSearchSchema>, TParentParams, TParams, Expand<TParentParams & TAllParams>>, 'path'> & {
     path?: never;
 } : RouteOptions<TRouteId, TPath, TParentRouteLoaderData, TRouteLoaderData, Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, Expand<TParentSearchSchema & TSearchSchema>, TParentParams, TParams, Expand<TParentParams & TAllParams>>, children?: TKnownChildren, isRoot?: boolean, parentId?: string, parentPath?: string) => RouteConfig<RoutePrefix<TParentId, TResolvedId>, TResolvedId, TPath, string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>, TParentRouteLoaderData, TRouteLoaderData, Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>, TActionPayload, TActionResponse, TParentSearchSchema, TSearchSchema, Expand<TParentSearchSchema & TSearchSchema>, TParentParams, TParams, Expand<TParentParams & TAllParams>, TKnownChildren>;
-declare type RoutePath<T extends string> = T extends RootRouteId ? '/' : TrimPathRight<`${T}`>;
-declare type RoutePrefix<TPrefix extends string, TId extends string> = string extends TId ? RootRouteId : TId extends string ? `${TPrefix}/${TId}` extends '/' ? '/' : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}` : never;
+type RoutePath<T extends string> = T extends RootRouteId ? '/' : TrimPathRight<`${T}`>;
+type RoutePrefix<TPrefix extends string, TId extends string> = string extends TId ? RootRouteId : TId extends string ? `${TPrefix}/${TId}` extends '/' ? '/' : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}` : never;
 interface AnyRouteConfig extends RouteConfig<any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any> {
 }
 interface AnyRouteConfigWithChildren<TChildren> extends RouteConfig<any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, TChildren> {
 }
-declare type TrimPath<T extends string> = '' extends T ? '' : TrimPathRight<TrimPathLeft<T>>;
-declare type TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}` ? TrimPathLeft<U> : T extends `/${infer U}` ? TrimPathLeft<U> : T;
-declare type TrimPathRight<T extends string> = T extends '/' ? '/' : T extends `${infer U}/` ? TrimPathRight<U> : T;
+type TrimPath<T extends string> = '' extends T ? '' : TrimPathRight<TrimPathLeft<T>>;
+type TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}` ? TrimPathLeft<U> : T extends `/${infer U}` ? TrimPathLeft<U> : T;
+type TrimPathRight<T extends string> = T extends '/' ? '/' : T extends `${infer U}/` ? TrimPathRight<U> : T;
 declare const createRouteConfig: CreateRouteConfigFn<true>;
 
-declare type LinkInfo = {
+type LinkInfo = {
     type: 'external';
     href: string;
 } | {
@@ -502,12 +509,12 @@ declare type LinkInfo = {
     isActive: boolean;
     disabled?: boolean;
 };
-declare type StartsWith<A, B> = A extends `${B extends string ? B : never}${infer _}` ? true : false;
-declare type CleanPath<T extends string> = T extends `${infer L}//${infer R}` ? CleanPath<`${CleanPath<L>}/${CleanPath<R>}`> : T extends `${infer L}//` ? `${CleanPath<L>}/` : T extends `//${infer L}` ? `/${CleanPath<L>}` : T;
-declare type Split<S, TIncludeTrailingSlash = true> = S extends unknown ? string extends S ? string[] : S extends string ? CleanPath<S> extends '' ? [] : TIncludeTrailingSlash extends true ? CleanPath<S> extends `${infer T}/` ? [...Split<T>, '/'] : CleanPath<S> extends `/${infer U}` ? Split<U> : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : [S] : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : S extends string ? [S] : never : never : never;
-declare type ParsePathParams<T extends string> = Split<T>[number] extends infer U ? U extends `:${infer V}` ? V : never : never;
-declare type Join<T> = T extends [] ? '' : T extends [infer L extends string] ? L : T extends [infer L extends string, ...infer Tail extends [...string[]]] ? CleanPath<`${L}/${Join<Tail>}`> : never;
-declare type RelativeToPathAutoComplete<AllPaths extends string, TFrom extends string, TTo extends string, SplitPaths extends string[] = Split<AllPaths, false>> = TTo extends `..${infer _}` ? SplitPaths extends [
+type StartsWith<A, B> = A extends `${B extends string ? B : never}${infer _}` ? true : false;
+type CleanPath<T extends string> = T extends `${infer L}//${infer R}` ? CleanPath<`${CleanPath<L>}/${CleanPath<R>}`> : T extends `${infer L}//` ? `${CleanPath<L>}/` : T extends `//${infer L}` ? `/${CleanPath<L>}` : T;
+type Split<S, TIncludeTrailingSlash = true> = S extends unknown ? string extends S ? string[] : S extends string ? CleanPath<S> extends '' ? [] : TIncludeTrailingSlash extends true ? CleanPath<S> extends `${infer T}/` ? [...Split<T>, '/'] : CleanPath<S> extends `/${infer U}` ? Split<U> : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : [S] : CleanPath<S> extends `${infer T}/${infer U}` ? [...Split<T>, ...Split<U>] : S extends string ? [S] : never : never : never;
+type ParsePathParams<T extends string> = Split<T>[number] extends infer U ? U extends `:${infer V}` ? V : never : never;
+type Join<T> = T extends [] ? '' : T extends [infer L extends string] ? L : T extends [infer L extends string, ...infer Tail extends [...string[]]] ? CleanPath<`${L}/${Join<Tail>}`> : never;
+type RelativeToPathAutoComplete<AllPaths extends string, TFrom extends string, TTo extends string, SplitPaths extends string[] = Split<AllPaths, false>> = TTo extends `..${infer _}` ? SplitPaths extends [
     ...Split<ResolveRelativePath<TFrom, TTo>, false>,
     ...infer TToRest
 ] ? `${CleanPath<Join<[
@@ -518,39 +525,40 @@ declare type RelativeToPathAutoComplete<AllPaths extends string, TFrom extends s
     ...Split<RestTTo, false>,
     ...infer RestPath
 ] ? `${TTo}${Join<RestPath>}` : never : './' | '../' | AllPaths;
-declare type NavigateOptionsAbsolute<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = ToOptions<TAllRouteInfo, TFrom, TTo> & {
+type NavigateOptionsAbsolute<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = ToOptions<TAllRouteInfo, TFrom, TTo> & {
     replace?: boolean;
 };
-declare type ToOptions<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.', TResolvedTo = ResolveRelativePath<TFrom, NoInfer<TTo>>> = {
+type ToOptions<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.', TResolvedTo = ResolveRelativePath<TFrom, NoInfer<TTo>>> = {
     to?: ToPathOption<TAllRouteInfo, TFrom, TTo>;
     hash?: Updater<string>;
+    state?: LocationState;
     from?: TFrom;
 } & CheckPath<TAllRouteInfo, NoInfer<TResolvedTo>, {}> & SearchParamOptions<TAllRouteInfo, TFrom, TResolvedTo> & PathParamOptions<TAllRouteInfo, TFrom, TResolvedTo>;
-declare type SearchParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo, TFromSchema = RouteInfoByPath<TAllRouteInfo, TFrom>['fullSearchSchema'], TToSchema = RouteInfoByPath<TAllRouteInfo, TTo>['fullSearchSchema']> = StartsWith<TFrom, TTo> extends true ? {
+type SearchParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo, TFromSchema = RouteInfoByPath<TAllRouteInfo, TFrom>['fullSearchSchema'], TToSchema = RouteInfoByPath<TAllRouteInfo, TTo>['fullSearchSchema']> = StartsWith<TFrom, TTo> extends true ? {
     search?: SearchReducer<TFromSchema, TToSchema>;
 } : keyof PickRequired<TToSchema> extends never ? {
     search?: SearchReducer<TFromSchema, TToSchema>;
 } : {
     search: SearchReducer<TFromSchema, TToSchema>;
 };
-declare type SearchReducer<TFrom, TTo> = {
+type SearchReducer<TFrom, TTo> = {
     [TKey in keyof TTo]: TTo[TKey];
 } | ((current: TFrom) => TTo);
-declare type PathParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo, TFromParams = RouteInfoByPath<TAllRouteInfo, TFrom>['allParams'], TToParams = RouteInfoByPath<TAllRouteInfo, TTo>['allParams']> = StartsWith<TFrom, TTo> extends true ? {
+type PathParamOptions<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo, TFromParams = RouteInfoByPath<TAllRouteInfo, TFrom>['allParams'], TToParams = RouteInfoByPath<TAllRouteInfo, TTo>['allParams']> = StartsWith<TFrom, TTo> extends true ? {
     params?: ParamsReducer<TFromParams, TToParams>;
 } : AnyPathParams extends TToParams ? {
     params?: ParamsReducer<TFromParams, Record<string, never>>;
 } : {
     params: ParamsReducer<TFromParams, TToParams>;
 };
-declare type ParamsReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo);
-declare type ToPathOption<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = TTo | RelativeToPathAutoComplete<TAllRouteInfo['routePaths'], NoInfer<TFrom> extends string ? NoInfer<TFrom> : '', NoInfer<TTo> & string>;
-declare type ToIdOption<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = TTo | RelativeToPathAutoComplete<TAllRouteInfo['routeIds'], NoInfer<TFrom> extends string ? NoInfer<TFrom> : '', NoInfer<TTo> & string>;
+type ParamsReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo);
+type ToPathOption<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = TTo | RelativeToPathAutoComplete<TAllRouteInfo['routePaths'], NoInfer<TFrom> extends string ? NoInfer<TFrom> : '', NoInfer<TTo> & string>;
+type ToIdOption<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = TTo | RelativeToPathAutoComplete<TAllRouteInfo['routeIds'], NoInfer<TFrom> extends string ? NoInfer<TFrom> : '', NoInfer<TTo> & string>;
 interface ActiveOptions {
     exact?: boolean;
     includeHash?: boolean;
 }
-declare type LinkOptions<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = NavigateOptionsAbsolute<TAllRouteInfo, TFrom, TTo> & {
+type LinkOptions<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'> = NavigateOptionsAbsolute<TAllRouteInfo, TFrom, TTo> & {
     target?: HTMLAnchorElement['target'];
     activeOptions?: ActiveOptions;
     preload?: false | 'intent';
@@ -559,22 +567,22 @@ declare type LinkOptions<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRoute
     preloadDelay?: number;
     disabled?: boolean;
 };
-declare type CheckRelativePath<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo> = TTo extends string ? TFrom extends string ? ResolveRelativePath<TFrom, TTo> extends TAllRouteInfo['routePaths'] ? {} : {
+type CheckRelativePath<TAllRouteInfo extends AnyAllRouteInfo, TFrom, TTo> = TTo extends string ? TFrom extends string ? ResolveRelativePath<TFrom, TTo> extends TAllRouteInfo['routePaths'] ? {} : {
     Error: `${TFrom} + ${TTo} resolves to ${ResolveRelativePath<TFrom, TTo>}, which is not a valid route path.`;
     'Valid Route Paths': TAllRouteInfo['routePaths'];
 } : {} : {};
-declare type CheckPath<TAllRouteInfo extends AnyAllRouteInfo, TPath, TPass> = Exclude<TPath, TAllRouteInfo['routePaths']> extends never ? TPass : CheckPathError<TAllRouteInfo, Exclude<TPath, TAllRouteInfo['routePaths']>>;
-declare type CheckPathError<TAllRouteInfo extends AnyAllRouteInfo, TInvalids> = Expand<{
+type CheckPath<TAllRouteInfo extends AnyAllRouteInfo, TPath, TPass> = Exclude<TPath, TAllRouteInfo['routePaths']> extends never ? TPass : CheckPathError<TAllRouteInfo, Exclude<TPath, TAllRouteInfo['routePaths']>>;
+type CheckPathError<TAllRouteInfo extends AnyAllRouteInfo, TInvalids> = Expand<{
     Error: `${TInvalids extends string ? TInvalids : never} is not a valid route path.`;
     'Valid Route Paths': TAllRouteInfo['routePaths'];
 }>;
-declare type CheckId<TAllRouteInfo extends AnyAllRouteInfo, TPath, TPass> = Exclude<TPath, TAllRouteInfo['routeIds']> extends never ? TPass : CheckIdError<TAllRouteInfo, Exclude<TPath, TAllRouteInfo['routeIds']>>;
-declare type CheckIdError<TAllRouteInfo extends AnyAllRouteInfo, TInvalids> = Expand<{
+type CheckId<TAllRouteInfo extends AnyAllRouteInfo, TPath, TPass> = Exclude<TPath, TAllRouteInfo['routeIds']> extends never ? TPass : CheckIdError<TAllRouteInfo, Exclude<TPath, TAllRouteInfo['routeIds']>>;
+type CheckIdError<TAllRouteInfo extends AnyAllRouteInfo, TInvalids> = Expand<{
     Error: `${TInvalids extends string ? TInvalids : never} is not a valid route ID.`;
     'Valid Route IDs': TAllRouteInfo['routeIds'];
 }>;
-declare type ResolveRelativePath<TFrom, TTo = '.'> = TFrom extends string ? TTo extends string ? TTo extends '.' ? TFrom : TTo extends `./` ? Join<[TFrom, '/']> : TTo extends `./${infer TRest}` ? ResolveRelativePath<TFrom, TRest> : TTo extends `/${infer TRest}` ? TTo : Split<TTo> extends ['..', ...infer ToRest] ? Split<TFrom> extends [...infer FromRest, infer FromTail] ? ToRest extends ['/'] ? Join<[...FromRest, '/']> : ResolveRelativePath<Join<FromRest>, Join<ToRest>> : never : Split<TTo> extends ['.', ...infer ToRest] ? ToRest extends ['/'] ? Join<[TFrom, '/']> : ResolveRelativePath<TFrom, Join<ToRest>> : CleanPath<Join<['/', ...Split<TFrom>, ...Split<TTo>]>> : never : never;
-declare type ValidFromPath<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo> = undefined | (string extends TAllRouteInfo['routePaths'] ? string : TAllRouteInfo['routePaths']);
+type ResolveRelativePath<TFrom, TTo = '.'> = TFrom extends string ? TTo extends string ? TTo extends '.' ? TFrom : TTo extends `./` ? Join<[TFrom, '/']> : TTo extends `./${infer TRest}` ? ResolveRelativePath<TFrom, TRest> : TTo extends `/${infer TRest}` ? TTo : Split<TTo> extends ['..', ...infer ToRest] ? Split<TFrom> extends [...infer FromRest, infer FromTail] ? ToRest extends ['/'] ? Join<[...FromRest, '/']> : ResolveRelativePath<Join<FromRest>, Join<ToRest>> : never : Split<TTo> extends ['.', ...infer ToRest] ? ToRest extends ['/'] ? Join<[TFrom, '/']> : ResolveRelativePath<TFrom, Join<ToRest>> : CleanPath<Join<['/', ...Split<TFrom>, ...Split<TTo>]>> : never : never;
+type ValidFromPath<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo> = undefined | (string extends TAllRouteInfo['routePaths'] ? string : TAllRouteInfo['routePaths']);
 
 interface Segment {
     type: 'pathname' | 'param' | 'wildcard';

package/build/umd/index.development.js

@@ -1488,11 +1488,19 @@
         }
       },
       fetch: async opts => {
-        const id = '' + Date.now() + Math.random();
-        routeMatch.__.latestId = id; // If the match was in an error state, set it
+        const loadId = '' + Date.now() + Math.random();
+        routeMatch.__.latestId = loadId;
+
+        const checkLatest = async () => {
+          if (loadId !== routeMatch.__.latestId) {
+            // warning(true, 'Data loader is out of date!')
+            return new Promise(() => {});
+          }
+        }; // If the match was in an error state, set it
         // to a loading state again. Otherwise, keep it
         // as loading or resolved
 
+
         if (routeMatch.status === 'idle') {
           routeMatch.status = 'loading';
         } // We started loading the route, so it's no longer invalid
@@ -1524,19 +1532,8 @@
               var _ref, _ref2, _opts$maxAge;
 
               if (routeMatch.options.loader) {
-                var _routeMatch$parentMat3;
-
-                const data = await routeMatch.options.loader({
-                  parentLoaderPromise: (_routeMatch$parentMat3 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat3.__.dataPromise,
-                  params: routeMatch.params,
-                  search: routeMatch.routeSearch,
-                  signal: routeMatch.__.abortController.signal
-                });
-
-                if (id !== routeMatch.__.latestId) {
-                  return routeMatch.__.loadPromise;
-                }
-
+                const data = await router.loadMatchData(routeMatch);
+                await checkLatest();
                 routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
               }
 
@@ -1546,9 +1543,7 @@
               routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
               return routeMatch.routeLoaderData;
             } catch (err) {
-              if (id !== routeMatch.__.latestId) {
-                return routeMatch.__.loadPromise;
-              }
+              await checkLatest();
 
               {
                 console.error(err);
@@ -1561,29 +1556,23 @@
             }
           });
 
-          try {
-            await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
-
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loadPromise;
-            }
-          } finally {
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loadPromise;
-            }
-
+          const after = async () => {
+            await checkLatest();
             routeMatch.isFetching = false;
+            delete routeMatch.__.loadPromise;
 
             routeMatch.__.notify();
+          };
+
+          try {
+            await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
+            after();
+          } catch (_unused) {
+            after();
           }
         });
         await routeMatch.__.loadPromise;
-
-        if (id !== routeMatch.__.latestId) {
-          return routeMatch.__.loadPromise;
-        }
-
-        delete routeMatch.__.loadPromise;
+        await checkLatest();
       }
     });
 
@@ -1677,6 +1666,8 @@
     });
 
     let router = {
+      types: undefined,
+      // public api
       history,
       options: originalOptions,
       listeners: [],
@@ -1685,7 +1676,6 @@
       routeTree: undefined,
       routesById: {},
       location: undefined,
-      allRouteInfo: undefined,
       //
       navigationPromise: Promise.resolve(),
       resolveNavigation: () => {},
@@ -2068,6 +2058,11 @@
           match.__.validate();
 
           match.load(loaderOpts);
+          const search = match.search;
+
+          if (search.__data && search.__data.matchId !== match.matchId) {
+            return;
+          }
 
           if (match.__.loadPromise) {
             // Wait for the first sign of activity from the match
@@ -2077,6 +2072,37 @@
         router.notify();
         await Promise.all(matchPromises);
       },
+      loadMatchData: async routeMatch => {
+        if (isServer || !router.options.useServerData) {
+          var _await$routeMatch$opt;
+
+          return (_await$routeMatch$opt = await (routeMatch.options.loader == null ? void 0 : routeMatch.options.loader({
+            // parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,
+            params: routeMatch.params,
+            search: routeMatch.routeSearch,
+            signal: routeMatch.__.abortController.signal
+          }))) != null ? _await$routeMatch$opt : {};
+        } else {
+          const next = router.buildNext({
+            to: '.',
+            search: d => _extends({}, d != null ? d : {}, {
+              __data: {
+                matchId: routeMatch.matchId
+              }
+            })
+          });
+          const res = await fetch(next.href, {
+            method: 'GET' // signal: routeMatch.__.abortController.signal,
+
+          });
+
+          if (res.ok) {
+            return res.json();
+          }
+
+          throw new Error('Failed to fetch match data');
+        }
+      },
       invalidateRoute: opts => {
         var _router$state$pending5, _router$state$pending6;
 
@@ -2405,9 +2431,9 @@
               pathname: next.pathname,
               hash: next.hash,
               search: next.searchStr
-            }, {
+            }, _extends({
               id
-            });
+            }, next.state));
           } else {
             history.push({
               pathname: next.pathname,