@konoui/mjimage 0.0.27 → 0.0.28

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

@@ -2,12 +2,12 @@ import { Tile } from "../core";
 import { Hand } from "./calc";
 export interface SerializedCandidate {
     tile: string;
-    candidates: string[];
+    candidates: readonly string[];
     shanten: number;
 }
 export interface Candidate {
     tile: Tile;
-    candidates: Tile[];
+    candidates: readonly Tile[];
     shanten: number;
 }
 export declare class Efficiency {

package/dist/mjs/lib/core/parser.d.ts

@@ -47,7 +47,7 @@ export declare abstract class Block {
     };
     get type(): "unknown" | "pon" | "chi" | "shokan" | "daikan" | "ankan" | "tsumo" | "three" | "pair" | "isolated" | "run" | "hand" | "dora" | "simple-discard";
     get tiles(): readonly Tile[];
-    toString(): string;
+    abstract toString(): string;
     is(type: BLOCK): boolean;
     isCalled(): boolean;
     clone(override?: {
@@ -63,9 +63,11 @@ export declare abstract class Block {
 }
 export declare class BlockChi extends Block {
     constructor(tiles: readonly [Tile, Tile, Tile]);
+    toString(): string;
 }
 export declare class BlockPon extends Block {
     constructor(tiles: readonly [Tile, Tile, Tile]);
+    toString(): string;
 }
 export declare class BlockAnKan extends Block {
     constructor(tiles: readonly Tile[]);
@@ -75,27 +77,35 @@ export declare class BlockAnKan extends Block {
 }
 export declare class BlockDaiKan extends Block {
     constructor(tiles: readonly Tile[]);
+    toString(): string;
 }
 export declare class BlockShoKan extends Block {
     constructor(tiles: readonly Tile[]);
+    toString(): string;
 }
 export declare class BlockPair extends Block {
     constructor(tile1: Tile, tile2: Tile);
+    toString(): string;
 }
 export declare class BlockThree extends Block {
     constructor(tiles: readonly [Tile, Tile, Tile]);
+    toString(): string;
 }
 export declare class BlockRun extends Block {
     constructor(tiles: readonly [Tile, Tile, Tile]);
+    toString(): string;
 }
 export declare class BlockIsolated extends Block {
     constructor(tile: Tile);
+    toString(): string;
 }
 export declare class BlockHand extends Block {
     constructor(tiles: readonly Tile[]);
+    toString(): string;
 }
 export declare class BlockOther extends Block {
     constructor(tiles: readonly Tile[], type: BLOCK);
+    toString(): string;
 }
 export declare class Parser {
     readonly input: string;

package/dist/mjs/lib/core/parser.js

@@ -172,25 +172,6 @@ var Block = (function () {
         enumerable: false,
         configurable: true
     });
-    Block.prototype.toString = function () {
-        var _this = this;
-        var sameType = this.tiles.every(function (v) { return v.t == _this.tiles[0].t; });
-        var ret = "";
-        if (sameType) {
-            if (this.tiles[0].t == _1.TYPE.BACK)
-                return this.tiles.join("");
-            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 _b = 0, _c = this.tiles; _b < _c.length; _b++) {
-            var t = _c[_b];
-            ret += t.toString();
-        }
-        return ret;
-    };
     Block.prototype.is = function (type) {
         return this._type == type;
     };
@@ -227,11 +208,42 @@ var Block = (function () {
     return Block;
 }());
 exports.Block = Block;
+var toStringForSame = function (tiles) {
+    var ret = "";
+    for (var _i = 0, tiles_1 = tiles; _i < tiles_1.length; _i++) {
+        var v = tiles_1[_i];
+        if (v.t == _1.TYPE.BACK)
+            return tiles.join("");
+        ret += v.toString().slice(0, -1);
+    }
+    return "".concat(ret).concat(tiles[0].t);
+};
+var toStringForHand = function (tiles) {
+    var preType = tiles[0].t;
+    var ret = "";
+    for (var i = 0; i < tiles.length; i++) {
+        var tile = tiles[i];
+        var type = tile.t;
+        var nop = type == _1.TYPE.BACK ? tile.toString() : tile.toString().slice(0, -1);
+        if (type != preType)
+            if (preType != _1.TYPE.BACK)
+                ret += preType;
+        preType = type;
+        ret += nop;
+    }
+    var last = tiles.at(-1);
+    if (last.t != _1.TYPE.BACK)
+        ret += last.t;
+    return ret;
+};
 var BlockChi = (function (_super) {
     __extends(BlockChi, _super);
     function BlockChi(tiles) {
         return _super.call(this, tiles, _1.BLOCK.CHI) || this;
     }
+    BlockChi.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockChi;
 }(Block));
 exports.BlockChi = BlockChi;
@@ -240,6 +252,9 @@ var BlockPon = (function (_super) {
     function BlockPon(tiles) {
         return _super.call(this, tiles, _1.BLOCK.PON) || this;
     }
+    BlockPon.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockPon;
 }(Block));
 exports.BlockPon = BlockPon;
@@ -281,10 +296,7 @@ var BlockAnKan = (function (_super) {
         return _super.from.call(this, v);
     };
     BlockAnKan.prototype.toString = function () {
-        var tiles = this.tilesWithBack;
-        return tiles.reduce(function (s, t) {
-            return "".concat(s).concat(t.toString());
-        }, "");
+        return toStringForHand(this.tilesWithBack);
     };
     return BlockAnKan;
 }(Block));
@@ -294,6 +306,9 @@ var BlockDaiKan = (function (_super) {
     function BlockDaiKan(tiles) {
         return _super.call(this, tiles, _1.BLOCK.DAI_KAN) || this;
     }
+    BlockDaiKan.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockDaiKan;
 }(Block));
 exports.BlockDaiKan = BlockDaiKan;
@@ -302,6 +317,9 @@ var BlockShoKan = (function (_super) {
     function BlockShoKan(tiles) {
         return _super.call(this, tiles, _1.BLOCK.SHO_KAN) || this;
     }
+    BlockShoKan.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockShoKan;
 }(Block));
 exports.BlockShoKan = BlockShoKan;
@@ -310,6 +328,9 @@ var BlockPair = (function (_super) {
     function BlockPair(tile1, tile2) {
         return _super.call(this, [tile1, tile2], _1.BLOCK.PAIR) || this;
     }
+    BlockPair.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockPair;
 }(Block));
 exports.BlockPair = BlockPair;
@@ -318,6 +339,9 @@ var BlockThree = (function (_super) {
     function BlockThree(tiles) {
         return _super.call(this, tiles, _1.BLOCK.THREE) || this;
     }
+    BlockThree.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockThree;
 }(Block));
 exports.BlockThree = BlockThree;
@@ -326,6 +350,9 @@ var BlockRun = (function (_super) {
     function BlockRun(tiles) {
         return _super.call(this, tiles, _1.BLOCK.RUN) || this;
     }
+    BlockRun.prototype.toString = function () {
+        return toStringForSame(this.tiles);
+    };
     return BlockRun;
 }(Block));
 exports.BlockRun = BlockRun;
@@ -334,6 +361,9 @@ var BlockIsolated = (function (_super) {
     function BlockIsolated(tile) {
         return _super.call(this, [tile], _1.BLOCK.ISOLATED) || this;
     }
+    BlockIsolated.prototype.toString = function () {
+        return this.tiles[0].toString();
+    };
     return BlockIsolated;
 }(Block));
 exports.BlockIsolated = BlockIsolated;
@@ -342,6 +372,9 @@ var BlockHand = (function (_super) {
     function BlockHand(tiles) {
         return _super.call(this, tiles, _1.BLOCK.HAND) || this;
     }
+    BlockHand.prototype.toString = function () {
+        return toStringForHand(this.tiles);
+    };
     return BlockHand;
 }(Block));
 exports.BlockHand = BlockHand;
@@ -350,6 +383,11 @@ var BlockOther = (function (_super) {
     function BlockOther(tiles, type) {
         return _super.call(this, tiles, type) || this;
     }
+    BlockOther.prototype.toString = function () {
+        if (this.is(_1.BLOCK.IMAGE_DISCARD))
+            return this.tiles.join("");
+        return toStringForHand(this.tiles);
+    };
     return BlockOther;
 }(Block));
 exports.BlockOther = BlockOther;
@@ -442,8 +480,8 @@ var Parser = (function () {
         var res = [];
         if (tiles.length == 0)
             return res;
-        for (var _i = 0, tiles_1 = tiles; _i < tiles_1.length; _i++) {
-            var t = tiles_1[_i];
+        for (var _i = 0, tiles_2 = tiles; _i < tiles_2.length; _i++) {
+            var t = tiles_2[_i];
             if (t == _1.INPUT_SEPARATOR) {
                 var type_1 = detectBlockType(cluster);
                 var b_1 = blockWrapper(cluster, type_1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@konoui/mjimage",
-    "version": "0.0.27",
+    "version": "0.0.28",
     "description": "Generates Mahjong tiles in SVG format.",
     "author": "konoui",
     "license": "MIT",
@@ -23,7 +23,8 @@
         "svg-sprite": "svg-sprite -C svg-sprite.config.json -shape-transform-svgo  svg-sprite.config.json static/svg/*.svg",
         "tsc": "tsc --declaration --outDir ./dist/mjs",
         "prepublishOnly": "rm -rf ./dist && npm run tsc && cp -rf ./static/svg ./dist/mjs/svg/",
-        "deploy": "./scripts/sync.sh personal"
+        "deploy": "./scripts/sync.sh personal",
+        "analyze": "parcel build --reporter @parcel/reporter-bundle-analyzer"
     },
     "types": "dist/mjs/index.d.ts",
     "files": [