@civ-clone/core-treasury 0.1.1 → 0.1.3

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

@@ -10,6 +10,5 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 12
-      - run: yarn install
-      - run: yarn prettier:check
-#      - run: yarn test
+      - run: npm install
+      - run: npm run prettier:check

package/PlayerTreasury.js

@@ -1,18 +1,16 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _player, _ruleRegistry, _cityBuildRegistry;
+var _PlayerTreasury_player, _PlayerTreasury_ruleRegistry, _PlayerTreasury_cityBuildRegistry;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayerTreasury = void 0;
 const CityBuildRegistry_1 = require("@civ-clone/core-city-build/CityBuildRegistry");
@@ -22,16 +20,16 @@ const Yield_1 = require("@civ-clone/core-yield/Yield");
 class PlayerTreasury extends Yield_1.default {
     constructor(player, cityBuildRegistry = CityBuildRegistry_1.instance, ruleRegistry = RuleRegistry_1.instance) {
         super();
-        _player.set(this, void 0);
-        _ruleRegistry.set(this, void 0);
-        _cityBuildRegistry.set(this, void 0);
-        __classPrivateFieldSet(this, _player, player);
-        __classPrivateFieldSet(this, _ruleRegistry, ruleRegistry);
-        __classPrivateFieldSet(this, _cityBuildRegistry, cityBuildRegistry);
+        _PlayerTreasury_player.set(this, void 0);
+        _PlayerTreasury_ruleRegistry.set(this, void 0);
+        _PlayerTreasury_cityBuildRegistry.set(this, void 0);
+        __classPrivateFieldSet(this, _PlayerTreasury_player, player, "f");
+        __classPrivateFieldSet(this, _PlayerTreasury_ruleRegistry, ruleRegistry, "f");
+        __classPrivateFieldSet(this, _PlayerTreasury_cityBuildRegistry, cityBuildRegistry, "f");
     }
     buy(city) {
-        const cityBuild = __classPrivateFieldGet(this, _cityBuildRegistry).getByCity(city), cost = this.cost(city);
-        if (city.player() !== __classPrivateFieldGet(this, _player) || this.value() < cost.value()) {
+        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), cost = this.cost(city);
+        if (city.player() !== __classPrivateFieldGet(this, _PlayerTreasury_player, "f") || this.value() < cost.value()) {
             return;
         }
         // TODO: do this via Rules and then use Production
@@ -39,17 +37,19 @@ class PlayerTreasury extends Yield_1.default {
         this.subtract(cost.value());
     }
     cost(city) {
-        const cityBuild = __classPrivateFieldGet(this, _cityBuildRegistry).getByCity(city), 
-        // TODO: do this via Rules and then use Gold
-        cost = new Yield_1.default();
-        __classPrivateFieldGet(this, _ruleRegistry).process(Spend_1.Spend, cityBuild, cost);
-        return cost;
+        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), cost = new Yield_1.default();
+        return __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f")
+            .process(Spend_1.default, cityBuild, cost)
+            .reduce((totalYield, currentYield) => {
+            totalYield.add(currentYield);
+            return totalYield;
+        });
     }
     player() {
-        return __classPrivateFieldGet(this, _player);
+        return __classPrivateFieldGet(this, _PlayerTreasury_player, "f");
     }
 }
 exports.PlayerTreasury = PlayerTreasury;
-_player = new WeakMap(), _ruleRegistry = new WeakMap(), _cityBuildRegistry = new WeakMap();
+_PlayerTreasury_player = new WeakMap(), _PlayerTreasury_ruleRegistry = new WeakMap(), _PlayerTreasury_cityBuildRegistry = new WeakMap();
 exports.default = PlayerTreasury;
 //# sourceMappingURL=PlayerTreasury.js.map

