Add Immer to other events (#327)

* 323 Added Immer for other events

* CR update - curry produce

* undo flow.test.js

* refactor test

Author: pgoodrich

src/core/flow.js

@@ -15,6 +15,7 @@ import {
 import { automaticGameEvent } from './action-creators';
 import { ContextEnhancer } from './reducer';
 import * as logging from './logger';
+import produce from 'immer';
 
 /**
  * Helper to create a reducer that manages ctx (with the
@@ -310,9 +311,11 @@ export function FlowWithPhases({
     if (conf.onPhaseBegin === undefined) {
       conf.onPhaseBegin = G => G;
     }
+    conf.onPhaseBegin = produce(conf.onPhaseBegin);
     if (conf.onPhaseEnd === undefined) {
       conf.onPhaseEnd = G => G;
     }
+    conf.onPhaseEnd = produce(conf.onPhaseEnd);
     if (conf.movesPerTurn === undefined) {
       conf.movesPerTurn = movesPerTurn;
     }
@@ -325,12 +328,15 @@ export function FlowWithPhases({
     if (conf.onTurnBegin === undefined) {
       conf.onTurnBegin = onTurnBegin;
     }
+    conf.onTurnBegin = produce(conf.onTurnBegin);
     if (conf.onTurnEnd === undefined) {
       conf.onTurnEnd = onTurnEnd;
     }
+    conf.onTurnEnd = produce(conf.onTurnEnd);
     if (conf.onMove === undefined) {
       conf.onMove = onMove;
     }
+    conf.onMove = produce(conf.onMove);
     if (conf.turnOrder === undefined) {
       conf.turnOrder = turnOrder;
     }

src/core/flow.test.js

@@ -866,3 +866,58 @@ describe('endPhase returns to previous phase', () => {
     expect(state.ctx.phase).toBe('B');
   });
 });
+
+describe('immer', () => {
+  let flow;
+  let state;
+
+  beforeAll(() => {
+    flow = FlowWithPhases({
+      startingPhase: 'A',
+      phases: {
+        A: {
+          onPhaseBegin: G => {
+            G.onPhaseBegin = true;
+          },
+          onPhaseEnd: G => {
+            G.onPhaseEnd = true;
+          },
+        },
+      },
+      onTurnBegin: G => {
+        G.onTurnBegin = true;
+      },
+      onTurnEnd: G => {
+        G.onTurnEnd = true;
+      },
+      onMove: G => {
+        G.onMove = true;
+      },
+    });
+
+    state = { G: {}, ctx: flow.ctx(2) };
+    state = flow.init(state);
+  });
+
+  test('begin', () => {
+    expect(state.G.onPhaseBegin).toBe(true);
+    expect(state.G.onTurnBegin).toBe(true);
+    expect(state.G.onPhaseEnd).not.toBe(true);
+    expect(state.G.onTurnEnd).not.toBe(true);
+  });
+
+  test('end turn', () => {
+    state = flow.processGameEvent(state, gameEvent('endTurn'));
+    expect(state.G.onTurnEnd).toBe(true);
+  });
+
+  test('end phase', () => {
+    state = flow.processGameEvent(state, gameEvent('endPhase'));
+    expect(state.G.onPhaseEnd).toBe(true);
+  });
+
+  test('move', () => {
+    state = flow.processMove(state, makeMove('A').payload);
+    expect(state.G.onMove).toBe(true);
+  });
+});