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

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,