chess-moments 0.14.7 → 0.14.9

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,21 +12,42 @@ const getNextMoments = (moments, current) => {
       return [moments[1]];
     }
 
-    // If there is no next moment, return empty array
+    // Get next moments for further processing
     const nextIndex = moments.indexOf(current) + 1;
     const nextMoment = moments[nextIndex];
+    const nextNextMoment = moments[nextIndex + 1];
+
+    // Early returns for edge cases
     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 [];
+    }
+
     // 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 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
+    if (
+      nextMoment?.move &&
+      !nextNextMoment?.move &&
+      current.depth >= nextNextMoment.depth &&
+      getMoveNumber(nextNextMoment.fen) <= getMoveNumber(current.fen)
+    ) {
       return next;
     }
 

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.7",
+  "version": "0.14.9",
   "description": "PGN parser that transforms PGN files into chess \"moments\"",
   "main": "dist/index.js",
   "files": [