From 1bb17668a73eadba0c8d02e55cedbfae9ed2286e Mon Sep 17 00:00:00 2001
From: Simon Lemieux <1105380+simlmx@users.noreply.github.com>
Date: Thu, 18 Jul 2024 20:22:54 +0000
Subject: [PATCH]  fixup

---
 game-template/game/src/index.test-d.ts |  4 ++--
 game-template/game/src/index.test.ts   |  4 ++--
 game-template/game/src/index.ts        | 31 ++++++++++++++------------
 game-template/ui/src/Board.tsx         |  6 ++---
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/game-template/game/src/index.test-d.ts b/game-template/game/src/index.test-d.ts
index 6165f32..595b675 100644
--- a/game-template/game/src/index.test-d.ts
+++ b/game-template/game/src/index.test-d.ts
@@ -2,10 +2,10 @@ import { expectTypeOf, test } from "vitest";
 
 import { MatchTester, PlayerMove } from "@lefun/game";
 
-import { game, GS } from ".";
+import { game, RollGame, RollGameState as GS } from ".";
 
 test("inside PlayerMove", () => {
-  expectTypeOf(game).toEqualTypeOf<typeof game>();
+  expectTypeOf(game).toEqualTypeOf<RollGame>();
 
   const move = {
     executeNow({ board, playerboard, payload }) {
diff --git a/game-template/game/src/index.test.ts b/game-template/game/src/index.test.ts
index 1a5494c..c1b7ec0 100644
--- a/game-template/game/src/index.test.ts
+++ b/game-template/game/src/index.test.ts
@@ -2,9 +2,9 @@ import { test } from "vitest";
 
 import { MatchTester as _MatchTester } from "@lefun/game";
 
-import { game, GS } from ".";
+import { game, RollGame as G, RollGameState as GS } from ".";
 
-class MatchTester extends _MatchTester<GS, typeof game> {}
+class MatchTester extends _MatchTester<GS, G> {}
 
 test("sanity check", () => {
   const match = new MatchTester({ game, numPlayers: 2 });
diff --git a/game-template/game/src/index.ts b/game-template/game/src/index.ts
index cfc0bed..e014cc0 100644
--- a/game-template/game/src/index.ts
+++ b/game-template/game/src/index.ts
@@ -11,20 +11,20 @@ export type Board = {
   players: Record<UserId, Player>;
 };
 
-type GS = GameState<Board>;
+export type RollGameState = GameState<Board>;
 
 type BMT = {
   someBoardMove: never;
   someBoardMoveWithArgs: { someArg: number };
 };
 
-const moveWithArg: PlayerMove<GS, { someArg: string }, BMT> = {
+const moveWithArg: PlayerMove<RollGameState, { someArg: string }, BMT> = {
   execute() {
     //
   },
 };
 
-const roll: PlayerMove<GS, never, BMT> = {
+const roll: PlayerMove<RollGameState, never, BMT> = {
   executeNow({ board, userId }) {
     board.players[userId].isRolling = true;
   },
@@ -36,26 +36,29 @@ const roll: PlayerMove<GS, never, BMT> = {
   },
 };
 
-const initMove_: BoardMove<GS, never, BMT> = {
+const initMove_: BoardMove<RollGameState, never, BMT> = {
   execute() {
     //
   },
 };
 
-const someBoardMove: BoardMove<GS, never, BMT> = {
+const someBoardMove: BoardMove<RollGameState, never, BMT> = {
   execute() {
     //
   },
 };
 
-const someBoardMoveWithArgs: BoardMove<GS, BMT["someBoardMoveWithArgs"], BMT> =
-  {
-    execute() {
-      //
-    },
-  };
+const someBoardMoveWithArgs: BoardMove<
+  RollGameState,
+  BMT["someBoardMoveWithArgs"],
+  BMT
+> = {
+  execute() {
+    //
+  },
+};
 
-const game = {
+export const game = {
   initialBoards: ({ players }) => ({
     board: {
       count: 0,
@@ -68,6 +71,6 @@ const game = {
   boardMoves: { initMove_, someBoardMove, someBoardMoveWithArgs },
   minPlayers: 1,
   maxPlayers: 10,
-} satisfies Game<GS, BMT>;
+} satisfies Game<RollGameState, BMT>;
 
-export { game, GS };
+export type RollGame = typeof game;
diff --git a/game-template/ui/src/Board.tsx b/game-template/ui/src/Board.tsx
index ed85e89..2d42120 100644
--- a/game-template/ui/src/Board.tsx
+++ b/game-template/ui/src/Board.tsx
@@ -12,13 +12,13 @@ import {
   useUsername,
 } from "@lefun/ui";
 
-import { game, GS } from "roll-game";
+import { game, RollGameState } from "roll-game";
 
 // Dice symbol characters
 const DICE = ["", "\u2680", "\u2681", "\u2682", "\u2683", "\u2684", "\u2685"];
 
-const useSelector = makeUseSelector<GS>();
-const useSelectorShallow = makeUseSelectorShallow<GS>();
+const useSelector = makeUseSelector<RollGameState>();
+const useSelectorShallow = makeUseSelectorShallow<RollGameState>();
 const useMakeMove = makeUseMakeMove<typeof game>();
 
 function Player({ userId }: { userId: UserId }) {