shogiops 0.2.7 → 0.4.0

package/kif.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeKifVariation = exports.makeKifMove = exports.parseKifMoves = exports.parseKifMove = exports.parseTags = exports.parseKifHand = exports.parseKifBoard = exports.parseKifPositionHeader = exports.parseKifHeader = exports.makeKifPocket = exports.makeKifBoard = exports.makeKifPositionHeader = exports.makeKifHeader = exports.KifError = exports.InvalidKif = void 0;
+exports.makeKifVariation = exports.makeKifMove = exports.parseKifMoves = exports.parseKifMove = exports.parseTags = exports.parseKifHand = exports.parseKifBoard = exports.parseKifPositionHeader = exports.parseKifHeader = exports.makeKifHand = exports.makeKifBoard = exports.makeKifPositionHeader = exports.makeKifHeader = exports.KifError = exports.InvalidKif = void 0;
 const result_1 = require("@badrap/result");
 const board_1 = require("./board");
 const fen_1 = require("./fen");
 const kifHandicaps_1 = require("./kifHandicaps");
-const setup_1 = require("./setup");
 const types_1 = require("./types");
 const util_1 = require("./util");
 const kifUtil_1 = require("./kifUtil");
+const hand_1 = require("./hand");
+const variantUtil_1 = require("./variantUtil");
 //
 // KIF HEADER
 //
@@ -17,94 +18,94 @@ var InvalidKif;
     InvalidKif["Kif"] = "ERR_KIF";
     InvalidKif["Board"] = "ERR_BOARD";
     InvalidKif["Handicap"] = "ERR_HANDICAP";