package/PlayerTreasury.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oFAGsD;AACtD,oEAG2C;AAC3C,yCAAsD;AAGtD,uDAAgD;AAQhD,MAAa,cAAe,SAAQ,eAAK;IAKvC,YACE,MAAc,EACd,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QATV,0BAAgB;QAChB,gCAA4B;QAC5B,qCAAsC;QASpC,uBAAA,IAAI,WAAW,MAAM,EAAC;QACtB,uBAAA,IAAI,iBAAiB,YAAY,EAAC;QAClC,uBAAA,IAAI,sBAAsB,iBAAiB,EAAC;IAC9C,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,iDAAwB,SAAS,CAAC,IAAI,CAAC,EACvD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE,0CAAiB,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO;SACR;QAED,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,iDAAwB,SAAS,CAAC,IAAI,CAAC;QACvD,4CAA4C;QAC5C,IAAI,GAAG,IAAI,eAAK,EAAE,CAAC;QACpB,2CAAqC,CAAC,OAAO,CAAC,aAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM;QACJ,6CAAoB;IACtB,CAAC;CACF;AA1CD,wCA0CC;;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"PlayerTreasury.js","sourceRoot":"","sources":["PlayerTreasury.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAGsD;AACtD,oEAG2C;AAG3C,yCAAkC;AAClC,uDAAgD;AAQhD,MAAa,cAAe,SAAQ,eAAK;IAKvC,YACE,MAAc,EACd,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QATV,yCAAgB;QAChB,+CAA4B;QAC5B,oDAAsC;QASpC,uBAAA,IAAI,0BAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,gCAAiB,YAAY,MAAA,CAAC;QAClC,uBAAA,IAAI,qCAAsB,iBAAiB,MAAA,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,uBAAA,IAAI,8BAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO;SACR;QAED,kDAAkD;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,eAAK,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EACvD,IAAI,GAAG,IAAI,eAAK,EAAE,CAAC;QAErB,OAAO,uBAAA,IAAI,oCAAc;aACtB,OAAO,CAAC,eAAK,EAAE,SAAS,EAAE,IAAI,CAAC;aAC/B,MAAM,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;YACnC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE7B,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM;QACJ,OAAO,uBAAA,IAAI,8BAAQ,CAAC;IACtB,CAAC;CACF;AA/CD,wCA+CC;;AAED,kBAAe,cAAc,CAAC"}

package/PlayerTreasury.ts

@@ -6,9 +6,9 @@ import {
   RuleRegistry,
   instance as ruleRegistryInstance,
 } from '@civ-clone/core-rule/RuleRegistry';
-import { Spend, ISpendRegistry } from './Rules/Spend';
 import City from '@civ-clone/core-city/City';
 import Player from '@civ-clone/core-player/Player';
