shogiops 0.2.7 → 0.4.0

package/fen.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeFen = exports.makePockets = exports.makePocket = exports.makeBoardFen = exports.makePiece = exports.parsePiece = exports.parseFen = exports.parsePockets = exports.parseBoardFen = exports.FenError = exports.InvalidFen = exports.EMPTY_FEN = exports.EMPTY_EPD = exports.EMPTY_BOARD_FEN = exports.INITIAL_FEN = exports.INITIAL_EPD = exports.INITIAL_BOARD_FEN = void 0;
+exports.makeFen = exports.makeHands = exports.makeHand = exports.makeBoardFen = exports.makePiece = exports.parsePiece = exports.parseFen = exports.parseHands = exports.parseBoardFen = exports.FenError = exports.InvalidFen = exports.EMPTY_FEN = exports.EMPTY_EPD = exports.EMPTY_BOARD_FEN = exports.INITIAL_FEN = exports.INITIAL_EPD = exports.INITIAL_BOARD_FEN = void 0;
 const result_1 = require("@badrap/result");
-const types_1 = require("./types");
 const board_1 = require("./board");
-const setup_1 = require("./setup");
 const util_1 = require("./util");
+const hand_1 = require("./hand");
+const types_1 = require("./types");
 exports.INITIAL_BOARD_FEN = 'lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL';
 exports.INITIAL_EPD = exports.INITIAL_BOARD_FEN + ' b -';
 exports.INITIAL_FEN = exports.INITIAL_EPD + ' 1';
@@ -16,7 +16,7 @@ var InvalidFen;
 (function (InvalidFen) {
     InvalidFen["Fen"] = "ERR_FEN";
     InvalidFen["Board"] = "ERR_BOARD";
-    InvalidFen["Pockets"] = "ERR_POCKETS";
+    InvalidFen["Hands"] = "ERR_HANDS";
     InvalidFen["Turn"] = "ERR_TURN";
     InvalidFen["Fullmoves"] = "ERR_FULLMOVES";
 })(InvalidFen = exports.InvalidFen || (exports.InvalidFen = {}));
@@ -27,17 +27,23 @@ function parseSmallUint(str) {
     return /^\d{1,4}$/.test(str) ? parseInt(str, 10) : undefined;
 }
 function charToPiece(ch) {
-    const role = (0, util_1.charToRole)(ch);
+    const role = util_1.charToRole(ch);
     return role && { role, color: ch.toLowerCase() === ch ? 'gote' : 'sente' };
 }
 function parseBoardFen(boardPart) {
     const board = board_1.Board.empty();
+    const ranks = boardPart.split('/');
+    board.numberOfRanks = ranks.length;
+    // we assume the board is square
+    // since that's good enough for now...
+    board.numberOfFiles = board.numberOfRanks;
+    const offset = 9 - board.numberOfFiles;
     let rank = 8;
-    let file = 0;
+    let file = offset;
     for (let i = 0; i < boardPart.length; i++) {
         let c = boardPart[i];
         if (c === '/' && file === 9) {
-            file = 0;
+            file = offset;
             rank--;
         }
         else {
@@ -58,35 +64,33 @@ function parseBoardFen(boardPart) {
             }
         }
     }
-    if (rank !== 0 || file !== 9)
+    if (rank !== offset || file !== 9)
         return result_1.Result.err(new FenError(InvalidFen.Board));
     return result_1.Result.ok(board);
 }
 exports.parseBoardFen = parseBoardFen;
