retire Game(). call it internally instead.

Author: nicolodavis

packages/core.js

@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/MIT.
  */
 
-import Game from '../src/core/game.js';
+import { Game } from '../src/core/game.js';
 import {
   InitializeGame,
   CreateGameReducer,

src/ai/bot.test.js

@@ -6,11 +6,11 @@
  * https://opensource.org/licenses/MIT.
  */
 
-import Game from '../core/game';
 import { InitializeGame } from '../core/reducer';
 import { MAKE_MOVE, GAME_EVENT } from '../core/action-types';
 import { makeMove } from '../core/action-creators';
 import { Simulate, Bot, RandomBot, MCTSBot } from './bot';
+import { Game } from '../core/game';
 
 function IsVictory(cells) {
   const positions = [
@@ -141,7 +141,7 @@ describe('MCTSBot', () => {
   });
 
   test('game that never ends', () => {
-    const game = Game({});
+    const game = {};
     const state = InitializeGame({ game });
     const bot = new MCTSBot({ seed: 'test', game, enumerate: () => [] });
     const { state: endState } = Simulate({ game, bots: bot, state });

src/client/client.js

@@ -9,6 +9,7 @@
 import { createStore, compose, applyMiddleware } from 'redux';
 import * as Actions from '../core/action-types';
 import * as ActionCreators from '../core/action-creators';
+import { Game } from '../core/game';
 import { error } from '../core/logger';
 import { SocketIO } from './transport/socketio';
 import { Local, LocalMaster } from './transport/local';
@@ -92,15 +93,15 @@ class _ClientImpl {
     credentials,
     enhancer,
   }) {
-    this.game = game;
+    this.game = Game(game);
     this.playerID = playerID;
     this.gameID = gameID;
     this.credentials = credentials;
     this.multiplayer = multiplayer;
     this.subscribeCallback = () => {};
 
     this.reducer = CreateGameReducer({
-      game,
+      game: this.game,
       numPlayers,
       multiplayer,
     });
@@ -124,7 +125,7 @@ class _ClientImpl {
 
     let initialState = null;
     if (multiplayer === undefined) {
-      initialState = InitializeGame({ game, numPlayers });
+      initialState = InitializeGame({ game: this.game, numPlayers });
     }
 
     this.reset = () => {
@@ -252,24 +253,25 @@ class _ClientImpl {
       }
 
       if (multiplayer.local === true) {
-        if (localMaster_ === null || localMaster_.game !== game) {
-          localMaster_ = new LocalMaster(game);
+        if (localMaster_ === null || localMaster_.config !== game) {
+          localMaster_ = new LocalMaster(this.game);
+          localMaster_.config = game;
         }
 
         this.transport = new Local({
           master: localMaster_,
           store: this.store,
           gameID: gameID,
           playerID: playerID,
-          gameName: game.name,
+          gameName: this.game.name,
           numPlayers,
         });
       } else if (multiplayer.server !== undefined) {
         this.transport = new SocketIO({
           store: this.store,
           gameID: gameID,
           playerID: playerID,
-          gameName: game.name,
+          gameName: this.game.name,
           numPlayers,
           server: multiplayer.server,
           socketOpts,

src/client/client.test.js

@@ -9,10 +9,10 @@
 import { createStore } from 'redux';
 import { InitializeGame, CreateGameReducer } from '../core/reducer';
 import { Client, createMoveDispatchers } from './client';
+import { Game } from '../core/game';
 import { Local } from './transport/local';
 import { SocketIO } from './transport/socketio';
 import { update, sync, makeMove, gameEvent } from '../core/action-creators';
-import Game from '../core/game';
 import { RandomBot } from '../ai/bot';
 import { error } from '../core/logger';
 
@@ -23,11 +23,11 @@ jest.mock('../core/logger', () => ({
 
 test('move api', () => {
   const client = Client({
-    game: Game({
+    game: {
       moves: {
         A: (G, ctx, arg) => ({ arg }),
       },
-    }),
+    },
   });
 
   expect(client.getState().G).toEqual({});
@@ -39,7 +39,7 @@ describe('namespaced moves', () => {
   let client;
   beforeAll(() => {
     client = Client({
-      game: Game({
+      game: {
         moves: {
           A: () => 'A',
         },
@@ -52,7 +52,7 @@ describe('namespaced moves', () => {
             },
           },
         },
-      }),
+      },
     });
   });
 
@@ -88,13 +88,13 @@ describe('namespaced moves', () => {
 
 test('isActive', () => {
   const client = Client({
-    game: Game({
+    game: {
       moves: {
         A: (G, ctx, arg) => ({ arg }),
       },
 
       endIf: G => G.arg == 42,
-    }),
+    },
   });
 
   expect(client.getState().G).toEqual({});
@@ -106,7 +106,7 @@ test('isActive', () => {
 
 describe('step', () => {
   const client = Client({
-    game: Game({
+    game: {
       setup: () => ({ moved: false }),
 
       moves: {
@@ -118,7 +118,7 @@ describe('step', () => {
       endIf(G) {
         if (G.moved) return true;
       },
-    }),
+    },
 
     ai: {
       bot: RandomBot,
@@ -134,7 +134,7 @@ describe('step', () => {
 
   test('does not crash on empty action', () => {
     const client = Client({
-      game: Game({}),
+      game: {},
 
       ai: {
         bot: RandomBot,
@@ -153,7 +153,7 @@ describe('multiplayer', () => {
 
     beforeAll(() => {
       client = Client({
-        game: Game({ moves: { A: () => {} } }),
+        game: { moves: { A: () => {} } },
         multiplayer: { server: host + ':' + port },
       });
       client.connect();
@@ -185,7 +185,7 @@ describe('multiplayer', () => {
 
     beforeAll(() => {
       client = Client({
-        game: Game({}),
+        game: {},
         multiplayer: true,
       });
       client.connect();
@@ -203,7 +203,7 @@ describe('multiplayer', () => {
 
     beforeAll(() => {
       spec = {
-        game: Game({ moves: { A: (G, ctx) => ({ A: ctx.playerID }) } }),
+        game: { moves: { A: (G, ctx) => ({ A: ctx.playerID }) } },
         multiplayer: { local: true },
       };
 
@@ -255,7 +255,7 @@ describe('multiplayer', () => {
 
     beforeAll(() => {
       client = Client({
-        game: Game({ moves: { A: () => {} } }),
+        game: { moves: { A: () => {} } },
         multiplayer: { transport: CustomTransport },
       });
     });
@@ -274,7 +274,7 @@ describe('multiplayer', () => {
   describe('invalid spec', () => {
     test('logs error', () => {
       Client({
-        game: Game({ moves: { A: () => {} } }),
+        game: { moves: { A: () => {} } },
         multiplayer: { blah: true },
       });
       expect(error).toHaveBeenCalledWith('invalid multiplayer spec');
@@ -292,11 +292,11 @@ test('accepts enhancer for store', () => {
     };
   };
   const client = Client({
-    game: Game({
+    game: {
       moves: {
         A: (G, ctx, arg) => ({ arg }),
       },
-    }),
+    },
     enhancer: spyEnhancer,
   });
 
@@ -307,7 +307,7 @@ test('accepts enhancer for store', () => {
 
 describe('event dispatchers', () => {
   test('default', () => {
-    const game = Game({});
+    const game = {};
     const client = Client({ game });
     expect(Object.keys(client.events)).toEqual(['endTurn']);
     expect(client.getState().ctx.turn).toBe(0);
@@ -316,11 +316,11 @@ describe('event dispatchers', () => {
   });
 
   test('all events', () => {
-    const game = Game({
+    const game = {
       endPhase: true,
       endGame: true,
       setActionPlayers: true,
-    });
+    };
     const client = Client({ game });
     expect(Object.keys(client.events)).toEqual([
       'endTurn',
@@ -334,10 +334,10 @@ describe('event dispatchers', () => {
   });
 
   test('no events', () => {
-    const game = Game({
+    const game = {
       endPhase: false,
       endTurn: false,
-    });
+    };
     const client = Client({ game });
     expect(Object.keys(client.events)).toEqual([]);
   });
@@ -418,11 +418,11 @@ describe('log handling', () => {
 
   beforeEach(() => {
     client = Client({
-      game: Game({
+      game: {
         moves: {
           A: () => ({}),
         },
-      }),
+      },
     });
   });
 

src/client/debug/debug.test.js

@@ -10,7 +10,6 @@ import React from 'react';
 import { stringify } from 'flatted';
 import { Client } from '../client';
 import { sync } from '../../core/action-creators';
-import Game from '../../core/game';
 import { createStore } from 'redux';
 import { Debug } from './debug';
 import Mousetrap from 'mousetrap';
@@ -147,11 +146,11 @@ describe('log', () => {
 
   test('hover', () => {
     const overrideGameState = jest.fn();
-    const game = Game({
+    const game = {
       moves: {
         A: (G, ctx, arg) => ({ arg }),
       },
-    });
+    };
 
     const client = Client({ game });
     client.moves.A(42);

src/client/log/log.test.js

@@ -9,7 +9,6 @@
 import React from 'react';
 import { Client } from '../client';
 import { makeMove, automaticGameEvent } from '../../core/action-creators';
-import Game from '../../core/game';
 import { GameLog } from './log';
 import { InitializeGame, CreateGameReducer } from '../../core/reducer';
 import Enzyme from 'enzyme';
@@ -18,13 +17,13 @@ import Adapter from 'enzyme-adapter-react-16';
 Enzyme.configure({ adapter: new Adapter() });
 
 describe('layout', () => {
-  const game = Game({
+  const game = {
     startingPhase: 'A',
     phases: {
       A: { next: 'B' },
       B: { next: 'A' },
     },
-  });
+  };
   const reducer = CreateGameReducer({ game });
   const state = InitializeGame({ game });
 
@@ -73,7 +72,7 @@ describe('time travel', () => {
   let hoverState;
 
   beforeAll(() => {
-    const game = Game({
+    const game = {
       moves: {
         A: (G, ctx, arg) => {
           return { arg };
@@ -83,7 +82,7 @@ describe('time travel', () => {
       turn: {
         endIf: G => G && G.arg == 42,
       },
-    });
+    };
 
     client = Client({ game });
     const initialState = client.getState()._initial;
@@ -157,12 +156,12 @@ describe('time travel', () => {
 });
 
 describe('pinning', () => {
-  const game = Game({
+  const game = {
     moves: {
       A: () => ({ A: true }),
       B: () => ({ B: true }),
     },
-  });
+  };
 
   const reducer = CreateGameReducer({ game });
   let state = InitializeGame({ game });
@@ -242,7 +241,7 @@ describe('pinning', () => {
 });
 
 describe('payload', () => {
-  const game = Game({});
+  const game = {};
   const reducer = CreateGameReducer({ game });
   const state = InitializeGame({ game });