shogiops 0.3.1 → 0.4.0

package/compat.d.ts

@@ -1,26 +1,8 @@
-import { Rules, SquareName, Move, Square, Role } from './types';
+import { Rules, SquareName, Move, Role } from './types';
 import { Position } from './shogi';
-export declare const C_FILE_NAMES: readonly ["a", "b", "c", "d", "e", "f", "g", "h", "i"];
-export declare type ChessFileName = typeof C_FILE_NAMES[number];
-export declare const C_RANK_NAMES: readonly ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
-export declare type ChessRankName = typeof C_RANK_NAMES[number];
-export declare type ChessSquareName = `${ChessFileName}${ChessRankName}`;
-export declare function makeChessSquare(square: Square): ChessSquareName;
-export declare function parseChessSquare(str: ChessSquareName): Square;
-export declare function parseChessSquare(str: string): Square | undefined;
-export declare function shogigroundDests(pos: Position): Map<ChessSquareName, ChessSquareName[]>;
-export declare function shogigroundDropDests(pos: Position, role?: Role): Map<Role, ChessSquareName[]>;
+export declare function shogigroundDests(pos: Position): Map<SquareName, SquareName[]>;
+export declare function shogigroundDropDests(pos: Position, role?: Role): Map<Role, SquareName[]>;
 export declare function scalashogiCharPair(move: Move): string;
-export declare function shogigroundMove(move: Move): ChessSquareName[];
-export declare function lishogiVariantRules(variant: 'standard' | 'fromPosition' | 'minishogi'): Rules;
-export declare function chessCoordToShogiCoord(s: ChessSquareName): SquareName;
-export declare function shogiCoordToChessCord(s: SquareName): ChessSquareName;
-export declare function chessCoord(str: string): ChessSquareName | undefined;
-export declare function shogiCoord(str: string): SquareName | undefined;
-export declare function roleToLishogiChar(role: Role): string;
-export declare function lishogiCharToRole(ch: 'p' | 'l' | 'n' | 's' | 'g' | 'b' | 'r' | 't' | 'u' | 'm' | 'a' | 'h' | 'd' | 'P' | 'L' | 'N' | 'S' | 'G' | 'B' | 'R' | 'T' | 'U' | 'M' | 'A' | 'H' | 'D'): Role;
-export declare function lishogiCharToRole(ch: string): Role | undefined;
-export declare function parseLishogiUci(str: string): Move | undefined;
-export declare function makeLishogiUci(move: Move): string;
-export declare function assureUsi(str: string): string | undefined;
-export declare function assureLishogiUci(str: string): string | undefined;
+export declare function usiToShogigroundMove(usi: string): SquareName[];
+export declare function shogigroundMove(move: Move): SquareName[];
+export declare function lishogiVariantRules(variant: string): Rules;

package/compat.js

@@ -1,31 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assureLishogiUci = exports.assureUsi = exports.makeLishogiUci = exports.parseLishogiUci = exports.lishogiCharToRole = exports.roleToLishogiChar = exports.shogiCoord = exports.chessCoord = exports.shogiCoordToChessCord = exports.chessCoordToShogiCoord = exports.lishogiVariantRules = exports.shogigroundMove = exports.scalashogiCharPair = exports.shogigroundDropDests = exports.shogigroundDests = exports.parseChessSquare = exports.makeChessSquare = exports.C_RANK_NAMES = exports.C_FILE_NAMES = void 0;
+exports.lishogiVariantRules = exports.shogigroundMove = exports.usiToShogigroundMove = exports.scalashogiCharPair = exports.shogigroundDropDests = exports.shogigroundDests = void 0;
 const types_1 = require("./types");
 const util_1 = require("./util");
