Added lerna support

Author: serbanghita

.github/workflows/glhf-ecs.yml

@@ -9,10 +9,6 @@ on:
   pull_request:
     branches: [ "main" ]
 
-defaults:
-  run:
-    working-directory: ./packages/glhf-ecs
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -29,7 +25,6 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-        cache-dependency-path: ./packages/glhf-ecs/package-lock.json
     - run: npm ci
     #- run: npm run build --if-present
-    - run: npm test
+    - run: lerna run test

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .tmp
 node_modules
+.nx/cache
 packages/glhf-demo/assets/*
 /packages/glhf-demo/build
 /packages/glhf-demo/src/assets/sprites/kil.png

lerna.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
+  "version": "0.0.0"
+}

nx.json

@@ -0,0 +1,13 @@
+{
+  "targetDefaults": {},
+  "namedInputs": {
+    "default": [
+      "{projectRoot}/**/*",
+      "sharedGlobals"
+    ],
+    "sharedGlobals": [],
+    "production": [
+      "default"
+    ]
+  }
+}

package.json

@@ -0,0 +1,11 @@
+{
+  "name": "glhf",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
+  "dependencies": {},
+  "devDependencies": {
+    "lerna": "^8.1.2"
+  }
+}

packages/glhf-assets/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified for glhf-assets yet.\""
   },
   "author": "",
   "license": "ISC"

packages/glhf-component/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "glhf-entity",
+  "name": "glhf-component",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified for glhf-component yet.\""
   },
   "author": "Serban Ghita",
   "license": "MIT"

packages/glhf-demo/package.json

@@ -4,7 +4,8 @@
   "description": "",
   "scripts": {
     "build": "webpack --mode development",
-    "dev": "webpack serve --mode development"
+    "dev": "webpack serve --mode development",
+    "test": "echo \"Error: no test specified for glhf-demo yet.\""
   },
   "author": "Serban Ghita",
   "license": "ISC",

packages/glhf-ecs/src/Entity.ts

@@ -1,14 +1,14 @@
 import Component from "./Component";
-import {addBit, hasBit, removeBit} from "../../glhf-bitmask/src/bitmask";
+import {addBit, hasBit, removeBit} from "@glhf/bitmask/bitmask";
 import World from "./World";
-import StateManager from "../../glhf-fsm/src/StateManager";
 
 export default class Entity {
+    // Bitmask for storing Entity's components.
     public componentsBitmask = 0n;
     // Cache of Component instances.
     public components = new Map<string, Component>();
 
-    constructor(public world: World, public fsm: StateManager, public id: string) {}
+    constructor(public world: World, public id: string) {}
 
     public addComponent<T extends typeof Component>(declaration: T, properties: Record<string, any> = {}): Entity
     {

packages/glhf-ecs/src/World.ts

@@ -2,8 +2,7 @@ import Entity from "./Entity";
 import System from "./System";
 import Query, {IQueryFilters} from "./Query";
 import Component from "./Component";
-import { hasBit } from "../../glhf-bitmask/src/bitmask";
-import StateManager from "../../glhf-fsm/src/StateManager";
+import { hasBit } from "@glhf/bitmask/bitmask";
 import ComponentRegistry from "./ComponentRegistry";
 
 export default class World {
@@ -48,7 +47,7 @@ export default class World {
             throw new Error(`Entity with the id "${id}" already exists.`);
         }
 
-        const entity = new Entity(this, new StateManager(), id);
+        const entity = new Entity(this, id);
 
         this.entities.set(entity.id, entity);
         this.notifyQueriesOfEntityCandidacy(entity);

packages/glhf-fsm/src/StateManager.test.ts

@@ -128,7 +128,7 @@ describe('StateManager', () => {
         sm.unregisterStateWithName('idle');
 
         expect(() => sm.getState('idle')).toThrowError('Requested state idle is not registered.');
-        expect(() => sm.getDefaultState()).toThrowError('No "default" state has been set.');
+            expect(() => sm.getDefaultState()).toThrowError('No "default" state has been set.');
         expect(() => sm.getCurrentState()).toThrowError('No "current" state has been set yet.');
     });
 

packages/glhf-fsm/src/StateManager.ts

@@ -49,7 +49,12 @@ export default class StateManager {
     }
 
     public unregisterStateWithName(stateName: string) {
+        const state = this.states.get(stateName);
+        if (!state) { return; }
         this.states.delete(stateName);
+        if (this.defaultState?.id === state.id) {
+            this.defaultState = undefined;
+        }
     }
 
     public queueState(id: string, ...args: any[]): StateManager {

packages/glhf-input/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified for glhf-input yet.\""
   },
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.33.1",

packages/glhf-renderer/package.json

@@ -5,7 +5,7 @@
     "tsc": "tsc",
     "build": "webpack --mode development",
     "dev": "webpack --mode development --watch",
-    "test": "jest"
+    "test": "echo \"Error: no test specified for glhf-renderer yet.\""
   },
   "author": "Serban Ghita",
   "license": "MIT",