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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.160",
+  "version": "0.0.1-beta.162",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -43,7 +43,7 @@
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/react-store": "0.0.1-beta.160"
+    "@tanstack/react-store": "0.0.1-beta.162"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/fileRoute.ts

@@ -59,7 +59,7 @@ export type ResolveFilePath<
   ? TrimPathLeft<TFilePath>
   : Replace<
       TrimPathLeft<TFilePath>,
-      TrimPathLeft<TParentRoute['__types']['customId']>,
+      TrimPathLeft<TParentRoute['types']['customId']>,
       ''
     >
 
@@ -96,14 +96,14 @@ export class FileRoute<
       ? AnyPathParams
       : Record<ParsePathParams<TPath>, RouteConstraints['TPath']>,
     TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<
-      TParentRoute['__types']['allParams'],
+      TParentRoute['types']['allParams'],
       TParams
     >,
-    TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'],
-    TAllParentContext extends RouteConstraints['TId'] = TParentRoute['__types']['context'],
+    TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],
+    TAllParentContext extends RouteConstraints['TId'] = TParentRoute['types']['context'],
     TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
     TContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<
-      TParentRoute['__types']['context'],
+      TParentRoute['types']['context'],
       TRouteContext
     >,
     TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,

package/src/link.ts

@@ -152,17 +152,17 @@ export type SearchParamOptions<
   TFromSchema = UnionToIntersection<
     FullSearchSchema<TRouteTree> & RouteByPath<TRouteTree, TFrom> extends never
       ? {}
-      : RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']
+      : RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
   >,
   // Find the schema for the new path, and make optional any keys
   // that are already defined in the current schema
   TToSchema = Partial<
-    RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']
+    RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
   > &
     Omit<
-      RouteByPath<TRouteTree, TTo>['__types']['fullSearchSchema'],
+      RouteByPath<TRouteTree, TTo>['types']['fullSearchSchema'],
       keyof PickRequired<
-        RouteByPath<TRouteTree, TFrom>['__types']['fullSearchSchema']
+        RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
       >
     >,
   TFromFullSchema = UnionToIntersection<
@@ -188,14 +188,14 @@ export type PathParamOptions<
   TFromSchema = UnionToIntersection<
     RouteByPath<TRouteTree, TFrom> extends never
       ? {}
-      : RouteByPath<TRouteTree, TFrom>['__types']['allParams']
+      : RouteByPath<TRouteTree, TFrom>['types']['allParams']
   >,
   // Find the schema for the new path, and make optional any keys
   // that are already defined in the current schema
-  TToSchema = Partial<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']>
+      RouteByPath<TRouteTree, TTo>['types']['allParams'],
+      keyof PickRequired<RouteByPath<TRouteTree, TFrom>['types']['allParams']>
     >,
   TFromFullParams = UnionToIntersection<AllParams<TRouteTree> & TFromSchema>,
   TToFullParams = UnionToIntersection<AllParams<TRouteTree> & TToSchema>,

package/src/route.ts

@@ -81,12 +81,12 @@ export type ComponentFromRoute<TRoute> = RegisteredRouteComponent<
 >
 
 export type RouteLoaderFromRoute<TRoute extends AnyRoute> = LoaderFn<
-  TRoute['__types']['loader'],
-  TRoute['__types']['searchSchema'],
-  TRoute['__types']['fullSearchSchema'],
-  TRoute['__types']['allParams'],
-  TRoute['__types']['routeContext'],
-  TRoute['__types']['context']
+  TRoute['types']['loader'],
+  TRoute['types']['searchSchema'],
+  TRoute['types']['fullSearchSchema'],
+  TRoute['types']['allParams'],
+  TRoute['types']['routeContext'],
+  TRoute['types']['context']
 >
 
 export type RouteProps<
