fix(proxy-state-tree): fix issue with derived

Author: christianalfoni

packages/node_modules/proxy-state-tree/src/index.test.ts

@@ -244,6 +244,16 @@ describe('ARRAYS', () => {
       tree.flush()
       expect(currentProxy).not.toBe(newProxy)
     })
+    test('should track with indexOf', () => {
+      const state = {
+        foo: ['bar'],
+      }
+      const tree = new ProxyStateTree(state)
+      const trackId = tree.startPathsTracking()
+      expect(tree.get().foo.indexOf('bar')).toBe(0)
+      const paths = tree.clearPathsTracking(trackId)
+      expect(paths).toEqual(new Set(['foo', 'foo.0']))
+    })
   })
 
   describe('MUTATIONS', () => {
@@ -424,6 +434,34 @@ describe('FUNCTIONS', () => {
 
     expect(tree.get().foo).toBe('bar')
   })
+  test('should track state values form within derived', () => {
+    let reactionCount = 0
+    const tree = new ProxyStateTree({
+      items: [
+        {
+          title: 'foo',
+        },
+      ],
+      foo: (proxyStateTree) => proxyStateTree.get().items.map((item) => item),
+    })
+    const state = tree.get()
+
+    const trackId = tree.startPathsTracking()
+    state.foo.forEach((item) => {
+      item.title
+    })
+    const paths = tree.clearPathsTracking(trackId)
+
+    tree.addMutationListener(paths, (flushId) => {
+      reactionCount++
+      expect(flushId).toBe(0)
+    })
+    tree.startMutationTracking()
+    state.items[0].title = 'foo2'
+    tree.clearMutationTracking()
+    tree.flush()
+    expect(reactionCount).toBe(1)
+  })
 })
 
 describe('REACTIONS', () => {

packages/node_modules/proxy-state-tree/src/proxify.ts

@@ -120,18 +120,14 @@ function createObjectProxy(tree, value, path) {
       if (typeof prop === 'symbol' || prop in Object.prototype)
         return target[prop]
 
-      let targetValue = target[prop]
+      const targetValue = target[prop]
       const nestedPath = concat(path, prop)
       trackPath(tree, nestedPath)
 
       if (typeof targetValue === 'function') {
-        return proxify(
-          tree,
-          tree.options.dynamicWrapper
-            ? tree.options.dynamicWrapper(tree, nestedPath, targetValue)
-            : targetValue(tree, nestedPath),
-          nestedPath
-        )
+        return tree.options.dynamicWrapper
+          ? tree.options.dynamicWrapper(tree, nestedPath, targetValue)
+          : targetValue(tree, nestedPath)
       }
 
       if (targetValue === undefined) {