Merge cdb7358 into dfdd4c4

boardgameio · Aug 3, 2021 · ba982fb · ba982fb
2 parents dfdd4c4 + cdb7358
commit ba982fb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/core/flow.test.ts b/src/core/flow.test.ts
@@ -730,6 +730,21 @@ test('init', () => {
   expect(state.G).toMatchObject({ done: true });
 });
 
+test('next', () => {
+  const flow = Flow({
+    phases: {
+      A: { start: true, next: () => 'C' },
+      B: {},
+      C: {},
+    },
+  });
+
+  let state = { ctx: flow.ctx(3) } as State;
+  state = flow.processEvent(state, gameEvent('endPhase'));
+
+  expect(state.ctx.phase).toEqual('C');
+});
+
 describe('endIf', () => {
   test('basic', () => {
     const flow = Flow({ endIf: (G) => G.win });

diff --git a/src/core/flow.ts b/src/core/flow.ts
@@ -163,6 +163,12 @@ export function Flow({
       onEnd: HookWrapper(phaseConfig.turn.onEnd),
       endIf: TriggerWrapper(phaseConfig.turn.endIf),
     };
+
+    if (typeof phaseConfig.next !== 'function') {
+      const { next } = phaseConfig;
+      phaseConfig.next = () => next || null;
+    }
+    phaseConfig.wrapped.next = HookWrapper(phaseConfig.next);
   }
 
   function GetPhase(ctx: { phase: string }): PhaseConfig {
@@ -315,7 +321,7 @@ export function Flow({
         return state;
       }
     } else if (phaseConfig.next !== undefined) {
-      ctx = { ...ctx, phase: phaseConfig.next };
+      ctx = { ...ctx, phase: phaseConfig.wrapped.next(state) || null };
     } else {
       ctx = { ...ctx, phase: null };
     }

diff --git a/src/types.ts b/src/types.ts
@@ -207,7 +207,7 @@ export interface PhaseConfig<
   CtxWithPlugins extends Ctx = Ctx
 > {
   start?: boolean;
-  next?: string;
+  next?: ((G: G, ctx: CtxWithPlugins) => string | void) | string;
   onBegin?: (G: G, ctx: CtxWithPlugins) => any;
   onEnd?: (G: G, ctx: CtxWithPlugins) => any;
   endIf?: (G: G, ctx: CtxWithPlugins) => boolean | void | { next: string };
@@ -219,6 +219,7 @@ export interface PhaseConfig<
     ) => boolean | void | { next: string };
     onBegin?: (state: State<G, CtxWithPlugins>) => any;
     onEnd?: (state: State<G, CtxWithPlugins>) => any;
+    next?: (state: State<G, CtxWithPlugins>) => string | void;
   };
 }