@@ -443,13 +443,13 @@ export type ResolveId<
 
 export type InferFullSearchSchema<TRoute> = TRoute extends {
   isRoot: true
-  __types: {
+  types: {
     searchSchema: infer TSearchSchema
   }
 }
   ? TSearchSchema
   : TRoute extends {
-      __types: {
+      types: {
         fullSearchSchema: infer TFullSearchSchema
       }
     }
@@ -542,21 +542,21 @@ export class Route<
     string
   >,
   TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<
-    TParentRoute['__types']['allParams'],
+    TParentRoute['types']['allParams'],
     TParams
   >,
-  TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'],
-  TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['__types']['context'],
+  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'],
+    TParentRoute['types']['context'],
     TRouteContext
   >,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
   TChildren extends RouteConstraints['TChildren'] = unknown,
   TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute,
 > {
-  __types!: {
+  types!: {
     parentRoute: TParentRoute
     path: TPath
     to: TrimPathRight<TFullPath>

package/src/routeInfo.ts

@@ -63,9 +63,9 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
   | '/'
 
 export type FullSearchSchema<TRouteTree extends AnyRoute> = MergeUnion<
-  ParseRoute<TRouteTree>['__types']['fullSearchSchema']
+  ParseRoute<TRouteTree>['types']['fullSearchSchema']
 > & {}
 
 export type AllParams<TRouteTree extends AnyRoute> = MergeUnion<
-  ParseRoute<TRouteTree>['__types']['allParams']
+  ParseRoute<TRouteTree>['types']['allParams']
 >

package/src/router.ts

@@ -114,7 +114,7 @@ export interface RouteMatch<
   key?: string
   routeId: string
   pathname: string
-  params: TRoute['__types']['allParams']
+  params: TRoute['types']['allParams']
   status: 'pending' | 'success' | 'error'
   isFetching: boolean
   invalid: boolean
@@ -124,13 +124,13 @@ export interface RouteMatch<
   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
 }
@@ -138,12 +138,12 @@ export interface RouteMatch<
 export type AnyRouteMatch = RouteMatch<AnyRoute, AnyRoute>
 
 export type RouterContextOptions<TRouteTree extends AnyRoute> =
-  AnyContext extends TRouteTree['__types']['routerContext']
+  AnyContext extends TRouteTree['types']['routerContext']
     ? {
-        context?: TRouteTree['__types']['routerContext']
+        context?: TRouteTree['types']['routerContext']
       }
     : {
-        context: TRouteTree['__types']['routerContext']
+        context: TRouteTree['types']['routerContext']
       }
 
 export interface RouterOptions<
@@ -172,7 +172,7 @@ export interface RouterOptions<
   basepath?: string
   createRoute?: (opts: { route: AnyRoute; router: AnyRouter }) => void
   onRouteChange?: () => void
-  context?: TRouteTree['__types']['routerContext']
+  context?: TRouteTree['types']['routerContext']
   Wrap?: React.ComponentType<{
     children: React.ReactNode
     dehydratedState?: TDehydrated
@@ -292,10 +292,6 @@ export class Router<
 
         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
@@ -869,7 +865,6 @@ export class Router<
             }
           }
 
-          console.log('set error')
           this.setRouteMatch(match.id, (s) => ({
             ...s,
             error: err,
@@ -936,19 +931,18 @@ export class Router<
               : undefined
           }
 
-          const load = async () => {
-            let latestPromise
-
-            const handleError = (err: any) => {
-              if (isRedirect(err)) {
-                if (!opts?.preload) {
-                  this.navigate(err as any)
-                }
-                return true
+          const handleIfRedirect = (err: any) => {
+            if (isRedirect(err)) {
+              if (!opts?.preload) {
+                this.navigate(err as any)
               }
-
-              return false
+              return true
             }
+            return false
+          }
+
+          const load = async () => {
+            let latestPromise
 
             try {
               const componentsPromise = Promise.all(
@@ -975,44 +969,58 @@ export class Router<
 
               this.setRouteMatchData(match.id, () => loader, opts)
             } catch (loaderError) {
+              let latestError = loaderError
               if ((latestPromise = checkLatest())) return await latestPromise
-              handleError(loaderError)
-
-              let error = loaderError
+              if (handleIfRedirect(loaderError)) return
+
+              if (route.options.onLoadError) {
+                try {
+                  route.options.onLoadError(loaderError)
+                } catch (onLoadError) {
+                  latestError = onLoadError
+                  if (handleIfRedirect(onLoadError)) return
+                }
+              }
 
-              try {
-                if (route.options.onLoadError) {
-                  route.options.onLoadError?.(loaderError)
-                } else {
-                  route.options.onError?.(loaderError)
+              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()
+          let loadPromise: Promise<void> | undefined
 
-          this.setRouteMatch(match.id, (s) => ({
-            ...s,
-            status: s.status !== 'success' ? 'pending' : s.status,
-            isFetching: true,
-            loadPromise,
-            fetchedAt,
-            invalid: false,
-          }))
+          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
         })(),
@@ -1081,7 +1089,7 @@ export class Router<
   >(
     location: ToOptions<TRouteTree, TFrom, TTo>,
     opts?: MatchRouteOptions,
-  ): false | RouteById<TRouteTree, TResolved>['__types']['allParams'] => {
+  ): false | RouteById<TRouteTree, TResolved>['types']['allParams'] => {
     location = {
       ...location,
       to: location.to
@@ -1655,7 +1663,6 @@ export class Router<
         this.options.defaultMaxAge ??
         Infinity)
 
-    console.log('set success')
     this.setRouteMatch(id, (s) => ({
       ...s,
       error: undefined,