@civ-clone/core-treasury 0.1.4 → 0.1.5

package/PlayerTreasury.d.ts

@@ -18,7 +18,11 @@ export declare class PlayerTreasury
   extends DataObject
   implements IPlayerTreasury
 {
-  #private;
+  private _cityBuildRegistry;
+  private _player;
+  private _ruleRegistry;
+  private _value;
+  private _yield;
   constructor(
     player: Player,
     YieldType: typeof Yield,

package/PlayerTreasury.js

@@ -1,16 +1,4 @@
 "use strict";
-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, 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 _PlayerTreasury_cityBuildRegistry, _PlayerTreasury_player, _PlayerTreasury_ruleRegistry, _PlayerTreasury_value, _PlayerTreasury_yield;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayerTreasury = void 0;
 const CityBuildRegistry_1 = require("@civ-clone/core-city-build/CityBuildRegistry");
@@ -22,43 +10,39 @@ const Rush_1 = require("./Rules/Rush");
 class PlayerTreasury extends DataObject_1.default {
     constructor(player, YieldType, cityBuildRegistry = CityBuildRegistry_1.instance, ruleRegistry = RuleRegistry_1.instance) {
         super();
-        _PlayerTreasury_cityBuildRegistry.set(this, void 0);
-        _PlayerTreasury_player.set(this, void 0);
-        _PlayerTreasury_ruleRegistry.set(this, void 0);
-        _PlayerTreasury_value.set(this, 0);
-        _PlayerTreasury_yield.set(this, void 0);
+        this._value = 0;
         this.addKey('value', 'yield');
-        __classPrivateFieldSet(this, _PlayerTreasury_cityBuildRegistry, cityBuildRegistry, "f");
-        __classPrivateFieldSet(this, _PlayerTreasury_player, player, "f");
-        __classPrivateFieldSet(this, _PlayerTreasury_ruleRegistry, ruleRegistry, "f");
-        __classPrivateFieldSet(this, _PlayerTreasury_yield, YieldType, "f");
+        this._cityBuildRegistry = cityBuildRegistry;
+        this._player = player;
+        this._ruleRegistry = ruleRegistry;
+        this._yield = YieldType;
     }
     add(value) {
         if (value instanceof Yield_1.default) {
             this.add(value.value());
             return;
         }
-        __classPrivateFieldSet(this, _PlayerTreasury_value, __classPrivateFieldGet(this, _PlayerTreasury_value, "f") + value, "f");
+        this._value += value;
     }
     buy(city) {
-        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city), [spendCost] = this.cost(city).filter((spendCost) => spendCost.resource() === __classPrivateFieldGet(this, _PlayerTreasury_yield, "f")), cost = spendCost.value();
-        if (city.player() !== __classPrivateFieldGet(this, _PlayerTreasury_player, "f") || this.value() < cost) {
+        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) {
             return;
         }
-        __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f").process(Rush_1.default, cityBuild, spendCost);
+        this._ruleRegistry.process(Rush_1.default, cityBuild, spendCost);
         // TODO: do this via Rules and then use Production
         cityBuild.add(new Yield_1.default(cityBuild.remaining()));
         this.subtract(cost);
     }
     cost(city) {
-        const cityBuild = __classPrivateFieldGet(this, _PlayerTreasury_cityBuildRegistry, "f").getByCity(city);
-        return __classPrivateFieldGet(this, _PlayerTreasury_ruleRegistry, "f").process(Spend_1.default, cityBuild);
+        const cityBuild = this._cityBuildRegistry.getByCity(city);
+        return this._ruleRegistry.process(Spend_1.default, cityBuild);
     }
     player() {
-        return __classPrivateFieldGet(this, _PlayerTreasury_player, "f");
+        return this._player;
     }
     set(value) {
-        __classPrivateFieldSet(this, _PlayerTreasury_value, 0, "f");
+        this._value = 0;
         this.add(value);
     }
     subtract(value) {
@@ -66,16 +50,15 @@ class PlayerTreasury extends DataObject_1.default {
             this.add(value.value());
             return;
         }
-        __classPrivateFieldSet(this, _PlayerTreasury_value, __classPrivateFieldGet(this, _PlayerTreasury_value, "f") - value, "f");
+        this._value -= value;
     }
     value() {
-        return __classPrivateFieldGet(this, _PlayerTreasury_value, "f");
+        return this._value;
     }
     yield() {
-        return __classPrivateFieldGet(this, _PlayerTreasury_yield, "f");
+        return this._yield;
     }
 }
 exports.PlayerTreasury = PlayerTreasury;
-_PlayerTreasury_cityBuildRegistry = new WeakMap(), _PlayerTreasury_player = new WeakMap(), _PlayerTreasury_ruleRegistry = new WeakMap(), _PlayerTreasury_value = new WeakMap(), _PlayerTreasury_yield = 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;AAE3C,uEAAgE;AAEhE,yCAAkC;AAElC,uDAAgD;AAChD,uCAAgC;AAYhC,MAAa,cAAe,SAAQ,oBAAU;IAO5C,YACE,MAAc,EACd,SAAuB,EACvB,oBAAuC,4BAAyB,EAChE,eAA6B,uBAAoB;QAEjD,KAAK,EAAE,CAAC;QAZV,oDAAsC;QACtC,yCAAgB;QAChB,+CAA4B;QAC5B,gCAAiB,CAAC,EAAC;QACnB,wCAAqB;QAUnB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,uBAAA,IAAI,qCAAsB,iBAAiB,MAAA,CAAC;QAC5C,uBAAA,IAAI,0BAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,gCAAiB,YAAY,MAAA,CAAC;QAClC,uBAAA,IAAI,yBAAU,SAAS,MAAA,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,+GAAe,KAAK,MAAA,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,MAAM,SAAS,GAAG,uBAAA,IAAI,yCAAmB,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,uBAAA,IAAI,6BAAO,CACpD,EACD,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,uBAAA,IAAI,8BAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE;YACzD,OAAO;SACR;QAED,uBAAA,IAAI,oCAAc,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,uBAAA,IAAI,yCAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,uBAAA,IAAI,oCAAc,CAAC,OAAO,CAAC,eAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,MAAM;QACJ,OAAO,uBAAA,IAAI,8BAAQ,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,KAAqB;QACvB,uBAAA,IAAI,yBAAU,CAAC,MAAA,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,+GAAe,KAAK,MAAA,CAAC;IACvB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,6BAAO,CAAC;IACrB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,6BAAO,CAAC;IACrB,CAAC;CACF;AApFD,wCAoFC;;AAED,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;IAO5C,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;CACF;AApFD,wCAoFC;AAED,kBAAe,cAAc,CAAC"}

package/PlayerTreasury.ts

@@ -25,11 +25,11 @@ export interface IPlayerTreasury {
 }
 
 export class PlayerTreasury extends DataObject implements IPlayerTreasury {
-  #cityBuildRegistry: CityBuildRegistry;
-  #player: Player;
-  #ruleRegistry: RuleRegistry;
-  #value: number = 0;
-  #yield: typeof Yield;
+  private _cityBuildRegistry: CityBuildRegistry;
+  private _player: Player;
+  private _ruleRegistry: RuleRegistry;
+  private _value: number = 0;
+  private _yield: typeof Yield;
 
   constructor(
     player: Player,
@@ -41,10 +41,10 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
 
     this.addKey('value', 'yield');
 
-    this.#cityBuildRegistry = cityBuildRegistry;
-    this.#player = player;
-    this.#ruleRegistry = ruleRegistry;
-    this.#yield = YieldType;
+    this._cityBuildRegistry = cityBuildRegistry;
+    this._player = player;
+    this._ruleRegistry = ruleRegistry;
+    this._yield = YieldType;
   }
 
   add(value: Yield | number): void {
@@ -54,21 +54,21 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
       return;
     }
 
-    this.#value += value;
+    this._value += value;
   }
 
   buy(city: City): void {
-    const cityBuild = this.#cityBuildRegistry.getByCity(city),
+    const cityBuild = this._cityBuildRegistry.getByCity(city),
       [spendCost] = this.cost(city).filter(
-        (spendCost) => spendCost.resource() === this.#yield
+        (spendCost) => spendCost.resource() === this._yield
       ),
       cost = spendCost.value();
 
-    if (city.player() !== this.#player || this.value() < cost) {
+    if (city.player() !== this._player || this.value() < cost) {
       return;
     }
 
-    this.#ruleRegistry.process(Rush, cityBuild, spendCost);
+    this._ruleRegistry.process(Rush, cityBuild, spendCost);
     // TODO: do this via Rules and then use Production
     cityBuild.add(new Yield(cityBuild.remaining()));
 
@@ -76,17 +76,17 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
   }
 
   cost(city: City): SpendCost[] {
-    const cityBuild = this.#cityBuildRegistry.getByCity(city);
+    const cityBuild = this._cityBuildRegistry.getByCity(city);
 
-    return this.#ruleRegistry.process(Spend, cityBuild);
+    return this._ruleRegistry.process(Spend, cityBuild);
   }
 
   player(): Player {
-    return this.#player;
+    return this._player;
   }
 
   set(value: Yield | number): void {
-    this.#value = 0;
+    this._value = 0;
 
     this.add(value);
   }
@@ -98,15 +98,15 @@ export class PlayerTreasury extends DataObject implements IPlayerTreasury {
       return;
     }
 
-    this.#value -= value;
+    this._value -= value;
   }
 
   value(): number {
-    return this.#value;
+    return this._value;
   }
 
   yield(): typeof Yield {
-    return this.#yield;
+    return this._yield;
   }
 }
 

