@tanstack/router-core 0.0.1-beta.160 → 0.0.1-beta.162

package/build/types/index.d.ts

@@ -114,8 +114,8 @@ type RouteByPath<TRouteTree extends AnyRoute, TPath> = Extract<ParseRoute<TRoute
     fullPath: TPath;
 }>;
 type RoutePaths<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree>['fullPath'] | '/';
-type FullSearchSchema<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['__types']['fullSearchSchema']> & {};
-type AllParams<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['__types']['allParams']>;
+type FullSearchSchema<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['fullSearchSchema']> & {};
+type AllParams<TRouteTree extends AnyRoute> = MergeUnion<ParseRoute<TRouteTree>['types']['allParams']>;
 
 declare global {
     interface Window {
@@ -156,7 +156,7 @@ interface RouteMatch<TRouteTree extends AnyRoute = AnyRoute, TRoute extends AnyR
     key?: string;
     routeId: string;
     pathname: string;
-    params: TRoute['__types']['allParams'];
+    params: TRoute['types']['allParams'];
     status: 'pending' | 'success' | 'error';
     isFetching: boolean;
     invalid: boolean;
@@ -166,21 +166,21 @@ interface RouteMatch<TRouteTree extends AnyRoute = AnyRoute, TRoute extends AnyR
     updatedAt: number;
     invalidAt: number;
     preloadInvalidAt: number;
-    loaderData: TRoute['__types']['loader'];
+    loaderData: TRoute['types']['loader'];
     loadPromise?: Promise<void>;
     __resolveLoadPromise?: () => void;
-    routeContext: TRoute['__types']['routeContext'];
-    context: TRoute['__types']['context'];
-    routeSearch: TRoute['__types']['searchSchema'];
-    search: FullSearchSchema<TRouteTree> & TRoute['__types']['fullSearchSchema'];
+    routeContext: TRoute['types']['routeContext'];
+    context: TRoute['types']['context'];
+    routeSearch: TRoute['types']['searchSchema'];
+    search: FullSearchSchema<TRouteTree> & TRoute['types']['fullSearchSchema'];
     fetchedAt: number;
     abortController: AbortController;
 }
 type AnyRouteMatch = RouteMatch<AnyRoute, AnyRoute>;
-type RouterContextOptions<TRouteTree extends AnyRoute> = AnyContext extends TRouteTree['__types']['routerContext'] ? {
-    context?: TRouteTree['__types']['routerContext'];
+type RouterContextOptions<TRouteTree extends AnyRoute> = AnyContext extends TRouteTree['types']['routerContext'] ? {
+    context?: TRouteTree['types']['routerContext'];
 } : {
-    context: TRouteTree['__types']['routerContext'];
+    context: TRouteTree['types']['routerContext'];
 };
 interface RouterOptions<TRouteTree extends AnyRoute, TDehydrated extends Record<string, any>> {
     history?: RouterHistory;
@@ -202,7 +202,7 @@ interface RouterOptions<TRouteTree extends AnyRoute, TDehydrated extends Record<
         router: AnyRouter;
     }) => void;
     onRouteChange?: () => void;
-    context?: TRouteTree['__types']['routerContext'];
+    context?: TRouteTree['types']['routerContext'];
     Wrap?: React.ComponentType<{
         children: React.ReactNode;
         dehydratedState?: TDehydrated;
@@ -303,7 +303,7 @@ declare class Router<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends
     reload: () => Promise<void>;
     resolvePath: (from: string, path: string) => string;
     navigate: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "">({ from, to, search, hash, replace, params, }: NavigateOptions<TRouteTree, TFrom, TTo>) => Promise<void>;
-    matchRoute: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "", TResolved extends string = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<TRouteTree, TFrom, TTo, ResolveRelativePath<TFrom, NoInfer<TTo>>>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>["__types"]["allParams"];
+    matchRoute: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "", TResolved extends string = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<TRouteTree, TFrom, TTo, ResolveRelativePath<TFrom, NoInfer<TTo>>>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>["types"]["allParams"];
     buildLink: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "">({ from, to, search, params, hash, target, replace, activeOptions, preload, preloadDelay: userPreloadDelay, disabled, state, }: LinkOptions<TRouteTree, TFrom, TTo>) => LinkInfo;
     dehydrate: () => DehydratedRouter;
     hydrate: (__do_not_use_server_ctx?: HydrationCtx) => Promise<void>;
@@ -374,7 +374,7 @@ type MetaOptions = keyof PickRequired<RouteMeta> extends never ? {
 type AnyRouteProps = RouteProps<any, any, any, any, any>;
 type ComponentPropsFromRoute<TRoute> = TRoute extends Route<infer TParentRoute, infer TPath, infer TFullPath, infer TCustomId, infer TId, infer TLoader, infer TSearchSchema, infer TFullSearchSchema, infer TParams, infer TAllParams, infer TParentContext, infer TAllParentContext, infer TRouteContext, infer TContext, infer TRouterContext, infer TChildren, infer TRouteTree> ? RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext> : never;
 type ComponentFromRoute<TRoute> = RegisteredRouteComponent<ComponentPropsFromRoute<TRoute>>;
-type RouteLoaderFromRoute<TRoute extends AnyRoute> = LoaderFn<TRoute['__types']['loader'], TRoute['__types']['searchSchema'], TRoute['__types']['fullSearchSchema'], TRoute['__types']['allParams'], TRoute['__types']['routeContext'], TRoute['__types']['context']>;
+type RouteLoaderFromRoute<TRoute extends AnyRoute> = LoaderFn<TRoute['types']['loader'], TRoute['types']['searchSchema'], TRoute['types']['fullSearchSchema'], TRoute['types']['allParams'], TRoute['types']['routeContext'], TRoute['types']['context']>;
 type RouteProps<TLoader extends any = unknown, TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TContext extends AnyContext = AnyContext> = {
     useMatch: () => RouteMatch<any, any>;
     useLoader: () => UseLoaderResult<TLoader>;
@@ -491,11 +491,11 @@ type ResolveId<TParentRoute, TCustomId extends string, TPath extends string> = T
 } ? RoutePrefix<TParentId, string extends TCustomId ? TPath : TCustomId> : RootRouteId;
 type InferFullSearchSchema<TRoute> = TRoute extends {
     isRoot: true;
-    __types: {
+    types: {
         searchSchema: infer TSearchSchema;
     };
 } ? TSearchSchema : TRoute extends {
-    __types: {
+    types: {
         fullSearchSchema: infer TFullSearchSchema;
     };
 } ? TFullSearchSchema : {};
@@ -531,8 +531,8 @@ type RouteConstraints = {
     TChildren: unknown;
     TRouteTree: AnyRoute;
 };
-declare class Route<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>, TLoader = unknown, TSearchSchema extends RouteConstraints['TSearchSchema'] = {}, TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends RouteConstraints['TParams'] = Record<ParsePathParams<TPath>, string>, TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<TParentRoute['__types']['allParams'], TParams>, TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'], TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['__types']['context'], TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext, TAllContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<TParentRoute['__types']['context'], TRouteContext>, TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext, TChildren extends RouteConstraints['TChildren'] = unknown, TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute> {
-    __types: {
+declare class Route<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>, TLoader = unknown, TSearchSchema extends RouteConstraints['TSearchSchema'] = {}, TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends RouteConstraints['TParams'] = Record<ParsePathParams<TPath>, string>, TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<TParentRoute['types']['allParams'], TParams>, TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'], TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'], TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext, TAllContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<TParentRoute['types']['context'], TRouteContext>, TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext, TChildren extends RouteConstraints['TChildren'] = unknown, TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute> {
+    types: {
         parentRoute: TParentRoute;
         path: TPath;
         to: TrimPathRight<TFullPath>;
@@ -593,12 +593,12 @@ type TrimLeft<T extends string, S extends string> = T extends `${S}${infer U}` ?
 type TrimRight<T extends string, S extends string> = T extends `${infer U}${S}` ? U : T;
 type Trim<T extends string, S extends string> = TrimLeft<TrimRight<T, S>, S>;
 type RemoveUnderScores<T extends string> = Replace<Replace<TrimRight<TrimLeft<T, '/_'>, '_'>, '_/', '/'>, '/_', '/'>;
-type ResolveFilePath<TParentRoute extends AnyRoute, TFilePath extends string> = TParentRoute['id'] extends RootRouteId ? TrimPathLeft<TFilePath> : Replace<TrimPathLeft<TFilePath>, TrimPathLeft<TParentRoute['__types']['customId']>, ''>;
+type ResolveFilePath<TParentRoute extends AnyRoute, TFilePath extends string> = TParentRoute['id'] extends RootRouteId ? TrimPathLeft<TFilePath> : Replace<TrimPathLeft<TFilePath>, TrimPathLeft<TParentRoute['types']['customId']>, ''>;
 type FileRoutePath<TParentRoute extends AnyRoute, TFilePath extends string> = ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}` ? string : ResolveFilePath<TParentRoute, TFilePath>;
 declare class FileRoute<TFilePath extends keyof FileRoutesByPath, TParentRoute extends AnyRoute = FileRoutesByPath[TFilePath]['parentRoute'], TId extends RouteConstraints['TId'] = TFilePath, TPath extends RouteConstraints['TPath'] = FileRoutePath<TParentRoute, TFilePath>, TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, RemoveUnderScores<TPath>>> {
     path: TFilePath;
     constructor(path: TFilePath);
-    createRoute: <TLoader = unknown, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends Record<string, any> = (TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never) extends never ? AnyPathParams : Record<TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never, string>, TAllParams extends Record<string, any> = IsAny<TParentRoute["__types"]["allParams"], TParams, TParentRoute["__types"]["allParams"] & TParams>, TParentContext extends AnyContext = TParentRoute["__types"]["routeContext"], TAllParentContext extends string = TParentRoute["__types"]["context"], TRouteContext extends RouteContext = RouteContext, TContext extends AnyContext = IsAny<TParentRoute["__types"]["context"], TRouteContext, TParentRoute["__types"]["context"] & TRouteContext>, TRouterContext extends AnyContext = AnyContext, TChildren extends unknown = unknown, TRouteTree extends AnyRoute = AnyRoute>(options: Omit<RouteOptions<TParentRoute, string, string, TLoader, InferFullSearchSchema<TParentRoute>, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TParentContext, TAllParentContext, TRouteContext, TContext>, "id" | "path" | "getParentRoute"> & {
+    createRoute: <TLoader = unknown, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends Record<string, any> = (TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never) extends never ? AnyPathParams : Record<TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never, string>, TAllParams extends Record<string, any> = IsAny<TParentRoute["types"]["allParams"], TParams, TParentRoute["types"]["allParams"] & TParams>, TParentContext extends AnyContext = TParentRoute["types"]["routeContext"], TAllParentContext extends string = TParentRoute["types"]["context"], TRouteContext extends RouteContext = RouteContext, TContext extends AnyContext = IsAny<TParentRoute["types"]["context"], TRouteContext, TParentRoute["types"]["context"] & TRouteContext>, TRouterContext extends AnyContext = AnyContext, TChildren extends unknown = unknown, TRouteTree extends AnyRoute = AnyRoute>(options: Omit<RouteOptions<TParentRoute, string, string, TLoader, InferFullSearchSchema<TParentRoute>, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TParentContext, TAllParentContext, TRouteContext, TContext>, "id" | "path" | "getParentRoute"> & {
         meta?: RouteMeta | undefined;
     } & {
         key?: false | GetKeyFn<TFullSearchSchema, TAllParams> | null | undefined;
@@ -677,7 +677,7 @@ type ToOptions<TRouteTree extends AnyRoute = AnyRoute, TFrom extends RoutePaths<
     state?: LocationState;
     from?: TFrom;
 } & CheckPath<TRouteTree, NoInfer<TResolvedTo>, {}> & SearchParamOptions<TRouteTree, TFrom, TResolvedTo> & PathParamOptions<TRouteTree, TFrom, TResolvedTo>;
-type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & RouteByPath<TRouteTree, TFrom> extends never ? {} : RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']>, TToSchema = Partial<RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']> & Omit<RouteByPath<TRouteTree, TTo>['__types']['fullSearchSchema'], keyof PickRequired<RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']>>, TFromFullSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & TFromSchema>, TToFullSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & TToSchema>> = keyof PickRequired<TToSchema> extends never ? {
+type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & RouteByPath<TRouteTree, TFrom> extends never ? {} : RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>, TToSchema = Partial<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']> & Omit<RouteByPath<TRouteTree, TTo>['types']['fullSearchSchema'], keyof PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>>, TFromFullSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & TFromSchema>, TToFullSchema = UnionToIntersection<FullSearchSchema<TRouteTree> & TToSchema>> = keyof PickRequired<TToSchema> extends never ? {
     search?: true | SearchReducer<TFromFullSchema, TToFullSchema>;
 } : {
     search: SearchReducer<TFromFullSchema, TToFullSchema>;
@@ -685,7 +685,7 @@ type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromSchema = U
 type SearchReducer<TFrom, TTo> = {
     [TKey in keyof TTo]: TTo[TKey];
 } | ((current: TFrom) => TTo);
-type PathParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromSchema = UnionToIntersection<RouteByPath<TRouteTree, TFrom> extends never ? {} : RouteByPath<TRouteTree, TFrom>['__types']['allParams']>, TToSchema = Partial<RouteByPath<TRouteTree, TFrom>['__types']['allParams']> & Omit<RouteByPath<TRouteTree, TTo>['__types']['allParams'], keyof PickRequired<RouteByPath<TRouteTree, TFrom>['__types']['allParams']>>, TFromFullParams = UnionToIntersection<AllParams<TRouteTree> & TFromSchema>, TToFullParams = UnionToIntersection<AllParams<TRouteTree> & TToSchema>> = keyof PickRequired<TToSchema> extends never ? {
+type PathParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromSchema = UnionToIntersection<RouteByPath<TRouteTree, TFrom> extends never ? {} : RouteByPath<TRouteTree, TFrom>['types']['allParams']>, TToSchema = Partial<RouteByPath<TRouteTree, TFrom>['types']['allParams']> & Omit<RouteByPath<TRouteTree, TTo>['types']['allParams'], keyof PickRequired<RouteByPath<TRouteTree, TFrom>['types']['allParams']>>, TFromFullParams = UnionToIntersection<AllParams<TRouteTree> & TFromSchema>, TToFullParams = UnionToIntersection<AllParams<TRouteTree> & TToSchema>> = keyof PickRequired<TToSchema> extends never ? {
     params?: ParamsReducer<TFromFullParams, TToFullParams>;
 } : {
     params: ParamsReducer<TFromFullParams, TToFullParams>;

package/build/umd/index.development.js

@@ -811,7 +811,6 @@
           onUpdate: () => {
             const prev = this.state;
             const next = this.__store.state;
-            console.log(Object.values(next.matchesById).find(d => d.status === 'error'));
             const matchesByIdChanged = prev.matchesById !== next.matchesById;
             let matchesChanged;
             let pendingMatchesChanged;
@@ -1238,7 +1237,6 @@
                   throw errorHandlerErr;
                 }
               }
-              console.log('set error');
               this.setRouteMatch(match.id, s => ({
                 ...s,
                 error: err,
@@ -1291,17 +1289,17 @@
               const latest = this.getRouteMatch(match.id);
               return latest && latest.fetchedAt !== fetchedAt ? latest.loadPromise : undefined;
             };
+            const handleIfRedirect = err => {
+              if (isRedirect(err)) {
+                if (!opts?.preload) {
+                  this.navigate(err);
+                }
+                return true;
+              }
+              return false;
+            };
             const load = async () => {
               let latestPromise;
-              const handleError = err => {
-                if (isRedirect(err)) {
-                  if (!opts?.preload) {
-                    this.navigate(err);
-                  }
-                  return true;
-                }
-                return false;
-              };
               try {
                 const componentsPromise = Promise.all(componentTypes.map(async type => {
                   const component = route.options[type];
@@ -1318,39 +1316,48 @@
                 if (latestPromise = checkLatest()) return await latestPromise;
                 this.setRouteMatchData(match.id, () => loader, opts);
               } catch (loaderError) {
+                let latestError = loaderError;
                 if (latestPromise = checkLatest()) return await latestPromise;
-                handleError(loaderError);
-                let error = loaderError;
-                try {
-                  if (route.options.onLoadError) {
-                    route.options.onLoadError?.(loaderError);
-                  } else {
-                    route.options.onError?.(loaderError);
+                if (handleIfRedirect(loaderError)) return;
+                if (route.options.onLoadError) {
+                  try {
+                    route.options.onLoadError(loaderError);
+                  } catch (onLoadError) {
+                    latestError = onLoadError;
+                    if (handleIfRedirect(onLoadError)) return;
+                  }
+                }
+                if ((!route.options.onLoadError || latestError !== loaderError) && route.options.onError) {
+                  try {
+                    route.options.onError(latestError);
+                  } catch (onErrorError) {
+                    if (handleIfRedirect(onErrorError)) return;
                   }
-                } catch (errorHandlerErr) {
-                  error = errorHandlerErr;
-                  handleError(error);
                 }
-                console.log('set error');
                 this.setRouteMatch(match.id, s => ({
                   ...s,
-                  error: error,
+                  error: loaderError,
                   status: 'error',
                   isFetching: false,
                   updatedAt: Date.now()
                 }));
-                console.log(this.getRouteMatch(match.id)?.status);
               }
             };
-            const loadPromise = load();
-            this.setRouteMatch(match.id, s => ({
-              ...s,
-              status: s.status !== 'success' ? 'pending' : s.status,
-              isFetching: true,
-              loadPromise,
-              fetchedAt,
-              invalid: false
-            }));
+            let loadPromise;
+            this.__store.batch(() => {
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                // status: s.status !== 'success' ? 'pending' : s.status,
+                isFetching: true,
+                fetchedAt,
+                invalid: false
+              }));
+              loadPromise = load();
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                loadPromise
+              }));
+            });
             await loadPromise;
           })());
         });
@@ -1786,7 +1793,6 @@
         const updatedAt = opts?.updatedAt ?? Date.now();
         const preloadInvalidAt = updatedAt + (opts?.maxAge ?? route.options.preloadMaxAge ?? this.options.defaultPreloadMaxAge ?? 5000);
         const invalidAt = updatedAt + (opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? Infinity);
-        console.log('set success');
         this.setRouteMatch(id, s => ({
           ...s,
           error: undefined,