-exports.C_FILE_NAMES = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'];
-exports.C_RANK_NAMES = ['1', '2', '3', '4', '5', '6', '7', '8', '9'];
-function makeChessSquare(square) {
-    return (exports.C_FILE_NAMES[util_1.squareFile(square)] + exports.C_RANK_NAMES[util_1.squareRank(square)]);
-}
-exports.makeChessSquare = makeChessSquare;
-function parseChessSquare(str) {
-    if (str.length !== 2)
-        return;
-    const file = Math.abs(str.charCodeAt(0) - 'a'.charCodeAt(0));
-    const rank = Math.abs(str.charCodeAt(1) - '1'.charCodeAt(0));
-    if (file < 0 || file >= 9 || rank < 0 || rank >= 9)
-        return;
-    return file + 9 * rank;
-}
-exports.parseChessSquare = parseChessSquare;
 function shogigroundDests(pos) {
     const result = new Map();
     const ctx = pos.ctx();
     for (const [from, squares] of pos.allDests(ctx)) {
         if (squares.nonEmpty()) {
-            const d = Array.from(squares, s => makeChessSquare(s));
-            result.set(makeChessSquare(from), d);
+            const d = Array.from(squares, s => util_1.makeSquare(s));
+            result.set(util_1.makeSquare(from), d);
         }
     }
     return result;
@@ -36,7 +20,7 @@ function shogigroundDropDests(pos, role) {
     if (role) {
         const squares = pos.dropDests(role);
         if (squares.nonEmpty()) {
-            const d = Array.from(squares, s => makeChessSquare(s));
+            const d = Array.from(squares, s => util_1.makeSquare(s));
             result.set(role, d);
         }
     }
@@ -44,7 +28,7 @@ function shogigroundDropDests(pos, role) {
         const ctx = pos.ctx();
         for (const [r, squares] of pos.allDropDests(ctx)) {
             if (squares.nonEmpty()) {
-                const d = Array.from(squares, s => makeChessSquare(s));
+                const d = Array.from(squares, s => util_1.makeSquare(s));
                 result.set(r, d);
             }
         }
@@ -59,164 +43,22 @@ function scalashogiCharPair(move) {
         return String.fromCharCode(34 + move.from, move.promotion ? 34 + move.to + 128 : 34 + move.to);
 }
 exports.scalashogiCharPair = scalashogiCharPair;
+function usiToShogigroundMove(usi) {
+    const move = util_1.parseUsi(usi);
+    return util_1.defined(move) ? shogigroundMove(move) : [];
+}
+exports.usiToShogigroundMove = usiToShogigroundMove;
 function shogigroundMove(move) {
-    return types_1.isDrop(move) ? [makeChessSquare(move.to)] : [makeChessSquare(move.from), makeChessSquare(move.to)];
+    return types_1.isDrop(move) ? [util_1.makeSquare(move.to)] : [util_1.makeSquare(move.from), util_1.makeSquare(move.to)];
 }
 exports.shogigroundMove = shogigroundMove;
 function lishogiVariantRules(variant) {
     switch (variant) {
-        case 'standard':
-        case 'fromPosition':
-            return 'shogi';
         case 'minishogi':
             return 'minishogi';
-    }
-}
-exports.lishogiVariantRules = lishogiVariantRules;
-function chessCoordToShogiCoord(s) {
-    return util_1.makeSquare(parseChessSquare(s));
-}
-exports.chessCoordToShogiCoord = chessCoordToShogiCoord;
-function shogiCoordToChessCord(s) {
-    return makeChessSquare(util_1.parseSquare(s));
-}
-exports.shogiCoordToChessCord = shogiCoordToChessCord;
-function chessCoord(str) {
-    if (str.match(/^[1-9][a-i]$/))
-        return shogiCoordToChessCord(str);
-    if (str.match(/^[a-i][1-9]$/))
-        return str;
-    return undefined;
-}
-exports.chessCoord = chessCoord;
-function shogiCoord(str) {
-    if (str.match(/^[1-9][a-i]$/))
-        return str;
-    if (str.match(/^[a-i][1-9]$/))
-        return chessCoordToShogiCoord(str);
-    else
-        return undefined;
-}
-exports.shogiCoord = shogiCoord;
-function roleToLishogiChar(role) {
-    switch (role) {
-        case 'pawn':
-            return 'p';
-        case 'lance':
-            return 'l';
-        case 'knight':
-            return 'n';
-        case 'silver':
-            return 's';
-        case 'gold':
-            return 'g';
-        case 'bishop':
-            return 'b';
-        case 'rook':
-            return 'r';
-        case 'tokin':
-            return 't';
-        case 'promotedlance':
-            return 'u';
-        case 'promotedknight':
-            return 'm';
-        case 'promotedsilver':
-            return 'a';
-        case 'horse':
-            return 'h';
-        case 'dragon':
-            return 'd';
-        case 'king':
-            return 'k';
-    }
-}
-exports.roleToLishogiChar = roleToLishogiChar;
-function lishogiCharToRole(ch) {
-    switch (ch) {
-        case 'P':
-        case 'p':
-            return 'pawn';
-        case 'L':
-        case 'l':
-            return 'lance';
-        case 'N':
-        case 'n':
-            return 'knight';
-        case 'S':
-        case 's':
-            return 'silver';
-        case 'G':
-        case 'g':
-            return 'gold';
-        case 'B':
-        case 'b':
-            return 'bishop';
-        case 'R':
-        case 'r':
-            return 'rook';
-        case 'T':
-        case 't':
-            return 'tokin';
-        case 'U':
-        case 'u':
-            return 'promotedlance';
-        case 'M':
-        case 'm':
-            return 'promotedknight';
-        case 'A':
-        case 'a':
-            return 'promotedsilver';
-        case 'H':
-        case 'h':
-            return 'horse';
-        case 'D':
-        case 'd':
-            return 'dragon';
-        case 'K':
-        case 'k':
-            return 'king';
         default:
-            return;
-    }
-}
-exports.lishogiCharToRole = lishogiCharToRole;
-function parseLishogiUci(str) {
-    if (str[1] === '*' && str.length === 4) {
-        const role = lishogiCharToRole(str[0]);
-        const to = parseChessSquare(str.slice(2));
-        if (util_1.defined(role) && util_1.defined(to))
-            return { role, to };
-    }
-    else if (str.length === 4 || str.length === 5) {
-        const from = parseChessSquare(str.slice(0, 2));
-        const to = parseChessSquare(str.slice(2, 4));
-        const promotion = str[4] === '+' ? true : false;
-        if (util_1.defined(from) && util_1.defined(to))
-            return { from, to, promotion };
+            return 'shogi';
     }
-    return;
 }
-exports.parseLishogiUci = parseLishogiUci;
-function makeLishogiUci(move) {
-    if (types_1.isDrop(move))
-        return `${roleToLishogiChar(move.role).toUpperCase()}*${makeChessSquare(move.to)}`;
-    return makeChessSquare(move.from) + makeChessSquare(move.to) + (move.promotion ? '+' : '');
-}
-exports.makeLishogiUci = makeLishogiUci;
-function assureUsi(str) {
-    if (str.match(/^([1-9][a-i]|([RBGSNLP]\*))[1-9][a-i](\+|\=)?$/))
-        return str;
-    if (str.match(/^([a-i][1-9]|([RBGSNLP]\*))[a-i][1-9](\+|\=)?$/))
-        return util_1.makeUsi(parseLishogiUci(str));
-    return;
-}
-exports.assureUsi = assureUsi;
-function assureLishogiUci(str) {
-    if (str.match(/^([a-i][1-9]|([RBGSNLP]\*))[a-i][1-9](\+|\=)?$/))
-        return str;
-    if (str.match(/^([1-9][a-i]|([RBGSNLP]\*))[1-9][a-i](\+|\=)?$/))
-        return makeLishogiUci(util_1.parseUsi(str));
-    return;
-}
-exports.assureLishogiUci = assureLishogiUci;
+exports.lishogiVariantRules = lishogiVariantRules;
 //# sourceMappingURL=compat.js.map

package/compat.js.map

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

package/index.d.ts

@@ -15,7 +15,6 @@ 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,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.variant = exports.transform = exports.san = 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;
-exports.variantUtil = 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; } });
@@ -56,7 +55,6 @@ 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");

