chess-moments 1.2.0 → 1.2.2

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

@@ -1,4 +1,4 @@
-const { getMoveNumber } = require('../helpers');
+const { isNextFen } = require('../helpers');
 
 /**
  * Always returns an array because there can be more than one next moment
@@ -23,81 +23,41 @@ const getNextMoments = (moments, current) => {
     }
 
     // Last move of a sideline should not have any next moves
-    if (
-      !nextMoment?.move &&
-      current.depth >= nextMoment.depth &&
-      getMoveNumber(nextMoment.fen) <= getMoveNumber(current.fen)
-    ) {
+    if (!nextMoment?.move && current.depth >= nextMoment.depth) {
       return [];
     }
 
-    // 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);
-    }
-
-    // Return early if we have consecutive moves or no next next moment
-    if (!nextNextMoment || (nextMoment?.move && nextNextMoment?.move)) {
-      return next;
-    }
-
-    // Second to last move of a sideline should not have any next moves
+    // Return early if there are two consecutive moves at the same depth or if the next next move does not exist
     if (
-      nextMoment?.move &&
-      !nextNextMoment?.move &&
-      current.depth >= nextNextMoment.depth &&
-      getMoveNumber(nextNextMoment.fen) <= getMoveNumber(current.fen)
+      current.move &&
+      current.depth === nextMoment.depth &&
+      (!nextNextMoment || current.depth === nextNextMoment.depth)
     ) {
-      return next;
-    }
-
-    // Remove all next moments until depth equals current.depth when next moment does not have a move
-    if (!nextMoment?.move) {
-      const filteredMoments = moments.filter((moment, index) => {
-        return index <= nextIndex || moment.depth === current.depth;
-      });
-      moments = filteredMoments;
+      return [nextMoment];
     }
 
-    // Add fullmove number to the current moment
-    current.fullmove = Number(current.fen.split(' ')[5]);
+    // Remove all moves before the current moment
+    moments = moments.filter((moment) => moment.index > current.index);
 
-    // 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 slim) {
-      // Only process main line and immediate variations
-      // Ignore next moments with depth lower than the current moment
-      if (moment.depth > current.depth + 1 || moment.depth < current.depth) {
-        continue;
+    // Remove all moments after the first moment that have a lower depth than the current moment
+    let filteredMoments = [];
+    for (const moment of moments) {
+      if (moment.depth < current.depth) {
+        break;
       }
+      filteredMoments.push(moment);
+    }
 
-      const activeColorAfterMoment = moment.fen.split(' ')[1];
-      const fullmove = Number(moment.fen.split(' ')[5]);
-
-      // Check if this is a valid next move based on color and fullmove
-      const isValidWhiteMove =
-        activeColorAfterCurrent === 'w' &&
-        activeColorAfterMoment === 'b' &&
-        fullmove === current.fullmove;
-
-      const isValidBlackMove =
-        activeColorAfterCurrent === 'b' &&
-        activeColorAfterMoment === 'w' &&
-        fullmove === current.fullmove + 1;
+    // If next moment does not have a move, remove all moments with the depth higher than current depth
+    if (!nextMoment.move) {
+      filteredMoments = filteredMoments.filter(
+        (moment) => moment.depth <= current.depth
+      );
+    }
 
-      // If the move is valid, add it to the next moments
-      if (isValidWhiteMove || isValidBlackMove) {
+    // Finally check for next moments from filtered moments
+    for (const moment of filteredMoments) {
+      if (moment.move && isNextFen(current.fen, moment.fen)) {
         next.push(moment);
       }
     }

package/functions/helpers/index.js

@@ -2,6 +2,7 @@ const getBrushCode = require('./get-brush-code');
 const getBrushColor = require('./get-brush-color');
 const getMoveNumber = require('./get-move-number');
 const insertMomentIntoTree = require('./insert-moment-into-tree');
+const isNextFen = require('./is-next-fen');
 const prepareMoment = require('./prepare-moment');
 
 module.exports = {
@@ -9,5 +10,6 @@ module.exports = {
   getBrushColor,
   getMoveNumber,
   insertMomentIntoTree,
+  isNextFen,
   prepareMoment,
 };

package/functions/helpers/is-next-fen.js

@@ -0,0 +1,42 @@
+/**
+ * Determines if nextFen comes immediately after currentFen in a chess game
+ *
+ * @param {String} currentFen - The current FEN position
+ * @param {String} nextFen - The potential next FEN position
+ * @returns {Boolean} - True if nextFen comes immediately after currentFen
+ */
+const isNextFen = (currentFen, nextFen) => {
+  try {
+    // Parse FEN components
+    const currentParts = currentFen.split(' ');
+    const nextParts = nextFen.split(' ');
+
+    // Validate FEN format (should have 6 parts each)
+    if (currentParts.length !== 6 || nextParts.length !== 6) {
+      return false;
+    }
+
+    const currentActiveColor = currentParts[1]; // 'w' or 'b' - who moves in current position
+    const currentFullmove = Number(currentParts[5]);
+
+    const nextActiveColor = nextParts[1]; // 'w' or 'b' - who moves in next position
+    const nextFullmove = Number(nextParts[5]);
+
+    // Check if the active color and fullmove number progression is valid
+    if (currentActiveColor === 'w') {
+      // If white is to move in current position, then after white's move:
+      // - Black should be to move in next position
+      // - Fullmove number should remain the same
+      return nextActiveColor === 'b' && nextFullmove === currentFullmove;
+    } else {
+      // If black is to move in current position, then after black's move:
+      // - White should be to move in next position
+      // - Fullmove number should increment by 1
+      return nextActiveColor === 'w' && nextFullmove === currentFullmove + 1;
+    }
+  } catch (error) {
+    return false;
+  }
+};
+
+module.exports = isNextFen;

package/package.json

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