Add support for gameData in dev-server

Author: simlmx

packages/dev-server/package.json

@@ -28,7 +28,8 @@
     "compile": "rollup --config",
     "watch": "rollup --config --watch",
     "format": "pnpm exec eslint . --fix",
-    "check-format": "pnpm exec eslint . --quiet"
+    "check-format": "pnpm exec eslint . --quiet",
+    "test": "pnpm vitest run src"
   },
   "devDependencies": {
     "@lefun/core": "workspace:*",
@@ -53,7 +54,8 @@
     "rollup": "^4.15.0",
     "rollup-plugin-postcss": "^4.0.0",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.5.2"
+    "typescript": "^5.5.2",
+    "vitest": "^1.2.1"
   },
   "peerDependencies": {
     "@lefun/core": "workspace:*",

packages/dev-server/src/App.tsx

@@ -120,7 +120,8 @@ const BoardForPlayer = <B, PB>({
               playerboard: playerboard as PB,
               payload,
               delayMove: () => {
-                throw new Error("delayMove not implemented yet");
+                console.warn("delayMove not implemented yet");
+                return { ts: 0 };
               },
             });
           });
@@ -378,10 +379,12 @@ function Main<B, PB = EmptyObject, SB = EmptyObject>({
   gameDef,
   matchSettings,
   matchData,
+  gameData,
 }: {
   gameDef: GameDef<B, PB, SB>;
   matchSettings: MatchSettings;
   matchData?: any;
+  gameData?: any;
 }) {
   const locale = useStore((state) => state.locale);
   const layout = useStore((state) => state.layout);
@@ -436,6 +439,7 @@ function Main<B, PB = EmptyObject, SB = EmptyObject>({
           matchSettings,
           matchPlayersSettings,
           matchData,
+          gameData,
           players,
           locale,
         });
@@ -445,7 +449,7 @@ function Main<B, PB = EmptyObject, SB = EmptyObject>({
       (window as any).lefun.match = matchRef.current;
       saveMatch(match);
     },
-    [gameDef, matchData, matchSettings],
+    [gameDef, matchData, gameData, matchSettings],
   );
 
   const firstRender = useRef(true);
@@ -524,13 +528,15 @@ async function render<B, PB = EmptyObject, SB = EmptyObject>({
   board,
   matchSettings = {},
   matchData,
+  gameData,
   idName = "home",
   messages = { en: {} },
 }: {
   gameDef: GameDef<B, PB, SB>;
   board: () => Promise<ReactNode>;
   matchSettings?: MatchSettings;
   matchData?: any;
+  gameData?: any;
   idName?: string;
   messages?: AllMessages;
 }) {
@@ -573,6 +579,7 @@ async function render<B, PB = EmptyObject, SB = EmptyObject>({
       gameDef={gameDef}
       matchSettings={matchSettings}
       matchData={matchData}
+      gameData={gameData}
     />
   );
 

packages/dev-server/src/match.test.ts

@@ -0,0 +1,119 @@
+import { enablePatches, produceWithPatches } from "immer";
+import { expect, test } from "vitest";
+
+import { separatePatchesByUser } from "./match";
+
+enablePatches();
+
+/* Compare two arrays, ignoring order. */
+function expectArraysEqual<T>(a: T[], b: T[]) {
+  expect(a.length).toBe(b.length);
+  for (const aa of a) {
+    expect(b).toContainEqual(aa);
+  }
+}
+
+test("separatePatchesByUser", () => {
+  const matchState = {
+    board: { x: 123 },
+    playerboards: {
+      user1: { x: 123 },
+      user2: { x: 123 },
+    },
+  };
+
+  const [, patches] = produceWithPatches(matchState, (draft) => {
+    draft.board = { x: 456 };
+    draft.playerboards.user1 = { x: 456 };
+    draft.playerboards.user2 = { x: 456 };
+  });
+
+  expectArraysEqual(patches, [
+    {
+      op: "replace",
+      path: ["playerboards", "user1"],
+      value: { x: 456 },
+    },
+    {
+      op: "replace",
+      path: ["playerboards", "user2"],
+      value: { x: 456 },
+    },
+    {
+      op: "replace",
+      path: ["board"],
+      value: { x: 456 },
+    },
+  ]);
+
+  // Without ignoreUserId
+  {
+    const patchesByUser = {
+      user1: [],
+      user2: [],
+    };
+
+    separatePatchesByUser({
+      patches,
+      userIds: ["user1", "user2"],
+      ignoreUserId: null,
+      patchesOut: patchesByUser,
+    });
+
+    expectArraysEqual(patchesByUser["user1"], [
+      {
+        op: "replace",
+        path: ["board"],
+        value: { x: 456 },
+      },
+      {
+        op: "replace",
+        path: ["playerboard"],
+        value: { x: 456 },
+      },
+    ]);
+
+    expectArraysEqual(patchesByUser["user2"], [
+      {
+        op: "replace",
+        path: ["board"],
+        value: { x: 456 },
+      },
+      {
+        op: "replace",
+        path: ["playerboard"],
+        value: { x: 456 },
+      },
+    ]);
+  }
+
+  // With ignoreUserId
+  {
+    const patchesByUser = {
+      user1: [],
+      user2: [],
+    };
+
+    separatePatchesByUser({
+      patches,
+      userIds: ["user1", "user2"],
+      ignoreUserId: "user1",
+      patchesOut: patchesByUser,
+    });
+
+    expectArraysEqual(patchesByUser["user1"], []);
+
+    expectArraysEqual(patchesByUser["user2"], [
+      {
+        op: "replace",
+        path: ["board"],
+        value: { x: 456 },
+      },
+      {
+        op: "replace",
+        path: ["playerboard"],
+        value: { x: 456 },
+      },
+    ]);
+  }
+});