@civ-clone/core-treasury 0.1.6 → 0.1.8

package/.github/workflows/build-on-push.yml

@@ -6,9 +6,34 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
-          node-version: 12
-      - run: npm install
-      - run: npm run prettier:check
+          version: 11
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      # No lock file, so this tests what a consumer resolves. The settings match
+      # web-renderer's pnpm-workspace.yaml: several @civ-clone packages depend on
+      # each other as `github:` URLs, this project's own releases are often only
+      # minutes old, and nothing here needs a dependency's build script.
+      - run: >-
+          pnpm install --no-frozen-lockfile
+          --config.block-exotic-subdeps=false
+          --config.minimum-release-age=0
+          --config.strict-dep-builds=false
+      - run: npm run --if-present prettier:check
+      # The tests load the committed `.js`, so compile to prove the source
+      # type-checks, and fail if the committed output is stale. `--force`
+      # because a fresh checkout's timestamps can make `tsc --build` treat the
+      # committed output as up to date and skip the compile entirely.
+      - run: npm run --if-present ts:compile -- --force
+      - run: npm run --if-present prettier:format
+      # Stale *or never committed* output fails: `git diff` alone misses a new
+      # module whose `.js` was never added, which the published package would
+      # then omit. Only the compiled extensions, so the lock file the install
+      # writes cannot fail it; `node_modules` is ignored, so it stays out.
+      - run: |
+          git status --short --untracked-files=all -- '*.js' '*.d.ts' '*.js.map'
+          test -z "$(git status --porcelain --untracked-files=all -- '*.js' '*.d.ts' '*.js.map')"
+      - run: npm run --if-present test

package/PlayerTreasury.js