-    InvalidKif["Pockets"] = "ERR_POCKETS";
+    InvalidKif["Hands"] = "ERR_HANDS";
 })(InvalidKif = exports.InvalidKif || (exports.InvalidKif = {}));
 class KifError extends Error {
 }
 exports.KifError = KifError;
 // Export
 function makeKifHeader(setup) {
-    const handicap = (0, kifHandicaps_1.sfenToHandicapName)((0, fen_1.makeFen)(setup, { epd: true }));
-    if ((0, util_1.defined)(handicap))
+    const handicap = kifHandicaps_1.sfenToHandicapName(fen_1.makeFen(setup, { epd: true }));
+    if (util_1.defined(handicap))
         return '手合割：' + handicap;
     return makeKifPositionHeader(setup);
 }
 exports.makeKifHeader = makeKifHeader;
 function makeKifPositionHeader(setup) {
     return [
-        '後手の持駒：' + makeKifPocket(setup.pockets.gote),
+        '後手の持駒：' + makeKifHand(setup.hands.gote),
         makeKifBoard(setup.board),
-        '先手の持駒：' + makeKifPocket(setup.pockets.sente),
+        '先手の持駒：' + makeKifHand(setup.hands.sente),
         ...(setup.turn === 'gote' ? ['後手番'] : []),
     ].join('\n');
 }
 exports.makeKifPositionHeader = makeKifPositionHeader;
 function makeKifBoard(board) {
-    let kifBoard = '  ９ ８ ７ ６ ５ ４ ３ ２ １\n+---------------------------+\n';
-    for (let rank = 8; rank >= 0; rank--) {
-        for (let file = 0; file < 9; file++) {
+    const kifFiles = ' ９ ８ ７ ６ ５ ４ ３ ２ １'.slice(-(board.numberOfFiles * 2));
+    const separator = '+' + '-'.repeat(board.numberOfFiles * 3) + '+';
+    const offset = 9 - board.numberOfFiles;
+    let kifBoard = ' ' + kifFiles + `\n${separator}\n`;
+    for (let rank = 8; rank >= 9 - board.numberOfRanks; rank--) {
+        for (let file = offset; file < 9; file++) {
             const square = file + rank * 9;
             const piece = board.get(square);
-            if (file === 0) {
+            if (file === offset) {
                 kifBoard += '|';
             }
             if (!piece)
                 kifBoard += ' ・';
             else {
                 if (piece.color === 'gote')
-                    kifBoard += 'v' + (0, util_1.roleTo1Kanji)(piece.role);
+                    kifBoard += 'v' + util_1.roleTo1Kanji(piece.role);
                 else
-                    kifBoard += ' ' + (0, util_1.roleTo1Kanji)(piece.role);
+                    kifBoard += ' ' + util_1.roleTo1Kanji(piece.role);
             }
             if (file === 8) {
-                kifBoard += '|' + (0, kifUtil_1.numberToKanji)(9 - rank) + '\n';
+                kifBoard += '|' + kifUtil_1.numberToKanji(9 - rank) + '\n';
             }
         }
     }
-    kifBoard += '+---------------------------+';
+    kifBoard += separator;
     return kifBoard;
 }
 exports.makeKifBoard = makeKifBoard;
-function makeKifPocket(material) {
-    if (material.isEmpty())
+function makeKifHand(hand) {
+    if (hand.isEmpty())
         return 'なし';
-    return types_1.POCKET_ROLES.map(role => {
-        const r = (0, util_1.roleTo1Kanji)(role);
-        const n = material[role];
-        return n > 1 ? r + (0, kifUtil_1.numberToKanji)(n) : n === 1 ? r : '';
+    return variantUtil_1.handRoles('shogi')
+        .map(role => {
+        const r = util_1.roleTo1Kanji(role);
+        const n = hand[role];
+        return n > 1 ? r + kifUtil_1.numberToKanji(n) : n === 1 ? r : '';
     })
         .filter(p => p.length > 0)
         .join(' ');
 }
-exports.makeKifPocket = makeKifPocket;
+exports.makeKifHand = makeKifHand;
 // Import
 function parseKifHeader(kif) {
-    const lines = (0, kifUtil_1.normalizedKifLines)(kif);
+    const lines = kifUtil_1.normalizedKifLines(kif);
     const handicap = lines.find(l => l.startsWith('手合割：'));
-    const hSfen = (0, util_1.defined)(handicap) ? (0, kifHandicaps_1.handicapNameToSfen)(handicap.split('：')[1]) : fen_1.INITIAL_FEN;
+    const hSfen = util_1.defined(handicap) ? kifHandicaps_1.handicapNameToSfen(handicap.split('：')[1]) : fen_1.INITIAL_FEN;
     return parseKifPositionHeader(kif).unwrap(kifBoard => result_1.Result.ok(kifBoard), () => {
-        if (!(0, util_1.defined)(hSfen))
+        if (!util_1.defined(hSfen))
             return result_1.Result.err(new KifError(InvalidKif.Handicap));
-        return (0, fen_1.parseFen)(hSfen);
+        return fen_1.parseFen(hSfen);
     });
 }
 exports.parseKifHeader = parseKifHeader;
 function parseKifPositionHeader(kif) {
-    const lines = (0, kifUtil_1.normalizedKifLines)(kif);
-    const gotePocketStr = lines.find(l => l.startsWith('後手の持駒：'));
-    const sentePocketStr = lines.find(l => l.startsWith('先手の持駒：'));
+    const lines = kifUtil_1.normalizedKifLines(kif);
+    const goteHandStr = lines.find(l => l.startsWith('後手の持駒：'));
+    const senteHandStr = lines.find(l => l.startsWith('先手の持駒：'));
     const turn = lines.some(l => l.startsWith('後手番')) ? 'gote' : 'sente';
     const board = parseKifBoard(kif);
-    const gotePocket = (0, util_1.defined)(gotePocketStr)
-        ? parseKifHand(gotePocketStr.split('：')[1])
-        : result_1.Result.ok(setup_1.MaterialSide.empty());
-    const sentePocket = (0, util_1.defined)(sentePocketStr)
-        ? parseKifHand(sentePocketStr.split('：')[1])
-        : result_1.Result.ok(setup_1.MaterialSide.empty());
-    return board.chain(board => gotePocket.chain(gPocket => sentePocket.map(sPocket => {
+    const goteHand = util_1.defined(goteHandStr) ? parseKifHand(goteHandStr.split('：')[1]) : result_1.Result.ok(hand_1.Hand.empty());
+    const senteHand = util_1.defined(senteHandStr) ? parseKifHand(senteHandStr.split('：')[1]) : result_1.Result.ok(hand_1.Hand.empty());
+    return board.chain(board => goteHand.chain(gHand => senteHand.map(sHand => {
         return {
             board,
-            pockets: new setup_1.Material(gPocket, sPocket),
+            hands: new hand_1.Hands(gHand, sHand),
             turn,
             fullmoves: 1,
         };
@@ -112,14 +113,18 @@ function parseKifPositionHeader(kif) {
 }
 exports.parseKifPositionHeader = parseKifPositionHeader;
 function parseKifBoard(kifBoard) {
-    const lines = (0, kifUtil_1.normalizedKifLines)(kifBoard).filter(l => l.startsWith('|'));
-    if (lines.length !== 9)
+    const lines = kifUtil_1.normalizedKifLines(kifBoard).filter(l => l.startsWith('|'));
+    if (lines.length === 0)
         return result_1.Result.err(new KifError(InvalidKif.Board));
     const board = board_1.Board.empty();
-    let file = 0;
+    // assuming square board
+    board.numberOfRanks = lines.length;
+    board.numberOfFiles = lines.length;
+    const offset = 9 - lines.length;
+    let file = offset;
     let rank = 9;
     for (const l of lines) {
-        file = 0;
+        file = offset;
         rank--;
         let gote = false;
         let prom = false;
@@ -137,10 +142,10 @@ function parseKifBoard(kifBoard) {
                 default:
                     if (file > 9 || rank < 0)
                         return result_1.Result.err(new KifError(InvalidKif.Board));
-                    const role = (0, util_1.kanjiToRole)(c);
-                    if ((0, util_1.defined)(role)) {
+                    const role = util_1.kanjiToRole(c);
+                    if (util_1.defined(role) && variantUtil_1.allRoles('shogi').includes(role)) {
                         const square = file + rank * 9;
-                        const piece = { role: prom ? (0, util_1.promote)(role) : role, color: (gote ? 'gote' : 'sente') };
+                        const piece = { role: prom ? variantUtil_1.promote('shogi')(role) : role, color: (gote ? 'gote' : 'sente') };
                         board.set(square, piece);
                         prom = false;
                         gote = false;
@@ -149,33 +154,33 @@ function parseKifBoard(kifBoard) {
             }
         }
     }
-    if (rank !== 0 || file !== 9)
+    if (rank !== 9 - lines.length || file !== 9)
         return result_1.Result.err(new KifError(InvalidKif.Board));
     return result_1.Result.ok(board);
 }
 exports.parseKifBoard = parseKifBoard;
-function parseKifHand(pocketPart) {
-    const pockets = setup_1.MaterialSide.empty();
-    const pieces = pocketPart.replace(/　/g, ' ').trim().split(' ');
-    if (pocketPart.includes('なし'))
-        return result_1.Result.ok(pockets);
+function parseKifHand(handPart) {
+    const hand = hand_1.Hand.empty();
+    const pieces = handPart.replace(/　/g, ' ').trim().split(' ');
+    if (handPart.includes('なし'))
+        return result_1.Result.ok(hand);
     for (const piece of pieces) {
         for (let i = 0; i < piece.length; i++) {
-            const role = (0, util_1.kanjiToRole)(piece[i++]);
-            if (!role)
-                return result_1.Result.err(new KifError(InvalidKif.Pockets));
+            const role = util_1.kanjiToRole(piece[i++]);
+            if (!role || !variantUtil_1.handRoles('shogi').includes(role))
+                return result_1.Result.err(new KifError(InvalidKif.Hands));
             let countStr = '';
             while (i < piece.length && ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'].includes(piece[i]))
                 countStr += piece[i++];
-            const count = (0, kifUtil_1.kanjiToNumber)(countStr) || 1;
-            pockets[role] += count;
+            const count = kifUtil_1.kanjiToNumber(countStr) || 1;
+            hand[role] += count;
         }
     }
-    return result_1.Result.ok(pockets);
+    return result_1.Result.ok(hand);
 }
 exports.parseKifHand = parseKifHand;
 function parseTags(kif) {
-    return (0, kifUtil_1.normalizedKifLines)(kif)
+    return kifUtil_1.normalizedKifLines(kif)
         .filter(l => !l.startsWith('#') && !l.startsWith('*'))
         .map(l => l.replace('：', ':').split(/:(.*)/, 2));
 }
@@ -194,14 +199,14 @@ function parseKifMove(kifMove, lastDest = undefined) {
         if (!match)
             return;
         const move = {
-            role: (0, util_1.kanjiToRole)(match[2]),
-            to: (_a = (0, kifUtil_1.parseKifSquare)(match[1])) !== null && _a !== void 0 ? _a : lastDest,
+            role: util_1.kanjiToRole(match[2]),
+            to: (_a = kifUtil_1.parseKifSquare(match[1])) !== null && _a !== void 0 ? _a : lastDest,
         };
         return move;
     }
     return {
-        from: (0, kifUtil_1.parseKifSquare)(match[4]),
-        to: (_b = (0, kifUtil_1.parseKifSquare)(match[1])) !== null && _b !== void 0 ? _b : lastDest,
+        from: kifUtil_1.parseKifSquare(match[4]),
+        to: (_b = kifUtil_1.parseKifSquare(match[1])) !== null && _b !== void 0 ? _b : lastDest,
         promotion: !!match[3],
     };
 }
@@ -220,15 +225,15 @@ function parseKifMoves(kifMoves, lastDest = undefined) {
 exports.parseKifMoves = parseKifMoves;
 // Making kif formatted moves
 function makeKifMove(pos, move, same = false) {
-    const moveDest = same ? '同　' : (0, kifUtil_1.kifDestSquare)(move.to);
-    if ((0, types_1.isDrop)(move)) {
-        return moveDest + (0, util_1.roleTo1Kanji)(move.role) + '打';
+    const moveDest = same ? '同　' : kifUtil_1.kifDestSquare(move.to);
+    if (types_1.isDrop(move)) {
+        return moveDest + util_1.roleTo1Kanji(move.role) + '打';
     }
     else {
         const role = pos.board.getRole(move.from);
         if (!role)
             return '反則';
-        return moveDest + (0, util_1.roleTo2Kanji)(role) + (move.promotion ? '成' : '') + '(' + (0, kifUtil_1.kifOrigSquare)(move.from) + ')';
+        return moveDest + util_1.roleTo2Kanji(role) + (move.promotion ? '成' : '') + '(' + kifUtil_1.kifOrigSquare(move.from) + ')';
     }
 }
 exports.makeKifMove = makeKifMove;

package/kif.js.map

@@ -1 +1 @@
-{"version":3,"file":"kif.js","sourceRoot":"","sources":["src/kif.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kif.js","sourceRoot":"","sources":["src/kif.ts"],"names":[],"mappings":"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"}

package/kifHandicaps.js

@@ -26,6 +26,9 @@ function sfenToHandicapName(sfen) {
             return '八枚落ち';
         case '4k4/9/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL w -':
             return '十枚落ち';
+        // minishogi
+        case 'rbsgk/4p/5/P4/KGSBR b -':
+            return '五々将棋';
         default:
             return undefined;
     }
@@ -82,6 +85,8 @@ function handicapNameToSfen(name) {
             return '2sgkgs2/9/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL w RB2N2L 1';
         case '八枚得':
             return '3gkg3/9/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL w RB2S2N2L 1';
+        case '五々将棋':
+            return 'rbsgk/4p/5/P4/KGSBR b - 1';
         default:
             return undefined;
     }

package/kifHandicaps.js.map

@@ -1 +1 @@
-{"version":3,"file":"kifHandicaps.js","sourceRoot":"","sources":["src/kifHandicaps.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAC3C,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,QAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC7C,KAAK,+DAA+D;YAClE,OAAO,IAAI,CAAC;QACd,KAAK,+DAA+D;YAClE,OAAO,KAAK,CAAC;QACf,KAAK,+DAA+D;YAClE,OAAO,MAAM,CAAC;QAChB,KAAK,6DAA6D;YAChE,OAAO,KAAK,CAAC;QACf,KAAK,6DAA6D;YAChE,OAAO,MAAM,CAAC;QAChB,KAAK,6DAA6D;YAChE,OAAO,MAAM,CAAC;QAChB,KAAK,2DAA2D;YAC9D,OAAO,MAAM,CAAC;QAChB,KAAK,2DAA2D;YAC9D,OAAO,MAAM,CAAC;QAChB,KAAK,yDAAyD;YAC5D,OAAO,MAAM,CAAC;QAChB,KAAK,uDAAuD;YAC1D,OAAO,MAAM,CAAC;QAChB,KAAK,qDAAqD;YACxD,OAAO,MAAM,CAAC;QAChB;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AA3BD,gDA2BC;AAED,2BAA2B;AAC3B,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,QAAQ,IAAI,EAAE;QACZ,KAAK,IAAI;YACP,OAAO,iEAAiE,CAAC;QAC3E,KAAK,KAAK;YACR,OAAO,iEAAiE,CAAC;QAC3E,KAAK,MAAM;YACT,OAAO,iEAAiE,CAAC;QAC3E,KAAK,KAAK;YACR,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,6DAA6D,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,6DAA6D,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,2DAA2D,CAAC;QACrE,KAAK,MAAM;YACT,OAAO,yDAAyD,CAAC;QACnE,KAAK,MAAM;YACT,OAAO,uDAAuD,CAAC;QACjE,KAAK,KAAK;YACR,OAAO,gDAAgD,CAAC;QAC1D,KAAK,IAAI;YACP,OAAO,+CAA+C,CAAC;QACzD,KAAK,QAAQ;YACX,OAAO,+DAA+D,CAAC;QACzE,KAAK,OAAO;YACV,OAAO,6DAA6D,CAAC;QACvE,KAAK,KAAK;YACR,OAAO,2DAA2D,CAAC;QACrE,KAAK,IAAI;YACP,OAAO,iEAAiE,CAAC;QAC3E,KAAK,IAAI;YACP,OAAO,+DAA+D,CAAC;QACzE,KAAK,KAAK;YACR,OAAO,+DAA+D,CAAC;QACzE,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,8DAA8D,CAAC;QACxE,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AArDD,gDAqDC"}
+{"version":3,"file":"kifHandicaps.js","sourceRoot":"","sources":["src/kifHandicaps.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAC3C,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,QAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC7C,KAAK,+DAA+D;YAClE,OAAO,IAAI,CAAC;QACd,KAAK,+DAA+D;YAClE,OAAO,KAAK,CAAC;QACf,KAAK,+DAA+D;YAClE,OAAO,MAAM,CAAC;QAChB,KAAK,6DAA6D;YAChE,OAAO,KAAK,CAAC;QACf,KAAK,6DAA6D;YAChE,OAAO,MAAM,CAAC;QAChB,KAAK,6DAA6D;YAChE,OAAO,MAAM,CAAC;QAChB,KAAK,2DAA2D;YAC9D,OAAO,MAAM,CAAC;QAChB,KAAK,2DAA2D;YAC9D,OAAO,MAAM,CAAC;QAChB,KAAK,yDAAyD;YAC5D,OAAO,MAAM,CAAC;QAChB,KAAK,uDAAuD;YAC1D,OAAO,MAAM,CAAC;QAChB,KAAK,qDAAqD;YACxD,OAAO,MAAM,CAAC;QAChB,YAAY;QACZ,KAAK,yBAAyB;YAC5B,OAAO,MAAM,CAAC;QAChB;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AA9BD,gDA8BC;AAED,2BAA2B;AAC3B,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,QAAQ,IAAI,EAAE;QACZ,KAAK,IAAI;YACP,OAAO,iEAAiE,CAAC;QAC3E,KAAK,KAAK;YACR,OAAO,iEAAiE,CAAC;QAC3E,KAAK,MAAM;YACT,OAAO,iEAAiE,CAAC;QAC3E,KAAK,KAAK;YACR,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,+DAA+D,CAAC;QACzE,KAAK,MAAM;YACT,OAAO,6DAA6D,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,6DAA6D,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,2DAA2D,CAAC;QACrE,KAAK,MAAM;YACT,OAAO,yDAAyD,CAAC;QACnE,KAAK,MAAM;YACT,OAAO,uDAAuD,CAAC;QACjE,KAAK,KAAK;YACR,OAAO,gDAAgD,CAAC;QAC1D,KAAK,IAAI;YACP,OAAO,+CAA+C,CAAC;QACzD,KAAK,QAAQ;YACX,OAAO,+DAA+D,CAAC;QACzE,KAAK,OAAO;YACV,OAAO,6DAA6D,CAAC;QACvE,KAAK,KAAK;YACR,OAAO,2DAA2D,CAAC;QACrE,KAAK,IAAI;YACP,OAAO,iEAAiE,CAAC;QAC3E,KAAK,IAAI;YACP,OAAO,+DAA+D,CAAC;QACzE,KAAK,KAAK;YACR,OAAO,+DAA+D,CAAC;QACzE,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,8DAA8D,CAAC;QACxE,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,gEAAgE,CAAC;QAC1E,KAAK,MAAM;YACT,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AAvDD,gDAuDC"}

package/kifUtil.js

@@ -7,16 +7,16 @@ function parseKifSquare(str) {
         return;
     const file = str[0].charCodeAt(0) >= 65297 ? String.fromCharCode(str[0].charCodeAt(0) - 65248) : str[0];
     const rank = String.fromCharCode(('一二三四五六七八九'.includes(str[1]) ? fromKanjiDigit(str[1]).toString() : str[1]).charCodeAt(0) + 48);
-    return (0, util_1.parseSquare)(file + rank);
+    return util_1.parseSquare(file + rank);
 }
 exports.parseKifSquare = parseKifSquare;
 function kifDestSquare(sq) {
-    return (String.fromCharCode((9 - (0, util_1.squareFile)(sq)).toString().charCodeAt(0) + 0xfee0) +
-        toKanjiDigit((9 - (0, util_1.squareRank)(sq)).toString()));
+    return (String.fromCharCode((9 - util_1.squareFile(sq)).toString().charCodeAt(0) + 0xfee0) +
+        toKanjiDigit((9 - util_1.squareRank(sq)).toString()));
 }
 exports.kifDestSquare = kifDestSquare;
 function kifOrigSquare(sq) {
-    return 9 - (0, util_1.squareFile)(sq) + (9 - (0, util_1.squareRank)(sq)).toString();
+    return 9 - util_1.squareFile(sq) + (9 - util_1.squareRank(sq)).toString();
 }
 exports.kifOrigSquare = kifOrigSquare;
 function toKanjiDigit(str) {

package/kifUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"kifUtil.js","sourceRoot":"","sources":["src/kifUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kifUtil.js","sourceRoot":"","sources":["src/kifUtil.ts"],"names":[],"mappings":";;;AACA,iCAA6D;AAE7D,SAAgB,cAAc,CAAC,GAAW;IACxC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxG,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAC9B,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAC/F,CAAC;IACF,OAAO,kBAAW,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AAClC,CAAC;AAPD,wCAOC;AAED,SAAgB,aAAa,CAAC,EAAU;IACtC,OAAO,CACL,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC3E,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC9C,CAAC;AACJ,CAAC;AALD,sCAKC;AAED,SAAgB,aAAa,CAAC,EAAU;IACtC,OAAO,CAAC,GAAG,iBAAU,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,iBAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9D,CAAC;AAFD,sCAEC;AAED,SAAgB,YAAY,CAAC,GAAW;IACtC,QAAQ,GAAG,EAAE;QACX,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,GAAG;YACN,OAAO,GAAG,CAAC;QACb,KAAK,IAAI;YACP,OAAO,GAAG,CAAC;QACb;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAzBD,oCAyBC;AAED,0EAA0E;AAC1E,SAAgB,aAAa,CAAC,CAAS;IACrC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,OAAO,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC3D,CAAC;AAJD,sCAIC;AAED,SAAgB,cAAc,CAAC,GAAW;IACxC,QAAQ,GAAG,EAAE;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QACX,KAAK,GAAG;YACN,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,CAAC,CAAC;KACZ;AACH,CAAC;AAzBD,wCAyBC;AAED,0EAA0E;AAC1E,SAAgB,aAAa,CAAC,GAAW;IACvC,IAAI,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,KAAK,GAAG;YAAE,GAAG,IAAI,EAAE,CAAC;;YACpB,GAAG,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;KAC/B;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;AACxC,CAAC;AAPD,sCAOC;AAED,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,OAAO,GAAG;SACP,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,mCAAmC;SACtD,KAAK,CAAC,SAAS,CAAC;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAPD,gDAOC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shogiops",
-  "version": "0.2.7",
+  "version": "0.4.0",
   "description": "Shogi rules and operations",
   "keywords": [
     "shogi",
@@ -43,6 +43,7 @@
     "shogi.js",
     "compat.js",
     "variant.js",
+    "variantUtil.js",
     "transform.js",
     "setup.js",
     "squareSet.js",
@@ -50,7 +51,7 @@
     "util.js",
     "debug.js",
     "fen.js",
-    "san.js",
+    "hand.js",
     "hash.js",
     "kifHandicaps.js",
     "kif.js",
@@ -63,6 +64,7 @@
     "shogi.d.ts",
     "compat.d.ts",
     "variant.d.ts",
+    "variantUtil.d.ts",
     "transform.d.ts",
     "setup.d.ts",
     "squareSet.d.ts",
@@ -70,7 +72,7 @@
     "util.d.ts",
     "debug.d.ts",
     "fen.d.ts",
-    "san.d.ts",
+    "hand.d.ts",
     "hash.d.ts",
     "kifHandicaps.d.ts",
     "kif.d.ts",
@@ -83,6 +85,7 @@
     "shogi.js.map",
     "compat.js.map",
     "variant.js.map",
+    "variantUtil.js.map",
     "transform.js.map",
     "setup.js.map",
     "squareSet.js.map",
@@ -90,7 +93,7 @@
     "util.js.map",
     "debug.js.map",
     "fen.js.map",
-    "san.js.map",
+    "hand.js.map",
     "hash.js.map",
     "kifHandicaps.js.map",
     "kif.js.map",
@@ -103,6 +106,7 @@
     "src/shogi.ts",
     "src/compat.ts",
     "src/variant.ts",
+    "src/variantUtil.ts",
     "src/transform.ts",
     "src/setup.ts",
     "src/squareSet.ts",
@@ -110,7 +114,7 @@
     "src/util.ts",
     "src/debug.ts",
     "src/fen.ts",
-    "src/san.ts",
+    "src/hand.ts",
     "src/hash.ts",
     "src/kifHandicaps.ts",
     "src/kif.ts",

package/setup.d.ts

@@ -1,39 +1,9 @@
 import { Color } from './types';
 import { Board } from './board';
-export declare class MaterialSide {
-    pawn: number;
-    lance: number;
-    knight: number;
-    silver: number;
-    gold: number;
-    bishop: number;
-    rook: number;
-    private constructor();
-    static empty(): MaterialSide;
-    static fromBoard(board: Board, color: Color): MaterialSide;
-    clone(): MaterialSide;
-    equals(other: MaterialSide): boolean;
-    add(other: MaterialSide): MaterialSide;
-    nonEmpty(): boolean;
-    isEmpty(): boolean;
-    count(): number;
-}
-export declare class Material {
-    gote: MaterialSide;
-    sente: MaterialSide;
-    constructor(gote: MaterialSide, sente: MaterialSide);
-    static empty(): Material;
-    static fromBoard(board: Board): Material;
-    clone(): Material;
-    equals(other: Material): boolean;
-    add(other: Material): Material;
-    count(): number;
-    isEmpty(): boolean;
-    nonEmpty(): boolean;
-}
+import { Hands } from './hand';
 export interface Setup {
     board: Board;
-    pockets: Material;
+    hands: Hands;
     turn: Color;
     fullmoves: number;
 }

package/setup.js

@@ -1,83 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultSetup = exports.Material = exports.MaterialSide = void 0;
-const types_1 = require("./types");
+exports.defaultSetup = void 0;
 const board_1 = require("./board");
-class MaterialSide {
-    constructor() { }
-    static empty() {
-        const m = new MaterialSide();
-        for (const role of types_1.POCKET_ROLES)
-            m[role] = 0;
-        return m;
-    }
-    static fromBoard(board, color) {
-        const m = new MaterialSide();
-        for (const role of types_1.POCKET_ROLES)
-            m[role] = board.pieces(color, role).size();
-        return m;
-    }
-    clone() {
-        const m = new MaterialSide();
-        for (const role of types_1.POCKET_ROLES)
-            m[role] = this[role];
-        return m;
-    }
-    equals(other) {
-        return types_1.POCKET_ROLES.every(role => this[role] === other[role]);
-    }
-    add(other) {
-        const m = new MaterialSide();
-        for (const role of types_1.POCKET_ROLES)
-            m[role] = this[role] + other[role];
-        return m;
-    }
-    nonEmpty() {
-        return types_1.POCKET_ROLES.some(role => this[role] > 0);
-    }
-    isEmpty() {
-        return !this.nonEmpty();
-    }
-    count() {
-        return this.pawn + this.lance + this.knight + this.silver + this.gold + this.bishop + this.rook;
-    }
-}
-exports.MaterialSide = MaterialSide;
-class Material {
-    constructor(gote, sente) {
-        this.gote = gote;
-        this.sente = sente;
-    }
-    static empty() {
-        return new Material(MaterialSide.empty(), MaterialSide.empty());
-    }
-    static fromBoard(board) {
-        return new Material(MaterialSide.fromBoard(board, 'gote'), MaterialSide.fromBoard(board, 'sente'));
-    }
-    clone() {
-        return new Material(this.gote.clone(), this.sente.clone());
-    }
-    equals(other) {
-        return this.gote.equals(other.gote) && this.sente.equals(other.sente);
-    }
-    add(other) {
-        return new Material(this.gote.add(other.gote), this.sente.add(other.sente));
-    }
-    count() {
-        return this.gote.count() + this.sente.count();
-    }
-    isEmpty() {
-        return this.gote.isEmpty() && this.sente.isEmpty();
-    }
-    nonEmpty() {
-        return !this.isEmpty();
-    }
-}
-exports.Material = Material;
+const hand_1 = require("./hand");
 function defaultSetup() {
     return {
         board: board_1.Board.default(),
-        pockets: Material.empty(),
+        hands: hand_1.Hands.empty(),
         turn: 'sente',
         fullmoves: 1,
     };

package/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["src/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["src/setup.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAChC,iCAA+B;AAS/B,SAAgB,YAAY;IAC1B,OAAO;QACL,KAAK,EAAE,aAAK,CAAC,OAAO,EAAE;QACtB,KAAK,EAAE,YAAK,CAAC,KAAK,EAAE;QACpB,IAAI,EAAE,OAAO;QACb,SAAS,EAAE,CAAC;KACb,CAAC;AACJ,CAAC;AAPD,oCAOC"}