-function parsePockets(pocketPart) {
-    if (pocketPart.toLowerCase().includes('k'))
-        return result_1.Result.err(new FenError(InvalidFen.Pockets));
-    const pockets = setup_1.Material.empty();
-    for (let i = 0; i < pocketPart.length; i++) {
-        if (pocketPart[i] === '-')
+function parseHands(handsPart) {
+    const hands = hand_1.Hands.empty();
+    for (let i = 0; i < handsPart.length; i++) {
+        if (handsPart[i] === '-')
             break;
         // max 99
         let count;
-        if (parseInt(pocketPart[i]) >= 0) {
-            count = parseInt(pocketPart[i++], 10);
-            if (parseInt(pocketPart[i]) >= 0)
-                count = count * 10 + parseInt(pocketPart[i++], 10);
+        if (parseInt(handsPart[i]) >= 0) {
+            count = parseInt(handsPart[i++], 10);
+            if (parseInt(handsPart[i]) >= 0)
+                count = count * 10 + parseInt(handsPart[i++], 10);
         }
         else
             count = 1;
-        const piece = charToPiece(pocketPart[i]);
+        const piece = charToPiece(handsPart[i]);
         if (!piece)
-            return result_1.Result.err(new FenError(InvalidFen.Pockets));
-        pockets[piece.color][piece.role] += count;
+            return result_1.Result.err(new FenError(InvalidFen.Hands));
+        hands[piece.color][piece.role] += count;
     }
-    return result_1.Result.ok(pockets);
+    return result_1.Result.ok(hands);
 }
-exports.parsePockets = parsePockets;
+exports.parseHands = parseHands;
 function parseFen(fen) {
     const parts = fen.split(' ');
     // Board
@@ -95,30 +99,30 @@ function parseFen(fen) {
     // Turn
     const turnPart = parts.shift();
     let turn;
-    if (!(0, util_1.defined)(turnPart) || turnPart === 'b')
+    if (!util_1.defined(turnPart) || turnPart === 'b')
         turn = 'sente';
     else if (turnPart === 'w')
         turn = 'gote';
     else
         return result_1.Result.err(new FenError(InvalidFen.Turn));
-    // Pocket
-    const pocketPart = parts.shift();
-    let pockets;
-    if (!(0, util_1.defined)(pocketPart))
-        pockets = result_1.Result.ok(setup_1.Material.empty());
+    // Hands
+    const handsPart = parts.shift();
+    let hands;
+    if (!util_1.defined(handsPart))
+        hands = result_1.Result.ok(hand_1.Hands.empty());
     else
-        pockets = parsePockets(pocketPart);
+        hands = parseHands(handsPart);
     // Turn
     const fullmovesPart = parts.shift();
-    const fullmoves = (0, util_1.defined)(fullmovesPart) ? parseSmallUint(fullmovesPart) : 1;
-    if (!(0, util_1.defined)(fullmoves))
+    const fullmoves = util_1.defined(fullmovesPart) ? parseSmallUint(fullmovesPart) : 1;
+    if (!util_1.defined(fullmoves))
         return result_1.Result.err(new FenError(InvalidFen.Fullmoves));
     if (parts.length > 0)
         return result_1.Result.err(new FenError(InvalidFen.Fen));
-    return board.chain(board => pockets.map(pockets => {
+    return board.chain(board => hands.map(hands => {
         return {
             board,
-            pockets,
+            hands,
             turn,
             fullmoves: Math.max(1, fullmoves),
         };
@@ -137,7 +141,7 @@ function parsePiece(str) {
 }
 exports.parsePiece = parsePiece;
 function makePiece(piece) {
-    let r = (0, util_1.roleToChar)(piece.role);
+    let r = util_1.roleToChar(piece.role);
     if (piece.color === 'sente')
         r = r.toUpperCase();
     return r;
@@ -146,8 +150,8 @@ exports.makePiece = makePiece;
 function makeBoardFen(board) {
     let fen = '';
     let empty = 0;
-    for (let rank = 8; rank >= 0; rank--) {
-        for (let file = 0; file < 9; file++) {
+    for (let rank = 8; rank >= 9 - board.numberOfRanks; rank--) {
+        for (let file = 9 - board.numberOfFiles; file < 9; file++) {
             const square = file + rank * 9;
             const piece = board.get(square);
             if (!piece)
@@ -164,7 +168,7 @@ function makeBoardFen(board) {
                     fen += empty;
                     empty = 0;
                 }
-                if (rank !== 0)
+                if (rank !== 9 - board.numberOfRanks)
                     fen += '/';
             }
         }
@@ -172,24 +176,24 @@ function makeBoardFen(board) {
     return fen;
 }
 exports.makeBoardFen = makeBoardFen;
-function makePocket(material) {
-    return types_1.POCKET_ROLES.map(role => {
-        const r = (0, util_1.roleToChar)(role);
-        const n = material[role];
+function makeHand(hand) {
+    return types_1.ROLES.map(role => {
+        const r = util_1.roleToChar(role);
+        const n = hand[role];
         return n > 1 ? n + r : n === 1 ? r : '';
     }).join('');
 }
-exports.makePocket = makePocket;
-function makePockets(pocket) {
-    const pockets = makePocket(pocket.sente).toUpperCase() + makePocket(pocket.gote);
-    return pockets === '' ? '-' : pockets;
+exports.makeHand = makeHand;
+function makeHands(hands) {
+    const handsStr = makeHand(hands.sente).toUpperCase() + makeHand(hands.gote);
+    return handsStr === '' ? '-' : handsStr;
 }
-exports.makePockets = makePockets;
+exports.makeHands = makeHands;
 function makeFen(setup, opts) {
     return [
         makeBoardFen(setup.board),
-        (0, util_1.toBW)(setup.turn),
-        makePockets(setup.pockets),
+        util_1.toBW(setup.turn),
+        makeHands(setup.hands),
         ...((opts === null || opts === void 0 ? void 0 : opts.epd) ? [] : [Math.max(1, Math.min(setup.fullmoves, 9999))]),
     ].join(' ');
 }

package/fen.js.map

@@ -1 +1 @@
-{"version":3,"file":"fen.js","sourceRoot":"","sources":["src/fen.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,mCAAiE;AACjE,mCAAgC;AAChC,mCAAwD;AACxD,iCAA+D;AAElD,QAAA,iBAAiB,GAAG,2DAA2D,CAAC;AAChF,QAAA,WAAW,GAAG,yBAAiB,GAAG,MAAM,CAAC;AACzC,QAAA,WAAW,GAAG,mBAAW,GAAG,IAAI,CAAC;AACjC,QAAA,eAAe,GAAG,mBAAmB,CAAC;AACtC,QAAA,SAAS,GAAG,uBAAe,GAAG,MAAM,CAAC;AACrC,QAAA,SAAS,GAAG,iBAAS,GAAG,IAAI,CAAC;AAE1C,IAAY,UAMX;AAND,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,iCAAmB,CAAA;IACnB,qCAAuB,CAAA;IACvB,+BAAiB,CAAA;IACjB,yCAA2B,CAAA;AAC7B,CAAC,EANW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAMrB;AAED,MAAa,QAAS,SAAQ,KAAK;CAAG;AAAtC,4BAAsC;AAEtC,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAED,SAAS,WAAW,CAAC,EAAU;IAC7B,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,IAAI,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AAC7E,CAAC;AAED,SAAgB,aAAa,CAAC,SAAiB;IAC7C,MAAM,KAAK,GAAG,aAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,KAAK,CAAC,EAAE;YAC3B,IAAI,GAAG,CAAC,CAAC;YACT,IAAI,EAAE,CAAC;SACR;aAAM;YACL,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,IAAI,GAAG,CAAC;gBAAE,IAAI,IAAI,IAAI,CAAC;iBACtB;gBACH,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC;oBAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7E,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM;oBAAE,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC/D,MAAM,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC;gBAC/B,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,KAAK;oBAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC9D,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACzB,IAAI,EAAE,CAAC;aACR;SACF;KACF;IACD,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAChF,OAAO,eAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AAzBD,sCAyBC;AAED,SAAgB,YAAY,CAAC,UAAkB;IAC7C,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAChG,MAAM,OAAO,GAAG,gBAAQ,CAAC,KAAK,EAAE,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,MAAM;QACjC,SAAS;QACT,IAAI,KAAa,CAAC;QAClB,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAChC,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAAE,KAAK,GAAG,KAAK,GAAG,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;SACtF;;YAAM,KAAK,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAkB,CAAC,IAAI,KAAK,CAAC;KACzD;IACD,OAAO,eAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAhBD,oCAgBC;AAED,SAAgB,QAAQ,CAAC,GAAW;IAClC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,QAAQ;IACR,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;IACjC,MAAM,KAAK,GAA4B,aAAa,CAAC,SAAS,CAAC,CAAC;IAEhE,OAAO;IACP,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAC/B,IAAI,IAAW,CAAC;IAChB,IAAI,CAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,GAAG;QAAE,IAAI,GAAG,OAAO,CAAC;SACtD,IAAI,QAAQ,KAAK,GAAG;QAAE,IAAI,GAAG,MAAM,CAAC;;QACpC,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtD,SAAS;IACT,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACjC,IAAI,OAAmC,CAAC;IACxC,IAAI,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC;QAAE,OAAO,GAAG,eAAM,CAAC,EAAE,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;;QAC3D,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;IAExC,OAAO;IACP,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,CAAC,IAAA,cAAO,EAAC,SAAS,CAAC;QAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAE/E,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,eAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CACzB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACpB,OAAO;YACL,KAAK;YACL,OAAO;YACP,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC;SAClC,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AArCD,4BAqCC;AAMD,SAAgB,UAAU,CAAC,GAAW;IACpC,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,CAAC,KAAK;QAAE,OAAO;SACd,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO;IAClD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,gCAMC;AAED,SAAgB,SAAS,CAAC,KAAY;IACpC,IAAI,CAAC,GAAG,IAAA,iBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO;QAAE,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,OAAO,CAAC,CAAC;AACX,CAAC;AAJD,8BAIC;AAED,SAAgB,YAAY,CAAC,KAAY;IACvC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE;QACpC,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE;YACnC,MAAM,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC;YAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK;gBAAE,KAAK,EAAE,CAAC;iBACf;gBACH,IAAI,KAAK,GAAG,CAAC,EAAE;oBACb,GAAG,IAAI,KAAK,CAAC;oBACb,KAAK,GAAG,CAAC,CAAC;iBACX;gBACD,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;aACzB;YAED,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,IAAI,KAAK,GAAG,CAAC,EAAE;oBACb,GAAG,IAAI,KAAK,CAAC;oBACb,KAAK,GAAG,CAAC,CAAC;iBACX;gBACD,IAAI,IAAI,KAAK,CAAC;oBAAE,GAAG,IAAI,GAAG,CAAC;aAC5B;SACF;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AA1BD,oCA0BC;AAED,SAAgB,UAAU,CAAC,QAAsB;IAC/C,OAAO,oBAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAC7B,MAAM,CAAC,GAAG,IAAA,iBAAU,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAND,gCAMC;AAED,SAAgB,WAAW,CAAC,MAAgB;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjF,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;AACxC,CAAC;AAHD,kCAGC;AAED,SAAgB,OAAO,CAAC,KAAY,EAAE,IAAc;IAClD,OAAO;QACL,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC;QACzB,IAAA,WAAI,EAAC,KAAK,CAAC,IAAI,CAAC;QAChB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1B,GAAG,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;KACrE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAPD,0BAOC"}
+{"version":3,"file":"fen.js","sourceRoot":"","sources":["src/fen.ts"],"names":[],"mappings":"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"}

package/hand.d.ts

@@ -0,0 +1,38 @@
+import { Role } from './types';
+export declare class Hand {
+    pawn: number;
+    lance: number;
+    knight: number;
+    silver: number;
+    gold: number;
+    bishop: number;
+    rook: number;
+    tokin: number;
+    promotedlance: number;
+    promotedknight: number;
+    promotedsilver: number;
+    horse: number;
+    dragon: number;
+    king: number;
+    private constructor();
+    static empty(): Hand;
+    clone(): Hand;
+    equals(other: Hand): boolean;
+    add(other: Hand): Hand;
+    nonEmpty(): boolean;
+    isEmpty(): boolean;
+    count(): number;
+    [Symbol.iterator](): Iterator<[Role, number]>;
+}
+export declare class Hands {
+    gote: Hand;
+    sente: Hand;
+    constructor(gote: Hand, sente: Hand);
+    static empty(): Hands;
+    clone(): Hands;
+    equals(other: Hands): boolean;
+    add(other: Hands): Hands;
+    count(): number;
+    isEmpty(): boolean;
+    nonEmpty(): boolean;
+}

package/hand.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Hands = exports.Hand = void 0;
+const types_1 = require("./types");
+// Hand alone can store anything
+// let the variants decide what to store and what not
+class Hand {
+    constructor() { }
+    static empty() {
+        const m = new Hand();
+        for (const role of types_1.ROLES)
+            m[role] = 0;
+        return m;
+    }
+    clone() {
+        const m = new Hand();
+        for (const role of types_1.ROLES)
+            m[role] = this[role];
+        return m;
+    }
+    equals(other) {
+        return types_1.ROLES.every(role => this[role] === other[role]);
+    }
+    add(other) {
+        const m = new Hand();
+        for (const role of types_1.ROLES)
+            m[role] = this[role] + other[role];
+        return m;
+    }
+    nonEmpty() {
+        return types_1.ROLES.some(role => this[role] > 0);
+    }
+    isEmpty() {
+        return !this.nonEmpty();
+    }
+    count() {
+        return types_1.ROLES.map(role => this[role]).reduce((acc, cur) => acc + cur);
+    }
+    *[Symbol.iterator]() {
+        for (const role of types_1.ROLES.filter(r => this[r] > 0)) {
+            yield [role, this[role]];
+        }
+    }
+}
+exports.Hand = Hand;
+class Hands {
+    constructor(gote, sente) {
+        this.gote = gote;
+        this.sente = sente;
+    }
+    static empty() {
+        return new Hands(Hand.empty(), Hand.empty());
+    }
+    clone() {
+        return new Hands(this.gote.clone(), this.sente.clone());
+    }
+    equals(other) {
+        return this.gote.equals(other.gote) && this.sente.equals(other.sente);
+    }
+    add(other) {
+        return new Hands(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.Hands = Hands;
+//# sourceMappingURL=hand.js.map

package/hand.js.map

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

package/hash.d.ts

@@ -1,7 +1,8 @@
 import { Board } from './board';
-import { Setup, MaterialSide, Material } from './setup';
+import { Setup } from './setup';
+import { Hand, Hands } from './hand';
 export declare function fxhash32(word: number, state?: number): number;
 export declare function hashBoard(board: Board, state?: number): number;
-export declare function hashMaterialSide(side: MaterialSide, state?: number): number;
-export declare function hashMaterial(material: Material, state?: number): number;
+export declare function hashHand(hand: Hand, state?: number): number;
+export declare function hashHands(hands: Hands, state?: number): number;
 export declare function hashSetup(setup: Setup, state?: number): number;

package/hash.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashSetup = exports.hashMaterial = exports.hashMaterialSide = exports.hashBoard = exports.fxhash32 = void 0;
+exports.hashSetup = exports.hashHands = exports.hashHand = exports.hashBoard = exports.fxhash32 = void 0;
 const types_1 = require("./types");
 function rol32(n, left) {
     return (n << left) | (n >>> (32 - left));
@@ -16,21 +16,21 @@ function hashBoard(board, state = 0) {
     return state;
 }
 exports.hashBoard = hashBoard;
-function hashMaterialSide(side, state = 0) {
-    for (const role of types_1.POCKET_ROLES)
-        state = fxhash32(side[role], state);
+function hashHand(hand, state = 0) {
+    for (const role of types_1.ROLES)
+        state = fxhash32(hand[role], state);
     return state;
 }
-exports.hashMaterialSide = hashMaterialSide;
-function hashMaterial(material, state = 0) {
+exports.hashHand = hashHand;
+function hashHands(hands, state = 0) {
     for (const color of types_1.COLORS)
-        state = hashMaterialSide(material[color], state);
+        state = hashHand(hands[color], state);
     return state;
 }
-exports.hashMaterial = hashMaterial;
+exports.hashHands = hashHands;
 function hashSetup(setup, state = 0) {
     state = hashBoard(setup.board, state);
-    state = hashMaterial(setup.pockets, state);
+    state = hashHands(setup.hands, state);
     if (setup.turn === 'sente')
         state = fxhash32(1, state);
     return state;

package/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["src/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAsD;AAItD,SAAS,KAAK,CAAC,CAAS,EAAE,IAAY;IACpC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,KAAK,GAAG,CAAC;IAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,SAAgB,SAAS,CAAC,KAAY,EAAE,KAAK,GAAG,CAAC;IAC/C,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1F,KAAK,MAAM,IAAI,IAAI,aAAK;QACtB,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/F,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8BAKC;AAED,SAAgB,gBAAgB,CAAC,IAAkB,EAAE,KAAK,GAAG,CAAC;IAC5D,KAAK,MAAM,IAAI,IAAI,oBAAY;QAAE,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACrE,OAAO,KAAK,CAAC;AACf,CAAC;AAHD,4CAGC;AAED,SAAgB,YAAY,CAAC,QAAkB,EAAE,KAAK,GAAG,CAAC;IACxD,KAAK,MAAM,KAAK,IAAI,cAAM;QAAE,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC;AACf,CAAC;AAHD,oCAGC;AAED,SAAgB,SAAS,CAAC,KAAY,EAAE,KAAK,GAAG,CAAC;IAC/C,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,KAAK,GAAG,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8BAKC"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["src/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAKxC,SAAS,KAAK,CAAC,CAAS,EAAE,IAAY;IACpC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,KAAK,GAAG,CAAC;IAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,SAAgB,SAAS,CAAC,KAAY,EAAE,KAAK,GAAG,CAAC;IAC/C,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1F,KAAK,MAAM,IAAI,IAAI,aAAK;QACtB,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/F,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8BAKC;AAED,SAAgB,QAAQ,CAAC,IAAU,EAAE,KAAK,GAAG,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,aAAK;QAAE,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC;AACf,CAAC;AAHD,4BAGC;AAED,SAAgB,SAAS,CAAC,KAAY,EAAE,KAAK,GAAG,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,cAAM;QAAE,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAClE,OAAO,KAAK,CAAC;AACf,CAAC;AAHD,8BAGC;AAED,SAAgB,SAAS,CAAC,KAAY,EAAE,KAAK,GAAG,CAAC;IAC/C,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,KAAK,GAAG,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8BAKC"}

package/index.d.ts

@@ -1,19 +1,20 @@
-export { FILE_NAMES, RANK_NAMES, FileName, RankName, Square, SquareName, BySquare, Color, COLORS, ByColor, Role, ROLES, POCKET_ROLES, PROMOTABLE_ROLES, ByRole, Piece, NormalMove, DropMove, Move, isDrop, isNormal, Rules, RULES, Outcome, } from './types';
+export { FILE_NAMES, RANK_NAMES, FileName, RankName, Square, SquareName, BySquare, Color, COLORS, ByColor, Role, ROLES, ByRole, Piece, NormalMove, DropMove, Move, isDrop, isNormal, Rules, RULES, Outcome, } from './types';
 export { charToRole, defined, makeSquare, makeUsi, opposite, parseSquare, parseUsi, roleToChar, squareFile, squareRank, } from './util';
 export { SquareSet } from './squareSet';
 export { attacks, between, bishopAttacks, kingAttacks, knightAttacks, pawnAttacks, lanceAttacks, silverAttacks, goldAttacks, horseAttacks, dragonAttacks, ray, rookAttacks, } from './attacks';
 export { Board } from './board';
-export { Material, MaterialSide, Setup, defaultSetup } from './setup';
+export { Setup, defaultSetup } from './setup';
 export { IllegalSetup, Shogi, Position, PositionError, Context } from './shogi';
 export * as compat from './compat';
 export * as debug from './debug';
 export * as fen from './fen';
 export * as handicaps from './kifHandicaps';
+export * as hand from './hand';
 export * as hash from './hash';
 export * as kif from './kif';
 export * as kifUtil from './kifUtil';
 export * as csa from './csa';
 export * as csaUtil from './csaUtil';
-export * as san from './san';
 export * as transform from './transform';
 export * as variant from './variant';
+export * as variantUtil from './variantUtil';

package/index.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.csaUtil = exports.csa = exports.kifUtil = exports.kif = exports.hash = exports.handicaps = exports.fen = exports.debug = exports.compat = exports.PositionError = exports.Position = exports.Shogi = exports.IllegalSetup = exports.defaultSetup = exports.MaterialSide = exports.Material = exports.Board = exports.rookAttacks = exports.ray = exports.dragonAttacks = exports.horseAttacks = exports.goldAttacks = exports.silverAttacks = exports.lanceAttacks = exports.pawnAttacks = exports.knightAttacks = exports.kingAttacks = exports.bishopAttacks = exports.between = exports.attacks = exports.SquareSet = exports.squareRank = exports.squareFile = exports.roleToChar = exports.parseUsi = exports.parseSquare = exports.opposite = exports.makeUsi = exports.makeSquare = exports.defined = exports.charToRole = exports.RULES = exports.isNormal = exports.isDrop = exports.PROMOTABLE_ROLES = exports.POCKET_ROLES = exports.ROLES = exports.COLORS = exports.RANK_NAMES = exports.FILE_NAMES = void 0;
-exports.variant = exports.transform = exports.san = void 0;
+exports.variantUtil = exports.variant = exports.transform = exports.csaUtil = exports.csa = exports.kifUtil = exports.kif = exports.hash = exports.hand = exports.handicaps = exports.fen = exports.debug = exports.compat = exports.PositionError = exports.Position = exports.Shogi = exports.IllegalSetup = exports.defaultSetup = exports.Board = exports.rookAttacks = exports.ray = exports.dragonAttacks = exports.horseAttacks = exports.goldAttacks = exports.silverAttacks = exports.lanceAttacks = exports.pawnAttacks = exports.knightAttacks = exports.kingAttacks = exports.bishopAttacks = exports.between = exports.attacks = exports.SquareSet = exports.squareRank = exports.squareFile = exports.roleToChar = exports.parseUsi = exports.parseSquare = exports.opposite = exports.makeUsi = exports.makeSquare = exports.defined = exports.charToRole = exports.RULES = exports.isNormal = exports.isDrop = exports.ROLES = exports.COLORS = exports.RANK_NAMES = exports.FILE_NAMES = void 0;
 var types_1 = require("./types");
 Object.defineProperty(exports, "FILE_NAMES", { enumerable: true, get: function () { return types_1.FILE_NAMES; } });
 Object.defineProperty(exports, "RANK_NAMES", { enumerable: true, get: function () { return types_1.RANK_NAMES; } });
 Object.defineProperty(exports, "COLORS", { enumerable: true, get: function () { return types_1.COLORS; } });
 Object.defineProperty(exports, "ROLES", { enumerable: true, get: function () { return types_1.ROLES; } });
-Object.defineProperty(exports, "POCKET_ROLES", { enumerable: true, get: function () { return types_1.POCKET_ROLES; } });
-Object.defineProperty(exports, "PROMOTABLE_ROLES", { enumerable: true, get: function () { return types_1.PROMOTABLE_ROLES; } });
 Object.defineProperty(exports, "isDrop", { enumerable: true, get: function () { return types_1.isDrop; } });
 Object.defineProperty(exports, "isNormal", { enumerable: true, get: function () { return types_1.isNormal; } });
 Object.defineProperty(exports, "RULES", { enumerable: true, get: function () { return types_1.RULES; } });
@@ -42,8 +39,6 @@ Object.defineProperty(exports, "rookAttacks", { enumerable: true, get: function
 var board_1 = require("./board");
 Object.defineProperty(exports, "Board", { enumerable: true, get: function () { return board_1.Board; } });
 var setup_1 = require("./setup");
-Object.defineProperty(exports, "Material", { enumerable: true, get: function () { return setup_1.Material; } });
-Object.defineProperty(exports, "MaterialSide", { enumerable: true, get: function () { return setup_1.MaterialSide; } });
 Object.defineProperty(exports, "defaultSetup", { enumerable: true, get: function () { return setup_1.defaultSetup; } });
 var shogi_1 = require("./shogi");
 Object.defineProperty(exports, "IllegalSetup", { enumerable: true, get: function () { return shogi_1.IllegalSetup; } });
@@ -54,12 +49,13 @@ exports.compat = require("./compat");
 exports.debug = require("./debug");
 exports.fen = require("./fen");
 exports.handicaps = require("./kifHandicaps");
+exports.hand = require("./hand");
 exports.hash = require("./hash");
 exports.kif = require("./kif");
 exports.kifUtil = require("./kifUtil");
 exports.csa = require("./csa");
 exports.csaUtil = require("./csaUtil");
-exports.san = require("./san");
 exports.transform = require("./transform");
 exports.variant = require("./variant");
+exports.variantUtil = require("./variantUtil");
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";;;;AAAA,iCAyBiB;AAxBf,mGAAA,UAAU,OAAA;AACV,mGAAA,UAAU,OAAA;AAOV,+FAAA,MAAM,OAAA;AAGN,8FAAA,KAAK,OAAA;AACL,qGAAA,YAAY,OAAA;AACZ,yGAAA,gBAAgB,OAAA;AAMhB,+FAAA,MAAM,OAAA;AACN,iGAAA,QAAQ,OAAA;AAER,8FAAA,KAAK,OAAA;AAIP,+BAWgB;AAVd,kGAAA,UAAU,OAAA;AACV,+FAAA,OAAO,OAAA;AACP,kGAAA,UAAU,OAAA;AACV,+FAAA,OAAO,OAAA;AACP,gGAAA,QAAQ,OAAA;AACR,mGAAA,WAAW,OAAA;AACX,gGAAA,QAAQ,OAAA;AACR,kGAAA,UAAU,OAAA;AACV,kGAAA,UAAU,OAAA;AACV,kGAAA,UAAU,OAAA;AAGZ,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAElB,qCAcmB;AAbjB,kGAAA,OAAO,OAAA;AACP,kGAAA,OAAO,OAAA;AACP,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,uGAAA,YAAY,OAAA;AACZ,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,uGAAA,YAAY,OAAA;AACZ,wGAAA,aAAa,OAAA;AACb,8FAAA,GAAG,OAAA;AACH,sGAAA,WAAW,OAAA;AAGb,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,iCAAsE;AAA7D,iGAAA,QAAQ,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAS,qGAAA,YAAY,OAAA;AAEpD,iCAAgF;AAAvE,qGAAA,YAAY,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAAE,sGAAA,aAAa,OAAA;AAErD,qCAAmC;AAEnC,mCAAiC;AAEjC,+BAA6B;AAE7B,8CAA4C;AAE5C,iCAA+B;AAE/B,+BAA6B;AAE7B,uCAAqC;AAErC,+BAA6B;AAE7B,uCAAqC;AAErC,+BAA6B;AAE7B,2CAAyC;AAEzC,uCAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";;;AAAA,iCAuBiB;AAtBf,mGAAA,UAAU,OAAA;AACV,mGAAA,UAAU,OAAA;AAOV,+FAAA,MAAM,OAAA;AAGN,8FAAA,KAAK,OAAA;AAML,+FAAA,MAAM,OAAA;AACN,iGAAA,QAAQ,OAAA;AAER,8FAAA,KAAK,OAAA;AAIP,+BAWgB;AAVd,kGAAA,UAAU,OAAA;AACV,+FAAA,OAAO,OAAA;AACP,kGAAA,UAAU,OAAA;AACV,+FAAA,OAAO,OAAA;AACP,gGAAA,QAAQ,OAAA;AACR,mGAAA,WAAW,OAAA;AACX,gGAAA,QAAQ,OAAA;AACR,kGAAA,UAAU,OAAA;AACV,kGAAA,UAAU,OAAA;AACV,kGAAA,UAAU,OAAA;AAGZ,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAElB,qCAcmB;AAbjB,kGAAA,OAAO,OAAA;AACP,kGAAA,OAAO,OAAA;AACP,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,uGAAA,YAAY,OAAA;AACZ,wGAAA,aAAa,OAAA;AACb,sGAAA,WAAW,OAAA;AACX,uGAAA,YAAY,OAAA;AACZ,wGAAA,aAAa,OAAA;AACb,8FAAA,GAAG,OAAA;AACH,sGAAA,WAAW,OAAA;AAGb,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd,iCAA8C;AAA9B,qGAAA,YAAY,OAAA;AAE5B,iCAAgF;AAAvE,qGAAA,YAAY,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAAE,sGAAA,aAAa,OAAA;AAErD,qCAAmC;AAEnC,mCAAiC;AAEjC,+BAA6B;AAE7B,8CAA4C;AAE5C,iCAA+B;AAE/B,iCAA+B;AAE/B,+BAA6B;AAE7B,uCAAqC;AAErC,+BAA6B;AAE7B,uCAAqC;AAErC,2CAAyC;AAEzC,uCAAqC;AAErC,+CAA6C"}

package/kif.d.ts

@@ -1,24 +1,25 @@
 import { Result } from '@badrap/result';
 import { Board } from './board';
-import { MaterialSide, Setup } from './setup';
+import { Setup } from './setup';
 import { Position } from './shogi';
 import { Move, Square } from './types';
+import { Hand } from './hand';
 export declare enum InvalidKif {
     Kif = "ERR_KIF",
     Board = "ERR_BOARD",
     Handicap = "ERR_HANDICAP",
-    Pockets = "ERR_POCKETS"
+    Hands = "ERR_HANDS"
 }
 export declare class KifError extends Error {
 }
 export declare function makeKifHeader(setup: Setup): string;
 export declare function makeKifPositionHeader(setup: Setup): string;
 export declare function makeKifBoard(board: Board): string;
-export declare function makeKifPocket(material: MaterialSide): string;
+export declare function makeKifHand(hand: Hand): string;
 export declare function parseKifHeader(kif: string): Result<Setup, KifError>;
 export declare function parseKifPositionHeader(kif: string): Result<Setup, KifError>;
 export declare function parseKifBoard(kifBoard: string): Result<Board, KifError>;
-export declare function parseKifHand(pocketPart: string): Result<MaterialSide, KifError>;
+export declare function parseKifHand(handPart: string): Result<Hand, KifError>;
 export declare function parseTags(kif: string): [string, string][];
 export declare function parseKifMove(kifMove: string, lastDest?: Square | undefined): Move | undefined;
 export declare function parseKifMoves(kifMoves: string[], lastDest?: Square | undefined): Move[];