@konoui/mjimage 0.0.25 → 0.0.27

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

@@ -163,8 +163,11 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        ret: e.choices.RON,
-                        targetInfo: e.tileInfo,
+                        ret: (0, calculator_1.deserializeWinResult)(e.choices.RON),
+                        targetInfo: {
+                            wind: e.discarterInfo.wind,
+                            tile: parser_1.Tile.from(e.discarterInfo.tile),
+                        },
                     });
                     break;
                 case "DAI_KAN":
@@ -172,7 +175,7 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        block: e.choices.DAI_KAN,
+                        block: parser_1.Block.from(e.choices.DAI_KAN),
                     });
                     break;
                 case "CHI":
@@ -183,7 +186,7 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        block: c[0],
+                        block: parser_1.Block.from(c[0]),
                     });
             }
         }
@@ -197,8 +200,8 @@ var Controller = (function () {
                     (0, assert_1.default)(e.choices.TSUMO, "tsumo choice is none");
                     this.actor.send({
                         type: selected.type,
-                        ret: e.choices.TSUMO,
-                        lastTile: e.tileInfo.tile,
+                        ret: (0, calculator_1.deserializeWinResult)(e.choices.TSUMO),
+                        lastTile: parser_1.Tile.from(e.drawerInfo.tile),
                         iam: w,
                     });
                     break;
@@ -207,7 +210,7 @@ var Controller = (function () {
                     (0, assert_1.default)(candidates, "".concat(selected.type, " candidates is none"));
                     this.actor.send({
                         type: selected.type,
-                        tile: candidates[0].tile,
+                        tile: parser_1.Tile.from(candidates[0].tile),
                         iam: w,
                     });
                     break;
@@ -216,7 +219,7 @@ var Controller = (function () {
                     (0, assert_1.default)(tiles, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        tile: tiles[0].clone({ remove: core_1.OPERATOR.TSUMO }),
+                        tile: parser_1.Tile.from(tiles[0]).clone({ remove: core_1.OPERATOR.TSUMO }),
                         iam: w,
                     });
                     break;
@@ -225,7 +228,7 @@ var Controller = (function () {
                     (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        block: choices[0],
+                        block: parser_1.BlockAnKan.from(choices[0]),
                         iam: w,
                     });
                     break;
@@ -235,7 +238,7 @@ var Controller = (function () {
                     (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        block: choices[0],
+                        block: parser_1.Block.from(choices[0]),
                         iam: w,
                     });
                     break;
@@ -248,7 +251,7 @@ var Controller = (function () {
         else if (sample.type == "CHOICE_AFTER_CALLED") {
             (0, assert_1.default)(sample.choices.DISCARD, "discard candidate tile is none: ".concat(JSON.stringify(sample, null, 2), " ").concat(this.hand(sample.wind).toString()));
             var w = sample.wind;
-            var t = sample.choices.DISCARD[0];
+            var t = parser_1.Tile.from(sample.choices.DISCARD[0]);
             (0, assert_1.default)(t != null, "undefined tile ".concat(this.hand(w).toString()));
             this.actor.send({ type: "DISCARD", tile: t, iam: w });
         }
@@ -266,9 +269,12 @@ var Controller = (function () {
             this.actor.send({
                 type: "RON",
                 iam: e.wind,
-                ret: e.choices.RON,
+                ret: (0, calculator_1.deserializeWinResult)(e.choices.RON),
                 quadWin: true,
-                targetInfo: e.tileInfo,
+                targetInfo: {
+                    wind: e.callerInfo.wind,
+                    tile: parser_1.Tile.from(e.callerInfo.tile),
+                },
             });
         }
     };
@@ -329,7 +335,7 @@ var Controller = (function () {
         var blindDoraMarkers = hand.reached
             ? this.wall.blindDoraMarkers
             : undefined;
-        var final = new calculator_1.DoubleCalculator(hand, __assign(__assign({}, ret.params), { sticks: this.placeManager.sticks, blindDoraMarkers: blindDoraMarkers })).calc([ret.hand]);
+        var final = new calculator_1.DoubleCalculator(hand, __assign(__assign({}, ret.boardContext), { sticks: this.placeManager.sticks, blindDoraMarkers: blindDoraMarkers })).calc([ret.hand]);
         (0, assert_1.default)(final);
         return final;
     };
@@ -637,7 +643,7 @@ var Controller = (function () {
         return num >= 9;
     };
     Controller.prototype.initialHands = function () {
-        var m = (0, _1.createWindMap)("");
+        var m = (0, calculator_1.createWindMap)("");
         for (var i = 0; i < 3; i++) {
             for (var _i = 0, _a = Object.values(core_1.WIND); _i < _a.length; _i++) {
                 var w = _a[_i];
@@ -672,16 +678,14 @@ var ActorHand = (function (_super) {
     };
     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 tiles;
+        return __spreadArray([], tiles, true);
     };
     return ActorHand;
 }(calculator_1.Hand));
@@ -691,7 +695,7 @@ var BaseActor = (function () {
         this.river = new _1.River();
         this.placeManager = new _1.PlaceManager({});
         this.scoreManager = new _1.ScoreManager({});
-        this.hands = (0, _1.createWindMap)(new ActorHand(""));
+        this.hands = (0, calculator_1.createWindMap)(new ActorHand(""));
         this.counter = new _1.Counter();
         this.doraMarkers = [];
         this.id = id;
@@ -711,14 +715,15 @@ var BaseActor = (function () {
                     break;
                 case "DISTRIBUTE":
                     this.counter.reset();
+                    var doraMarker = parser_1.Tile.from(e.doraMarker);
                     this.setHands(e);
                     this.placeManager = new _1.PlaceManager(structuredClone(e.places), {
                         round: structuredClone(e.round),
                         sticks: structuredClone(e.sticks),
                     });
                     this.scoreManager = new _1.ScoreManager(structuredClone(e.scores));
-                    this.doraMarkers = [e.doraMarker];
-                    this.counter.dec(e.doraMarker);
+                    this.doraMarkers = [doraMarker];
+                    this.counter.dec(doraMarker);
                     for (var _i = 0, _d = Object.values(core_1.WIND); _i < _d.length; _i++) {
                         var w = _d[_i];
                         if (w != e.wind)
@@ -726,56 +731,68 @@ var BaseActor = (function () {
                         (_a = this.counter).dec.apply(_a, this.hand(w).hands);
                     }
                     break;
-                case "DRAW":
-                    this.hands[e.iam].draw(e.tile);
-                    this.counter.dec(e.tile);
+                case "DRAW": {
+                    var t = parser_1.Tile.from(e.tile);
+                    this.hands[e.iam].draw(t);
+                    this.counter.dec(t);
                     break;
-                case "DISCARD":
-                    this.river.discard(e.tile, e.iam);
-                    this.hands[e.iam].discard(e.tile);
+                }
+                case "DISCARD": {
+                    var t = parser_1.Tile.from(e.tile);
+                    this.river.discard(t, e.iam);
+                    this.hands[e.iam].discard(t);
                     if (e.iam != e.wind) {
-                        this.counter.dec(e.tile);
-                        this.counter.addTileToSafeMap(e.tile, e.iam);
+                        this.counter.dec(t);
+                        this.counter.addTileToSafeMap(t, e.iam);
                         for (var _e = 0, _f = Object.values(core_1.WIND); _e < _f.length; _e++) {
                             var w = _f[_e];
                             if (this.hand(w).reached)
-                                this.counter.addTileToSafeMap(e.tile, w);
+                                this.counter.addTileToSafeMap(t, w);
                         }
                     }
                     break;
+                }
                 case "PON":
                 case "CHI":
-                case "DAI_KAN":
-                    this.hands[e.iam].call(e.block);
+                case "DAI_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].call(block);
                     this.river.markCalled();
                     if (e.iam != e.wind)
-                        (_b = this.counter).dec.apply(_b, e.block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
+                        (_b = this.counter).dec.apply(_b, block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
                     break;
-                case "SHO_KAN":
-                    this.hands[e.iam].kan(e.block);
+                }
+                case "SHO_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].kan(block);
                     if (e.iam != e.wind)
-                        this.counter.dec(e.block.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); })[0]);
+                        this.counter.dec(block.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); })[0]);
                     break;
-                case "AN_KAN":
-                    this.hands[e.iam].kan(e.block);
+                }
+                case "AN_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].kan(block);
                     if (e.iam != e.wind)
-                        (_c = this.counter).dec.apply(_c, e.block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
+                        (_c = this.counter).dec.apply(_c, block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
                     break;
+                }
                 case "REACH":
                     var pid = this.placeManager.playerID(e.iam);
                     this.hands[e.iam].reach();
                     this.scoreManager.reach(pid);
                     this.placeManager.incrementReachStick();
                     break;
-                case "NEW_DORA":
-                    this.doraMarkers.push(e.doraMarker);
-                    this.counter.dec(e.doraMarker);
+                case "NEW_DORA": {
+                    var doraMarker_1 = parser_1.Tile.from(e.doraMarker);
+                    this.doraMarkers.push(doraMarker_1);
+                    this.counter.dec(doraMarker_1);
                     break;
+                }
                 case "TSUMO":
                     break;
                 case "RON":
                     if (e.pushBackReachStick) {
-                        var w = e.targetInfo.wind;
+                        var w = e.victimInfo.wind;
                         var id = this.placeManager.playerID(w);
                         this.scoreManager.restoreReachStick(id);
                         this.placeManager.decrementReachStick();
@@ -827,7 +844,7 @@ var Observer = (function (_super) {
         var _this = _super.call(this, "observer", eventHandler) || this;
         _this.applied = {};
         _this.counter.disable = true;
-        _this.hands = (0, _1.createWindMap)(new ActorHand("_____________"));
+        _this.hands = (0, calculator_1.createWindMap)(new ActorHand("_____________"));
         return _this;
     }
     Observer.prototype.setHands = function (e) {

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

@@ -1,6 +1,6 @@
 import { Wind, Round } from "../core/constants";
-import { BlockAnKan, BlockChi, BlockDaiKan, BlockPon, BlockShoKan, Tile } from "../core/parser";
-import { WinResult, Candidate } from "../calculator";
+import { SerializedBlock } from "../core/parser";
+import { SerializedCandidate, SerializedWinResult } from "../calculator";
 type Event = CallEvent | "DRAW" | "CHOICE_AFTER_DRAWN" | "CHOICE_AFTER_DISCARDED" | "CHOICE_AFTER_CALLED" | "CHOICE_FOR_CHAN_KAN" | "DISTRIBUTE" | "NEW_DORA" | "END_GAME";
 type ChoiceEvent = "PON" | "CHI" | "RON" | "DISCARD" | "TSUMO" | "REACH" | "AN_KAN" | "SHO_KAN" | "DAI_KAN" | "DRAWN_GAME_BY_NINE_TILES";
 export interface DistributeEvent {
@@ -10,7 +10,7 @@ export interface DistributeEvent {
         [key in Wind]: string;
     };
     wind: Wind;
-    doraMarker: Tile;
+    doraMarker: string;
     players: string[];
     places: {
         [key: string]: Wind;
@@ -49,17 +49,17 @@ export interface CallEvent {
     type: Extract<ChoiceEvent, "PON" | "CHI" | "AN_KAN" | "SHO_KAN" | "DAI_KAN">;
     iam: Wind;
     wind: Wind;
-    block: BlockPon | BlockChi | BlockAnKan | BlockShoKan | BlockDaiKan;
+    block: SerializedBlock;
 }
 export interface RonEvent {
     id: string;
     type: Extract<ChoiceEvent, "RON">;
     iam: Wind;
     wind: Wind;
-    ret: WinResult;
-    targetInfo: {
+    ret: SerializedWinResult;
+    victimInfo: {
         wind: Wind;
-        tile: Tile;
+        tile: string;
     };
     pushBackReachStick: boolean;
 }
@@ -68,15 +68,15 @@ export interface TsumoEvent {
     type: Extract<ChoiceEvent, "TSUMO">;
     iam: Wind;
     wind: Wind;
-    lastTile: Tile;
-    ret: WinResult;
+    lastTile: string;
+    ret: SerializedWinResult;
 }
 export interface DiscardEvent {
     id: string;
     type: Extract<ChoiceEvent, "DISCARD">;
     iam: Wind;
     wind: Wind;
-    tile: Tile;
+    tile: string;
 }
 export interface DrawEvent {
     id: string;
@@ -84,28 +84,28 @@ export interface DrawEvent {
     subtype?: "kan";
     iam: Wind;
     wind: Wind;
-    tile: Tile;
+    tile: string;
 }
 export interface ReachEvent {
     id: string;
     type: Extract<ChoiceEvent, "REACH">;
-    tile: Tile;
+    tile: string;
     iam: Wind;
     wind: Wind;
 }
 export interface NewDoraEvent {
     id: string;
     type: Extract<Event, "NEW_DORA">;
-    doraMarker: Tile;
+    doraMarker: string;
     wind: Wind;
 }
 export interface ChoiceAfterDrawnEvent {
     id: string;
     type: Extract<Event, "CHOICE_AFTER_DRAWN">;
     wind: Wind;
-    tileInfo: {
+    drawerInfo: {
         wind: Wind;
-        tile: Tile;
+        tile: string;
     };
     choices: DrawnChoice;
 }
@@ -113,9 +113,9 @@ export interface ChoiceAfterDiscardedEvent {
     id: string;
     type: Extract<Event, "CHOICE_AFTER_DISCARDED">;
     wind: Wind;
-    tileInfo: {
+    discarterInfo: {
         wind: Wind;
-        tile: Tile;
+        tile: string;
     };
     choices: DiscardedChoice;
 }
@@ -129,25 +129,25 @@ export interface ChoiceForChanKan {
     id: string;
     type: Extract<Event, "CHOICE_FOR_CHAN_KAN">;
     wind: Wind;
-    tileInfo: {
+    callerInfo: {
         wind: Wind;
-        tile: Tile;
+        tile: string;
     };
     choices: Pick<DiscardedChoice, "RON">;
 }
 export type PlayerEvent = DistributeEvent | EndEvent | CallEvent | RonEvent | TsumoEvent | DiscardEvent | DrawEvent | ReachEvent | NewDoraEvent | ChoiceAfterDrawnEvent | ChoiceAfterDiscardedEvent | ChoiceAfterCalled | ChoiceForChanKan;
 interface DiscardedChoice {
-    RON: false | WinResult;
-    PON: false | BlockPon[];
-    CHI: false | BlockChi[];
-    DAI_KAN: false | BlockDaiKan;
+    RON: false | SerializedWinResult;
+    PON: false | SerializedBlock[];
+    CHI: false | SerializedBlock[];
+    DAI_KAN: false | SerializedBlock;
 }
 interface DrawnChoice {
-    TSUMO: false | WinResult;
-    REACH: false | Candidate[];
-    AN_KAN: false | BlockAnKan[];
-    SHO_KAN: false | BlockShoKan[];
-    DISCARD: false | Tile[];
+    TSUMO: false | SerializedWinResult;
+    REACH: false | SerializedCandidate[];
+    AN_KAN: false | SerializedBlock[];
+    SHO_KAN: false | SerializedBlock[];
+    DISCARD: false | string[];
     DRAWN_GAME_BY_NINE_TILES: boolean;
 }
 export declare function prioritizeDiscardedEvents(events: ChoiceAfterDiscardedEvent[]): {

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

@@ -55,12 +55,6 @@ export declare const nextRound: (r: Round) => Round;
 export declare const prevRound: (r: Round) => "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
 export declare const nextWind: (w: Wind) => Wind;
 export declare const prevWind: (w: Wind) => Wind;
-export declare function createWindMap<T>(initial: T, clone?: boolean): {
-    "1w": T;
-    "2w": T;
-    "3w": T;
-    "4w": T;
-};
 export declare function shuffle<T>(array: T[]): T[];
 export declare class Counter {
     disable: boolean;

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

@@ -4,10 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Counter = exports.prevWind = exports.nextWind = exports.prevRound = exports.nextRound = exports.PlaceManager = exports.ScoreManager = void 0;
-exports.createWindMap = createWindMap;
 exports.shuffle = shuffle;
 var assert_1 = __importDefault(require("assert"));
 var constants_1 = require("../core/constants");
+var calculator_1 = require("../calculator");
+var parser_1 = require("../core/parser");
 var ScoreManager = (function () {
     function ScoreManager(initial) {
         this.reachValue = 1000;
@@ -40,7 +41,7 @@ var PlaceManager = (function () {
     function PlaceManager(initial, params) {
         var _a, _b;
         this.pToW = {};
-        this.wToP = createWindMap("");
+        this.wToP = (0, calculator_1.createWindMap)("");
         this.round = (_a = params === null || params === void 0 ? void 0 : params.round) !== null && _a !== void 0 ? _a : "1w1";
         this.sticks = (_b = params === null || params === void 0 ? void 0 : params.sticks) !== null && _b !== void 0 ? _b : { reach: 0, dead: 0 };
         this.pToW = initial;
@@ -123,22 +124,6 @@ var prevWind = function (w) {
     return (0, exports.nextWind)((0, exports.nextWind)((0, exports.nextWind)(w)));
 };
 exports.prevWind = prevWind;
-function createWindMap(initial, clone) {
-    if (clone === void 0) { clone = false; }
-    var m = {
-        "1w": initial,
-        "2w": initial,
-        "3w": initial,
-        "4w": initial,
-    };
-    if (clone) {
-        for (var _i = 0, _a = Object.values(constants_1.WIND); _i < _a.length; _i++) {
-            var w = _a[_i];
-            m[w] = structuredClone(initial);
-        }
-    }
-    return m;
-}
 function shuffle(array) {
     var _a;
     for (var i = array.length - 1; i > 0; i--) {
@@ -158,12 +143,12 @@ var Counter = (function () {
             _a[constants_1.TYPE.P] = [1, 4, 4, 4, 4, 4, 4, 4, 4, 4],
             _a[constants_1.TYPE.Z] = [0, 4, 4, 4, 4, 4, 4, 4],
             _a);
-        this.safeMap = createWindMap({}, true);
+        this.safeMap = (0, calculator_1.createWindMap)({}, true);
     }
     Counter.prototype.get = function (t) {
         if (t.t == constants_1.TYPE.BACK)
             return 0;
-        if (t.isNum() && t.n == 0)
+        if ((0, parser_1.isNum0)(t))
             return this.c[t.t][5];
         return this.c[t.t][t.n];
     };
@@ -181,7 +166,7 @@ var Counter = (function () {
             if (this.get(t) <= 0)
                 throw new Error("cannot decrease ".concat(t.toString(), " due to zero"));
             this.c[t.t][t.n] -= 1;
-            if (t.isNum() && t.n == 0)
+            if ((0, parser_1.isNum0)(t))
                 this.c[t.t][5] -= 1;
         }
     };

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

@@ -68,8 +68,8 @@ var Player = (function (_super) {
             case "CHOICE_AFTER_CALLED":
             case "CHOICE_AFTER_DRAWN":
                 if (e.choices.DISCARD) {
-                    var t = this.handleDiscard(e.choices.DISCARD);
-                    e.choices.DISCARD = [t];
+                    var t = this.handleDiscard(e.choices.DISCARD.map(core_1.Tile.from));
+                    e.choices.DISCARD = [t.toString()];
                 }
                 this.eventHandler.emit(e);
                 break;