@konoui/mjimage 0.0.10 → 0.0.12

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

@@ -17,7 +17,7 @@ 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;
@@ -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;

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

@@ -25,7 +25,7 @@ var Hand = (function () {
             _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,
@@ -54,7 +54,7 @@ var Hand = (function () {
                 this.inc(b.tiles);
                 continue;
             }
-            if (allowBackBlock) {
+            else if (allowBackBlock) {
                 this.inc(b.tiles);
                 continue;
             }
@@ -66,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));
                     }
@@ -133,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 = [];
@@ -148,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 &&
@@ -164,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 = [];
@@ -178,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 &&
@@ -269,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++;
             }
         }
@@ -319,7 +331,7 @@ var ShantenCalculator = (function () {
             var b = [0, 0, 0];
             var bn = _this.hand.get(constants_1.TYPE.BACK, 0);
             var bb = bn % 3;
-            b[0] = bn / 3;
+            b[0] = Math.floor(bn / 3);
             if (bb == 2)
                 b[1] = 1;
             if (bb == 1)
@@ -351,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);
@@ -365,6 +379,8 @@ var ShantenCalculator = (function () {
     };
     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.commonByType(k, n + 1);
@@ -569,6 +585,8 @@ var BlockCalculator = (function () {
         for (var _i = 0, _a = Object.values(constants_1.TYPE); _i < _a.length; _i++) {
             var k = _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)]);
                     var v = this_1.commonAll()
@@ -606,7 +624,9 @@ var BlockCalculator = (function () {
             var b = [];
             var bt = constants_1.TYPE.BACK;
             var sum = _this.hand.get(bt, 0);
-            Array(sum / 3)
+            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)]));

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

@@ -66,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;

package/dist/mjs/lib/parser.js

@@ -401,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/dist/mjs/lib/table-parser.d.ts

@@ -70,12 +70,12 @@ declare const tableInputSchema: z.ZodObject<{
         front: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"1w" | "2w" | "3w" | "4w">, z.ZodLiteral<"1w" | "2w" | "3w" | "4w">, ...z.ZodLiteral<"1w" | "2w" | "3w" | "4w">[]]>>>;
     }, "strict", z.ZodTypeAny, {
         round: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
+        front: "1w" | "2w" | "3w" | "4w";
         sticks: {
             reach: number;
             dead: number;
         };
         doras: string[];
-        front: "1w" | "2w" | "3w" | "4w";
     }, {
         round?: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4" | undefined;
         sticks?: {
@@ -108,12 +108,12 @@ declare const tableInputSchema: z.ZodObject<{
     };
     board: {
         round: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
+        front: "1w" | "2w" | "3w" | "4w";
         sticks: {
             reach: number;
             dead: number;
         };
         doras: string[];
-        front: "1w" | "2w" | "3w" | "4w";
     };
 }, {
     board: {
@@ -206,12 +206,12 @@ export declare const parseTableInput: (s: string) => {
     };
     board: {
         round: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
+        front: "1w" | "2w" | "3w" | "4w";
         sticks: {
             reach: number;
             dead: number;
         };
         doras: string[];
-        front: "1w" | "2w" | "3w" | "4w";
     };
 };
 export declare const convertInput: (i: TableInput) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@konoui/mjimage",
-    "version": "0.0.10",
+    "version": "0.0.12",
     "description": "Generates Mahjong tiles in SVG format.",
     "author": "konoui",
     "license": "MIT",
@@ -64,13 +64,13 @@
         "parcel-reporter-static-files-copy": "^1.5.2",
         "process": "^0.11.10",
         "svg-sprite": "^2.0.2",
-        "svgdom": "^0.1.16",
+        "svgdom": "0.1.14",
         "svgo": "^3.0.2",
         "ts-jest": "^29.1.1",
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@svgdotjs/svg.js": "^3.2.0",
+        "@svgdotjs/svg.js": "^3.2.4",
         "eventmit": "^2.0.4",
         "js-yaml": "^4.1.0",
         "xstate": "^5.7.0",