shogiops 0.2.8 → 0.5.0

package/notation/kitaoKawasaki.js

@@ -0,0 +1,26 @@
+import { roleTo2Kanji } from '../util';
+import { isDrop } from '../types';
+import { pieceCanPromote } from '../variantUtil';
+import { makeNumberSquare, piecesAiming } from './notationUtil';
+// 歩-76
+export function makeKitaoKawasakiMove(pos, move, lastDest) {
+    if (isDrop(move)) {
+        return roleTo2Kanji(move.role).toUpperCase() + '*' + makeNumberSquare(move.to);
+    }
+    else {
+        const piece = pos.board.get(move.from);
+        if (piece) {
+            const roleStr = roleTo2Kanji(piece.role).toUpperCase();
+            const ambStr = piecesAiming(pos, piece, move.to).without(move.from).isEmpty()
+                ? ''
+                : `(${makeNumberSquare(move.from)})`;
+            const actionStr = pos.board.has(move.to) ? 'x' : '-';
+            const destStr = lastDest === move.to ? '' : makeNumberSquare(move.to);
+            const promStr = move.promotion ? '+' : pieceCanPromote(pos.rules)(piece, move.from, move.to) ? '=' : '';
+            return `${roleStr}${ambStr}${actionStr}${destStr}${promStr}`;
+        }
+        else
+            return undefined;
+    }
+}
+//# sourceMappingURL=kitaoKawasaki.js.map

package/notation/kitaoKawasaki.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kitaoKawasaki.js","sourceRoot":"","sources":["../src/notation/kitaoKawasaki.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAQ,MAAM,EAAU,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEhE,OAAO;AACP,MAAM,UAAU,qBAAqB,CAAC,GAAa,EAAE,IAAU,EAAE,QAAiB;IAChF,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAChF;SAAM;QACL,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE;gBAC3E,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACvC,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YACrD,MAAM,OAAO,GAAG,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,EAAE,CAAC;SAC9D;;YAAM,OAAO,SAAS,CAAC;KACzB;AACH,CAAC"}

package/notation/kitaokawasaki.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=kitaokawasaki.js.map

package/notation/kitaokawasaki.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kitaokawasaki.js","sourceRoot":"","sources":["../src/notation/kitaokawasaki.ts"],"names":[],"mappings":""}

package/notation/notationUtil.d.ts

@@ -0,0 +1,12 @@
+import { Position } from '../shogi';
+import { Piece, Square } from '../types';
+import { SquareSet } from '../squareSet';
+export declare function piecesAiming(pos: Position, piece: Piece, to: Square): SquareSet;
+export declare function makeNumberSquare(sq: Square): string;
+export declare function parseNumberSquare(str: string): Square | undefined;
+export declare function makeJapaneseSquare(sq: Square): string;
+export declare function parseJapaneseSquare(str: string): Square | undefined;
+export declare function toKanjiDigit(str: string): string;
+export declare function fromKanjiDigit(str: string): number;
+export declare function numberToKanji(n: number): string;
+export declare function kanjiToNumber(str: string): number;

package/{kifUtil.js → notation/notationUtil.js}

