Fix setState so it handles values

src/alt/store/index.js

@@ -53,7 +53,13 @@ export function createStoreConfig(globalConfig, StoreModel) {
 
       return state
     },
-    setState: fn.assign,
+    setState(currentState, nextState) {
+      if (Object.prototype.toString.call(nextState) === '[object Object]') {
+        return fn.assign(currentState, nextState)
+      } else {
+        return nextState
+      }
+    },
   }, globalConfig, StoreModel.config)
 }
 

test/value-stores-test.js

@@ -26,6 +26,20 @@ const store2 = alt.createStore({
   }
 })
 
+const store3 = alt.createStore({
+  state: 21,
+
+  displayName: 'ValueStore3',
+
+  bindListeners: {
+    fire: actions.fire
+  },
+
+  fire() {
+    this.setState(this.state + 1)
+  }
+})
+
 export default {
   'value stores': {
     beforeEach() {
@@ -47,6 +61,21 @@ export default {
       actions.fire()
     },
 
+    'stores can contain state as any value (non reduce)'(done) {
+      assert(store3.state === 21, 'store state is value')
+      assert(store3.getState() === 21, 'getState returns value too')
+
+      const unlisten = store3.listen((state) => {
+        assert(state === 22, 'incremented store state')
+        unlisten()
+        done()
+      })
+
+      assert(JSON.parse(alt.takeSnapshot()).ValueStore3 === 21, 'snapshot ok')
+
+      actions.fire()
+    },
+
     'store with array works too'() {
       assert.deepEqual(store2.state, [1, 2, 3])
       actions.fire()