@tanstack/router-core 0.0.1-beta.176 → 0.0.1-beta.178

package/build/esm/index.js

@@ -804,7 +804,7 @@ class Router {
   };
   #onFocus = () => {
     if (this.options.refetchOnWindowFocus ?? true) {
-      this.reload();
+      this.invalidate();
     }
   };
   update = opts => {
@@ -1140,39 +1140,14 @@ class Router {
           return parentSearchInfo;
         }
       })();
-      Object.assign(match, {
-        ...searchInfo
-      });
-      const contextInfo = (() => {
-        try {
-          const routeContext = route.options.getContext?.({
-            parentContext: parentMatch?.routeContext ?? {},
-            context: parentMatch?.context ?? this?.options.context ?? {},
-            params: match.params,
-            search: match.search
-          }) || {};
-          const context = {
-            ...(parentMatch?.context ?? this?.options.context),
-            ...routeContext
-          };
-          return {
-            context,
-            routeContext
-          };
-        } catch (err) {
-          route.options.onError?.(err);
-          throw err;
-        }
-      })();
-      Object.assign(match, {
-        ...contextInfo
-      });
+      Object.assign(match, searchInfo);
     });
     return matches;
   };
-  loadMatches = async (resolvedMatches, opts) => {
+  loadMatches = async (_resolvedMatches, opts) => {
+    const getFreshMatches = () => _resolvedMatches.map(d => this.getRouteMatch(d.id));
     if (!opts?.preload) {
-      resolvedMatches.forEach(match => {
+      getFreshMatches().forEach(match => {
         // Update each match with its latest route data
         this.setRouteMatch(match.id, s => ({
           ...s,
@@ -1192,7 +1167,8 @@ class Router {
 
     // Check each match middleware to see if the route can be accessed
     try {
-      for (const [index, match] of resolvedMatches.entries()) {
+      for (const [index, match] of getFreshMatches().entries()) {
+        const parentMatch = getFreshMatches()[index - 1];
         const route = this.getRoute(match.routeId);
         const handleError = (err, code) => {
           err.routerCode = code;
@@ -1223,10 +1199,21 @@ class Router {
         }
         let didError = false;
         try {
-          await route.options.beforeLoad?.({
+          const routeContext = (await route.options.beforeLoad?.({
             ...match,
-            preload: !!opts?.preload
-          });
+            preload: !!opts?.preload,
+            parentContext: parentMatch?.routeContext ?? {},
+            context: parentMatch?.context ?? this?.options.context ?? {}
+          })) ?? {};
+          const context = {
+            ...(parentMatch?.context ?? this?.options.context),
+            ...routeContext
+          };
+          this.setRouteMatch(match.id, s => ({
+            ...s,
+            context,
+            routeContext
+          }));
         } catch (err) {
           handleError(err, 'BEFORE_LOAD');
           didError = true;
@@ -1243,7 +1230,7 @@ class Router {
       }
       throw err;
     }
-    const validResolvedMatches = resolvedMatches.slice(0, firstBadMatchIndex);
+    const validResolvedMatches = getFreshMatches().slice(0, firstBadMatchIndex);
     const matchPromises = [];
     validResolvedMatches.forEach((match, index) => {
       matchPromises.push((async () => {
@@ -1323,13 +1310,6 @@ class Router {
     });
     await Promise.all(matchPromises);
   };
-  reload = () => {
-    return this.navigate({
-      fromCurrent: true,
-      replace: true,
-      search: true
-    });
-  };
   resolvePath = (from, path) => {
     return resolvePath(this.basepath, from, cleanPath(path));
   };
@@ -1807,7 +1787,11 @@ class Router {
       });
     }
     if (opts?.reload ?? true) {
-      return this.reload();
+      return this.navigate({
+        fromCurrent: true,
+        replace: true,
+        search: true
+      });
     }
   };
 }