try add new store impl

dmaskasky · Jan 20, 2025 · 705004d · 705004d
1 parent b48545d
commit 705004d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/src/vanilla/store.ts b/src/vanilla/store.ts
@@ -614,6 +614,24 @@ const buildStore = (...storeArgs: StoreArgs): Store => {
       atomState.h?.()
       if (isActuallyWritableAtom(atom)) {
         const mounted = atomState.m
+        let setAtom: (...args: unknown[]) => unknown
+        const createInvocationContext = <T>(fn: () => T) => {
+          let isSync = true
+          setAtom = (...args: unknown[]) => {
+            try {
+              return writeAtomState(atom, ...args)
+            } finally {
+              if (!isSync) {
+                flushCallbacks()
+              }
+            }
+          }
+          try {
+            return fn()
+          } finally {
+            isSync = false
+          }
+        }
         const processOnMount = () => {
           let isSync = true
           const setAtom = (...args: unknown[]) => {

diff --git a/tests/syncEffect/syncEffect.test.tsx b/tests/syncEffect/syncEffect.test.tsx
@@ -358,7 +358,6 @@ it('should disallow synchronous set.recurse in cleanup', () => {
   })
   const store = createDebugStore()
   store.sub(effectAtom, () => {})
-  store.set(anotherAtom, increment)
   expect(() => store.set(anotherAtom, increment)).toThrowError(
     'set.recurse is not allowed in cleanup',
   )

diff --git a/tests/syncEffect/syncEffect.ts b/tests/syncEffect/syncEffect.ts
@@ -53,6 +53,7 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
     },
     () => {},
   )
+  internalAtom.onMount = () => () => {}
 
   internalAtom.unstable_onInit = (store) => {
     const ref = store.get(refAtom)
@@ -116,19 +117,16 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
             try {
               fromCleanup = true
               return cleanup()
-            } /* catch (error) {
-              ref.error = error
-              refresh()
-            }  */ finally {
+            } finally {
               fromCleanup = false
               runCleanup = undefined
             }
           }
         }
-      } /* catch (error) {
+      } catch (error) {
         ref.error = error
-        refresh()
-      }  */ finally {
+        throw error
+      } finally {
         Array.from(deps.keys(), ref.get!)
         --inProgress
       }
@@ -169,7 +167,6 @@ export function syncEffect(effect: Effect): Atom<void> & { effect: Effect } {
       syncEffectChannel.add(runEffect)
     })
   }
-  internalAtom.onMount = () => () => {}
 
   if (process.env.NODE_ENV !== 'production') {
     function setLabel(atom: Atom<unknown>, label: string) {
@@ -209,7 +206,7 @@ function ensureSyncEffectChannel(store: Store) {
       () => void
     >()
     hookInto(storeWithHooks, INTERNAL_flushStoreHook, () => {
-      syncEffectChannel!.forEach((fn: () => void) => fn())
+      syncEffectChannel!.forEach((fn) => fn())
       syncEffectChannel!.clear()
     })
   }