npm - @lichess-org/chessground - Versions diffs - 9.3.1 → 9.4.1 - Mend

@lichess-org/chessground 9.3.1 → 9.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/dist/util.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import * as cg from './types.js';
 export const invRanks = [...cg.ranks].reverse();
-export const allKeys = Array.prototype.concat(...cg.files.map(c => cg.ranks.map(r => c + r)));
+export const allKeys = cg.files.flatMap(f => cg.ranks.map(r => (f + r)));
 export const pos2key = (pos) => allKeys[8 * pos[0] + pos[1]];
 export const key2pos = (k) => [k.charCodeAt(0) - 97, k.charCodeAt(1) - 49];
 export const uciToMove = (uci) => {
@@ -42,11 +42,9 @@ export const timer = () => {
     };
 };
 export const opposite = (c) => (c === 'white' ? 'black' : 'white');
-export const distanceSq = (pos1, pos2) => {
-    const dx = pos1[0] - pos2[0], dy = pos1[1] - pos2[1];
-    return dx * dx + dy * dy;
-};
+export const distanceSq = (pos1, pos2) => (pos1[0] - pos2[0]) ** 2 + (pos1[1] - pos2[1]) ** 2;
 export const samePiece = (p1, p2) => p1.role === p2.role && p1.color === p2.color;
+export const samePos = (p1, p2) => p1[0] === p2[0] && p1[1] === p2[1];
 export const posToTranslate = (bounds) => (pos, asWhite) => [
     ((asWhite ? pos[0] : 7 - pos[0]) * bounds.width) / 8,
     ((asWhite ? 7 - pos[1] : pos[1]) * bounds.height) / 8,
@@ -61,10 +59,9 @@ export const setVisible = (el, v) => {
     el.style.visibility = v ? 'visible' : 'hidden';
 };
 export const eventPosition = (e) => {
-    var _a;
     if (e.clientX || e.clientX === 0)
         return [e.clientX, e.clientY];
-    if ((_a = e.targetTouches) === null || _a === void 0 ? void 0 : _a[0])
+    if (e.targetTouches?.[0])
         return [e.targetTouches[0].clientX, e.targetTouches[0].clientY];
     return; // touchend has no position!
 };
@@ -87,15 +84,20 @@ export function computeSquareCenter(key, asWhite, bounds) {
     ];
 }
 export const diff = (a, b) => Math.abs(a - b);
-export const knightDir = (x1, y1, x2, y2) => {
-    const xd = diff(x1, x2);
-    const yd = diff(y1, y2);
-    return (xd === 1 && yd === 2) || (xd === 2 && yd === 1);
-};
-export const rookDir = (x1, y1, x2, y2) => x1 === x2 || y1 === y2;
-export const bishopDir = (x1, y1, x2, y2) => diff(x1, x2) === diff(y1, y2);
+export const knightDir = (x1, y1, x2, y2) => diff(x1, x2) * diff(y1, y2) === 2;
+export const rookDir = (x1, y1, x2, y2) => (x1 === x2) !== (y1 === y2);
+export const bishopDir = (x1, y1, x2, y2) => diff(x1, x2) === diff(y1, y2) && x1 !== x2;
 export const queenDir = (x1, y1, x2, y2) => rookDir(x1, y1, x2, y2) || bishopDir(x1, y1, x2, y2);
