Fix race condition when evicting aborted requests from cache

Author: axelboc

packages/app/src/App.tsx

@@ -41,8 +41,7 @@ function App(props: Props) {
   const { valuesStore } = useDataContext();
   function onSelectPath(path: string) {
     setSelectedPath(path);
-    valuesStore.abortAll('entity changed');
-    valuesStore.evictErrors();
+    valuesStore.abortAll('entity changed', true);
   }
 
   return (

packages/app/src/visualizer/VisManager.tsx

@@ -31,8 +31,7 @@ function VisManager(props: Props) {
   const { valuesStore } = useDataContext();
   function onVisChange(index: number) {
     setActiveVis(index);
-    valuesStore.abortAll('visualization changed');
-    valuesStore.evictErrors();
+    valuesStore.abortAll('visualization changed', true);
   }
 
   return (

packages/shared/src/react-suspense-fetch.ts

@@ -22,8 +22,8 @@ export interface FetchStore<Input, Result> {
   preset: (input: Input, result: Result) => void;
   evict: (input: Input) => void;
   evictErrors: () => void;
-  abort: (input: Input, reason?: string) => void;
-  abortAll: (reason?: string) => void;
+  abort: (input: Input, reason?: string, evict?: boolean) => void;
+  abortAll: (reason?: string, evict?: boolean) => void;
   get progressStore(): StoreApi<ProgressState<Input>>;
 }
 
@@ -83,12 +83,20 @@ export function createFetchStore<Input, Result>(
         }
       });
     },
-    abort: (input: Input, reason?: string): void => {
+    abort: (input: Input, reason?: string, evict?: boolean): void => {
       cache.get(input)?.abort(reason);
+
+      if (evict) {
+        cache.delete(input);
+      }
     },
-    abortAll: (reason?: string): void => {
-      cache.values().forEach((instance) => {
+    abortAll: (reason?: string, evict?: boolean): void => {
+      cache.entries().forEach(([input, instance]) => {
         instance.abort(reason);
+
+        if (evict) {
+          cache.delete(input);
+        }
       });
     },
     get progressStore() {