@tanstack/router-core 1.130.2 → 1.130.6

package/dist/cjs/router.cjs

@@ -691,30 +691,21 @@ class RouterCore {
     };
     this.updateMatch = (id, updater) => {
       var _a;
-      let updated;
-      const isPending = (_a = this.state.pendingMatches) == null ? void 0 : _a.find((d) => d.id === id);
-      const isMatched = this.state.matches.find((d) => d.id === id);
-      const isCached = this.state.cachedMatches.find((d) => d.id === id);
-      const matchesKey = isPending ? "pendingMatches" : isMatched ? "matches" : isCached ? "cachedMatches" : "";
+      const matchesKey = ((_a = this.state.pendingMatches) == null ? void 0 : _a.some((d) => d.id === id)) ? "pendingMatches" : this.state.matches.some((d) => d.id === id) ? "matches" : this.state.cachedMatches.some((d) => d.id === id) ? "cachedMatches" : "";
       if (matchesKey) {
         this.__store.setState((s) => {
           var _a2;
           return {
             ...s,
-            [matchesKey]: (_a2 = s[matchesKey]) == null ? void 0 : _a2.map(
-              (d) => d.id === id ? updated = updater(d) : d
-            )
+            [matchesKey]: (_a2 = s[matchesKey]) == null ? void 0 : _a2.map((d) => d.id === id ? updater(d) : d)
           };
         });
       }
-      return updated;
     };
     this.getMatch = (matchId) => {
-      return [
-        ...this.state.cachedMatches,
-        ...this.state.pendingMatches ?? [],
-        ...this.state.matches
-      ].find((d) => d.id === matchId);
+      var _a;
+      const findFn = (d) => d.id === matchId;
+      return this.state.cachedMatches.find(findFn) ?? ((_a = this.state.pendingMatches) == null ? void 0 : _a.find(findFn)) ?? this.state.matches.find(findFn);
     };
     this.loadMatches = async ({
       location,
@@ -1281,7 +1272,10 @@ class RouterCore {
           return true;
         }
         const gcTime = (d.preload ? route.options.preloadGcTime ?? this.options.defaultPreloadGcTime : route.options.gcTime ?? this.options.defaultGcTime) ?? 5 * 60 * 1e3;
-        return !(d.status !== "error" && Date.now() - d.updatedAt < gcTime);
+        const isError = d.status === "error";
+        if (isError) return true;
+        const isStale = Date.now() - d.updatedAt >= gcTime;
+        return isStale;
       };
       this.clearCache({ filter });
     };