+import Spend from './Rules/Spend';
 import Yield from '@civ-clone/core-yield/Yield';
 
 export interface IPlayerTreasury {
@@ -37,6 +37,7 @@ export class PlayerTreasury extends Yield implements IPlayerTreasury {
   buy(city: City): void {
     const cityBuild = this.#cityBuildRegistry.getByCity(city),
       cost = this.cost(city);
+
     if (city.player() !== this.#player || this.value() < cost.value()) {
       return;
     }
@@ -49,11 +50,15 @@ export class PlayerTreasury extends Yield implements IPlayerTreasury {
 
   cost(city: City): Yield {
     const cityBuild = this.#cityBuildRegistry.getByCity(city),
-      // TODO: do this via Rules and then use Gold
       cost = new Yield();
-    (this.#ruleRegistry as ISpendRegistry).process(Spend, cityBuild, cost);
 
-    return cost;
+    return this.#ruleRegistry
+      .process(Spend, cityBuild, cost)
+      .reduce((totalYield, currentYield) => {
+        totalYield.add(currentYield);
+
+        return totalYield;
+      });
   }
 
   player(): Player {

package/PlayerTreasuryRegistry.d.ts

@@ -9,7 +9,8 @@ interface IPlayerTreasuryRegistry extends IEntityRegistry<PlayerTreasury> {
 }
 export declare class PlayerTreasuryRegistry
   extends EntityRegistry<PlayerTreasury>
-  implements IPlayerTreasuryRegistry {
+  implements IPlayerTreasuryRegistry
+{
   constructor();
   getByPlayer(player: Player): PlayerTreasury;
 }

package/PlayerTreasuryRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerTreasuryRegistry.js","sourceRoot":"","sources":["PlayerTreasuryRegistry.ts"],"names":[],"mappings":";;;AAAA,4EAGiD;AAEjD,qDAA8C;AAM9C,MAAa,sBACX,SAAQ,+BAA8B;IAEtC;QACE,KAAK,CAAC,wBAAc,CAAC,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEtD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;SACrE;QAED,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AAhBD,wDAgBC;AAEY,QAAA,QAAQ,GAA2B,IAAI,sBAAsB,EAAE,CAAC;AAE7E,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"PlayerTreasuryRegistry.js","sourceRoot":"","sources":["PlayerTreasuryRegistry.ts"],"names":[],"mappings":";;;AAAA,4EAGiD;AAEjD,qDAA8C;AAM9C,MAAa,sBACX,SAAQ,+BAA8B;IAGtC;QACE,KAAK,CAAC,wBAAc,CAAC,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEtD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;SACrE;QAED,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AAjBD,wDAiBC;AAEY,QAAA,QAAQ,GAA2B,IAAI,sBAAsB,EAAE,CAAC;AAE7E,kBAAe,sBAAsB,CAAC"}

package/PlayerTreasuryRegistry.ts

@@ -11,7 +11,8 @@ interface IPlayerTreasuryRegistry extends IEntityRegistry<PlayerTreasury> {
 
 export class PlayerTreasuryRegistry
   extends EntityRegistry<PlayerTreasury>
-  implements IPlayerTreasuryRegistry {
+  implements IPlayerTreasuryRegistry
+{
   constructor() {
     super(PlayerTreasury);
   }

package/README.md

@@ -1,4 +1,11 @@
 # core-treasury
 
-This is a template repo.
+Classes related to the concept of a `Player` having a treasury of a `Yield`.
 
+This could probably benefit from a bit of a rewrite having multiple stores of `Yield`s (`Gold`, `Faith`, etc) that can
+be spent.
+
+It would also be nice to separate out the concepts of "buy" and "rush". This would also enable the (Civ 2?) concept of
+sacrificing population to build items quickly.
+
+Would be nice to add some core unit tests here too.

package/Rules/Spend.d.ts

@@ -1,9 +1,5 @@
 import CityBuild from '@civ-clone/core-city-build/CityBuild';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import Rule from '@civ-clone/core-rule/Rule';
 import Yield from '@civ-clone/core-yield/Yield';
-declare type SpendArgs = [CityBuild, Yield];
-export declare class Spend extends Rule<SpendArgs, Yield> {}
+export declare class Spend extends Rule<[CityBuild, Yield], Yield> {}
 export default Spend;
-export interface ISpendRegistry
-  extends IRuleRegistry<Spend, SpendArgs, Yield> {}

package/Rules/Spend.js.map

@@ -1 +1 @@
-{"version":3,"file":"Spend.js","sourceRoot":"","sources":["Spend.ts"],"names":[],"mappings":";;;AAEA,oDAA6C;AAK7C,MAAa,KAAM,SAAQ,cAAsB;CAAG;AAApD,sBAAoD;AAEpD,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"Spend.js","sourceRoot":"","sources":["Spend.ts"],"names":[],"mappings":";;;AACA,oDAA6C;AAG7C,MAAa,KAAM,SAAQ,cAA+B;CAAG;AAA7D,sBAA6D;AAE7D,kBAAe,KAAK,CAAC"}

package/Rules/Spend.ts

@@ -1,13 +1,7 @@
 import CityBuild from '@civ-clone/core-city-build/CityBuild';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import Rule from '@civ-clone/core-rule/Rule';
 import Yield from '@civ-clone/core-yield/Yield';
 
-type SpendArgs = [CityBuild, Yield];
-
-export class Spend extends Rule<SpendArgs, Yield> {}
+export class Spend extends Rule<[CityBuild, Yield], Yield> {}
 
 export default Spend;
-
-export interface ISpendRegistry
-  extends IRuleRegistry<Spend, SpendArgs, Yield> {}

package/Rules/Updated.d.ts

@@ -1,9 +1,5 @@
 import City from '@civ-clone/core-city/City';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import PlayerTreasury from '../PlayerTreasury';
 import Rule from '@civ-clone/core-rule/Rule';
-declare type UpdatedArgs = [PlayerTreasury, City];
-export declare class Updated extends Rule<UpdatedArgs, void> {}
+export declare class Updated extends Rule<[PlayerTreasury, City], void> {}
 export default Updated;
-export interface IUpdatedRegistry
-  extends IRuleRegistry<Updated, UpdatedArgs, void> {}

package/Rules/Updated.js.map

@@ -1 +1 @@
-{"version":3,"file":"Updated.js","sourceRoot":"","sources":["Updated.ts"],"names":[],"mappings":";;;AAGA,oDAA6C;AAI7C,MAAa,OAAQ,SAAQ,cAAuB;CAAG;AAAvD,0BAAuD;AAEvD,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"Updated.js","sourceRoot":"","sources":["Updated.ts"],"names":[],"mappings":";;;AAEA,oDAA6C;AAE7C,MAAa,OAAQ,SAAQ,cAAkC;CAAG;AAAlE,0BAAkE;AAElE,kBAAe,OAAO,CAAC"}

package/Rules/Updated.ts

@@ -1,13 +1,7 @@
 import City from '@civ-clone/core-city/City';
-import { IRuleRegistry } from '@civ-clone/core-rule/RuleRegistry';
 import PlayerTreasury from '../PlayerTreasury';
 import Rule from '@civ-clone/core-rule/Rule';
 
-type UpdatedArgs = [PlayerTreasury, City];
-
-export class Updated extends Rule<UpdatedArgs, void> {}
+export class Updated extends Rule<[PlayerTreasury, City], void> {}
 
 export default Updated;
-
-export interface IUpdatedRegistry
-  extends IRuleRegistry<Updated, UpdatedArgs, void> {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civ-clone/core-treasury",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "index.js",
   "repository": "git@github.com:civ-clone/core-treasury.git",
   "keywords": [

package/registerAdditionalData.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const AdditionalDataRegistry_1 = require("@civ-clone/core-data-object/AdditionalDataRegistry");
 const treasury_1 = require("./AdditionalData/treasury");
-AdditionalDataRegistry_1.instance.register(...treasury_1.default());
+AdditionalDataRegistry_1.instance.register(...(0, treasury_1.default)());
 //# sourceMappingURL=registerAdditionalData.js.map

package/registerAdditionalData.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerAdditionalData.js","sourceRoot":"","sources":["registerAdditionalData.ts"],"names":[],"mappings":";;AAAA,+FAAgH;AAChH,wDAAiD;AAEjD,iCAA8B,CAAC,QAAQ,CAAC,GAAG,kBAAQ,EAAE,CAAC,CAAC"}
+{"version":3,"file":"registerAdditionalData.js","sourceRoot":"","sources":["registerAdditionalData.ts"],"names":[],"mappings":";;AAAA,+FAAgH;AAChH,wDAAiD;AAEjD,iCAA8B,CAAC,QAAQ,CAAC,GAAG,IAAA,kBAAQ,GAAE,CAAC,CAAC"}

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "declaration": true,
     "lib": [
-      "es2019"
+      "es2020"
     ],
     "module": "commonjs",
     "sourceMap": true,
@@ -13,4 +13,4 @@
     "node_modules",
     "tests/*.test.ts"
   ]
-}
+}