@@ -25,8 +25,11 @@ class PlayerTreasury extends DataObject_1.default {
         this._value += value;
     }
     buy(city) {
-        const cityBuild = this._cityBuildRegistry.getByCity(city), [spendCost] = this.cost(city).filter((spendCost) => spendCost.resource() === this._yield), cost = spendCost.value();
-        if (city.player() !== this._player || this.value() < cost) {
+        const cityBuild = this._cityBuildRegistry.getByCity(city), [spendCost] = this.cost(city).filter((spendCost) => spendCost.resource() === this._yield), cost = spendCost === null || spendCost === void 0 ? void 0 : spendCost.value();
+        // Nothing to buy when the rules give no price in this treasury's yield.
+        if (cost === undefined ||
+            city.player() !== this._player ||
+            this.value() < cost) {
             return;
         }
         this._ruleRegistry.process(Rush_1.default, cityBuild, spendCost);
@@ -47,7 +50,7 @@ class PlayerTreasury extends DataObject_1.default {
     }
     subtract(value) {
         if (value instanceof Yield_1.default) {
-            this.add(value.value());
+            this.subtract(value.value());
             return;
         }
         this._value -= value;

package/PlayerTreasury.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;AAAA,oFAGsD;AACtD,oEAG2C;AAE3C,uEAAgE;AAEhE,yCAAkC;AAElC,uDAAgD;AAChD,uCAAgC;AAYhC,MAAa,cAAe,SAAQ,oBAAU;IAQ5C,YACE,MAAc,EACd,SAAuB,EACvB,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QATF,WAAM,GAAW,CAAC,CAAC;QAWzB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAExB,OAAO;SACR;QAED,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAClC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,MAAM,CACpD,EACD,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;YACzD,OAAO;SACR;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,cAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvD,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,KAAqB;QAC5B,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAExB,OAAO;SACR;QAED,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;;AApFH,wCAqFC;AApFiB,wBAAS,GAAG,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;AAsFtE,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;AAAA,oFAGsD;AACtD,oEAG2C;AAE3C,uEAAgE;AAEhE,yCAAkC;AAElC,uDAAgD;AAChD,uCAAgC;AAYhC,MAAa,cAAe,SAAQ,oBAAU;IAQ5C,YACE,MAAc,EACd,SAAuB,EACvB,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QATF,WAAM,GAAW,CAAC,CAAC;QAWzB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAExB,OAAO;SACR;QAED,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAClC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,MAAM,CACpD,EACD,IAAI,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,EAAE,CAAC;QAE5B,wEAAwE;QACxE,IACE,IAAI,KAAK,SAAS;YAClB,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,OAAO;YAC9B,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EACnB;YACA,OAAO;SACR;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,cAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvD,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,KAAqB;QAC5B,IAAI,KAAK,YAAY,eAAK,EAAE;YAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAE7B,OAAO;SACR;QAED,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;IACvB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;;AAzFH,wCA0FC;AAzFiB,wBAAS,GAAG,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;AA2FtE,kBAAe,cAAc,CAAC"}

package/PlayerTreasury.ts

@@ -63,9 +63,14 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
       [spendCost] = this.cost(city).filter(
         (spendCost) => spendCost.resource() === this._yield
       ),
-      cost = spendCost.value();
-
-    if (city.player() !== this._player || this.value() < cost) {
+      cost = spendCost?.value();
+
+    // Nothing to buy when the rules give no price in this treasury's yield.
+    if (
+      cost === undefined ||
+      city.player() !== this._player ||
+      this.value() < cost
+    ) {
       return;
     }
 
@@ -94,7 +99,7 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
 
   subtract(value: Yield | number): void {
     if (value instanceof Yield) {
-      this.add(value.value());
+      this.subtract(value.value());
 
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/core-treasury",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/core-treasury.git",
   "keywords": [
@@ -12,12 +12,21 @@
   "private": false,
   "scripts": {
     "build": "npm run ts:compile && npm run prettier:format",
-    "prettier:check": "prettier --config .prettierrc '**/*.ts'",
+    "prettier:check": "prettier --config .prettierrc --check '**/*.ts'",
     "prettier:format": "prettier --config .prettierrc '**/*.ts' --write",
+    "test": "ts-mocha ./tests/*.test.ts",
+    "test:coverage": "c8 ts-mocha ./tests/*.test.ts",
     "ts:compile": "tsc --build tsconfig.json"
   },
   "devDependencies": {
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.0",
+    "@types/node": "^16.0",
+    "c8": "^7.3",
+    "chai": "^4.2",
+    "mocha": "^9.0",
     "prettier": "^2.1.2",
+    "ts-mocha": "^9.0",
     "typescript": "^4.0.3"
   },
   "dependencies": {

package/tests/PlayerTreasury.test.ts

@@ -0,0 +1,78 @@
+import City from '@civ-clone/core-city/City';
+import CityBuild from '@civ-clone/core-city-build/CityBuild';
+import CityBuildRegistry from '@civ-clone/core-city-build/CityBuildRegistry';
+import Player from '@civ-clone/core-player/Player';
+import PlayerTreasury from '../PlayerTreasury';
+import RuleRegistry from '@civ-clone/core-rule/RuleRegistry';
+import Yield from '@civ-clone/core-yield/Yield';
+import { expect } from 'chai';
+
+describe('PlayerTreasury', () => {
+  const treasury = (value: number): PlayerTreasury => {
+    const playerTreasury = new PlayerTreasury(new Player(), Yield);
+
+    playerTreasury.set(value);
+
+    return playerTreasury;
+  };
+
+  it('adds a number or a Yield', () => {
+    const fromNumber = treasury(50),
+      fromYield = treasury(50);
+
+    fromNumber.add(10);
+    fromYield.add(new Yield(10));
+
+    expect(fromNumber.value()).to.equal(60);
+    expect(fromYield.value()).to.equal(60);
+  });
+
+  it('subtracts a number or a Yield', () => {
+    const fromNumber = treasury(50),
+      fromYield = treasury(50);
+
+    fromNumber.subtract(10);
+    fromYield.subtract(new Yield(10));
+
+    expect(fromNumber.value()).to.equal(40);
+    expect(fromYield.value()).to.equal(40);
+  });
+
+  it('sets a number or a Yield', () => {
+    const fromNumber = treasury(50),
+      fromYield = treasury(50);
+
+    fromNumber.set(5);
+    fromYield.set(new Yield(5));
+
+    expect(fromNumber.value()).to.equal(5);
+    expect(fromYield.value()).to.equal(5);
+  });
+
+  it("doesn't buy, or throw, when the rules give no price", () => {
+    const player = new Player(),
+      city = { player: () => player } as unknown as City;
+    let added = false;
+
+    const cityBuild = {
+        city: () => city,
+        remaining: () => 10,
+        add: () => (added = true),
+      } as unknown as CityBuild,
+      cityBuildRegistry = {
+        getByCity: () => cityBuild,
+      } as unknown as CityBuildRegistry,
+      playerTreasury = new PlayerTreasury(
+        player,
+        Yield,
+        cityBuildRegistry,
+        new RuleRegistry()
+      );
+
+    playerTreasury.set(100);
+
+    expect(() => playerTreasury.buy(city)).not.to.throw();
+    expect(playerTreasury.value()).to.equal(100);
+    expect(added).to.equal(false);
+  });
+});