@@ -1,25 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizedKifLines = exports.kanjiToNumber = exports.fromKanjiDigit = exports.numberToKanji = exports.toKanjiDigit = exports.kifOrigSquare = exports.kifDestSquare = exports.parseKifSquare = void 0;
-const util_1 = require("./util");
-function parseKifSquare(str) {
+import { parseSquare, squareFile, squareRank } from '../util';
+import { SquareSet } from '../squareSet';
+export function piecesAiming(pos, piece, to) {
+    // Disambiguation
+    let pieces = SquareSet.empty();
+    for (const s of pos.board.pieces(pos.turn, piece.role))
+        if (pos.dests(s).has(to))
+            pieces = pieces.union(SquareSet.fromSquare(s));
+    return pieces;
+}
+export function makeNumberSquare(sq) {
+    return (9 - squareFile(sq)).toString() + (9 - squareRank(sq));
+}
+export function parseNumberSquare(str) {
     if (str.length !== 2)
         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 util_1.parseSquare(file + rank);
+    const file = Math.abs(str.charCodeAt(0) - '9'.charCodeAt(0));
+    const rank = Math.abs(str.charCodeAt(1) - '9'.charCodeAt(0));
+    if (file < 0 || file >= 9 || rank < 0 || rank >= 9)
+        return;
+    return file + 9 * rank;
 }
-exports.parseKifSquare = parseKifSquare;
-function kifDestSquare(sq) {
-    return (String.fromCharCode((9 - util_1.squareFile(sq)).toString().charCodeAt(0) + 0xfee0) +
-        toKanjiDigit((9 - util_1.squareRank(sq)).toString()));
+export function makeJapaneseSquare(sq) {
+    return (String.fromCharCode((9 - squareFile(sq)).toString().charCodeAt(0) + 0xfee0) +
+        toKanjiDigit((9 - squareRank(sq)).toString()));
 }
-exports.kifDestSquare = kifDestSquare;
-function kifOrigSquare(sq) {
-    return 9 - util_1.squareFile(sq) + (9 - util_1.squareRank(sq)).toString();
+export function parseJapaneseSquare(str) {
+    if (str.length !== 2)
+        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 parseSquare(file + rank);
 }
-exports.kifOrigSquare = kifOrigSquare;
-function toKanjiDigit(str) {
+export function toKanjiDigit(str) {
     switch (str) {
         case '1':
             return '一';
@@ -45,15 +57,7 @@ function toKanjiDigit(str) {
             return '';
     }
 }
-exports.toKanjiDigit = toKanjiDigit;
-// max 99, meant for pieces in hand, you don't need more than 99 pieces...
-function numberToKanji(n) {
-    n = Math.max(0, Math.min(n, 99));
-    const res = n >= 20 ? toKanjiDigit(Math.floor(n / 10).toString()) + '十' : n >= 10 ? '十' : '';
-    return res + toKanjiDigit(Math.floor(n % 10).toString());
-}
-exports.numberToKanji = numberToKanji;
-function fromKanjiDigit(str) {
+export function fromKanjiDigit(str) {
     switch (str) {
         case '一':
             return 1;
@@ -79,9 +83,14 @@ function fromKanjiDigit(str) {
             return 0;
     }
 }
-exports.fromKanjiDigit = fromKanjiDigit;
-// max 99, meant for pieces in hand, you don't need more than 99 pieces...
-function kanjiToNumber(str) {
+// max 99
+export function numberToKanji(n) {
+    n = Math.max(0, Math.min(n, 99));
+    const res = n >= 20 ? toKanjiDigit(Math.floor(n / 10).toString()) + '十' : n >= 10 ? '十' : '';
+    return res + toKanjiDigit(Math.floor(n % 10).toString());
+}
+// max 99
+export function kanjiToNumber(str) {
     let res = str.startsWith('十') ? 1 : 0;
     for (const s of str) {
         if (s === '十')
@@ -91,14 +100,4 @@ function kanjiToNumber(str) {
     }
     return Math.max(0, Math.min(res, 99));
 }
-exports.kanjiToNumber = kanjiToNumber;
-function normalizedKifLines(kif) {
-    return kif
-        .replace(/:/g, '：')
-        .replace(/　/g, ' ') // full-width space to normal space
-        .split(/[\r\n]+/)
-        .map(l => l.trim())
-        .filter(l => l);
-}
-exports.normalizedKifLines = normalizedKifLines;
-//# sourceMappingURL=kifUtil.js.map
+//# sourceMappingURL=notationUtil.js.map

package/notation/notationUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notationUtil.js","sourceRoot":"","sources":["../src/notation/notationUtil.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,YAAY,CAAC,GAAa,EAAE,KAAY,EAAE,EAAU;IAClE,iBAAiB;IACjB,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QACpD,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAAU;IACzC,OAAO,CAAC,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO;IAC3D,OAAO,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EAAU;IAC3C,OAAO,CACL,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC3E,YAAY,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,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,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,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;AAED,MAAM,UAAU,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;AAED,SAAS;AACT,MAAM,UAAU,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;AAED,SAAS;AACT,MAAM,UAAU,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"}

package/notation/western.d.ts

@@ -0,0 +1,3 @@
+import { Position } from '../shogi';
+import { Move } from '../types';
+export declare function makeWesternMove(pos: Position, move: Move): string | undefined;

package/notation/western.js

@@ -0,0 +1,23 @@
+import { roleToString } from '../util';
+import { isDrop } from '../types';
+import { pieceCanPromote } from '../variantUtil';
+import { makeNumberSquare, piecesAiming } from './notationUtil';
+// P-76
+export function makeWesternMove(pos, move) {
+    if (isDrop(move)) {
+        return roleToString(move.role).toUpperCase() + '*' + makeNumberSquare(move.to);
+    }
+    else {
+        const piece = pos.board.get(move.from);
+        if (piece) {
+            const roleStr = roleToString(piece.role).toUpperCase();
+            const ambStr = piecesAiming(pos, piece, move.to).without(move.from).isEmpty() ? '' : makeNumberSquare(move.from);
+            const actionStr = pos.board.has(move.to) ? 'x' : '-';
+            const promStr = move.promotion ? '+' : pieceCanPromote(pos.rules)(piece, move.from, move.to) ? '=' : '';
+            return `${roleStr}${ambStr}${actionStr}${makeNumberSquare(move.to)}${promStr}`;
+        }
+        else
+            return undefined;
+    }
+}
+//# sourceMappingURL=western.js.map

package/notation/western.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"western.js","sourceRoot":"","sources":["../src/notation/western.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAQ,MAAM,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEhE,OAAO;AACP,MAAM,UAAU,eAAe,CAAC,GAAa,EAAE,IAAU;IACvD,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAChF;SAAM;QACL,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjH,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;SAChF;;YAAM,OAAO,SAAS,CAAC;KACzB;AACH,CAAC"}

package/notation/westernEngine.d.ts

@@ -0,0 +1,3 @@
+import { Position } from '../shogi';
+import { Move } from '../types';
+export declare function makeWesternEngineMove(pos: Position, move: Move): string | undefined;

package/notation/westernEngine.js

@@ -0,0 +1,23 @@
+import { makeSquare, roleToString } from '../util';
+import { isDrop } from '../types';
+import { pieceCanPromote } from '../variantUtil';
+import { piecesAiming } from './notationUtil';
+// P-7f
+export function makeWesternEngineMove(pos, move) {
+    if (isDrop(move)) {
+        return roleToString(move.role).toUpperCase() + '*' + makeSquare(move.to);
+    }
+    else {
+        const piece = pos.board.get(move.from);
+        if (piece) {
+            const roleStr = roleToString(piece.role).toUpperCase();
+            const ambStr = piecesAiming(pos, piece, move.to).without(move.from).isEmpty() ? '' : makeSquare(move.from);
+            const actionStr = pos.board.has(move.to) ? 'x' : '-';
+            const promStr = move.promotion ? '+' : pieceCanPromote(pos.rules)(piece, move.from, move.to) ? '=' : '';
+            return `${roleStr}${ambStr}${actionStr}${makeSquare(move.to)}${promStr}`;
+        }
+        else
+            return undefined;
+    }
+}
+//# sourceMappingURL=westernEngine.js.map

package/notation/westernEngine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"westernEngine.js","sourceRoot":"","sources":["../src/notation/westernEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,OAAO,EAAQ,MAAM,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO;AACP,MAAM,UAAU,qBAAqB,CAAC,GAAa,EAAE,IAAU;IAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAC1E;SAAM;QACL,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3G,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;SAC1E;;YAAM,OAAO,SAAS,CAAC;KACzB;AACH,CAAC"}

package/package.json

@@ -1,32 +1,33 @@
 {
   "name": "shogiops",
-  "version": "0.2.8",
+  "version": "0.5.0",
   "description": "Shogi rules and operations",
   "keywords": [
     "shogi",
     "lishogi",
-    "fen",
     "sfen",
     "usi",
-    "uci",
     "typescript"
   ],
   "repository": "https://github.com/WandererXII/shogiops",
   "author": "Niklas Fiekas <niklas.fiekas@backscattering.de>(chessops), WandererXII(shogiops)",
   "license": "GPL-3.0-or-later",
-  "type": "commonjs",
+  "module": "index.js",
+  "types": "index.d.ts",
+  "type": "module",
+  "sideEffects": false,
   "dependencies": {
-    "@badrap/result": "^0.2.6"
+    "@badrap/result": "^0.2"
   },
   "devDependencies": {
     "@types/jest": "^27",
-    "@typescript-eslint/eslint-plugin": "^4",
-    "@typescript-eslint/parser": "^4",
-    "eslint": "^7",
+    "@typescript-eslint/eslint-plugin": "^5",
+    "@typescript-eslint/parser": "^5.9.0",
+    "eslint": "^8",
     "jest": "^27",
     "prettier": "^2",
     "ts-jest": "^27",
-    "typedoc": "^0.21",
+    "typedoc": "^0.22",
     "typescript": "^4"
   },
   "scripts": {
@@ -43,80 +44,96 @@
     "shogi.js",
     "compat.js",
     "variant.js",
+    "variantUtil.js",
     "transform.js",
     "setup.js",
     "squareSet.js",
     "types.js",
     "util.js",
     "debug.js",
-    "fen.js",
-    "san.js",
+    "sfen.js",
+    "hand.js",
     "hash.js",
-    "kifHandicaps.js",
-    "kif.js",
-    "kifUtil.js",
-    "csa.js",
-    "csaUtil.js",
+    "notation/kif/kifHandicaps.js",
+    "notation/kif/kif.js",
+    "notation/csa/csa.js",
+    "notation/japanese.js",
+    "notation/kitaoKawasaki.js",
+    "notation/notationUtil.js",
+    "notation/western.js",
+    "notation/westernEngine.js",
     "index.js",
     "attacks.d.ts",
     "board.d.ts",
     "shogi.d.ts",
     "compat.d.ts",
     "variant.d.ts",
+    "variantUtil.d.ts",
     "transform.d.ts",
     "setup.d.ts",
     "squareSet.d.ts",
     "types.d.ts",
     "util.d.ts",
     "debug.d.ts",
-    "fen.d.ts",
-    "san.d.ts",
+    "sfen.d.ts",
+    "hand.d.ts",
     "hash.d.ts",
-    "kifHandicaps.d.ts",
-    "kif.d.ts",
-    "kifUtil.d.ts",
-    "csa.d.ts",
-    "csaUtil.d.ts",
+    "notation/kif/kifHandicaps.d.ts",
+    "notation/kif/kif.d.ts",
+    "notation/csa/csa.d.ts",
+    "notation/japanese.d.ts",
+    "notation/kitaoKawasaki.d.ts",
+    "notation/notationUtil.d.ts",
+    "notation/western.d.ts",
+    "notation/westernEngine.d.ts",
     "index.d.ts",
     "attacks.js.map",
     "board.js.map",
     "shogi.js.map",
     "compat.js.map",
     "variant.js.map",
+    "variantUtil.js.map",
     "transform.js.map",
     "setup.js.map",
     "squareSet.js.map",
     "types.js.map",
     "util.js.map",
     "debug.js.map",
-    "fen.js.map",
-    "san.js.map",
+    "sfen.js.map",
+    "hand.js.map",
     "hash.js.map",
-    "kifHandicaps.js.map",
-    "kif.js.map",
-    "kifUtil.js.map",
-    "csa.js.map",
-    "csaUtil.js.map",
+    "notation/kif/kifHandicaps.js.map",
+    "notation/kif/kif.js.map",
+    "notation/csa/csa.js.map",
+    "notation/japanese.js.map",
+    "notation/kitaoKawasaki.js.map",
+    "notation/notationUtil.js.map",
+    "notation/western.js.map",
+    "notation/westernEngine.js.map",
     "index.js.map",
     "src/attacks.ts",
     "src/board.ts",
     "src/shogi.ts",
     "src/compat.ts",
     "src/variant.ts",
+    "src/variantUtil.ts",
     "src/transform.ts",
     "src/setup.ts",
     "src/squareSet.ts",
     "src/types.ts",
     "src/util.ts",
     "src/debug.ts",
-    "src/fen.ts",
-    "src/san.ts",
+    "src/sfen.ts",
+    "src/hand.ts",
     "src/hash.ts",
-    "src/kifHandicaps.ts",
-    "src/kif.ts",
-    "src/kifUtil.ts",
-    "src/csa.ts",
-    "src/csaUtil.ts",
+    "src/notation/kif/kifHandicaps.ts",
+    "src/notation/kif/kif.ts",
+    "src/notation/csa/csa.ts",
+    "src/notation/japanese.ts",
+    "src/notation/kitaoKawasaki.ts",
+    "src/notation/notationUtil.ts",
+    "src/notation/western.ts",
+    "src/notation/westernEngine.ts",
     "src/index.ts"
   ],
   "jest": {

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,86 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultSetup = exports.Material = exports.MaterialSide = void 0;
-const types_1 = require("./types");
-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;
-function defaultSetup() {
+import { Board } from './board';
+import { Hands } from './hand';
+export function defaultSetup() {
     return {
-        board: board_1.Board.default(),
-        pockets: Material.empty(),
+        board: Board.default(),
+        hands: Hands.empty(),
         turn: 'sente',
         fullmoves: 1,
     };
 }
-exports.defaultSetup = defaultSetup;
 //# sourceMappingURL=setup.js.map

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,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAS/B,MAAM,UAAU,YAAY;IAC1B,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QACpB,IAAI,EAAE,OAAO;QACb,SAAS,EAAE,CAAC;KACb,CAAC;AACJ,CAAC"}

package/sfen.d.ts

@@ -0,0 +1,33 @@
+import { Result } from '@badrap/result';
+import { Piece } from './types';
+import { Board } from './board';
+import { Setup } from './setup';
+import { Hand, Hands } from './hand';
+export declare const INITIAL_BOARD_SFEN = "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL";
+export declare const INITIAL_EPD: string;
+export declare const INITIAL_SFEN: string;
+export declare const EMPTY_BOARD_SFEN = "9/9/9/9/9/9/9/9/9";
+export declare const EMPTY_EPD: string;
+export declare const EMPTY_SFEN: string;
+export declare enum InvalidSfen {
+    Sfen = "ERR_SFEN",
+    Board = "ERR_BOARD",
+    Hands = "ERR_HANDS",
+    Turn = "ERR_TURN",
+    Fullmoves = "ERR_FULLMOVES"
+}
+export declare class SfenError extends Error {
+}
+export declare function parseBoardSfen(boardPart: string): Result<Board, SfenError>;
+export declare function parseHands(handsPart: string): Result<Hands, SfenError>;
+export declare function parseSfen(sfen: string): Result<Setup, SfenError>;
+interface SfenOpts {
+    epd?: boolean;
+}
+export declare function parsePiece(str: string): Piece | undefined;
+export declare function makePiece(piece: Piece): string;
+export declare function makeBoardSfen(board: Board): string;
+export declare function makeHand(hand: Hand): string;
+export declare function makeHands(hands: Hands): string;
+export declare function makeSfen(setup: Setup, opts?: SfenOpts): string;
+export {};