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

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.161",
   "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.161"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/router.ts

@@ -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
         })(),
@@ -1655,7 +1663,6 @@ export class Router<
         this.options.defaultMaxAge ??
         Infinity)
 
-    console.log('set success')
     this.setRouteMatch(id, (s) => ({
       ...s,
       error: undefined,