package/SpendCost.d.ts

@@ -5,7 +5,8 @@ interface ISpend {
   value(): number;
 }
 export declare class SpendCost extends DataObject implements ISpend {
-  #private;
+  private _resource;
+  private _value;
   constructor(resource: typeof Yield, value: number);
   resource(): typeof Yield;
   value(): number;

package/SpendCost.js

@@ -1,36 +1,21 @@
 "use strict";
-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, 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 _SpendCost_resource, _SpendCost_value;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpendCost = void 0;
 const DataObject_1 = require("@civ-clone/core-data-object/DataObject");
 class SpendCost extends DataObject_1.default {
     constructor(resource, value) {
         super();
-        _SpendCost_resource.set(this, void 0);
-        _SpendCost_value.set(this, void 0);
         this.addKey('resource', 'value');
-        __classPrivateFieldSet(this, _SpendCost_resource, resource, "f");
-        __classPrivateFieldSet(this, _SpendCost_value, value, "f");
+        this._resource = resource;
+        this._value = value;
     }
     resource() {
-        return __classPrivateFieldGet(this, _SpendCost_resource, "f");
+        return this._resource;
     }
     value() {
-        return __classPrivateFieldGet(this, _SpendCost_value, "f");
+        return this._value;
     }
 }
 exports.SpendCost = SpendCost;
-_SpendCost_resource = new WeakMap(), _SpendCost_value = new WeakMap();
 exports.default = SpendCost;
 //# sourceMappingURL=SpendCost.js.map

package/SpendCost.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpendCost.js","sourceRoot":"","sources":["SpendCost.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAAgE;AAQhE,MAAa,SAAU,SAAQ,oBAAU;IAIvC,YAAY,QAAsB,EAAE,KAAa;QAC/C,KAAK,EAAE,CAAC;QAJV,sCAAwB;QACxB,mCAAe;QAKb,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEjC,uBAAA,IAAI,uBAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,oBAAU,KAAK,MAAA,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,uBAAA,IAAI,2BAAU,CAAC;IACxB,CAAC;IAED,KAAK;QACH,OAAO,uBAAA,IAAI,wBAAO,CAAC;IACrB,CAAC;CACF;AApBD,8BAoBC;;AAED,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"SpendCost.js","sourceRoot":"","sources":["SpendCost.ts"],"names":[],"mappings":";;;AAAA,uEAAgE;AAQhE,MAAa,SAAU,SAAQ,oBAAU;IAIvC,YAAY,QAAsB,EAAE,KAAa;QAC/C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AApBD,8BAoBC;AAED,kBAAe,SAAS,CAAC"}

package/SpendCost.ts

@@ -7,24 +7,24 @@ interface ISpend {
 }
 
 export class SpendCost extends DataObject implements ISpend {
-  #resource: typeof Yield;
-  #value: number;
+  private _resource: typeof Yield;
+  private _value: number;
 
   constructor(resource: typeof Yield, value: number) {
     super();
 
     this.addKey('resource', 'value');
 
-    this.#resource = resource;
-    this.#value = value;
+    this._resource = resource;
+    this._value = value;
   }
 
   resource(): typeof Yield {
-    return this.#resource;
+    return this._resource;
   }
 
   value(): number {
-    return this.#value;
+    return this._value;
   }
 }
 

package/package.json

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