-/** Return all board squares between (x1, y1) and (x2, y2) exclusive,
+export const kingDirNonCastling = (x1, y1, x2, y2) => Math.max(diff(x1, x2), diff(y1, y2)) === 1;
+export const pawnDirCapture = (x1, y1, x2, y2, isDirectionUp) => diff(x1, x2) === 1 && y2 === y1 + (isDirectionUp ? 1 : -1);
+export const pawnDirAdvance = (x1, y1, x2, y2, isDirectionUp) => {
+    const step = isDirectionUp ? 1 : -1;
+    return (x1 === x2 &&
+        (y2 === y1 + step ||
+            // allow 2 squares from first two ranks, for horde
+            (y2 === y1 + 2 * step && (isDirectionUp ? y1 <= 1 : y1 >= 6))));
+};
+/** Returns all board squares between (x1, y1) and (x2, y2) exclusive,
  *  along a straight line (rook or bishop path). Returns [] if not aligned, or none between.
  */
 export const squaresBetween = (x1, y1, x2, y2) => {
@@ -104,9 +106,7 @@ export const squaresBetween = (x1, y1, x2, y2) => {
     // Must be a straight or diagonal line
     if (dx && dy && Math.abs(dx) !== Math.abs(dy))
         return [];
-    // Determine step direction
-    const stepX = dx === 0 ? 0 : dx > 0 ? 1 : -1;
-    const stepY = dy === 0 ? 0 : dy > 0 ? 1 : -1;
+    const stepX = Math.sign(dx), stepY = Math.sign(dy);
     const squares = [];
     let x = x1 + stepX, y = y1 + stepY;
     while (x !== x2 || y !== y2) {
@@ -116,4 +116,18 @@ export const squaresBetween = (x1, y1, x2, y2) => {
     }
     return squares.map(sq => pos2key(sq));
 };
+export const adjacentSquares = (square) => {
+    const pos = key2pos(square);
+    const adjacentSquares = [];
+    if (pos[0] > 0)
+        adjacentSquares.push([pos[0] - 1, pos[1]]);
+    if (pos[0] < 7)
+        adjacentSquares.push([pos[0] + 1, pos[1]]);
+    return adjacentSquares.map(pos2key);
+};
+export const squareShiftedVertically = (square, delta) => {
+    const pos = key2pos(square);
+    pos[1] += delta;
+    return pos2key(pos);
+};
 //# sourceMappingURL=util.js.map

package/dist/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,MAAM,CAAC,MAAM,QAAQ,GAAuB,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AAEpE,MAAM,CAAC,MAAM,OAAO,GAAsB,~~KAAK,CAAC,SAAS,CAAC,MAAM,CAC9D,GAAG,~~EAAE,CAAC,KAAK,CAAC,~~GAAG~~,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,~~CAC/C,~~CAAC;~~AAEF~~,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAuB,EAAwB,EAAE;IACzE,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAW,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAa,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAsB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAE9D,MAAM,UAAU,IAAI,CAAI,CAAU;IAChC,IAAI,CAAgB,CAAC;IACrB,MAAM,GAAG,GAAG,GAAM,EAAE;QAClB,IAAI,CAAC,KAAK,SAAS;YAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IACF,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE;QACf,CAAC,GAAG,SAAS,CAAC;IAChB,CAAC,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,GAAa,EAAE;IAClC,IAAI,OAA2B,CAAC;IAChC,OAAO;QACL,KAAK;YACH,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM;YACJ,OAAO,GAAG,SAAS,CAAC;QACtB,CAAC;QACD,IAAI;YACF,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,CAAC;YACvB,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YACzC,OAAO,GAAG,SAAS,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAY,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAEvF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE~~;IAC~~/D,~~MAAM~~,~~EAAE,GAAG,~~IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,~~EAC1B~~,~~EAAE~~,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;~~IACzB~~,~~OAAO~~,~~EAAE~~,GAAG,EAAE,~~GAAG~~,EAAE,~~GAAG~~,EAAE,CAAC~~;AAC3B~~,CAAC,CAAC;~~AAEF~~,MAAM,CAAC,MAAM,~~SAAS~~,GAAG,CAAC,~~EAAY~~,EAAE,~~EAAY~~,EAAW,EAAE,~~CAC/D~~,EAAE,CAAC,~~IAAI~~,KAAK,EAAE,CAAC,~~IAAI~~,IAAI,EAAE,CAAC,~~KAAK~~,KAAK,EAAE,CAAC,~~KAAK~~,CAAC;AAE/C,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,MAAuB,EAAsD,EAAE,CAChF,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IACpD,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;CACtD,CAAC;AAEJ,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAe,EAAE,GAAkB,EAAQ,EAAE;IACrE,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAe,EAAE,GAAkB,EAAE,KAAK,GAAG,CAAC,EAAQ,EAAE;IACxF,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,aAAa,KAAK,GAAG,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAe,EAAE,CAAU,EAAQ,EAAE;IAC9D,EAAE,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAgB,EAA6B,EAAE;;IAC3E,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAQ,CAAC,CAAC;IACjE,IAAI,~~MAAA,~~CAAC,CAAC,aAAa,~~0CAAG~~,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1F,OAAO,CAAC,4BAA4B;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAW,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,SAAkB,EAAe,EAAE;IAC3E,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,SAAS;QAAE,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,GAAW,EAAE,OAAgB,EAAE,MAAuB;IACxF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACzB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IACD,OAAO;QACL,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,EAAE;QAC7D,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE;KACrE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,SAAS,GAAwB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE~~;IAC/D~~,~~MAAM~~,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;~~IACxB~~,MAAM,~~EAAE~~,~~GAAG~~,~~IAAI~~,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC~~;IACxB~~,~~OAAO~~,~~CAAC~~,EAAE,KAAK,CAAC,~~IAAI,~~EAAE,KAAK,CAAC,CAAC,~~IAAI~~,CAAC,EAAE,~~KAAK~~,CAAC,IAAI,EAAE,~~KAAK~~,~~CAAC~~,CAAC,CAAC~~;AAC1D~~,CAAC,CAAC;~~AAEF~~,MAAM,CAAC,MAAM,~~OAAO~~,GAAwB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,~~KAAK~~,EAAE,IAAI,EAAE,~~KAAK~~,EAAE,CAAC;~~AAEvF~~,MAAM,CAAC,MAAM,~~SAAS~~,GAAwB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,~~KAAK~~,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;~~AAEhG~~,MAAM,CAAC,MAAM,~~QAAQ~~,~~GAAwB~~,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,~~CAC9D~~,~~OAAO~~,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,~~CAAC~~,IAAI,~~SAAS~~,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;~~AAEvD~~;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAY,EAAE;IACzF,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAEnB,sCAAsC;IACtC,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAAE,OAAO,EAAE,CAAC;IAEzD,~~2BAA2B;IAC3B,~~MAAM,KAAK,GAAG,EAAE,KAAK,~~CAAC~~,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~IAC7C~~,~~MAAM~~,KAAK,~~GAAG~~,~~EAAE~~,KAAK,CAAC,CAAC,~~CAAC~~,~~CAAC~~,CAAC,~~CAAC~~,CAAC,CAAC,EAAE,~~GAAG~~,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~IAE7C~~,MAAM,~~OAAO~~,GAAa,EAAE,CAAC;~~IAC7B~~,IAAI,CAAC,GAAG,~~EAAE~~,GAAG,~~KAAK~~,~~EAChB~~,CAAC,GAAG,EAAE,GAAG,~~KAAK~~,CAAC~~;IACjB~~,~~OAAO~~,CAAC,~~KAAK~~,~~EAAE~~,IAAI,CAAC,~~KAAK~~,~~EAAE~~,~~EAAE~~,CAAC;~~QAC5B~~,~~OAAO~~,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~QACrB~~,CAAC,~~IAAI~~,~~KAAK~~,CAAC;~~QACX~~,CAAC,~~IAAI~~,~~KAAK~~,CAAC~~;IACb~~,CAAC;~~IACD~~,~~OAAO~~,OAAO,CAAC,GAAG,CAAC,~~EAAE~~,CAAC,~~EAAE~~,CAAC,OAAO,CAAC,~~EAAE~~,CAAC,CAAC~~,CAAC~~;~~AACxC~~,CAAC,CAAC"}
1	+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lichess-org/chessground",
-  "version": "9.3.1",
+  "version": "9.4.1",
   "//": "version is managed by the build system",
   "description": "lichess.org chess ui",
   "type": "module",
@@ -36,7 +36,8 @@
     "check-format": "prettier --check .",
     "bundle": "esbuild src/chessground.ts --bundle --format=esm --outfile=dist/chessground.min.js --minify",
     "dist": "$npm_execpath run compile && $npm_execpath run bundle",
-    "test": "vitest"
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "files": [
     "/dist/*.js",

package/src/board.ts CHANGED Viewed

@@ -8,6 +8,7 @@ import {
   computeSquareCenter,
   queenDir,
   knightDir,
+  samePos,
 } from './util.js';
 import { premove } from './premove.js';
 import * as cg from './types.js';
@@ -362,6 +363,7 @@ export function getSnappedKeyAtDomPos(
   const origPos = key2pos(orig);
   const validSnapPos = allPos.filter(
     pos2 =>
+      samePos(origPos, pos2) ||
       queenDir(origPos[0], origPos[1], pos2[0], pos2[1]) ||
       knightDir(origPos[0], origPos[1], pos2[0], pos2[1]),
   );

package/src/config.ts CHANGED Viewed

@@ -47,7 +47,7 @@ export interface Config {
     castle?: boolean; // whether to allow king castle premoves
     dests?: cg.Key[]; // premove destinations for the current selection
     customDests?: cg.Dests; // use custom valid premoves. {"a2" ["a3" "a4"] "b1" ["a3" "c3"]}
-    premoveThroughFriendlies?: boolean; // if falsy, the positions of friendly pieces will be used to trim premove options
+    unrestrictedPremoves?: boolean; // if falsy, the positions of friendly pieces will be used to trim premove options
     events?: {
       set?: (orig: cg.Key, dest: cg.Key, metadata?: cg.SetPremoveMetadata) => void; // called after the premove has been set
       unset?: () => void; // called after the premove has been unset

package/src/premove.ts CHANGED Viewed

@@ -2,156 +2,229 @@ import * as util from './util.js';
 import * as cg from './types.js';
 import { HeadlessState } from './state.js';
-type Mobility = (x1: number, y1: number, x2: number, y2: number) => boolean;
-const squaresFriendlyPiecesBetween = (
-  x1: number,
-  y1: number,
-  x2: number,
-  y2: number,
-  pieces: cg.Pieces,
-  color: cg.Color,
-): cg.Key[] => util.squaresBetween(x1, y1, x2, y2).filter(sq => pieces.get(sq)?.color === color);
-const noFriendliesBetweenOrJustOneEnPassantTarget = (
-  x1: number,
-  y1: number,
-  x2: number,
-  y2: number,
-  pieces: cg.Pieces,
-  color: cg.Color,
-  lastMove: cg.Key[] | undefined,
+type MobilityContext = {
+  pos1: cg.Pos;
+  pos2: cg.Pos;
+  allPieces: cg.Pieces;
+  friendlies: cg.Pieces;
+  enemies: cg.Pieces;
+  unrestrictedPremoves: boolean;
+  color: cg.Color;
+  canCastle: boolean;
+  rookFilesFriendlies: number[];
+  lastMove: cg.Key[] | undefined;
+};
+type Mobility = (ctx: MobilityContext) => boolean;
+const isDestOccupiedByFriendly = (ctx: MobilityContext): boolean =>
+  ctx.friendlies.has(util.pos2key(ctx.pos2));
+const isDestOccupiedByEnemy = (ctx: MobilityContext): boolean => ctx.enemies.has(util.pos2key(ctx.pos2));
+const anyPieceBetween = (pos1: cg.Pos, pos2: cg.Pos, pieces: cg.Pieces): boolean =>
+  util.squaresBetween(...pos1, ...pos2).some(s => pieces.has(s));
+const canEnemyPawnAdvanceToSquare = (pawnStart: cg.Key, dest: cg.Key, ctx: MobilityContext): boolean => {
+  const piece = ctx.enemies.get(pawnStart);
+  if (piece?.role !== 'pawn') return false;
+  const step = piece.color === 'white' ? 1 : -1;
+  const startPos = util.key2pos(pawnStart);
+  const destPos = util.key2pos(dest);
+  return (
+    util.pawnDirAdvance(...startPos, ...destPos, piece.color === 'white') &&
+    !anyPieceBetween(startPos, [destPos[0], destPos[1] + step], ctx.allPieces)
+  );
+};
+const canEnemyPawnCaptureOnSquare = (pawnStart: cg.Key, dest: cg.Key, ctx: MobilityContext): boolean => {
+  const enemyPawn = ctx.enemies.get(pawnStart);
+  return (
+    enemyPawn?.role === 'pawn' &&
+    util.pawnDirCapture(...util.key2pos(pawnStart), ...util.key2pos(dest), enemyPawn.color === 'white') &&
+    (ctx.friendlies.has(dest) ||
+      canBeCapturedBySomeEnemyEnPassant(
+        util.squareShiftedVertically(dest, enemyPawn.color === 'white' ? -1 : 1),
+        ctx.friendlies,
+        ctx.enemies,
+        ctx.lastMove,
+      ))
+  );
+};
+const canSomeEnemyPawnAdvanceToDest = (ctx: MobilityContext): boolean =>
+  [...ctx.enemies.keys()].some(key => canEnemyPawnAdvanceToSquare(key, util.pos2key(ctx.pos2), ctx));
+const isDestControlledByEnemy = (ctx: MobilityContext, pieceRolesExclude?: cg.Role[]): boolean => {
+  const square: cg.Pos = ctx.pos2;
+  return [...ctx.enemies].some(([key, piece]) => {
+    const piecePos = util.key2pos(key);
+    return (
+      !pieceRolesExclude?.includes(piece.role) &&
+      ((piece.role === 'pawn' && util.pawnDirCapture(...piecePos, ...square, piece.color === 'white')) ||
+        (piece.role === 'knight' && util.knightDir(...piecePos, ...square)) ||
+        (piece.role === 'bishop' && util.bishopDir(...piecePos, ...square)) ||
+        (piece.role === 'rook' && util.rookDir(...piecePos, ...square)) ||
+        (piece.role === 'queen' && util.queenDir(...piecePos, ...square)) ||
+        (piece.role === 'king' && util.kingDirNonCastling(...piecePos, ...square))) &&
+      (!['bishop', 'rook', 'queen'].includes(piece.role) || !anyPieceBetween(piecePos, square, ctx.allPieces))
+    );
+  });
+};
+const isFriendlyOnDestAndAttacked = (ctx: MobilityContext): boolean =>
+  isDestOccupiedByFriendly(ctx) &&
+  (canBeCapturedBySomeEnemyEnPassant(util.pos2key(ctx.pos2), ctx.friendlies, ctx.enemies, ctx.lastMove) ||
+    isDestControlledByEnemy(ctx));
+const canBeCapturedBySomeEnemyEnPassant = (
+  potentialSquareOfFriendlyPawn: cg.Key,
+  friendlies: cg.Pieces,
+  enemies: cg.Pieces,
+  lastMove?: cg.Key[],
 ): boolean => {
-  const squaresFriendliesBetween = squaresFriendlyPiecesBetween(x1, y1, x2, y2, pieces, color);
-  if (!squaresFriendliesBetween.length) return true;
-  if (squaresFriendliesBetween.length > 1 || !lastMove || squaresFriendliesBetween[0] !== lastMove[1])
-    return false;
-  const destKey = lastMove[1],
-    srcPos = util.key2pos(lastMove[0]),
-    destPos = util.key2pos(destKey),
-    piece = pieces.get(destKey)!;
+  if (lastMove && potentialSquareOfFriendlyPawn !== lastMove[1]) return false;
+  const pos = util.key2pos(potentialSquareOfFriendlyPawn);
+  const friendly = friendlies.get(potentialSquareOfFriendlyPawn);
+  return (
+    friendly?.role === 'pawn' &&
+    pos[1] === (friendly.color === 'white' ? 3 : 4) &&
+    (!lastMove || util.diff(util.key2pos(lastMove[0])[1], pos[1]) === 2) &&
+    [1, -1].some(delta => enemies.get(util.pos2key([pos[0] + delta, pos[1]]))?.role === 'pawn')
+  );
+};
+const isPathClearEnoughOfFriendliesForPremove = (ctx: MobilityContext): boolean => {
+  if (ctx.unrestrictedPremoves) return true;
+  const squaresBetween = util.squaresBetween(...ctx.pos1, ...ctx.pos2);
+  const squaresOfFriendliesBetween = squaresBetween.filter(s => ctx.friendlies.has(s));
   return (
-    piece.role === 'pawn' &&
-    util.diff(srcPos[1], destPos[1]) === 2 &&
-    [1, -1].some(delta => {
-      const enemyPiece = pieces.get(util.pos2key([destPos[0] + delta, destPos[1]]));
-      return enemyPiece?.role === 'pawn' && enemyPiece.color === util.opposite(piece.color);
-    })
+    !squaresOfFriendliesBetween.length ||
+    (squaresOfFriendliesBetween.length === 1 &&
+      canBeCapturedBySomeEnemyEnPassant(
+        squaresOfFriendliesBetween[0],
+        ctx.friendlies,
+        ctx.enemies,
+        ctx.lastMove,
+      ) &&
+      !squaresBetween.includes(
+        util.squareShiftedVertically(squaresOfFriendliesBetween[0], ctx.color === 'white' ? -1 : 1),
+      ))
   );
 };
-const pawn =
-  (pieces: cg.Pieces, color: cg.Color, premoveThroughFriendlies: boolean): Mobility =>
-  (x1, y1, x2, y2) => {
-    const step = color === 'white' ? 1 : -1;
-    if (util.diff(x1, x2) === 1) return y2 === y1 + step;
+const isPathClearEnoughOfEnemiesForPremove = (ctx: MobilityContext): boolean => {
+  if (ctx.unrestrictedPremoves) return true;
+  const squaresBetween = util.squaresBetween(...ctx.pos1, ...ctx.pos2);
+  const squaresOfEnemiesBetween = squaresBetween.filter(s => ctx.enemies.has(s));
+  if (squaresOfEnemiesBetween.length > 1) return false;
+  if (!squaresOfEnemiesBetween.length) return true;
+  const enemySquare = squaresOfEnemiesBetween[0];
+  const enemy = ctx.enemies.get(enemySquare);
+  if (!enemy || enemy.role !== 'pawn') return true;
+  const enemyStep = enemy.color === 'white' ? 1 : -1;
+  const squareAbove = util.squareShiftedVertically(enemySquare, enemyStep);
+  const enemyPawnDests: cg.Key[] = [
+    ...util.adjacentSquares(squareAbove).filter(s => canEnemyPawnCaptureOnSquare(enemySquare, s, ctx)),
+    ...[squareAbove, util.squareShiftedVertically(squareAbove, enemyStep)].filter(s =>
+      canEnemyPawnAdvanceToSquare(enemySquare, s, ctx),
+    ),
+  ];
+  const badSquares = [...squaresBetween, util.pos2key(ctx.pos1)];
+  return enemyPawnDests.some(square => !badSquares.includes(square));
+};
+const isPathClearEnoughForPremove = (ctx: MobilityContext): boolean =>
+  isPathClearEnoughOfFriendliesForPremove(ctx) && isPathClearEnoughOfEnemiesForPremove(ctx);
+const pawn: Mobility = (ctx: MobilityContext) => {
+  const step = ctx.color === 'white' ? 1 : -1;
+  if (util.diff(ctx.pos1[0], ctx.pos2[0]) > 1) return false;
+  if (!util.diff(ctx.pos1[0], ctx.pos2[0])) {
     return (
-      x1 === x2 &&
-      (y2 === y1 + step ||
-        // allow 2 squares from first two ranks, for horde
-        (y2 === y1 + 2 * step && (color === 'white' ? y1 <= 1 : y1 >= 6))) &&
-      (premoveThroughFriendlies || !squaresFriendlyPiecesBetween(x1, y1, x2, y2 + step, pieces, color).length)
+      util.pawnDirAdvance(...ctx.pos1, ...ctx.pos2, ctx.color === 'white') &&
+      isPathClearEnoughForPremove({ ...ctx, pos2: [ctx.pos2[0], ctx.pos2[1] + step] })
     );
-  };
-const knight: Mobility = (x1, y1, x2, y2) => util.knightDir(x1, y1, x2, y2);
-const bishop =
-  (
-    pieces: cg.Pieces,
-    color: cg.Color,
-    premoveThroughFriendlies: boolean,
-    lastMove: cg.Key[] | undefined,
-  ): Mobility =>
-  (x1, y1, x2, y2) =>
-    util.bishopDir(x1, y1, x2, y2) &&
-    (premoveThroughFriendlies ||
-      noFriendliesBetweenOrJustOneEnPassantTarget(x1, y1, x2, y2, pieces, color, lastMove));
-const rook =
-  (
-    pieces: cg.Pieces,
-    color: cg.Color,
-    premoveThroughFriendlies: boolean,
-    lastMove: cg.Key[] | undefined,
-  ): Mobility =>
-  (x1, y1, x2, y2) =>
-    util.rookDir(x1, y1, x2, y2) &&
-    (premoveThroughFriendlies ||
-      noFriendliesBetweenOrJustOneEnPassantTarget(x1, y1, x2, y2, pieces, color, lastMove));
-const queen =
-  (
-    pieces: cg.Pieces,
-    color: cg.Color,
-    premoveThroughFriendlies: boolean,
-    lastMove: cg.Key[] | undefined,
-  ): Mobility =>
-  (x1, y1, x2, y2) =>
-    bishop(pieces, color, premoveThroughFriendlies, lastMove)(x1, y1, x2, y2) ||
-    rook(pieces, color, premoveThroughFriendlies, lastMove)(x1, y1, x2, y2);
-const king =
-  (
-    pieces: cg.Pieces,
-    color: cg.Color,
-    premoveThroughFriendlies: boolean,
-    rookFiles: number[],
-    canCastle: boolean,
-  ): Mobility =>
-  (x1, y1, x2, y2) =>
-    (util.diff(x1, x2) < 2 && util.diff(y1, y2) < 2) ||
-    (canCastle &&
-      y1 === y2 &&
-      y1 === (color === 'white' ? 0 : 7) &&
-      ((x1 === 4 && ((x2 === 2 && rookFiles.includes(0)) || (x2 === 6 && rookFiles.includes(7)))) ||
-        rookFiles.includes(x2)) &&
-      (premoveThroughFriendlies ||
-        /* The following checks if no non-rook friendly piece is in the way between the king and its castling destination.
-         Note that for the Chess960 edge case of Kb1 "long castling", the check passes even if there is a piece in the way
-         on c1. But this is fine, since the king can always premove recapturing Ra1. */
-        squaresFriendlyPiecesBetween(x1, y1, x2 > x1 ? 7 : 1, y2, pieces, color).every(
-          s => pieces.get(s)!.role === 'rook',
-        )));
-const rookFilesOf = (pieces: cg.Pieces, color: cg.Color) => {
-  const backrank = color === 'white' ? '1' : '8';
-  const files = [];
-  for (const [key, piece] of pieces) {
-    if (key[1] === backrank && piece.color === color && piece.role === 'rook') {
-      files.push(util.key2pos(key)[0]);
-    }
   }
-  return files;
+  if (ctx.pos2[1] !== ctx.pos1[1] + step) return false;
+  if (ctx.unrestrictedPremoves || isDestOccupiedByEnemy(ctx)) return true;
+  if (isDestOccupiedByFriendly(ctx)) return isDestControlledByEnemy(ctx);
+  else
+    return (
+      canSomeEnemyPawnAdvanceToDest(ctx) ||
+      canBeCapturedBySomeEnemyEnPassant(
+        util.pos2key([ctx.pos2[0], ctx.pos2[1] + step]),
+        ctx.friendlies,
+        ctx.enemies,
+        ctx.lastMove,
+      ) ||
+      isDestControlledByEnemy(ctx, ['pawn'])
+    );
 };
+const knight: Mobility = (ctx: MobilityContext) =>
+  util.knightDir(...ctx.pos1, ...ctx.pos2) &&
+  (ctx.unrestrictedPremoves || !isDestOccupiedByFriendly(ctx) || isFriendlyOnDestAndAttacked(ctx));
+const bishop: Mobility = (ctx: MobilityContext) =>
+  util.bishopDir(...ctx.pos1, ...ctx.pos2) &&
+  isPathClearEnoughForPremove(ctx) &&
+  (ctx.unrestrictedPremoves || !isDestOccupiedByFriendly(ctx) || isFriendlyOnDestAndAttacked(ctx));
+const rook: Mobility = (ctx: MobilityContext) =>
+  util.rookDir(...ctx.pos1, ...ctx.pos2) &&
+  isPathClearEnoughForPremove(ctx) &&
+  (ctx.unrestrictedPremoves || !isDestOccupiedByFriendly(ctx) || isFriendlyOnDestAndAttacked(ctx));
+const queen: Mobility = (ctx: MobilityContext) => bishop(ctx) || rook(ctx);
+const king: Mobility = (ctx: MobilityContext) =>
+  (util.kingDirNonCastling(...ctx.pos1, ...ctx.pos2) &&
+    (ctx.unrestrictedPremoves || !isDestOccupiedByFriendly(ctx) || isFriendlyOnDestAndAttacked(ctx))) ||
+  (ctx.canCastle &&
+    ctx.pos1[1] === ctx.pos2[1] &&
+    ctx.pos1[1] === (ctx.color === 'white' ? 0 : 7) &&
+    ((ctx.pos1[0] === 4 &&
+      ((ctx.pos2[0] === 2 && ctx.rookFilesFriendlies.includes(0)) ||
+        (ctx.pos2[0] === 6 && ctx.rookFilesFriendlies.includes(7)))) ||
+      ctx.rookFilesFriendlies.includes(ctx.pos2[0])) &&
+    (ctx.unrestrictedPremoves ||
+      /* The following checks if no non-rook friendly piece is in the way between the king and its castling destination.
+         Note that for the Chess960 edge case of Kb1 "long castling", the check passes even if there is a piece in the way
+         on c1. But this is fine, since premoving from b1 to a1 as a normal move would have already returned true. */
+      util
+        .squaresBetween(...ctx.pos1, ctx.pos2[0] > ctx.pos1[0] ? 7 : 1, ctx.pos2[1])
+        .map(s => ctx.allPieces.get(s))
+        .every(p => !p || util.samePiece(p, { role: 'rook', color: ctx.color }))));
+const mobilityByRole = { pawn, knight, bishop, rook, queen, king };
 export function premove(state: HeadlessState, key: cg.Key): cg.Key[] {
   const pieces = state.pieces,
     canCastle = state.premovable.castle,
-    premoveThroughFriendlies = !!state.premovable.premoveThroughFriendlies;
+    unrestrictedPremoves = !!state.premovable.unrestrictedPremoves;
   const piece = pieces.get(key);
-  if (!piece) return [];
-  const pos = util.key2pos(key),
-    r = piece.role,
-    mobility: Mobility =
-      r === 'pawn'
-        ? pawn(pieces, piece.color, premoveThroughFriendlies)
-        : r === 'knight'
-          ? knight
-          : r === 'bishop'
-            ? bishop(pieces, piece.color, premoveThroughFriendlies, state.lastMove)
-            : r === 'rook'
-              ? rook(pieces, piece.color, premoveThroughFriendlies, state.lastMove)
-              : r === 'queen'
-                ? queen(pieces, piece.color, premoveThroughFriendlies, state.lastMove)
-                : king(
-                    pieces,
-                    piece.color,
-                    premoveThroughFriendlies,
-                    rookFilesOf(pieces, piece.color),
-                    canCastle,
-                  );
-  return util.allPos
-    .filter(pos2 => (pos[0] !== pos2[0] || pos[1] !== pos2[1]) && mobility(pos[0], pos[1], pos2[0], pos2[1]))
-    .map(util.pos2key);
+  if (!piece || piece.color === state.turnColor) return [];
+  const color = piece.color,
+    friendlies = new Map([...pieces].filter(([_, p]) => p.color === color)),
+    enemies = new Map([...pieces].filter(([_, p]) => p.color === util.opposite(color))),
+    pos = util.key2pos(key),
+    mobility: Mobility = mobilityByRole[piece.role],
+    ctx = {
+      pos1: pos,
+      allPieces: pieces,
+      friendlies: friendlies,
+      enemies: enemies,
+      unrestrictedPremoves: unrestrictedPremoves,
+      color: color,
+      canCastle: canCastle,
+      rookFilesFriendlies: Array.from(pieces)
+        .filter(
+          ([k, p]) => k[1] === (color === 'white' ? '1' : '8') && p.color === color && p.role === 'rook',
+        )
+        .map(([k]) => util.key2pos(k)[0]),
+      lastMove: state.lastMove,
+    };
+  return util.allPos.filter(pos2 => mobility({ ...ctx, pos2 })).map(util.pos2key);
 }

package/src/state.ts CHANGED Viewed

@@ -51,7 +51,7 @@ export interface HeadlessState {
     dests?: cg.Key[]; // premove destinations for the current selection
     customDests?: cg.Dests; // use custom valid premoves. {"a2" ["a3" "a4"] "b1" ["a3" "c3"]}
     current?: cg.KeyPair; // keys of the current saved premove ["e2" "e4"]
-    premoveThroughFriendlies?: boolean; // if falsy, the positions of friendly pieces will be used to trim premove options
+    unrestrictedPremoves?: boolean; // if falsy, the positions of friendly pieces will be used to trim premove options
     events: {
       set?: (orig: cg.Key, dest: cg.Key, metadata?: cg.SetPremoveMetadata) => void; // called after the premove has been set
       unset?: () => void; // called after the premove has been unset