package/index.js.map

@@ -1 +1 @@
-{"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,+BAA6B;AAE7B,2CAAyC;AAEzC,uCAAqC;AAErC,+CAA6C"}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shogiops",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Shogi rules and operations",
   "keywords": [
     "shogi",
@@ -51,7 +51,6 @@
     "util.js",
     "debug.js",
     "fen.js",
-    "san.js",
     "hand.js",
     "hash.js",
     "kifHandicaps.js",
@@ -73,7 +72,6 @@
     "util.d.ts",
     "debug.d.ts",
     "fen.d.ts",
-    "san.d.ts",
     "hand.d.ts",
     "hash.d.ts",
     "kifHandicaps.d.ts",
@@ -95,7 +93,6 @@
     "util.js.map",
     "debug.js.map",
     "fen.js.map",
-    "san.js.map",
     "hand.js.map",
     "hash.js.map",
     "kifHandicaps.js.map",
@@ -117,7 +114,6 @@
     "src/util.ts",
     "src/debug.ts",
     "src/fen.ts",
-    "src/san.ts",
     "src/hand.ts",
     "src/hash.ts",
     "src/kifHandicaps.ts",

package/src/compat.ts

@@ -1,54 +1,32 @@
-import { Rules, SquareName, Move, isDrop, Square, Role } from './types';
-import { defined, makeSquare, makeUsi, parseSquare, parseUsi, squareFile, squareRank } from './util';
+import { Rules, SquareName, Move, isDrop, Role } from './types';
+import { defined, makeSquare, parseUsi } from './util';
 import { Position } from './shogi';
 
-export const C_FILE_NAMES = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'] as const;
-export type ChessFileName = typeof C_FILE_NAMES[number];
-
-export const C_RANK_NAMES = ['1', '2', '3', '4', '5', '6', '7', '8', '9'] as const;
-export type ChessRankName = typeof C_RANK_NAMES[number];
-
-export type ChessSquareName = `${ChessFileName}${ChessRankName}`;
-
-export function makeChessSquare(square: Square): ChessSquareName {
-  return (C_FILE_NAMES[squareFile(square)] + C_RANK_NAMES[squareRank(square)]) as ChessSquareName;
-}
-
-export function parseChessSquare(str: ChessSquareName): Square;
-export function parseChessSquare(str: string): Square | undefined;
-export function parseChessSquare(str: string): Square | undefined {
-  if (str.length !== 2) return;
-  const file = Math.abs(str.charCodeAt(0) - 'a'.charCodeAt(0));
-  const rank = Math.abs(str.charCodeAt(1) - '1'.charCodeAt(0));
-  if (file < 0 || file >= 9 || rank < 0 || rank >= 9) return;
-  return file + 9 * rank;
-}
-
-export function shogigroundDests(pos: Position): Map<ChessSquareName, ChessSquareName[]> {
+export function shogigroundDests(pos: Position): Map<SquareName, SquareName[]> {
   const result = new Map();
   const ctx = pos.ctx();
   for (const [from, squares] of pos.allDests(ctx)) {
     if (squares.nonEmpty()) {
-      const d = Array.from(squares, s => makeChessSquare(s));
-      result.set(makeChessSquare(from), d);
+      const d = Array.from(squares, s => makeSquare(s));
+      result.set(makeSquare(from), d);
     }
   }
   return result;
 }
 
-export function shogigroundDropDests(pos: Position, role?: Role): Map<Role, ChessSquareName[]> {
+export function shogigroundDropDests(pos: Position, role?: Role): Map<Role, SquareName[]> {
   const result = new Map();
   if (role) {
     const squares = pos.dropDests(role);
     if (squares.nonEmpty()) {
-      const d = Array.from(squares, s => makeChessSquare(s));
+      const d = Array.from(squares, s => makeSquare(s));
       result.set(role, d);
     }
   } else {
     const ctx = pos.ctx();
     for (const [r, squares] of pos.allDropDests(ctx)) {
       if (squares.nonEmpty()) {
-        const d = Array.from(squares, s => makeChessSquare(s));
+        const d = Array.from(squares, s => makeSquare(s));
         result.set(r, d);
       }
     }
@@ -65,179 +43,20 @@ export function scalashogiCharPair(move: Move): string {
   else return String.fromCharCode(34 + move.from, move.promotion ? 34 + move.to + 128 : 34 + move.to);
 }
 
-export function shogigroundMove(move: Move): ChessSquareName[] {
-  return isDrop(move) ? [makeChessSquare(move.to)] : [makeChessSquare(move.from), makeChessSquare(move.to)];
+export function usiToShogigroundMove(usi: string): SquareName[] {
+  const move = parseUsi(usi);
+  return defined(move) ? shogigroundMove(move) : [];
+}
+
+export function shogigroundMove(move: Move): SquareName[] {
+  return isDrop(move) ? [makeSquare(move.to)] : [makeSquare(move.from), makeSquare(move.to)];
 }
 
-export function lishogiVariantRules(variant: 'standard' | 'fromPosition' | 'minishogi'): Rules {
+export function lishogiVariantRules(variant: string): Rules {
   switch (variant) {
-    case 'standard':
-    case 'fromPosition':
-      return 'shogi';
     case 'minishogi':
       return 'minishogi';
-  }
-}
-
-export function chessCoordToShogiCoord(s: ChessSquareName): SquareName {
-  return makeSquare(parseChessSquare(s));
-}
-
-export function shogiCoordToChessCord(s: SquareName): ChessSquareName {
-  return makeChessSquare(parseSquare(s));
-}
-
-export function chessCoord(str: string): ChessSquareName | undefined {
-  if (str.match(/^[1-9][a-i]$/)) return shogiCoordToChessCord(str as SquareName);
-  if (str.match(/^[a-i][1-9]$/)) return str as ChessSquareName;
-  return undefined;
-}
-
-export function shogiCoord(str: string): SquareName | undefined {
-  if (str.match(/^[1-9][a-i]$/)) return str as SquareName;
-  if (str.match(/^[a-i][1-9]$/)) return chessCoordToShogiCoord(str as ChessSquareName);
-  else return undefined;
-}
-
-export function roleToLishogiChar(role: Role): string {
-  switch (role) {
-    case 'pawn':
-      return 'p';
-    case 'lance':
-      return 'l';
-    case 'knight':
-      return 'n';
-    case 'silver':
-      return 's';
-    case 'gold':
-      return 'g';
-    case 'bishop':
-      return 'b';
-    case 'rook':
-      return 'r';
-    case 'tokin':
-      return 't';
-    case 'promotedlance':
-      return 'u';
-    case 'promotedknight':
-      return 'm';
-    case 'promotedsilver':
-      return 'a';
-    case 'horse':
-      return 'h';
-    case 'dragon':
-      return 'd';
-    case 'king':
-      return 'k';
-  }
-}
-
-export function lishogiCharToRole(
-  ch:
-    | 'p'
-    | 'l'
-    | 'n'
-    | 's'
-    | 'g'
-    | 'b'
-    | 'r'
-    | 't'
-    | 'u'
-    | 'm'
-    | 'a'
-    | 'h'
-    | 'd'
-    | 'P'
-    | 'L'
-    | 'N'
-    | 'S'
-    | 'G'
-    | 'B'
-    | 'R'
-    | 'T'
-    | 'U'
-    | 'M'
-    | 'A'
-    | 'H'
-    | 'D'
-): Role;
-export function lishogiCharToRole(ch: string): Role | undefined;
-export function lishogiCharToRole(ch: string): Role | undefined {
-  switch (ch) {
-    case 'P':
-    case 'p':
-      return 'pawn';
-    case 'L':
-    case 'l':
-      return 'lance';
-    case 'N':
-    case 'n':
-      return 'knight';
-    case 'S':
-    case 's':
-      return 'silver';
-    case 'G':
-    case 'g':
-      return 'gold';
-    case 'B':
-    case 'b':
-      return 'bishop';
-    case 'R':
-    case 'r':
-      return 'rook';
-    case 'T':
-    case 't':
-      return 'tokin';
-    case 'U':
-    case 'u':
-      return 'promotedlance';
-    case 'M':
-    case 'm':
-      return 'promotedknight';
-    case 'A':
-    case 'a':
-      return 'promotedsilver';
-    case 'H':
-    case 'h':
-      return 'horse';
-    case 'D':
-    case 'd':
-      return 'dragon';
-    case 'K':
-    case 'k':
-      return 'king';
     default:
-      return;
-  }
-}
-
-export function parseLishogiUci(str: string): Move | undefined {
-  if (str[1] === '*' && str.length === 4) {
-    const role = lishogiCharToRole(str[0]);
-    const to = parseChessSquare(str.slice(2));
-    if (defined(role) && defined(to)) return { role, to };
-  } else if (str.length === 4 || str.length === 5) {
-    const from = parseChessSquare(str.slice(0, 2));
-    const to = parseChessSquare(str.slice(2, 4));
-    const promotion = str[4] === '+' ? true : false;
-    if (defined(from) && defined(to)) return { from, to, promotion };
+      return 'shogi';
   }
-  return;
-}
-
-export function makeLishogiUci(move: Move): string {
-  if (isDrop(move)) return `${roleToLishogiChar(move.role).toUpperCase()}*${makeChessSquare(move.to)}`;
-  return makeChessSquare(move.from) + makeChessSquare(move.to) + (move.promotion ? '+' : '');
-}
-
-export function assureUsi(str: string): string | undefined {
-  if (str.match(/^([1-9][a-i]|([RBGSNLP]\*))[1-9][a-i](\+|\=)?$/)) return str;
-  if (str.match(/^([a-i][1-9]|([RBGSNLP]\*))[a-i][1-9](\+|\=)?$/)) return makeUsi(parseLishogiUci(str)!);
-  return;
-}
-
-export function assureLishogiUci(str: string): string | undefined {
-  if (str.match(/^([a-i][1-9]|([RBGSNLP]\*))[a-i][1-9](\+|\=)?$/)) return str;
-  if (str.match(/^([1-9][a-i]|([RBGSNLP]\*))[1-9][a-i](\+|\=)?$/)) return makeLishogiUci(parseUsi(str)!);
-  return;
 }

package/src/index.ts

@@ -80,8 +80,6 @@ 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';

package/san.d.ts

@@ -1,6 +0,0 @@
-import { Move } from './types';
-import { Position } from './shogi';
-export declare function makeSanAndPlay(pos: Position, move: Move): string;
-export declare function makeSanVariation(pos: Position, variation: Move[]): string;
-export declare function makeSan(pos: Position, move: Move): string;
-export declare function parseSan(pos: Position, san: string): Move | undefined;

package/san.js

@@ -1,124 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSan = exports.makeSan = exports.makeSanVariation = exports.makeSanAndPlay = void 0;
-const types_1 = require("./types");
-const util_1 = require("./util");
-const squareSet_1 = require("./squareSet");
-const compat_1 = require("./compat");
-const variantUtil_1 = require("./variantUtil");
-function makeSanWithoutSuffix(pos, move) {
-    let san = '';
-    if (types_1.isDrop(move)) {
-        san = compat_1.roleToLishogiChar(move.role).toUpperCase() + '*' + compat_1.shogiCoordToChessCord(util_1.makeSquare(move.to));
-    }
-    else {
-        const piece = pos.board.get(move.from);
-        if (!piece)
-            return '--';
-        const capture = pos.board.occupied.has(move.to);
-        san = compat_1.roleToLishogiChar(piece.role).toUpperCase();
-        if (piece.role !== 'pawn' && piece.role !== 'lance' && piece.role !== 'king') {
-            // Disambiguation
-            let others = squareSet_1.SquareSet.empty();
-            for (const s of pos.board.pieces(pos.turn, piece.role)) {
-                if (pos.dests(s).has(move.to))
-                    others = others.union(squareSet_1.SquareSet.fromSquare(s));
-            }
-            others = others.without(move.from);
-            if (others.nonEmpty()) {
-                san += compat_1.shogiCoordToChessCord(util_1.makeSquare(move.from));
-            }
-        }
-        if (capture)
-            san += 'x';
-        san += compat_1.shogiCoordToChessCord(util_1.makeSquare(move.to));
-        if (move.promotion || variantUtil_1.pieceInDeadZone(pos.rules)(piece, move.to))
-            san += '+';
-        else if (variantUtil_1.pieceCanPromote(pos.rules)(piece, move.from, move.to))
-            san += '=';
-    }
-    return san;
-}
-function makeSanAndPlay(pos, move) {
-    const san = makeSanWithoutSuffix(pos, move);
-    pos.play(move);
-    return san;
-}
-exports.makeSanAndPlay = makeSanAndPlay;
-function makeSanVariation(pos, variation) {
-    var _a;
-    pos = pos.clone();
-    const line = [];
-    for (let i = 0; i < variation.length; i++) {
-        if (i !== 0)
-            line.push(' ');
-        line.push(pos.fullmoves, '. ');
-        const san = makeSanWithoutSuffix(pos, variation[i]);
-        pos.play(variation[i]);
-        line.push(san);
-        if (san === '--')
-            return line.join('');
-        if (i === variation.length - 1 && ((_a = pos.outcome()) === null || _a === void 0 ? void 0 : _a.winner))
-            line.push('投了');
-    }
-    return line.join('');
-}
-exports.makeSanVariation = makeSanVariation;
-function makeSan(pos, move) {
-    return makeSanAndPlay(pos.clone(), move);
-}
-exports.makeSan = makeSan;
-function parseSan(pos, san) {
-    const ctx = pos.ctx();
-    // Normal move
-    const match = san.match(/^([PLNSGKBRTUMAHD])([a-i][1-9])?[x]?([a-i][1-9])(\+|\=)?$/);
-    if (!match) {
-        // Drop
-        const match = san.match(/^([PLNSGBRplsgbr])\*([a-i][1-9])$/);
-        if (!match)
-            return;
-        const move = {
-            role: compat_1.lishogiCharToRole(match[1]),
-            to: compat_1.parseChessSquare(match[2]),
-        };
-        return pos.isLegal(move, ctx) ? move : undefined;
-    }
-    const role = compat_1.lishogiCharToRole(match[1]);
-    const to = compat_1.parseChessSquare(match[3]);
-    const fromStr = match[2];
-    let candidates = pos.board.pieces(pos.turn, role);
-    if (fromStr)
-        candidates = candidates.intersect(squareSet_1.SquareSet.fromSquare(compat_1.parseChessSquare(fromStr)));
-    // Check uniqueness and legality
-    let from;
-    for (const candidate of candidates) {
-        if (pos.dests(candidate, ctx).has(to)) {
-            if (util_1.defined(from))
-                return; // Ambiguous
-            from = candidate;
-        }
-    }
-    if (!util_1.defined(from))
-        return; // Illegal
-    const piece = pos.board.get(from);
-    const promotionStr = match[4];
-    let promotion;
-    if (promotionStr === '+')
-        promotion = true;
-    else
-        promotion = false;
-    // Promotion needs to be specified in san
-    if (util_1.defined(promotionStr) !== variantUtil_1.pieceCanPromote(pos.rules)(piece, from, to)) {
-        return;
-    }
-    // force promotion
-    else if (!promotion && variantUtil_1.pieceInDeadZone(pos.rules)(piece, to))
-        return;
-    return {
-        from,
-        to,
-        promotion,
-    };
-}
-exports.parseSan = parseSan;
-//# sourceMappingURL=san.js.map

package/san.js.map

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

package/src/san.ts

@@ -1,113 +0,0 @@
-import { isDrop, Move } from './types';
-import { defined, makeSquare } from './util';
-import { SquareSet } from './squareSet';
-import { Position } from './shogi';
-import { lishogiCharToRole, roleToLishogiChar, shogiCoordToChessCord, parseChessSquare } from './compat';
-import { pieceCanPromote, pieceInDeadZone } from './variantUtil';
-
-function makeSanWithoutSuffix(pos: Position, move: Move): string {
-  let san = '';
-  if (isDrop(move)) {
-    san = roleToLishogiChar(move.role).toUpperCase() + '*' + shogiCoordToChessCord(makeSquare(move.to));
-  } else {
-    const piece = pos.board.get(move.from);
-    if (!piece) return '--';
-    const capture = pos.board.occupied.has(move.to);
-    san = roleToLishogiChar(piece.role).toUpperCase();
-
-    if (piece.role !== 'pawn' && piece.role !== 'lance' && piece.role !== 'king') {
-      // Disambiguation
-      let others = SquareSet.empty();
-      for (const s of pos.board.pieces(pos.turn, piece.role)) {
-        if (pos.dests(s).has(move.to)) others = others.union(SquareSet.fromSquare(s));
-      }
-      others = others.without(move.from);
-      if (others.nonEmpty()) {
-        san += shogiCoordToChessCord(makeSquare(move.from));
-      }
-    }
-    if (capture) san += 'x';
-    san += shogiCoordToChessCord(makeSquare(move.to));
-    if (move.promotion || pieceInDeadZone(pos.rules)(piece, move.to)) san += '+';
-    else if (pieceCanPromote(pos.rules)(piece, move.from, move.to)) san += '=';
-  }
-  return san;
-}
-
-export function makeSanAndPlay(pos: Position, move: Move): string {
-  const san = makeSanWithoutSuffix(pos, move);
-  pos.play(move);
-  return san;
-}
-
-export function makeSanVariation(pos: Position, variation: Move[]): string {
-  pos = pos.clone();
-  const line = [];
-  for (let i = 0; i < variation.length; i++) {
-    if (i !== 0) line.push(' ');
-    line.push(pos.fullmoves, '. ');
-    const san = makeSanWithoutSuffix(pos, variation[i]);
-    pos.play(variation[i]);
-    line.push(san);
-    if (san === '--') return line.join('');
-    if (i === variation.length - 1 && pos.outcome()?.winner) line.push('投了');
-  }
-  return line.join('');
-}
-
-export function makeSan(pos: Position, move: Move): string {
-  return makeSanAndPlay(pos.clone(), move);
-}
-
-export function parseSan(pos: Position, san: string): Move | undefined {
-  const ctx = pos.ctx();
-
-  // Normal move
-  const match = san.match(/^([PLNSGKBRTUMAHD])([a-i][1-9])?[x]?([a-i][1-9])(\+|\=)?$/);
-  if (!match) {
-    // Drop
-    const match = san.match(/^([PLNSGBRplsgbr])\*([a-i][1-9])$/);
-    if (!match) return;
-    const move = {
-      role: lishogiCharToRole(match[1])!,
-      to: parseChessSquare(match[2])!,
-    };
-    return pos.isLegal(move, ctx) ? move : undefined;
-  }
-  const role = lishogiCharToRole(match[1])!;
-  const to = parseChessSquare(match[3])!;
-  const fromStr = match[2];
-
-  let candidates = pos.board.pieces(pos.turn, role);
-  if (fromStr) candidates = candidates.intersect(SquareSet.fromSquare(parseChessSquare(fromStr)!));
-
-  // Check uniqueness and legality
-  let from;
-  for (const candidate of candidates) {
-    if (pos.dests(candidate, ctx).has(to)) {
-      if (defined(from)) return; // Ambiguous
-      from = candidate;
-    }
-  }
-  if (!defined(from)) return; // Illegal
-  const piece = pos.board.get(from)!;
-
-  const promotionStr = match[4];
-  let promotion: boolean;
-  if (promotionStr === '+') promotion = true;
-  else promotion = false;
-
-  // Promotion needs to be specified in san
-  if (defined(promotionStr) !== pieceCanPromote(pos.rules)(piece, from, to)) {
-    return;
-  }
-
-  // force promotion
-  else if (!promotion && pieceInDeadZone(pos.rules)(piece, to)) return;
-
-  return {
-    from,
-    to,
-    promotion,
-  };
-}