chess-moments 0.14.6 → 0.14.8

package/functions/extras/get-next-moments.js

@@ -1,3 +1,5 @@
+const { getMoveNumber } = require('../helpers');
+
 /**
  * Always returns an array because there can be more than one next moment
  */
@@ -10,32 +12,49 @@ const getNextMoments = (moments, current) => {
       return [moments[1]];
     }
 
-    // Split moments after the current index
-    const currentIndex = moments.indexOf(current);
-    let moves = moments.slice(currentIndex + 1).filter((m) => m.move);
+    // If there is no next moment, return empty array
+    const nextIndex = moments.indexOf(current) + 1;
+    const nextMoment = moments[nextIndex];
+    if (!nextMoment) {
+      return [];
+    }
+    // Last move of a sideline should not have any next moves
+    if (
+      !nextMoment?.move &&
+      current.depth >= nextMoment.depth &&
+      getMoveNumber(nextMoment.fen) <= getMoveNumber(current.fen)
+    ) {
+      return [];
+    }
 
-    // If the immediate next moment has increased depth, filter out all moments until depth returns to current
-    if (moves.length > 0 && moves[0].depth > current.depth) {
-      let foundReturnToCurrentDepth = false;
-      moves = moves.filter((moment) => {
-        if (foundReturnToCurrentDepth) {
-          return true; // Keep all moments after we return to current depth
-        }
-        if (moment.depth === current.depth) {
-          foundReturnToCurrentDepth = true;
-          return true; // Keep this moment and all following
-        }
-        return false; // Skip moments with increased depth
-      });
+    // Add the next moment if it has a move and is at the same depth
+    if (nextMoment.move && current.depth === nextMoment.depth) {
+      next.push(nextMoment);
+    }
+
+    // If the next next moment has a move, we don't have any other sidelines
+    const nextNextMoment = moments[nextIndex + 1];
+    if (nextMoment?.move && nextNextMoment?.move) {
+      return next;
     }
 
     // Add fullmove number to the current moment
     current.fullmove = Number(current.fen.split(' ')[5]);
 
+    // Keep only slim moments
+    const slim = moments.filter((moment) => {
+      const fullmove = Number(moment.fen.split(' ')[5]);
+      return (
+        moment.index > current.index + 1 &&
+        fullmove <= current.fullmove + 1 &&
+        moment.move // Also filter out moments without a move
+      );
+    });
+
     // Active color after current move (who moves next)
     const activeColorAfterCurrent = current.fen.split(' ')[1];
 
-    for (const moment of moves) {
+    for (const moment of slim) {
       // Only process main line and immediate variations
       if (moment.depth > current.depth + 1) {
         continue;

package/functions/helpers/get-move-number.js

@@ -0,0 +1,8 @@
+const getMoveNumber = (fen) => {
+  // FEN format: rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1
+  // The fullmove number is the sixth part of the FEN string
+  const parts = fen.split(' ');
+  return Number(parts[5]);
+};
+
+module.exports = getMoveNumber;

package/functions/helpers/index.js

@@ -1,7 +1,9 @@
 const getBrushCode = require('./get-brush-code');
 const getBrushColor = require('./get-brush-color');
+const getMoveNumber = require('./get-move-number');
 
 module.exports = {
   getBrushCode,
   getBrushColor,
+  getMoveNumber,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chess-moments",
-  "version": "0.14.6",
+  "version": "0.14.8",
   "description": "PGN parser that transforms PGN files into chess \"moments\"",
   "main": "dist/index.js",
   "files": [