@konoui/mjimage 0.0.12 → 0.0.13

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

@@ -1,22 +1,11 @@
 import { TYPE, Round, Wind } from "../constants";
 import { Tile, BlockPon, BlockChi, BlockShoKan, BlockAnKan, BlockDaiKan, Type, Block } from "../parser";
-type FixedNumber = [
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number,
-    number
-];
+export type TupleOfSize<T, N extends number, R extends unknown[] = []> = R["length"] extends N ? R : TupleOfSize<T, N, [T, ...R]>;
 export interface HandData {
-    [TYPE.M]: FixedNumber;
-    [TYPE.S]: FixedNumber;
-    [TYPE.P]: FixedNumber;
-    [TYPE.Z]: [number, number, number, number, number, number, number, number];
+    [TYPE.M]: TupleOfSize<number, 10>;
+    [TYPE.S]: TupleOfSize<number, 10>;
+    [TYPE.P]: TupleOfSize<number, 10>;
+    [TYPE.Z]: TupleOfSize<number, 8>;
     [TYPE.BACK]: [string, number];
     called: (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
     tsumo: Tile | null;
@@ -32,8 +21,8 @@ export declare class Hand {
     get reached(): boolean;
     get drawn(): Tile | null;
     get menzen(): boolean;
-    getArrayLen(k: Type): 2 | 8 | 10;
-    sum(k: Type): number;
+    getArrayLen(t: Type): 2 | 8 | 10;
+    sum(t: Type): number;
     get(t: Type, n: number): number;
     inc(tiles: Tile[]): Tile[];
     dec(tiles: Tile[]): Tile[];
@@ -272,4 +261,3 @@ export declare class DoubleCalculator {
     dK13(h: Block[]): never[];
     calcFu(h: Block[]): number;
 }
-export {};

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

@@ -65,15 +65,15 @@ var Hand = (function () {
         get: function () {
             var tiles = [];
             for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-                var k = _a[_i];
-                for (var n = 1; n < this.getArrayLen(k); n++) {
-                    var count = this.get(k, n);
-                    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));
+                var t = _a[_i];
+                for (var n = 1; n < this.getArrayLen(t); n++) {
+                    var count = this.get(t, n);
+                    if (t != constants_1.TYPE.Z && n == 5 && this.get(t, 0) > 0) {
+                        count -= this.get(t, 0);
+                        tiles.push(new parser_1.Tile(t, 0));
                     }
                     for (var i = 0; i < count; i++) {
-                        tiles.push(new parser_1.Tile(k, n));
+                        tiles.push(new parser_1.Tile(t, n));
                     }
                 }
             }
@@ -126,13 +126,13 @@ var Hand = (function () {
         enumerable: false,
         configurable: true
     });
-    Hand.prototype.getArrayLen = function (k) {
-        return this.data[k].length;
+    Hand.prototype.getArrayLen = function (t) {
+        return this.data[t].length;
     };
-    Hand.prototype.sum = function (k) {
+    Hand.prototype.sum = function (t) {
         var sum = 0;
-        for (var n = 1; n < this.getArrayLen(k); n++)
-            sum += this.get(k, n);
+        for (var n = 1; n < this.getArrayLen(t); n++)
+            sum += this.get(t, n);
         return sum;
     };
     Hand.prototype.get = function (t, n) {
@@ -144,7 +144,7 @@ var Hand = (function () {
         var backup = [];
         for (var _i = 0, tiles_1 = tiles; _i < tiles_1.length; _i++) {
             var t = tiles_1[_i];
-            if (t.t != constants_1.TYPE.BACK && this.get(t.t, t.n) > 4) {
+            if (t.t != constants_1.TYPE.BACK && this.get(t.t, t.n) >= 4) {
                 this.dec(backup);
                 throw new Error("unable to increase ".concat(t, " in ").concat(this.toString()));
             }
@@ -301,15 +301,15 @@ var ShantenCalculator = (function () {
         var nOrphans = 0;
         var nPairs = 0;
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            if (k == constants_1.TYPE.BACK)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
                 continue;
-            var nn = k == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var nn = t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
             for (var _b = 0, nn_1 = nn; _b < nn_1.length; _b++) {
                 var n = nn_1[_b];
-                if (this.hand.get(k, n) >= 1)
+                if (this.hand.get(t, n) >= 1)
                     nOrphans++;
-                if (this.hand.get(k, n) >= 2)
+                if (this.hand.get(t, n) >= 2)
                     nPairs++;
             }
         }
@@ -361,12 +361,10 @@ var ShantenCalculator = (function () {
         };
         var min = calc(false);
         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 t = _a[_i];
+            for (var n = 1; n < this.hand.getArrayLen(t); n++) {
+                if (this.hand.get(t, n) >= 2) {
+                    var tiles = this.hand.dec([new parser_1.Tile(t, n), new parser_1.Tile(t, n)]);
                     var r = calc(true);
                     this.hand.inc(tiles);
                     if (r < min) {
@@ -377,23 +375,23 @@ var ShantenCalculator = (function () {
         }
         return min;
     };
-    ShantenCalculator.prototype.commonByType = function (k, n) {
+    ShantenCalculator.prototype.commonByType = function (t, 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 (t == constants_1.TYPE.BACK || t == constants_1.TYPE.Z)
+            throw new Error("expect number type but ".concat(t));
         if (n > 9)
-            return this.groupRemainingTiles(k);
-        var max = this.commonByType(k, n + 1);
+            return this.groupRemainingTiles(t);
+        var max = this.commonByType(t, n + 1);
         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 r = this.commonByType(k, n);
+            var r = this.commonByType(t, n);
             this.hand.inc(tiles);
             r.patternA[0]++, r.patternB[0]++;
             if (r.patternA[2] < max.patternA[2] ||
@@ -405,13 +403,13 @@ var ShantenCalculator = (function () {
                 max.patternB = r.patternB;
             }
         }
-        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 r = this.commonByType(k, n);
+            var r = this.commonByType(t, n);
             this.hand.inc(tiles);
             r.patternA[0]++, r.patternB[0]++;
             if (r.patternA[2] < max.patternA[2] ||
@@ -425,15 +423,15 @@ var ShantenCalculator = (function () {
         }
         return max;
     };
-    ShantenCalculator.prototype.groupRemainingTiles = function (k) {
+    ShantenCalculator.prototype.groupRemainingTiles = function (t) {
         var nSerialPairs = 0;
         var nIsolated = 0;
         var nTiles = 0;
-        for (var n = 1; n < this.hand.getArrayLen(k); n++) {
-            nTiles += this.hand.get(k, n);
+        for (var n = 1; n < this.hand.getArrayLen(t); n++) {
+            nTiles += this.hand.get(t, n);
             if (n <= 7 &&
-                this.hand.get(k, n + 1) == 0 &&
-                this.hand.get(k, n + 2) == 0) {
+                this.hand.get(t, n + 1) == 0 &&
+                this.hand.get(t, n + 2) == 0) {
                 nSerialPairs += nTiles >> 1;
                 nIsolated += nTiles % 2;
                 nTiles = 0;
@@ -518,13 +516,13 @@ var BlockCalculator = (function () {
             return [];
         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)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
                 continue;
-            for (var n = 1; n < this.hand.getArrayLen(k); n++) {
-                var v = this.hand.get(k, n);
+            for (var n = 1; n < this.hand.getArrayLen(t); n++) {
+                var v = this.hand.get(t, n);
                 if (v == 2)
-                    ret.push(new parser_1.BlockPair(new parser_1.Tile(k, n), new parser_1.Tile(k, n)));
+                    ret.push(new parser_1.BlockPair(new parser_1.Tile(t, n), new parser_1.Tile(t, n)));
                 else if (v == 0)
                     continue;
                 else
@@ -537,16 +535,16 @@ var BlockCalculator = (function () {
         var ret = [];
         var pairs = "";
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            if (k == constants_1.TYPE.BACK)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
                 continue;
-            var nn = k == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var nn = t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
             for (var _b = 0, nn_2 = nn; _b < nn_2.length; _b++) {
                 var n = nn_2[_b];
-                if (this.hand.get(k, n) == 1)
-                    ret.push(new parser_1.BlockIsolated(new parser_1.Tile(k, n)));
-                else if (this.hand.get(k, n) == 2 && pairs == "")
-                    ret.unshift(new parser_1.BlockPair(new parser_1.Tile(k, n), new parser_1.Tile(k, n)));
+                if (this.hand.get(t, n) == 1)
+                    ret.push(new parser_1.BlockIsolated(new parser_1.Tile(t, n)));
+                else if (this.hand.get(t, n) == 2 && pairs == "")
+                    ret.unshift(new parser_1.BlockPair(new parser_1.Tile(t, n), new parser_1.Tile(t, n)));
                 else
                     return [];
             }
@@ -555,25 +553,25 @@ var BlockCalculator = (function () {
     };
     BlockCalculator.prototype.nineGates = function () {
         var _this = this;
-        var cond = function (k, n, want) {
-            return want.includes(_this.hand.get(k, n));
+        var cond = function (t, n, want) {
+            return want.includes(_this.hand.get(t, n));
         };
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            if (k == constants_1.TYPE.BACK)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
                 continue;
-            if (k == constants_1.TYPE.Z)
+            if (t == constants_1.TYPE.Z)
                 continue;
-            var cond1 = cond(k, 1, [3, 4]) &&
-                cond(k, 9, [3, 4]) &&
-                cond(k, 2, [1, 2]) &&
-                cond(k, 3, [1, 2]) &&
-                cond(k, 4, [1, 2]) &&
-                cond(k, 5, [1, 2]) &&
-                cond(k, 6, [1, 2]) &&
-                cond(k, 7, [1, 2]) &&
-                cond(k, 8, [1, 2]);
-            var cond2 = this.hand.sum(k) == 14;
+            var cond1 = cond(t, 1, [3, 4]) &&
+                cond(t, 9, [3, 4]) &&
+                cond(t, 2, [1, 2]) &&
+                cond(t, 3, [1, 2]) &&
+                cond(t, 4, [1, 2]) &&
+                cond(t, 5, [1, 2]) &&
+                cond(t, 6, [1, 2]) &&
+                cond(t, 7, [1, 2]) &&
+                cond(t, 8, [1, 2]);
+            var cond2 = this.hand.sum(t) == 14;
             if (cond1 && cond2) {
                 return [[new parser_1.Block(this.hand.hands, constants_1.BLOCK.HAND)]];
             }
@@ -583,12 +581,10 @@ var BlockCalculator = (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];
+            var t = _a[_i];
             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)]);
+                if (this_1.hand.get(t, n) >= 2) {
+                    var tiles_3 = this_1.hand.dec([new parser_1.Tile(t, n), new parser_1.Tile(t, n)]);
                     var v = this_1.commonAll()
                         .filter(function (arr) { return arr.length == 4; })
                         .map(function (arr) {
@@ -600,7 +596,7 @@ var BlockCalculator = (function () {
                 }
             };
             var this_1 = this;
-            for (var n = 1; n < this.hand.getArrayLen(k); n++) {
+            for (var n = 1; n < this.hand.getArrayLen(t); n++) {
                 _loop_1(n);
             }
         }
@@ -1130,15 +1126,15 @@ var DoubleCalculator = (function () {
         var cond = !h.some(function (block) { return block.tiles[0].t == constants_1.TYPE.Z; });
         if (cond)
             return [];
-        var _loop_4 = function (k) {
-            var ok = h.every(function (b) { return b.tiles[0].t == constants_1.TYPE.Z || b.tiles[0].t == k; });
+        var _loop_4 = function (t) {
+            var ok = h.every(function (b) { return b.tiles[0].t == constants_1.TYPE.Z || b.tiles[0].t == t; });
             if (ok)
                 return { value: [{ name: "混一色", double: 3 - this_3.minus() }] };
         };
         var this_3 = this;
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            var state_3 = _loop_4(k);
+            var t = _a[_i];
+            var state_3 = _loop_4(t);
             if (typeof state_3 === "object")
                 return state_3.value;
         }
@@ -1165,17 +1161,17 @@ var DoubleCalculator = (function () {
     DoubleCalculator.prototype.dA6 = function (h) {
         if (h.some(function (block) { return block.tiles[0].t == constants_1.TYPE.Z; }))
             return [];
-        var _loop_5 = function (k) {
-            if (k == constants_1.TYPE.Z)
+        var _loop_5 = function (t) {
+            if (t == constants_1.TYPE.Z)
                 return "continue";
-            var ok = h.every(function (v) { return v.tiles[0].t == k; });
+            var ok = h.every(function (v) { return v.tiles[0].t == t; });
             if (ok)
                 return { value: [{ name: "清一色", double: 6 - this_4.minus() }] };
         };
         var this_4 = this;
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
-            var k = _a[_i];
-            var state_4 = _loop_5(k);
+            var t = _a[_i];
+            var state_4 = _loop_5(t);
             if (typeof state_4 === "object")
                 return state_4.value;
         }
@@ -1385,6 +1381,6 @@ var countSameBlocks = function (h) {
 };
 var toDora = function (doraMarker) {
     var n = doraMarker.isNum() && doraMarker.n == 0 ? 5 : doraMarker.n;
-    var k = doraMarker.t;
-    return new parser_1.Tile(k, (n % 9) + 1);
+    var t = doraMarker.t;
+    return new parser_1.Tile(t, (n % 9) + 1);
 };

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

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

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

@@ -43,22 +43,22 @@ var Efficiency = (function () {
         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)
+            var t = _a[_i];
+            if (t == constants_1.TYPE.BACK)
                 continue;
-            for (var n = 1; n < hand.getArrayLen(k); n++) {
-                if (hand.get(k, n) >= 4)
+            for (var n = 1; n < hand.getArrayLen(t); n++) {
+                if (hand.get(t, n) >= 4)
                     continue;
-                var t = new parser_1.Tile(k, n);
-                var tiles = hand.inc([t]);
+                var tile = new parser_1.Tile(t, n);
+                var tiles = hand.inc([tile]);
                 var s = sc.calc();
                 hand.dec(tiles);
                 if (s < r) {
                     r = s;
-                    candidates = [t];
+                    candidates = [tile];
                 }
                 else if (s == r)
-                    candidates.push(t);
+                    candidates.push(tile);
             }
         }
         return {
@@ -73,6 +73,14 @@ var Efficiency = (function () {
             .map(function () { return h.inc([new parser_1.Tile(constants_1.TYPE.BACK, 0)]); });
         return Efficiency.candidateTiles(h);
     };
+    Efficiency.partialShanten = 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)]); });
+        var sc = new calculator_1.ShantenCalculator(h);
+        return sc.calc();
+    };
     return Efficiency;
 }());
 exports.Efficiency = Efficiency;

package/dist/mjs/lib/parser.js

@@ -23,10 +23,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = exports.blockWrapper = exports.BlockIsolated = exports.BlockRun = exports.BlockThree = exports.BlockPair = exports.BlockShoKan = exports.BlockDaiKan = exports.BlockAnKan = exports.BlockPon = exports.BlockChi = exports.Block = exports.Tile = exports.isType = exports.tileSortFunc = void 0;
 var lexer_1 = require("./lexer");
 var constants_1 = require("./constants");
+var assert_1 = __importDefault(require("assert"));
 var tileSortFunc = function (i, j) {
     var _a;
     if (i.t == j.t) {
@@ -118,21 +122,20 @@ var Block = (function () {
         }
     }
     Block.prototype.toString = function () {
-        var _a = this.tiles.reduce(function (a, b) {
-            return [a[0] && a[1].t == b.t, b];
-        }, [true, this.tiles[0]]), sameAll = _a[0], _ = _a[1];
+        var _this = this;
+        var sameType = this.tiles.every(function (v) { return v.t == _this.tiles[0].t; });
         var ret = "";
-        if (sameAll) {
+        if (sameType) {
             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];
+            for (var _i = 0, _a = this.tiles; _i < _a.length; _i++) {
+                var v = _a[_i];
                 ret += v.toString().slice(0, -1);
             }
             return "".concat(ret).concat(this.tiles[0].t);
         }
-        for (var _c = 0, _d = this.tiles; _c < _d.length; _c++) {
-            var t = _d[_c];
+        for (var _b = 0, _c = this.tiles; _b < _c.length; _b++) {
+            var t = _c[_b];
             ret += t.toString();
         }
         return ret;
@@ -167,6 +170,7 @@ var Block = (function () {
     Block.prototype.minTile = function () {
         if (this.is(constants_1.BLOCK.CHI))
             return this.clone().tiles.sort(exports.tileSortFunc)[0];
+        (0, assert_1.default)(!this.is(constants_1.BLOCK.HAND), "mintile() is called with ".concat(this.toString()));
         return this.tiles[0];
     };
     Block.prototype.clone = function () {
@@ -391,7 +395,7 @@ function detectBlockType(tiles) {
             return constants_1.BLOCK.TSUMO;
         return constants_1.BLOCK.HAND;
     }
-    var sameAll = tiles.filter(function (v) { return v.equals(tiles[0], true); }).length == tiles.length;
+    var sameAll = tiles.every(function (v) { return v.equals(tiles[0], true); });
     var numOfHorizontals = tiles.filter(function (v) {
         return v.has(constants_1.OPERATOR.HORIZONTAL);
     }).length;

package/package.json

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