refactor: move flushBatch in buildStore and call recomputeDependents …

…directly
pmndrs · Jan 7, 2025 · d092f6e · d092f6e
1 parent 04734ef
commit d092f6e
Showing 1 changed file with 26 additions and 29 deletions.
diff --git a/src/vanilla/store.ts b/src/vanilla/store.ts
@@ -185,8 +185,6 @@ type Batch = [
 ] & {
   /** Atom dependents map */
   D: Map<AnyAtom, Set<AnyAtom>>
-  /** Recompute dependents function */
-  R?: (batch: Batch) => void
 }
 
 const createBatch = (): Batch =>
@@ -229,32 +227,6 @@ const addBatchAtomDependent = (
 const getBatchAtomDependents = (batch: Batch, atom: AnyAtom) =>
   batch.D.get(atom)
 
-const flushBatch = (batch: Batch) => {
-  let error: AnyError
-  let hasError = false
-  const call = (fn: () => void) => {
-    try {
-      fn()
-    } catch (e) {
-      if (!hasError) {
-        error = e
-        hasError = true
-      }
-    }
-  }
-  while (batch.D.size || batch.some((channel) => channel.size)) {
-    batch.R?.(batch)
-    batch.D.clear()
-    for (const channel of batch) {
-      channel.forEach(call)
-      channel.clear()
-    }
-  }
-  if (hasError) {
-    throw error
-  }
-}
-
 // internal & unstable type
 type StoreArgs = readonly [
   getAtomState: <Value>(atom: Atom<Value>) => AtomState<Value> | undefined,
@@ -574,6 +546,32 @@ const buildStore = (...storeArgs: StoreArgs): Store => {
     }
   }
 
+  const flushBatch = (batch: Batch) => {
+    let error: AnyError
+    let hasError = false
+    const call = (fn: () => void) => {
+      try {
+        fn()
+      } catch (e) {
+        if (!hasError) {
+          error = e
+          hasError = true
+        }
+      }
+    }
+    while (batch.D.size || batch.some((channel) => channel.size)) {
+      recomputeDependents(batch)
+      batch.D.clear()
+      for (const channel of batch) {
+        channel.forEach(call)
+        channel.clear()
+      }
+    }
+    if (hasError) {
+      throw error
+    }
+  }
+
   const writeAtomState = <Value, Args extends unknown[], Result>(
     batch: Batch,
     atom: WritableAtom<Value, Args, Result>,
@@ -599,7 +597,6 @@ const buildStore = (...storeArgs: StoreArgs): Store => {
           mountDependencies(batch, a, aState)
           if (prevEpochNumber !== aState.n) {
             dirtyDependents(batch, a, aState)
-            batch.R = recomputeDependents
             registerBatchAtom(batch, a, aState)
           }
           return undefined as R