fix: Bot compound actions (#109)

* chore(server): path mapping

* fix: bunch of small changes

* test: fixes

* fix: comp action association

* feat: consider ready clients

* feat: first player is ready by default

* fix: issues around failed room start

.eslintrc.cjs

@@ -7,7 +7,6 @@ module.exports = {
     "import/first": "error",
     "import/named": "error",
     "import/no-absolute-path": "error",
-    // "import/no-cycle": "error",
     "import/no-mutable-exports": "error",
     "import/no-self-import": "error",
     "import/no-unused-modules": "error",
@@ -20,8 +19,21 @@ module.exports = {
           order: "asc",
           caseInsensitive: true,
         },
-        // "groups": ["index", "sibling", "parent", "internal", "external", "builtin", "object"],
+        groups: [
+          "builtin",
+          "external",
+          "internal",
+          "parent",
+          "sibling",
+          "index",
+        ],
         "newlines-between": "always",
+        pathGroups: [
+          {
+            pattern: "@/**",
+            group: "internal",
+          },
+        ],
       },
     ],
     "no-extra-semi": "off",

.vscode/settings.json

@@ -8,8 +8,8 @@
   },
   "files.exclude": {
     "**/.turbo": true,
-    "**/lib": true,
-    "**/node_modules": true,
+    // "**/lib": true,
+    // "**/node_modules": true,
     "docs/docs/api/**": true,
     "docs/build/**": true,
     "docs/.docusaurus/**": true

package.json

@@ -57,6 +57,7 @@
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "release-please": "^16.1.0",
+    "resolve-tspaths": "^0.8.19",
     "rollup": "^2.67.2",
     "rollup-plugin-terser": "^7.0.2",
     "ts-jest": "^29.0.3",

packages/client/src/schema/types.ts

@@ -44,7 +44,7 @@ type ObjectSchemaColyBase<T> = {
   onChange: SchemaChangeCallback
   listen<K extends keyof T>(
     propName: K,
-    callback: (value: T[K], previousValue: T[K]) => void
+    callback: (value: T[K], previousValue: T[K]) => void,
   ): () => void
 }
 type _ArrayCollection<T extends Array<any>> =
@@ -115,7 +115,7 @@ interface EntityParentNode {
  * Root game state
  */
 export type ClientGameStateProps = {
-  clients: string[]
+  clients: GameClientDefinition[]
 
   currentPlayerIdx?: number
   isGameStarted: boolean
@@ -169,13 +169,13 @@ export function isDefinitionOfMapSchema(o: unknown): o is MapSchemaDefinition {
 }
 
 export function isDefinitionOfArraySchema(
-  o: unknown
+  o: unknown,
 ): o is ArraySchemaDefinition {
   return typeof o === "object" && o !== null && "array" in o
 }
 
 export function isDefinitionOfPrimitivesCollection(
-  o: unknown
+  o: unknown,
 ): o is CollectionOfPrimitivesDefinition {
   if (isDefinitionOfMapSchema(o)) {
     return typeof o.map === "string"
@@ -186,7 +186,7 @@ export function isDefinitionOfPrimitivesCollection(
 }
 
 export function isDefinitionOfObjectsCollection(
-  o: unknown
+  o: unknown,
 ): o is CollectionOfObjectsDefinition {
   if (isDefinitionOfMapSchema(o)) {
     return isDefinitionOfSchema(o.map)

packages/server/jest.config.cjs

@@ -1,7 +1,17 @@
 const base = require("@cardsgame/base-configs/jest.config.cjs")
+const { pathsToModuleNameMapper } = require("ts-jest")
 
+const { compilerOptions } = require("./tsconfig.json")
+
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   ...base,
   displayName: "server",
   setupFiles: ["./testSetup.ts"],
+  modulePaths: [compilerOptions.baseUrl], // <-- This will be set to 'baseUrl' value
+  // modulePaths: [`<rootDir>/packages/server/${compilerOptions.baseUrl}`],
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
+    // prefix: "<rootDir>/src/",
+    useESM: true,
+  }),
 }

packages/server/package.json

@@ -21,8 +21,8 @@
   ],
   "scripts": {
     "build": "concurrently npm:build:esm npm:build:cjs",
-    "build:esm": "tsc -p tsconfig.build.json",
-    "build:cjs": "tsc -p tsconfig.build.cjs.json && ../../scripts/mapToCjs.sh ./lib/cjs",
+    "build:esm": "tsc -p tsconfig.build.json && resolve-tspaths -p tsconfig.build.json && resolve-tspaths -p tsconfig.build.json -o ./lib/types/",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json && resolve-tspaths -p tsconfig.build.cjs.json && ../../scripts/mapToCjs.sh ./lib/cjs",
     "build:watch": "echo \"only for ESM!\" && tsc -p tsconfig.build.json --watch",
     "test": "jest",
     "test:watch": "jest --watch"

packages/server/src/__test__/helpers/dumbEntities.ts

@@ -1,9 +1,9 @@
-import { canBeChild } from "../../annotations/canBeChild.js"
-import { containsChildren } from "../../annotations/containsChildren.js"
-import { ChildTrait } from "../../traits/child.js"
-import { applyTraitsMixins, Entity } from "../../traits/entity.js"
-import { IdentityTrait } from "../../traits/identity.js"
-import { ParentTrait } from "../../traits/parent.js"
+import { canBeChild } from "@/annotations/canBeChild.js"
+import { containsChildren } from "@/annotations/containsChildren.js"
+import { ChildTrait } from "@/traits/child.js"
+import { applyTraitsMixins, Entity } from "@/traits/entity.js"
+import { IdentityTrait } from "@/traits/identity.js"
+import { ParentTrait } from "@/traits/parent.js"
 
 @canBeChild
 @containsChildren

packages/server/src/__test__/helpers/labeledEntities.ts

@@ -1,10 +1,10 @@
-import { canBeChild } from "../../annotations/canBeChild.js"
-import { containsChildren } from "../../annotations/containsChildren.js"
-import { ChildTrait } from "../../traits/child.js"
-import { applyTraitsMixins, Entity } from "../../traits/entity.js"
-import { IdentityTrait } from "../../traits/identity.js"
-import { LabelTrait } from "../../traits/label.js"
-import { ParentTrait } from "../../traits/parent.js"
+import { canBeChild } from "@/annotations/canBeChild.js"
+import { containsChildren } from "@/annotations/containsChildren.js"
+import { ChildTrait } from "@/traits/child.js"
+import { applyTraitsMixins, Entity } from "@/traits/entity.js"
+import { IdentityTrait } from "@/traits/identity.js"
+import { LabelTrait } from "@/traits/label.js"
+import { ParentTrait } from "@/traits/parent.js"
 
 @canBeChild
 @containsChildren

packages/server/src/__test__/helpers/ownableEntities.ts

@@ -1,10 +1,10 @@
-import { canBeChild } from "../../annotations/canBeChild.js"
-import { containsChildren } from "../../annotations/containsChildren.js"
-import { ChildTrait } from "../../traits/child.js"
-import { applyTraitsMixins, Entity } from "../../traits/entity.js"
-import { IdentityTrait } from "../../traits/identity.js"
-import { OwnershipTrait } from "../../traits/ownership.js"
-import { ParentTrait } from "../../traits/parent.js"
+import { canBeChild } from "@/annotations/canBeChild.js"
+import { containsChildren } from "@/annotations/containsChildren.js"
+import { ChildTrait } from "@/traits/child.js"
+import { applyTraitsMixins, Entity } from "@/traits/entity.js"
+import { IdentityTrait } from "@/traits/identity.js"
+import { OwnershipTrait } from "@/traits/ownership.js"
+import { ParentTrait } from "@/traits/parent.js"
 
 @canBeChild
 @containsChildren

packages/server/src/__helpers__/room.ts → packages/server/src/__test__/helpers/room.ts

@@ -1,6 +1,6 @@
 import { noop } from "@cardsgame/utils"
 
-import { defineRoom } from "../room/defineRoom.js"
+import { defineRoom } from "@/room/defineRoom.js"
 
 const TestRoom = defineRoom("TestRoom", {
   onPlayerTurnEnded: jest.fn(),

packages/server/src/__test__/helpers/selectableParent.ts

@@ -1,10 +1,10 @@
-import { canBeChild } from "../../annotations/canBeChild.js"
-import { containsChildren } from "../../annotations/containsChildren.js"
-import { ChildTrait } from "../../traits/child.js"
-import { applyTraitsMixins, Entity } from "../../traits/entity.js"
-import { IdentityTrait } from "../../traits/identity.js"
-import { ParentTrait } from "../../traits/parent.js"
-import { SelectableChildrenTrait } from "../../traits/selectableChildren.js"
+import { canBeChild } from "@/annotations/canBeChild.js"
+import { containsChildren } from "@/annotations/containsChildren.js"
+import { ChildTrait } from "@/traits/child.js"
+import { applyTraitsMixins, Entity } from "@/traits/entity.js"
+import { IdentityTrait } from "@/traits/identity.js"
+import { ParentTrait } from "@/traits/parent.js"
+import { SelectableChildrenTrait } from "@/traits/selectableChildren.js"
 
 @canBeChild
 @containsChildren

packages/server/src/__test__/helpers/smartEntities.ts

@@ -1,14 +1,14 @@
 import { def } from "@cardsgame/utils"
 
-import { canBeChild } from "../../annotations/canBeChild.js"
-import { containsChildren } from "../../annotations/containsChildren.js"
-import type { State } from "../../state/state.js"
-import { ChildTrait } from "../../traits/child.js"
-import { applyTraitsMixins, Entity } from "../../traits/entity.js"
-import { IdentityTrait } from "../../traits/identity.js"
-import { LabelTrait } from "../../traits/label.js"
-import { OwnershipTrait } from "../../traits/ownership.js"
-import { ParentTrait } from "../../traits/parent.js"
+import { canBeChild } from "@/annotations/canBeChild.js"
+import { containsChildren } from "@/annotations/containsChildren.js"
+import type { State } from "@/state/state.js"
+import { ChildTrait } from "@/traits/child.js"
+import { applyTraitsMixins, Entity } from "@/traits/entity.js"
+import { IdentityTrait } from "@/traits/identity.js"
+import { LabelTrait } from "@/traits/label.js"
+import { OwnershipTrait } from "@/traits/ownership.js"
+import { ParentTrait } from "@/traits/parent.js"
 
 @canBeChild
 @containsChildren