@konoui/mjimage 0.0.8 → 0.0.11

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

@@ -17,14 +17,14 @@ export interface HandData {
     [TYPE.S]: FixedNumber;
     [TYPE.P]: FixedNumber;
     [TYPE.Z]: [number, number, number, number, number, number, number, number];
-    [TYPE.BACK]: [number];
+    [TYPE.BACK]: [string, number];
     called: (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
     tsumo: Tile | null;
     reached: boolean;
 }
 export declare class Hand {
     private data;
-    constructor(input: string);
+    constructor(input: string, allowBackBlock?: boolean);
     private init;
     get hands(): Tile[];
     toString(): string;
@@ -32,9 +32,9 @@ export declare class Hand {
     get reached(): boolean;
     get drawn(): Tile | null;
     get menzen(): boolean;
-    getArrayLen(k: Type): 1 | 8 | 10;
+    getArrayLen(k: Type): 2 | 8 | 10;
     sum(k: Type): number;
-    get(k: Type, n: number): number;
+    get(t: Type, n: number): number;
     inc(tiles: Tile[]): Tile[];
     dec(tiles: Tile[]): Tile[];
     draw(t: Tile): void;
@@ -42,7 +42,6 @@ export declare class Hand {
     reach(): void;
     call(b: BlockPon | BlockChi | BlockDaiKan): void;
     kan(b: BlockAnKan | BlockShoKan): void;
-    get canReach(): boolean;
     clone(): Hand;
 }
 export declare class ShantenCalculator {
@@ -52,19 +51,11 @@ export declare class ShantenCalculator {
     sevenPairs(): number;
     thirteenOrphans(): number;
     fourSetsOnePair(): number;
-    private commonByKind;
+    private commonByType;
     private groupRemainingTiles;
     private calcCommon;
 }
-export declare class ExShantenCalculator {
-    h: Hand;
-    private c;
-    constructor(h: Hand);
-    menzen(): number;
-    yakuhai(): number;
-    tanyao(): void;
-}
-export declare class TileCalculator {
+export declare class BlockCalculator {
     hand: Hand;
     constructor(hand: Hand);
     calc(lastTile: Tile): Block[][];
@@ -74,7 +65,7 @@ export declare class TileCalculator {
     nineGates(): Block[][];
     fourSetsOnePair(): Block[][];
     private commonAll;
-    private commonByKind;
+    private commonByType;
 }
 export interface BoardParams {
     doraMarkers: Tile[];

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

@@ -12,26 +12,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DoubleCalculator = exports.TileCalculator = exports.ExShantenCalculator = exports.ShantenCalculator = exports.Hand = void 0;
+exports.DoubleCalculator = exports.BlockCalculator = exports.ShantenCalculator = exports.Hand = void 0;
 var assert_1 = __importDefault(require("assert"));
 var constants_1 = require("../constants");
 var parser_1 = require("../parser");
 var Hand = (function () {
-    function Hand(input) {
+    function Hand(input, allowBackBlock) {
         var _a;
+        if (allowBackBlock === void 0) { allowBackBlock = false; }
         this.data = (_a = {},
             _a[constants_1.TYPE.M] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             _a[constants_1.TYPE.P] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             _a[constants_1.TYPE.S] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             _a[constants_1.TYPE.Z] = [0, 0, 0, 0, 0, 0, 0, 0],
-            _a[constants_1.TYPE.BACK] = [0],
+            _a[constants_1.TYPE.BACK] = ["untouchable", 0],
             _a.called = [],
             _a.reached = false,
             _a.tsumo = null,
             _a);
-        this.init(input);
+        this.init(input, allowBackBlock);
     }
-    Hand.prototype.init = function (input) {
+    Hand.prototype.init = function (input, allowBackBlock) {
         var blocks = new parser_1.Parser(input).parse();
         for (var _i = 0, blocks_1 = blocks; _i < blocks_1.length; _i++) {
             var b = blocks_1[_i];
@@ -53,6 +54,10 @@ var Hand = (function () {
                 this.inc(b.tiles);
                 continue;
             }
+            else if (allowBackBlock) {
+                this.inc(b.tiles);
+                continue;
+            }
             throw new Error("unexpected block ".concat(b.type, " ").concat(b.toString()));
         }
     };
@@ -61,10 +66,12 @@ var Hand = (function () {
             var tiles = [];
             for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
                 var k = _a[_i];
-                for (var n = 0; n < this.getArrayLen(k); n++) {
+                for (var n = 1; n < this.getArrayLen(k); n++) {
                     var count = this.get(k, n);
-                    if (k != constants_1.TYPE.Z && n == 5)
+                    if (k != constants_1.TYPE.Z && n == 5 && this.get(k, 0) > 0) {
                         count -= this.get(k, 0);
+                        tiles.push(new parser_1.Tile(k, 0));
+                    }
                     for (var i = 0; i < count; i++) {
                         tiles.push(new parser_1.Tile(k, n));
                     }
@@ -114,7 +121,7 @@ var Hand = (function () {
     });
     Object.defineProperty(Hand.prototype, "menzen", {
         get: function () {
-            return this.called.some(function (v) { return !(v instanceof parser_1.BlockAnKan); });
+            return !this.called.some(function (v) { return !(v instanceof parser_1.BlockAnKan); });
         },
         enumerable: false,
         configurable: true
@@ -128,8 +135,10 @@ var Hand = (function () {
             sum += this.get(k, n);
         return sum;
     };
-    Hand.prototype.get = function (k, n) {
-        return this.data[k][n];
+    Hand.prototype.get = function (t, n) {
+        if (t == constants_1.TYPE.BACK)
+            return this.data[t][1];
+        return this.data[t][n];
     };
     Hand.prototype.inc = function (tiles) {
         var backup = [];
@@ -143,7 +152,10 @@ var Hand = (function () {
             if (!(t.t == constants_1.TYPE.Z || t.t == constants_1.TYPE.BACK) && t.n == 0) {
                 this.data[t.t][5] += 1;
             }
-            this.data[t.t][t.n] += 1;
+            if (t.t == constants_1.TYPE.BACK)
+                this.data[t.t][1] += 1;
+            else
+                this.data[t.t][t.n] += 1;
             if (t.t != constants_1.TYPE.Z &&
                 t.n == 5 &&
                 this.get(t.t, 5) == 4 &&
@@ -159,7 +171,7 @@ var Hand = (function () {
     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][0] -= tiles.length;
+            this.data[constants_1.TYPE.BACK][1] -= tiles.length;
             return toRemove;
         }
         var backup = [];
@@ -173,7 +185,10 @@ var Hand = (function () {
             if (!(t.t == constants_1.TYPE.Z || t.t == constants_1.TYPE.BACK) && t.n == 0) {
                 this.data[t.t][5] -= 1;
             }
-            this.data[t.t][t.n] -= 1;
+            if (t.t == constants_1.TYPE.BACK)
+                this.data[t.t][1] -= 1;
+            else
+                this.data[t.t][t.n] -= 1;
             if (t.t != constants_1.TYPE.Z &&
                 t.n == 5 &&
                 this.get(t.t, 5) == 0 &&
@@ -198,7 +213,7 @@ var Hand = (function () {
         return;
     };
     Hand.prototype.reach = function () {
-        if (!this.canReach)
+        if (!this.menzen)
             throw new Error("cannot reach");
         if (this.data.reached)
             throw new Error("already reached");
@@ -241,13 +256,6 @@ var Hand = (function () {
         }
         throw new Error("unexpected input ".concat(b));
     };
-    Object.defineProperty(Hand.prototype, "canReach", {
-        get: function () {
-            return this.called.filter(function (b) { return !(b instanceof parser_1.BlockAnKan); }).length == 0;
-        },
-        enumerable: false,
-        configurable: true
-    });
     Hand.prototype.clone = function () {
         var c = new Hand(this.toString());
         c.data.called = this.called.map(function (b) { return b.clone(); });
@@ -271,11 +279,13 @@ var ShantenCalculator = (function () {
         var nPairs = 0;
         var nIsolated = 0;
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            for (var n = 1; n < this.hand.getArrayLen(k); n++) {
-                if (this.hand.get(k, n) == 2)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
+                continue;
+            for (var n = 1; n < this.hand.getArrayLen(t); n++) {
+                if (this.hand.get(t, n) == 2)
                     nPairs++;
-                if (this.hand.get(k, n) == 1)
+                if (this.hand.get(t, n) == 1)
                     nIsolated++;
             }
         }
@@ -309,19 +319,27 @@ var ShantenCalculator = (function () {
         var _this = this;
         var calc = function (hasPair) {
             var z = [0, 0, 0];
-            var k = constants_1.TYPE.Z;
-            for (var n = 1; n < _this.hand.getArrayLen(k); n++) {
-                if (_this.hand.get(k, n) >= 3)
+            var zt = constants_1.TYPE.Z;
+            for (var n = 1; n < _this.hand.getArrayLen(zt); n++) {
+                if (_this.hand.get(zt, n) >= 3)
                     z[0]++;
-                else if (_this.hand.get(k, n) == 2)
+                else if (_this.hand.get(zt, n) == 2)
                     z[1]++;
-                else if (_this.hand.get(k, n) == 1)
+                else if (_this.hand.get(zt, n) == 1)
                     z[2]++;
             }
+            var b = [0, 0, 0];
+            var bn = _this.hand.get(constants_1.TYPE.BACK, 0);
+            var bb = bn % 3;
+            b[0] = Math.floor(bn / 3);
+            if (bb == 2)
+                b[1] = 1;
+            if (bb == 1)
+                b[2] = 1;
             var min = 13;
-            var mr = _this.commonByKind(constants_1.TYPE.M);
-            var pr = _this.commonByKind(constants_1.TYPE.P);
-            var sr = _this.commonByKind(constants_1.TYPE.S);
+            var mr = _this.commonByType(constants_1.TYPE.M);
+            var pr = _this.commonByType(constants_1.TYPE.P);
+            var sr = _this.commonByType(constants_1.TYPE.S);
             for (var _i = 0, _a = [mr.patternA, mr.patternB]; _i < _a.length; _i++) {
                 var m = _a[_i];
                 for (var _b = 0, _c = [pr.patternA, pr.patternB]; _b < _c.length; _b++) {
@@ -330,7 +348,7 @@ var ShantenCalculator = (function () {
                         var s = _e[_d];
                         var v = [_this.hand.called.length, 0, 0];
                         for (var i = 0; i < 3; i++) {
-                            v[i] += m[i] + p[i] + s[i] + z[i];
+                            v[i] += m[i] + p[i] + s[i] + z[i] + b[i];
                         }
                         var r = _this.calcCommon(v[0], v[1], v[2], hasPair);
                         if (r < min) {
@@ -345,6 +363,8 @@ var ShantenCalculator = (function () {
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
             var k = _a[_i];
             for (var n = 1; n < this.hand.getArrayLen(k); n++) {
+                if (k == constants_1.TYPE.BACK && this.hand.get(k, n) % 3 != 2)
+                    continue;
                 if (this.hand.get(k, n) >= 2) {
                     var tiles = this.hand.dec([new parser_1.Tile(k, n), new parser_1.Tile(k, n)]);
                     var r = calc(true);
@@ -357,11 +377,13 @@ var ShantenCalculator = (function () {
         }
         return min;
     };
-    ShantenCalculator.prototype.commonByKind = function (k, n) {
+    ShantenCalculator.prototype.commonByType = function (k, n) {
         if (n === void 0) { n = 1; }
+        if (k == constants_1.TYPE.BACK || k == constants_1.TYPE.Z)
+            throw new Error("expect number type but ".concat(k));
         if (n > 9)
             return this.groupRemainingTiles(k);
-        var max = this.commonByKind(k, n + 1);
+        var max = this.commonByType(k, n + 1);
         if (n <= 7 &&
             this.hand.get(k, n) > 0 &&
             this.hand.get(k, n + 1) > 0 &&
@@ -371,7 +393,7 @@ var ShantenCalculator = (function () {
                 new parser_1.Tile(k, n + 1),
                 new parser_1.Tile(k, n + 2),
             ]);
-            var r = this.commonByKind(k, n);
+            var r = this.commonByType(k, n);
             this.hand.inc(tiles);
             r.patternA[0]++, r.patternB[0]++;
             if (r.patternA[2] < max.patternA[2] ||
@@ -389,7 +411,7 @@ var ShantenCalculator = (function () {
                 new parser_1.Tile(k, n),
                 new parser_1.Tile(k, n),
             ]);
-            var r = this.commonByKind(k, n);
+            var r = this.commonByType(k, n);
             this.hand.inc(tiles);
             r.patternA[0]++, r.patternB[0]++;
             if (r.patternA[2] < max.patternA[2] ||
@@ -444,55 +466,16 @@ var ShantenCalculator = (function () {
     return ShantenCalculator;
 }());
 exports.ShantenCalculator = ShantenCalculator;
-var ExShantenCalculator = (function () {
-    function ExShantenCalculator(h) {
-        this.h = h;
-        this.c = new ShantenCalculator(h);
-    }
-    ExShantenCalculator.prototype.menzen = function () {
-        return this.h.menzen ? this.c.calc() : Number.POSITIVE_INFINITY;
-    };
-    ExShantenCalculator.prototype.yakuhai = function () {
-        var three = 0;
-        var vPon = null;
-        for (var _i = 0, _a = [1, 2, 3, 4, 5, 6, 7]; _i < _a.length; _i++) {
-            var n = _a[_i];
-            if (this.h.get(constants_1.TYPE.Z, n) >= 3)
-                three++;
-            else if (this.h.get(constants_1.TYPE.Z, n) == 2) {
-                var t = new parser_1.Tile(constants_1.TYPE.Z, n);
-                vPon = new parser_1.BlockPon([t, t.clone(), t.clone()]);
-            }
-            else
-                for (var _b = 0, _c = this.h.called; _b < _c.length; _b++) {
-                    var b = _c[_b];
-                    if (b.tiles[0].t == constants_1.TYPE.Z && b.tiles[0].n == n)
-                        three++;
-                }
-        }
-        if (three > 0)
-            return this.c.calc();
-        if (vPon) {
-            var cloned = this.h.clone();
-            cloned.call(vPon);
-            return new ShantenCalculator(cloned).calc() + 1;
-        }
-        return Number.POSITIVE_INFINITY;
-    };
-    ExShantenCalculator.prototype.tanyao = function () { };
-    return ExShantenCalculator;
-}());
-exports.ExShantenCalculator = ExShantenCalculator;
-var TileCalculator = (function () {
-    function TileCalculator(hand) {
+var BlockCalculator = (function () {
+    function BlockCalculator(hand) {
         this.hand = hand;
     }
-    TileCalculator.prototype.calc = function (lastTile) {
+    BlockCalculator.prototype.calc = function (lastTile) {
         if (this.hand.drawn != null)
             lastTile = this.hand.drawn;
         return this.markDrawn(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], this.sevenPairs(), true), this.thirteenOrphans(), true), this.nineGates(), true), this.fourSetsOnePair(), true), lastTile);
     };
-    TileCalculator.prototype.markDrawn = function (hands, lastTile) {
+    BlockCalculator.prototype.markDrawn = function (hands, lastTile) {
         if (hands.length == 0)
             return [];
         var op = this.hand.drawn != null
@@ -530,7 +513,7 @@ var TileCalculator = (function () {
         }
         return newHands;
     };
-    TileCalculator.prototype.sevenPairs = function () {
+    BlockCalculator.prototype.sevenPairs = function () {
         if (this.hand.called.length > 0)
             return [];
         var ret = [];
@@ -550,7 +533,7 @@ var TileCalculator = (function () {
         }
         return [ret];
     };
-    TileCalculator.prototype.thirteenOrphans = function () {
+    BlockCalculator.prototype.thirteenOrphans = function () {
         var ret = [];
         var pairs = "";
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
@@ -570,7 +553,7 @@ var TileCalculator = (function () {
         }
         return [ret];
     };
-    TileCalculator.prototype.nineGates = function () {
+    BlockCalculator.prototype.nineGates = function () {
         var _this = this;
         var cond = function (k, n, want) {
             return want.includes(_this.hand.get(k, n));
@@ -597,13 +580,13 @@ var TileCalculator = (function () {
         }
         return [];
     };
-    TileCalculator.prototype.fourSetsOnePair = function () {
+    BlockCalculator.prototype.fourSetsOnePair = function () {
         var ret = [];
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
             var k = _a[_i];
-            if (k == constants_1.TYPE.BACK)
-                continue;
             var _loop_1 = function (n) {
+                if (k == constants_1.TYPE.BACK && this_1.hand.get(k, n) % 3 != 2)
+                    return "continue";
                 if (this_1.hand.get(k, n) >= 2) {
                     var tiles_3 = this_1.hand.dec([new parser_1.Tile(k, n), new parser_1.Tile(k, n)]);
                     var v = this_1.commonAll()
@@ -623,25 +606,39 @@ var TileCalculator = (function () {
         }
         return ret;
     };
-    TileCalculator.prototype.commonAll = function () {
+    BlockCalculator.prototype.commonAll = function () {
         var _this = this;
         var handleZ = function () {
             var z = [];
-            var k = constants_1.TYPE.Z;
-            for (var n = 1; n < _this.hand.getArrayLen(k); n++) {
-                if (_this.hand.get(k, n) == 0)
+            var zt = constants_1.TYPE.Z;
+            for (var n = 1; n < _this.hand.getArrayLen(zt); n++) {
+                if (_this.hand.get(zt, n) == 0)
                     continue;
-                else if (_this.hand.get(k, n) != 3)
+                else if (_this.hand.get(zt, n) != 3)
                     return [];
-                z.push(new parser_1.BlockThree([new parser_1.Tile(k, n), new parser_1.Tile(k, n), new parser_1.Tile(k, n)]));
+                z.push(new parser_1.BlockThree([new parser_1.Tile(zt, n), new parser_1.Tile(zt, n), new parser_1.Tile(zt, n)]));
             }
             return z.length == 0 ? [] : [z];
         };
+        var handleBack = function () {
+            var b = [];
+            var bt = constants_1.TYPE.BACK;
+            var sum = _this.hand.get(bt, 0);
+            if (sum < 3)
+                return [];
+            Array(Math.floor(sum / 3))
+                .fill(undefined)
+                .map(function (_) {
+                b.push(new parser_1.BlockThree([new parser_1.Tile(bt, 0), new parser_1.Tile(bt, 0), new parser_1.Tile(bt, 0)]));
+            });
+            return b.length == 0 ? [] : [b];
+        };
         var vvv = [
-            this.commonByKind(constants_1.TYPE.M),
-            this.commonByKind(constants_1.TYPE.P),
-            this.commonByKind(constants_1.TYPE.S),
+            this.commonByType(constants_1.TYPE.M),
+            this.commonByType(constants_1.TYPE.P),
+            this.commonByType(constants_1.TYPE.S),
             handleZ(),
+            handleBack(),
             [this.hand.called],
         ].sort(function (a, b) { return b.length - a.length; });
         var ret = vvv[0].concat();
@@ -655,23 +652,23 @@ var TileCalculator = (function () {
         }
         return ret;
     };
-    TileCalculator.prototype.commonByKind = function (k, n) {
+    BlockCalculator.prototype.commonByType = function (t, n) {
         if (n === void 0) { n = 1; }
         if (n > 9)
             return [];
-        if (this.hand.get(k, n) == 0)
-            return this.commonByKind(k, n + 1);
+        if (this.hand.get(t, n) == 0)
+            return this.commonByType(t, n + 1);
         var ret = [];
         if (n <= 7 &&
-            this.hand.get(k, n) > 0 &&
-            this.hand.get(k, n + 1) > 0 &&
-            this.hand.get(k, n + 2) > 0) {
+            this.hand.get(t, n) > 0 &&
+            this.hand.get(t, n + 1) > 0 &&
+            this.hand.get(t, n + 2) > 0) {
             var tiles = this.hand.dec([
-                new parser_1.Tile(k, n),
-                new parser_1.Tile(k, n + 1),
-                new parser_1.Tile(k, n + 2),
+                new parser_1.Tile(t, n),
+                new parser_1.Tile(t, n + 1),
+                new parser_1.Tile(t, n + 2),
             ]);
-            var nested = this.commonByKind(k, n);
+            var nested = this.commonByType(t, n);
             this.hand.inc(tiles);
             if (nested.length == 0)
                 nested.push([]);
@@ -681,13 +678,13 @@ var TileCalculator = (function () {
                 ret.push(arr);
             }
         }
-        if (this.hand.get(k, n) == 3) {
+        if (this.hand.get(t, n) == 3) {
             var tiles = this.hand.dec([
-                new parser_1.Tile(k, n),
-                new parser_1.Tile(k, n),
-                new parser_1.Tile(k, n),
+                new parser_1.Tile(t, n),
+                new parser_1.Tile(t, n),
+                new parser_1.Tile(t, n),
             ]);
-            var nested = this.commonByKind(k, n);
+            var nested = this.commonByType(t, n);
             this.hand.inc(tiles);
             if (nested.length == 0)
                 nested.push([]);
@@ -699,9 +696,9 @@ var TileCalculator = (function () {
         }
         return ret;
     };
-    return TileCalculator;
+    return BlockCalculator;
 }());
-exports.TileCalculator = TileCalculator;
+exports.BlockCalculator = BlockCalculator;
 var DoubleCalculator = (function () {
     function DoubleCalculator(hand, params) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -863,7 +860,7 @@ var DoubleCalculator = (function () {
         return ret;
     };
     DoubleCalculator.prototype.minus = function () {
-        return this.hand.canReach ? 0 : 1;
+        return this.hand.menzen ? 0 : 1;
     };
     DoubleCalculator.prototype.dA1 = function (h) {
         if (this.cfg.reached == 1)
@@ -914,13 +911,13 @@ var DoubleCalculator = (function () {
             if (tile.t == constants_1.TYPE.Z) {
                 if (tile.equals(_this.cfg.myWind))
                     ret.push({ name: "自風", double: 1 });
-                if (tile.equals(_this.cfg.roundWind))
+                else if (tile.equals(_this.cfg.roundWind))
                     ret.push({ name: "場風", double: 1 });
-                if (tile.n == 5)
+                else if (tile.n == 5)
                     ret.push({ name: "白", double: 1 });
-                if (tile.n == 6)
+                else if (tile.n == 6)
                     ret.push({ name: "發", double: 1 });
-                if (tile.n == 7)
+                else if (tile.n == 7)
                     ret.push({ name: "中", double: 1 });
             }
         });
@@ -985,13 +982,13 @@ var DoubleCalculator = (function () {
             var tile = block.minTile();
             if (tile.t == constants_1.TYPE.Z)
                 return "continue";
-            var filteredKinds = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
+            var filteredTypes = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
             var cond1 = h.some(function (b) {
-                var newTile = new parser_1.Tile(filteredKinds[0], tile.n);
+                var newTile = new parser_1.Tile(filteredTypes[0], tile.n);
                 return check(b) && newTile.equals(b.minTile(), true);
             });
             var cond2 = h.some(function (b) {
-                var newTile = new parser_1.Tile(filteredKinds[1], tile.n);
+                var newTile = new parser_1.Tile(filteredTypes[1], tile.n);
                 return check(b) && newTile.equals(b.minTile(), true);
             });
             if (cond1 && cond2)
@@ -1050,13 +1047,13 @@ var DoubleCalculator = (function () {
             var tile = block.minTile();
             if (tile.t == constants_1.TYPE.Z)
                 return "continue";
-            var filteredKinds = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
+            var filteredTypes = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
             var cond1 = h.some(function (b) {
-                var newTile = new parser_1.Tile(filteredKinds[0], tile.n);
+                var newTile = new parser_1.Tile(filteredTypes[0], tile.n);
                 return check(b) && newTile.equals(b.minTile(), true);
             });
             var cond2 = h.some(function (b) {
-                var newTile = new parser_1.Tile(filteredKinds[1], tile.n);
+                var newTile = new parser_1.Tile(filteredTypes[1], tile.n);
                 return check(b) && newTile.equals(b.minTile(), true);
             });
             if (cond1 && cond2)
@@ -1085,7 +1082,9 @@ var DoubleCalculator = (function () {
         return cond ? [{ name: "混老頭", double: 2 }] : [];
     };
     DoubleCalculator.prototype.dI2 = function (h) {
-        if (!h.some(function (b) { return b instanceof parser_1.BlockRun; }) && !(h.length == 7))
+        if (h.length == 7)
+            return [];
+        if (!h.some(function (b) { return b instanceof parser_1.BlockRun || b instanceof parser_1.BlockChi; }))
             return [];
         if (!h.some(function (b) { return b.tiles[0].t == constants_1.TYPE.Z; }))
             return [];
@@ -1146,13 +1145,14 @@ var DoubleCalculator = (function () {
         return [];
     };
     DoubleCalculator.prototype.dB3 = function (h) {
-        if (!h.some(function (b) { return b instanceof parser_1.BlockRun; }) && !(h.length == 7))
+        if (h.length == 7)
+            return [];
+        if (!h.some(function (b) { return b instanceof parser_1.BlockRun || b instanceof parser_1.BlockChi; }))
             return [];
         if (h.some(function (b) { return b.tiles[0].t == constants_1.TYPE.Z; }))
             return [];
         var cond = h.every(function (b) {
-            var values = b.tiles[0].t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
-            return b.tiles.some(function (t) { return values.includes(t.n); });
+            return b.tiles.some(function (t) { return [1, 9].includes(t.n); });
         });
         return cond ? [{ name: "純全帯么九色", double: 3 - this.minus() }] : [];
     };

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

@@ -340,7 +340,7 @@ var Controller = (function () {
             env.replacementWin = params === null || params === void 0 ? void 0 : params.replacementWin;
         }
         env.oneShotWin = params === null || params === void 0 ? void 0 : params.oneShot;
-        var tc = new calculator_1.TileCalculator(hand);
+        var tc = new calculator_1.BlockCalculator(hand);
         var dc = new calculator_1.DoubleCalculator(hand, env);
         var hands = tc.calc(t);
         var ret = dc.calc(hands);
@@ -479,7 +479,7 @@ var Controller = (function () {
         var hand = this.hand(w);
         if (hand.reached)
             return false;
-        if (!hand.canReach)
+        if (!hand.menzen)
             return false;
         var s = new calculator_1.ShantenCalculator(hand).calc();
         if (s > 0)

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

@@ -13,6 +13,10 @@ export declare class Efficiency {
         shanten: number;
         candidates: Tile[];
     };
+    static partialCandidateTiles(input: string): {
+        shanten: number;
+        candidates: Tile[];
+    };
 }
 export interface PlayerCandidate {
     tile: Tile;

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

@@ -41,6 +41,7 @@ var Efficiency = (function () {
     Efficiency.candidateTiles = function (hand) {
         var r = Number.POSITIVE_INFINITY;
         var candidates = [];
+        var sc = new calculator_1.ShantenCalculator(hand);
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
             var k = _a[_i];
             if (k == constants_1.TYPE.BACK)
@@ -50,7 +51,7 @@ var Efficiency = (function () {
                     continue;
                 var t = new parser_1.Tile(k, n);
                 var tiles = hand.inc([t]);
-                var s = new calculator_1.ShantenCalculator(hand).calc();
+                var s = sc.calc();
                 hand.dec(tiles);
                 if (s < r) {
                     r = s;
@@ -65,6 +66,13 @@ var Efficiency = (function () {
             candidates: candidates,
         };
     };
+    Efficiency.partialCandidateTiles = function (input) {
+        var h = new calculator_1.Hand(input, true);
+        Array(13 - h.hands.length)
+            .fill(undefined)
+            .map(function () { return h.inc([new parser_1.Tile(constants_1.TYPE.BACK, 0)]); });
+        return Efficiency.candidateTiles(h);
+    };
     return Efficiency;
 }());
 exports.Efficiency = Efficiency;
@@ -179,7 +187,7 @@ var RiskRank = (function () {
     };
     RiskRank.rankZ = function (c, targetUser, t) {
         if (t.t != constants_1.TYPE.Z)
-            throw new Error("expected KIND.Z but ".concat(t.toString()));
+            throw new Error("expected TYPE.Z but ".concat(t.toString()));
         if (c.isSafeTile(t.t, t.n, targetUser))
             return 0;
         var remaining = c.get(t);
@@ -187,7 +195,7 @@ var RiskRank = (function () {
     };
     RiskRank.rankN = function (c, targetUser, t) {
         if (!t.isNum())
-            throw new Error("expected KIND.NUMBER but ".concat(t.toString()));
+            throw new Error("expected TYPE.NUMBER but ".concat(t.toString()));
         var n = t.n;
         var type = t.t;
         if (c.isSafeTile(type, n, targetUser))

package/dist/mjs/lib/parser.js

@@ -123,6 +123,8 @@ var Block = (function () {
         }, [true, this.tiles[0]]), sameAll = _a[0], _ = _a[1];
         var ret = "";
         if (sameAll) {
+            if (this.tiles[0].t == constants_1.TYPE.BACK)
+                return this.tiles.join("");
             for (var _i = 0, _b = this.tiles; _i < _b.length; _i++) {
                 var v = _b[_i];
                 ret += v.toString().slice(0, -1);
@@ -399,7 +401,7 @@ function detectBlockType(tiles) {
         return constants_1.BLOCK.UNKNOWN;
     if (numOfHorizontals == 0 && numOfBackTiles == 0)
         return constants_1.BLOCK.HAND;
-    if (tiles.length === 3) {
+    if (tiles.length === 3 && numOfBackTiles === 0) {
         if (sameAll)
             return constants_1.BLOCK.PON;
         if (numOfHorizontals == 1 && areConsecutiveTiles(tiles))

package/package.json

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