@konoui/mjimage 0.0.24 → 0.0.26

package/dist/mjs/lib/calculator/calc.d.ts

@@ -12,7 +12,7 @@ export interface HandData {
     reached: boolean;
 }
 export declare class Hand {
-    private data;
+    protected data: HandData;
     constructor(input: string, allowBackBlock?: boolean);
     private init;
     get hands(): Tile[];
@@ -24,8 +24,8 @@ export declare class Hand {
     getArrayLen(t: Type): 2 | 8 | 10;
     sum(t: Type): number;
     get(t: Type, n: number): number;
-    inc(tiles: Tile[]): Tile[];
-    dec(tiles: Tile[]): Tile[];
+    inc(tiles: readonly Tile[]): Tile[];
+    dec(tiles: readonly Tile[]): Tile[];
     draw(t: Tile): void;
     discard(t: Tile): void;
     reach(): void;

package/dist/mjs/lib/calculator/calc.js

@@ -43,15 +43,15 @@ var Hand = (function () {
                 continue;
             }
             else if (b.is(constants_1.BLOCK.HAND)) {
-                this.inc(__spreadArray([], b.tiles, true));
+                this.inc(b.tiles);
                 continue;
             }
             else if (input.split("").every(function (v) { return v === constants_1.TYPE.BACK; })) {
-                this.inc(__spreadArray([], b.tiles, true));
+                this.inc(b.tiles);
                 continue;
             }
             else if (allowBackBlock) {
-                this.inc(__spreadArray([], b.tiles, true));
+                this.inc(b.tiles);
                 continue;
             }
             throw new Error("unexpected block ".concat(b.type, " ").concat(b.toString()));
@@ -77,8 +77,9 @@ var Hand = (function () {
                 var drawn_1 = this.drawn;
                 var idx = tiles.findIndex(function (t) { return t.equals(drawn_1); });
                 if (idx < 0)
-                    throw new Error("[debug] hand has drawn: ".concat(this.drawn, " but no tile in hands"));
-                tiles[idx] = tiles[idx].clone({ add: constants_1.OPERATOR.TSUMO });
+                    throw new Error("[debug] hand has drawn: ".concat(this.drawn, " but no tile in hands: ").concat(tiles.join("")));
+                else
+                    tiles[idx] = tiles[idx].clone({ add: constants_1.OPERATOR.TSUMO });
             }
             if (tiles.length < 1)
                 throw new Error("[debug] no tiles in hand ".concat(tiles.length, ", called: ").concat(this.called, ", data: ").concat(JSON.stringify(this.data, null, 2)));
@@ -164,11 +165,6 @@ var Hand = (function () {
         return backup;
     };
     Hand.prototype.dec = function (tiles) {
-        if (this.hands.every(function (t) { return t.t == constants_1.TYPE.BACK; })) {
-            var toRemove = tiles.map(function (v) { return new parser_1.Tile(constants_1.TYPE.BACK, 0); });
-            this.data[constants_1.TYPE.BACK][1] -= tiles.length;
-            return toRemove;
-        }
         var backup = [];
         for (var _i = 0, tiles_2 = tiles; _i < tiles_2.length; _i++) {
             var t = tiles_2[_i];
@@ -225,8 +221,8 @@ var Hand = (function () {
     };
     Hand.prototype.kan = function (b) {
         if (b instanceof parser_1.BlockAnKan) {
-            var t = b.tiles.filter(function (v) { return v.t != constants_1.TYPE.BACK && v.n != 0; });
-            this.dec([t[0], t[0], t[0], t[0]]);
+            var t = b.tiles[0];
+            this.dec([t, t, t, t]);
             this.data.called.push(b);
             this.data.tsumo = null;
             return;

package/dist/mjs/lib/controller/controller.d.ts

@@ -82,56 +82,7 @@ export declare class Controller {
     } | {
         type: "DRAWN_GAME_BY_NINE_TILES";
         iam: Wind;
-    }, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, unknown, import("xstate").NonReducibleUnknown, import("xstate").ResolveTypegenMeta<import("xstate").TypegenDisabled, {
-        type: "";
-    } | {
-        type: "NEXT";
-    } | {
-        type: "CHI";
-        block: BlockChi;
-        iam: Wind;
-    } | {
-        type: "PON";
-        block: BlockPon;
-        iam: Wind;
-    } | {
-        type: "RON";
-        ret: WinResult;
-        iam: Wind;
-        targetInfo: {
-            wind: Wind;
-            tile: Tile;
-        };
-        quadWin?: boolean;
-    } | {
-        type: "TSUMO";
-        ret: WinResult;
-        iam: Wind;
-        lastTile: Tile;
-    } | {
-        type: "REACH";
-        tile: Tile;
-        iam: Wind;
-    } | {
-        type: "DISCARD";
-        tile: Tile;
-        iam: Wind;
-    } | {
-        type: "AN_KAN";
-        block: BlockAnKan;
-        iam: Wind;
-    } | {
-        type: "SHO_KAN";
-        block: BlockShoKan;
-        iam: Wind;
-    } | {
-        type: "DAI_KAN";
-        block: BlockDaiKan;
-        iam: Wind;
-    } | {
-        type: "DRAWN_GAME_BY_NINE_TILES";
-        iam: Wind;
-    }, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, string>>>;
+    }, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, never, import("xstate").StateValue, string, unknown, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, any>>;
     observer: Observer;
     handlers: {
         [id: string]: EventHandler;
@@ -146,7 +97,7 @@ export declare class Controller {
         debug?: boolean;
     });
     boardParams(w: Wind): BoardParams;
-    hand(w: Wind): Hand;
+    hand(w: Wind): ActorHand;
     get placeManager(): PlaceManager;
     get scoreManager(): ScoreManager;
     get river(): River;
@@ -183,22 +134,27 @@ export declare class Controller {
         "4w": string;
     };
 }
+export declare class ActorHand extends Hand {
+    isBackHand(): boolean;
+    clone(): ActorHand;
+    dec(tiles: readonly Tile[]): Tile[];
+}
 export declare abstract class BaseActor {
     id: string;
     river: River;
     placeManager: PlaceManager;
     scoreManager: ScoreManager;
     hands: {
-        "1w": Hand;
-        "2w": Hand;
-        "3w": Hand;
-        "4w": Hand;
+        "1w": ActorHand;
+        "2w": ActorHand;
+        "3w": ActorHand;
+        "4w": ActorHand;
     };
     counter: Counter;
     doraMarkers: Tile[];
     eventHandler: EventHandler;
     constructor(id: string, eventHandler: EventHandler);
-    hand(w: Wind): Hand;
+    hand(w: Wind): ActorHand;
     protected abstract setHands(e: DistributeEvent): void;
     handleEvent(e: PlayerEvent): void;
 }
@@ -210,4 +166,3 @@ export declare class Observer extends BaseActor {
     setHands(e: DistributeEvent): void;
     handleEvent(e: PlayerEvent): void;
 }
-export declare function replaceTileBlock(obj: any): void;

package/dist/mjs/lib/controller/controller.js

@@ -38,8 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Observer = exports.BaseActor = exports.Controller = void 0;
-exports.replaceTileBlock = replaceTileBlock;
+exports.Observer = exports.BaseActor = exports.ActorHand = exports.Controller = void 0;
 var assert_1 = __importDefault(require("assert"));
 var xstate_1 = require("xstate");
 var core_1 = require("../core/");
@@ -278,7 +277,6 @@ var Controller = (function () {
     };
     Controller.load = function (h) {
         var events = h.choiceEvents;
-        replaceTileBlock(events);
         var playerIDs = Object.keys(h.players);
         var empty = {
             emit: function (_) { },
@@ -657,12 +655,43 @@ var Controller = (function () {
     return Controller;
 }());
 exports.Controller = Controller;
+var ActorHand = (function (_super) {
+    __extends(ActorHand, _super);
+    function ActorHand() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ActorHand.prototype.isBackHand = function () {
+        for (var _i = 0, _a = Object.values(core_1.TYPE); _i < _a.length; _i++) {
+            var t = _a[_i];
+            if (t == core_1.TYPE.BACK)
+                continue;
+            if (this.sum(t) > 0)
+                return false;
+        }
+        return this.sum(core_1.TYPE.BACK) > 0;
+    };
+    ActorHand.prototype.clone = function () {
+        var c = new ActorHand(this.toString());
+        c.data.called = this.called.map(function (b) { return b.clone(); });
+        c.data.reached = this.data.reached;
+        c.data.tsumo = this.data.tsumo == null ? null : this.data.tsumo;
+        return c;
+    };
+    ActorHand.prototype.dec = function (tiles) {
+        if (!this.isBackHand())
+            return _super.prototype.dec.call(this, tiles);
+        _super.prototype.dec.call(this, tiles.map(function () { return new parser_1.Tile(core_1.TYPE.BACK, 0); }));
+        return __spreadArray([], tiles, true);
+    };
+    return ActorHand;
+}(calculator_1.Hand));
+exports.ActorHand = ActorHand;
 var BaseActor = (function () {
     function BaseActor(id, eventHandler) {
         this.river = new _1.River();
         this.placeManager = new _1.PlaceManager({});
         this.scoreManager = new _1.ScoreManager({});
-        this.hands = (0, _1.createWindMap)(new calculator_1.Hand(""));
+        this.hands = (0, _1.createWindMap)(new ActorHand(""));
         this.counter = new _1.Counter();
         this.doraMarkers = [];
         this.id = id;
@@ -798,11 +827,11 @@ var Observer = (function (_super) {
         var _this = _super.call(this, "observer", eventHandler) || this;
         _this.applied = {};
         _this.counter.disable = true;
-        _this.hands = (0, _1.createWindMap)(new calculator_1.Hand("_____________"));
+        _this.hands = (0, _1.createWindMap)(new ActorHand("_____________"));
         return _this;
     }
     Observer.prototype.setHands = function (e) {
-        this.hands[e.wind] = new calculator_1.Hand(e.hands[e.wind]);
+        this.hands[e.wind] = new ActorHand(e.hands[e.wind]);
     };
     Observer.prototype.handleEvent = function (e) {
         _super.prototype.handleEvent.call(this, e);
@@ -852,44 +881,3 @@ var Observer = (function (_super) {
     return Observer;
 }(BaseActor));
 exports.Observer = Observer;
-function replaceTileBlock(obj) {
-    for (var key in obj) {
-        if (obj.hasOwnProperty(key)) {
-            var propValue = obj[key];
-            if (typeof propValue === "object" &&
-                propValue !== null &&
-                "k" in propValue &&
-                "n" in propValue &&
-                "ops" in propValue) {
-                obj[key] = new parser_1.Tile(propValue.k, propValue.n, propValue.ops);
-            }
-            else if (typeof propValue === "object" &&
-                propValue != null &&
-                "tiles" in propValue &&
-                "type" in propValue) {
-                obj[key] = (0, parser_1.blockWrapper)(propValue.tiles.map(function (t) { return new parser_1.Tile(t.t, t.n, t.ops); }), propValue.type);
-            }
-            else if (Array.isArray(propValue)) {
-                for (var i = 0; i < propValue.length; i++) {
-                    var v = propValue[i];
-                    if (typeof v === "object" &&
-                        v !== null &&
-                        "k" in v &&
-                        "n" in v &&
-                        "ops" in v)
-                        propValue[i] = new parser_1.Tile(v.k, v.n, v.ops);
-                    else if (typeof v === "object" &&
-                        v != null &&
-                        "tiles" in v &&
-                        "type" in v)
-                        propValue[i] = (0, parser_1.blockWrapper)(v.tiles.map(function (t) { return new parser_1.Tile(t.t, t.n, t.ops); }), v.type);
-                    else
-                        replaceTileBlock(propValue[i]);
-                }
-            }
-            else if (typeof propValue === "object") {
-                replaceTileBlock(propValue);
-            }
-        }
-    }
-}

package/dist/mjs/lib/controller/player.js

@@ -40,7 +40,7 @@ var Player = (function (_super) {
     Player.prototype.setHands = function (e) {
         for (var _i = 0, _a = Object.values(core_1.WIND); _i < _a.length; _i++) {
             var w = _a[_i];
-            this.hands[w] = new calculator_1.Hand(e.hands[w]);
+            this.hands[w] = new _1.ActorHand(e.hands[w]);
         }
     };
     Player.prototype.handleDiscard = function (tiles) {

package/dist/mjs/lib/controller/state-machine.d.ts

@@ -62,55 +62,6 @@ export declare const createControllerMachine: (c: Controller) => import("xstate"
 } | {
     type: "DRAWN_GAME_BY_NINE_TILES";
     iam: Wind;
-}, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, unknown, import("xstate").NonReducibleUnknown, import("xstate").ResolveTypegenMeta<import("xstate").TypegenDisabled, {
-    type: "";
-} | {
-    type: "NEXT";
-} | {
-    type: "CHI";
-    block: BlockChi;
-    iam: Wind;
-} | {
-    type: "PON";
-    block: BlockPon;
-    iam: Wind;
-} | {
-    type: "RON";
-    ret: WinResult;
-    iam: Wind;
-    targetInfo: {
-        wind: Wind;
-        tile: Tile;
-    };
-    quadWin?: boolean;
-} | {
-    type: "TSUMO";
-    ret: WinResult;
-    iam: Wind;
-    lastTile: Tile;
-} | {
-    type: "REACH";
-    tile: Tile;
-    iam: Wind;
-} | {
-    type: "DISCARD";
-    tile: Tile;
-    iam: Wind;
-} | {
-    type: "AN_KAN";
-    block: BlockAnKan;
-    iam: Wind;
-} | {
-    type: "SHO_KAN";
-    block: BlockShoKan;
-    iam: Wind;
-} | {
-    type: "DAI_KAN";
-    block: BlockDaiKan;
-    iam: Wind;
-} | {
-    type: "DRAWN_GAME_BY_NINE_TILES";
-    iam: Wind;
-}, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, string>>;
+}, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, never, import("xstate").StateValue, string, unknown, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, any>;
 export declare function incrementalIDGenerator(start?: number): () => string;
 export {};

package/dist/mjs/lib/controller/state-machine.js

@@ -470,7 +470,7 @@ var createControllerMachine = function (c) {
                     context.missingMap[iam] = false;
                 for (var _i = 0, _b = Object.values(constants_1.WIND); _i < _b.length; _i++) {
                     var w = _b[_i];
-                    var t = new parser_1.Tile(constants_1.TYPE.BACK, 0);
+                    var t = new parser_1.Tile(constants_1.TYPE.BACK, 0, [constants_1.OPERATOR.TSUMO]);
                     if (w == iam)
                         t = drawn;
                     var e = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@konoui/mjimage",
-    "version": "0.0.24",
+    "version": "0.0.26",
     "description": "Generates Mahjong tiles in SVG format.",
     "author": "konoui",
     "license": "MIT",