improve error handling for flushPending

pmndrs · Nov 14, 2024 · 004e873 · 004e873
1 parent 9462d55
commit 004e873
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 11 deletions.
diff --git a/src/vanilla/store.ts b/src/vanilla/store.ts
@@ -199,14 +199,27 @@ const addPendingFunction = (pending: Pending, fn: () => void) => {
 }
 
 const flushPending = (pending: Pending) => {
+  let error: unknown | undefined
+  const call = (fn: () => void) => {
+    try {
+      fn()
+    } catch (e) {
+      if (!error) {
+        error = e
+      }
+    }
+  }
   while (pending[1].size || pending[2].size) {
     pending[0].clear()
     const atomStates = new Set(pending[1].values())
     pending[1].clear()
     const functions = new Set(pending[2])
     pending[2].clear()
-    atomStates.forEach((atomState) => atomState.m?.l.forEach((l) => l()))
-    functions.forEach((fn) => fn())
+    atomStates.forEach((atomState) => atomState.m?.l.forEach(call))
+    functions.forEach(call)
+  }
+  if (error) {
+    throw error
   }
 }
 

diff --git a/tests/vanilla/store.test.tsx b/tests/vanilla/store.test.tsx
@@ -664,7 +664,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
         get(a)
         try {
           get(e)
-        } catch {}
+        } catch {
+          // expect error
+        }
       })
     })
     store.sub(b, () => {})
@@ -687,7 +689,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
         setTimeout(() => {
           try {
             setSelf()
-          } catch {}
+          } catch {
+            // expect error
+          }
         })
       },
       (get, set) => {
@@ -736,7 +740,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
       setTimeout(() => {
         try {
           set(b)
-        } catch {}
+        } catch {
+          // expect error
+        }
       })
     })
     const listener = vi.fn()
@@ -763,7 +769,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
     store.sub(a, listener)
     try {
       store.set(b)
-    } catch {}
+    } catch {
+      // expect error
+    }
     expect(listener).toHaveBeenCalledOnce()
   })
 
@@ -781,13 +789,17 @@ describe('should mount and trigger listeners even when an error is thrown', () =
       setTimeout(() => {
         try {
           setAtom()
-        } catch {}
+        } catch {
+          // expect error
+        }
       })
       return () => {
         setTimeout(() => {
           try {
             setAtom()
-          } catch {}
+          } catch {
+            // expect error
+          }
         })
       }
     }
@@ -816,7 +828,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
     }
     try {
       store.sub(b, () => {})
-    } catch {}
+    } catch {
+      // expect error
+    }
     expect(a.onMount).toHaveBeenCalledOnce()
   })
 
@@ -835,7 +849,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
     const unsub = store.sub(b, () => {})
     try {
       unsub()
-    } catch {}
+    } catch {
+      // expect error
+    }
     expect(aUnmount).toHaveBeenCalledOnce()
   })
 
@@ -854,7 +870,9 @@ describe('should mount and trigger listeners even when an error is thrown', () =
     store.sub(a, listener)
     try {
       store.set(b)
-    } catch {}
+    } catch {
+      // expect error
+    }
     expect(listener).toHaveBeenCalledOnce()
   })
 })