Add default value to normalized game settings

games/game1-v2.3.0/game/src/index.ts

@@ -133,7 +133,10 @@ const gameSettings: GameSettings = [
     key: "setting1",
     options: [{ value: "a" }, { value: "b" }],
   },
-  { key: "setting2", options: [{ value: "x" }, { value: "y" }] },
+  {
+    key: "setting2",
+    options: [{ value: "x" }, { value: "y", isDefault: true }],
+  },
 ];
 
 const gamePlayerSettings: GamePlayerSettings = [
@@ -157,7 +160,7 @@ const gamePlayerSettings: GamePlayerSettings = [
   {
     key: "dieNumFaces",
     type: "string",
-    options: [{ value: "6" }, { value: "20" }],
+    options: [{ value: "6", isDefault: true }, { value: "20" }],
   },
 ];
 

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "npmClient": "pnpm"
 }

packages/core/README.md

@@ -0,0 +1 @@
+Core library to make games at [lefun.fun](https://lefun.fun).

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lefun/core",
-  "version": "2.5.1",
-  "description": "Core library to make games for https://lefun.fun",
+  "version": "2.5.2",
+  "description": "Core library to make games at https://lefun.fun",
   "author": "Simon Lemieux",
   "repository": {
     "type": "git",

packages/core/src/types.ts

@@ -37,6 +37,7 @@ export type GameSetting = {
   // * `previousMatchValue`
   // * The first option `default: true`
   // * The first option
+  // This logic si defined where we set `defaultValue`.
   //
   // If your implement this function, don't forget to return `previousMatchValue` when
   // it is defined, if you want to keep that behaviour!
@@ -53,7 +54,14 @@ export type GameSettings = GameSetting[];
 
 export type GameSettings_ = {
   allIds: string[];
-  byId: Record<string, GameSetting>;
+  byId: Record<
+    string,
+    GameSetting & {
+      // We set this from the `isDefault` option if there is one.
+      // This avoids the need to loop through all the options to find it.
+      defaultValue: string;
+    }
+  >;
 };
 
 /*
@@ -104,7 +112,7 @@ export type GamePlayerSettings = GamePlayerSetting[];
 
 export type GamePlayerSettings_ = {
   allIds: string[];
-  byId: Record<string, GamePlayerSetting>;
+  byId: Record<string, GamePlayerSetting & { defaultValue: string }>;
 };
 
 export type GameStatType =

packages/dev-server/README.md

@@ -0,0 +1 @@
+Development server to help while developing games at [lefun.fun](https://lefun.com).

packages/dev-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lefun/dev-server",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Development server to run games developed for https://lefun.com.",
   "author": "Simon Lemieux",
   "repository": {

packages/dev-server/src/App.tsx

@@ -295,9 +295,9 @@ function MatchSetting({
           });
         }}
       >
-        {options.map(({ value }) => (
+        {options.map(({ value, isDefault }) => (
           <option key={value} value={value}>
-            {value}
+            {value} {isDefault ? " (default)" : ""}
           </option>
         ))}
       </select>
@@ -372,9 +372,9 @@ function MatchPlayerSetting({
           });
         }}
       >
-        {options.map(({ value }) => (
+        {options.map(({ value, isDefault }) => (
           <option key={value} value={value}>
-            {value}
+            {value} {isDefault ? " (default)" : ""}
           </option>
         ))}
       </select>
@@ -796,12 +796,8 @@ const initMatch = ({
     if (gameSettings) {
       matchSettings = Object.fromEntries(
         gameSettings.allIds.map((key) => {
-          for (const { value, isDefault } of gameSettings.byId[key].options) {
-            if (isDefault) {
-              return [key, value];
-            }
-          }
-          return [key, gameSettings.byId[key].options[0].value];
+          const defaultValue = gameSettings.byId[key].defaultValue;
+          return [key, defaultValue];
         }),
       );
     }

packages/game/README.md

@@ -0,0 +1 @@
+Main dependency for writing game logic at [lefun.fun](https://lefun.fun).

packages/game/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lefun/game",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Main dependency for writing game logic at https://lefun.fun.",
   "author": "Simon Lemieux",
   "repository": {

packages/game/src/gameDef.ts

@@ -479,6 +479,36 @@ function normalizeStats(stats: GameStats | undefined): GameStats_ {
   return stats_;
 }
 
+function normalizeSettings(settings: GameSettings): GameSettings_;
+function normalizeSettings(settings: GamePlayerSettings): GamePlayerSettings_;
+function normalizeSettings(settings: GameSettings | GamePlayerSettings) {
+  const newSettings = normalizeArray(settings, "key");
+
+  // Find the default values.
+  for (const key of newSettings.allIds) {
+    const gameSetting = newSettings.byId[key];
+
+    let defaultValue: string | null = null;
+    let numDefault = 0;
+
+    for (const { value, isDefault } of gameSetting.options) {
+      if (isDefault) {
+        defaultValue = value;
+        numDefault++;
+      }
+    }
+
+    if (numDefault > 1) {
+      throw new Error(`multiple default values for game setting ${key}`);
+    }
+
+    (gameSetting as any).defaultValue =
+      defaultValue ?? gameSetting.options[0].value;
+  }
+
+  return newSettings;
+}
+
 /*
  * Parse a @lefun/game game definition into our internal game definition.
  */
@@ -489,8 +519,10 @@ export function parseGame<
 >(game: Game<GS, PMT, BMT>): Game_<GS, PMT, BMT> {
   const playerStats = normalizeStats(game.playerStats);
   const matchStats = normalizeStats(game.matchStats);
-  const gameSettings = normalizeArray(game.gameSettings, "key");
-  const gamePlayerSettings = normalizeArray(game.gamePlayerSettings, "key");
+  const gameSettings =
+    game.gameSettings && normalizeSettings(game.gameSettings);
+  const gamePlayerSettings =
+    game.gamePlayerSettings && normalizeSettings(game.gamePlayerSettings);
 
   return { ...game, playerStats, matchStats, gameSettings, gamePlayerSettings };
 }

packages/game/src/testing.test.ts

@@ -163,6 +163,44 @@ describe("turns", () => {
     match.makeMove(userId, "go", {});
     expect(match.board.expiresAt).toEqual(1000);
   });
+
+  test("double begin turn: only the latest counts", () => {
+    type B = {
+      x: string;
+    };
+    type GS = GameState<B>;
+    const game = {
+      ...gameBase,
+      initialBoards: () => ({ board: { x: "" } }),
+      playerMoves: {
+        add: {
+          executeNow({ board, payload }) {
+            board.x += payload.x;
+          },
+        } as PlayerMove<GS, { x: string }>,
+        begin: {
+          execute({ userId, payload, _ }) {
+            _.turns.begin(userId, {
+              expiresIn: 10,
+              playerMoveOnExpire: ["add", { x: payload.onExpire }],
+            });
+          },
+        } as PlayerMove<GS, { onExpire: string }>,
+      },
+    } satisfies Game<GS>;
+
+    const match = new MatchTester<GS, typeof game>({ game, numPlayers: 1 });
+    const userId = match.meta.players.allIds[0];
+    match.makeMove(userId, "begin", { onExpire: "a" });
+    expect(match.board.x).toBe("");
+    match.fastForward(10);
+    expect(match.board.x).toBe("a");
+
+    match.makeMove(userId, "begin", { onExpire: "b" });
+    match.makeMove(userId, "begin", { onExpire: "c" });
+    match.fastForward(20);
+    expect(match.board.x).toBe("ac");
+  });
 });
 
 describe("fastForward", () => {
@@ -345,7 +383,7 @@ test("end match ends turns", () => {
     initialBoards: () => ({ board: { x: 0 } }),
     playerMoves: {
       go: {
-        execute({ userId, board, _ }) {
+        execute({ userId, _ }) {
           _.turns.begin(userId);
           _.endMatch();
         },

packages/game/src/testing.ts

@@ -399,7 +399,8 @@ export class MatchTester<GS extends GameStateBase, G extends Game<GS>> {
   }) {
     for (const userId of beginTurnUsers) {
       this.meta.players.byId[userId].itsYourTurn = true;
-      // Clear previous turn player moves for that player.
+      // Clear previous turn player moves for that player: in other words only the
+      // lastest `turns.begin` counts for a given player.
       this.delayedMoves = this.delayedMoves.filter(
         ({ userId: otherUserId }) => otherUserId !== userId,
       );

packages/ui-testing/README.md

@@ -0,0 +1 @@
+Utils for testing the UI of games at [lefun.fun](https://lefun.fun).

packages/ui-testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lefun/ui-testing",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Utils for testing the UI of games at https://lefun.fun.",
   "author": "Simon Lemieux",
   "repository": {

packages/ui/README.md

@@ -0,0 +1 @@
+Main dependency for writing the UI of games at [lefun.fun](https://lefun.com).

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lefun/ui",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Main dependency for writing the UI of games at https://lefun.com.",
   "author": "Simon Lemieux",
   "repository": {