Merge pull request cerebral#244 from lrn2prgrm/patch-3

Fix deepCopy to pass getters to cloned object

Author: christianalfoni

packages/node_modules/overmind/src/index.test.ts

@@ -1,4 +1,4 @@
-import { EventType, Overmind, IAction } from './'
+import { EventType, Overmind, IAction, createOvermindMock } from './'
 import { namespaced } from './config'
 
 function toJSON(obj) {
@@ -332,3 +332,23 @@ describe('Overmind', () => {
     expect(app.state.item.isAwesome).toBe(false)
   })
 })
+
+describe('Overmind mock', () => {
+  test('should preserve getters', async (done) => {
+    expect.assertions(1)
+    const state = {
+      value: 0,
+      get valuePlusTwo() { return this.value + 2 }
+    }
+    const updateValue: Action = (context) => context.state.value = 15
+    const actions = { updateValue }
+    const config = { state, actions}
+    type Config = typeof config
+    interface Action<Value = void> extends IAction<Config, Value> {}
+
+    const mock = createOvermindMock(config)
+    await mock.actions.updateValue()
+    expect(mock.state.valuePlusTwo).toEqual(17)
+    done()
+  })
+})

packages/node_modules/overmind/src/utils.test.ts

@@ -0,0 +1,14 @@
+import { deepCopy } from './utils'
+
+describe('deepCopy', () => {
+  test('should be able to preserve getters', () => {
+    expect.assertions(1)
+    const original = {
+        value: 0,
+        get valuePlusTwo() { return this.value + 2 }
+    }
+    const copy = deepCopy(original)
+    copy.value = 15
+    expect(copy.valuePlusTwo).toBe(17)
+  })
+})

packages/node_modules/overmind/src/utils.ts

@@ -29,8 +29,20 @@ export const makeStringifySafeMutations = (mutations: IMutation[]) => {
 
 export function deepCopy(obj) {
   if (isPlainObject(obj)) {
-    return Object.keys(obj).reduce((aggr, key) => {
-      aggr[key] = deepCopy(obj[key])
+    return Object.keys(obj).reduce((aggr: any, key) => {
+      if (key === '__esModule') {
+        return aggr
+      }
+
+      const originalDescriptor = Object.getOwnPropertyDescriptor(obj, key)
+      const isAGetter = originalDescriptor && 'get' in originalDescriptor
+      const value = obj[key]
+
+      if (isPlainObject(value) && !isAGetter) {
+        aggr[key] = deepCopy(value)
+      } else {
+        Object.defineProperty(aggr, key, originalDescriptor as any)
+      }
 
       return aggr
     }, {})