IT WORKS!!!

PASS: unscoped derived can change to dependent scoped and back

Author: dmaskasky

src/ScopeProvider/scope.ts

@@ -249,6 +249,8 @@ export function createScope(props: CreateScopeProps): ScopedStore {
     const mountedMap = buildingBlocks[1]
     const invalidatedAtoms = buildingBlocks[2]
     const changedAtoms = buildingBlocks[3]
+    const ensureAtomState = buildingBlocks[11]
+    const mountDependencies = buildingBlocks[17]
 
     const proxyState: ProxyState = {
       get originalAtom() {
@@ -261,7 +263,6 @@ export function createScope(props: CreateScopeProps): ScopedStore {
     }
 
     const proxyAtom = createAtom(customRead) as T
-    const ensureAtomState = buildingBlocks[11]
     const proxyAtomState = ensureAtomState(store, proxyAtom)
 
     function customRead(get: <V>(a: Atom<V>) => V) {
@@ -302,30 +303,20 @@ export function createScope(props: CreateScopeProps): ScopedStore {
       const [fromAtom, toAtom] = isScoped
         ? [originalAtom, scopedAtom]
         : [scopedAtom, originalAtom]
-
-      if (isScoped !== proxyState.hasScoped || proxyAtomState.d.size === 0) {
-        // update proxyAtomState dep to be toAtom
+      const scopeChange = isScoped !== proxyState.hasScoped
+      proxyState.hasScoped = isScoped
+      if (scopeChange || !isAtomStateInitialized(proxyAtomState)) {
         const toAtomState = ensureAtomState(store, toAtom)
         proxyAtomState.d.delete(fromAtom)
         proxyAtomState.d.set(toAtom, toAtomState.n)
-        const mounted = mountedMap.get(proxyAtom)
-        if (mounted) {
-          mounted.d.delete(fromAtom)
-          mounted.d.add(toAtom)
-        }
-        const mountedScoped = mountedMap.get(fromAtom)
-        if (mountedScoped) {
-          mountedScoped.t.delete(proxyAtom)
-        }
-        const mountedOriginal = mountedMap.get(toAtom)
-        if (mountedOriginal) {
-          mountedOriginal.t.add(proxyAtom)
-        }
+        proxyAtomState.v = toAtomState.v
+        // TODO: Do we need this?
+        // proxyAtomState.n = toAtomState.n - 1
+        mountDependencies(store, proxyAtom)
         if ('e' in atomState) {
           throw atomState.e
         }
       }
-      proxyState.hasScoped = isScoped
       return isScoped
     }
 

tests/ScopeProvider/01_basic_spec.test.tsx

@@ -492,14 +492,13 @@ describe('Counter', () => {
         b: v=0
         c: v=0
       b@S1: v=0
-      d?@S1: v=00
+      _d@S1: v=00
         d@S1: v=00
           b@S1: v=0
           c: v=0
       d@S1: v=00
         b@S1: v=0
         c: v=0
-      --------------------
     `)
     console.log('set d in S0')
     s[0].set(d)
@@ -518,14 +517,13 @@ describe('Counter', () => {
         b: v=1
         c: v=1
       b@S1: v=0
-      d?@S1: v=01
+      _d@S1: v=01
         d@S1: v=01
           b@S1: v=0
           c: v=1
       d@S1: v=01
         b@S1: v=0
         c: v=1
-      --------------------
     `)
   })
 

tests/ScopeProvider/dependent.test.ts

@@ -110,7 +110,7 @@ describe('open issues', () => {
         a: v=scoped_2
         b@S1: v=0
     `)
-    expect(cReadCount).toHaveBeenCalledTimes(2) // called once for c0 and once for c1
+    expect(cReadCount).toHaveBeenCalledTimes(2) // called for c0 and c1
     cReadCount.mockClear()
 
     s0.set(c, 1) // c0 writes to b0
@@ -161,10 +161,10 @@ describe('open issues', () => {
       _c@S1: v=undefined
         c: v=undefined
           a: v=unscoped_3
-      c@S1: v=2
+      c@S1: v=undefined
         a: v=unscoped_3
     `)
-    expect(cReadCount).toHaveBeenCalledTimes(1) // called for c1
+    expect(cReadCount).toHaveBeenCalledTimes(2) // called for c0 and c1
     cReadCount.mockClear()
   })
 })