chess-moments 0.14.2 → 0.14.4

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

@@ -4,58 +4,63 @@
 const getNextMoments = (moments, current) => {
   try {
     const next = [];
-    const sameDepth = moments[moments.indexOf(current) + 1];
-    if (sameDepth.move && sameDepth.depth === current.depth) {
-      next.push(sameDepth);
-    }
 
     // If it's the first moment without move, add the next moment
     if (current.index === 0 && !current.move) {
-      next.push(moments[1]);
+      return moments[1];
     }
 
     // Split moments after the current index
     const currentIndex = moments.indexOf(current);
-    const moves = moments.slice(currentIndex + 1).filter((m) => m.move);
+    let moves = moments.slice(currentIndex + 1).filter((m) => m.move);
+
+    // 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 fullmove number to the current moment
     current.fullmove = Number(current.fen.split(' ')[5]);
 
-    // Active color is white
-    if (current.fen.split(' ')[1] === 'w') {
-      for (const moment of moves) {
-        const activeColor = moment.fen.split(' ')[1];
-        const fullmove = Number(moment.fen.split(' ')[5]);
+    // Active color after current move (who moves next)
+    const activeColorAfterCurrent = current.fen.split(' ')[1];
 
-        // Check if the next moment is a valid move for white
-        if (
-          moment.depth === current.depth + 1 &&
-          activeColor === 'b' &&
-          fullmove === current.fullmove
-        ) {
-          next.push(moment);
-        }
+    for (const moment of moves) {
+      // Only process main line and immediate variations
+      if (moment.depth > current.depth + 1) {
+        continue;
       }
-    }
 
-    // Active color is black
-    if (current.fen.split(' ')[1] === 'b') {
-      for (const moment of moves) {
-        const activeColor = moment.fen.split(' ')[1];
-        const fullmove = Number(moment.fen.split(' ')[5]);
+      const activeColorAfterMoment = moment.fen.split(' ')[1];
+      const fullmove = Number(moment.fen.split(' ')[5]);
 
-        // Check if the next moment is a valid move for black
-        if (
-          moment.depth === current.depth + 1 &&
-          activeColor === 'w' &&
-          fullmove === current.fullmove + 1
-        ) {
-          next.push(moment);
-        }
+      // 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 the move is valid, add it to the next moments
+      if (isValidWhiteMove || isValidBlackMove) {
+        next.push(moment);
       }
     }
 
-    // If no next moment is found, return an empty array
     return next;
   } catch {
     return [];

package/functions/extras/moments-to-pgn.js

@@ -7,11 +7,16 @@ const { getBrushCode } = require('../helpers');
  * @returns {String} PGN string
  */
 const momentsToPgn = (moments) => {
+  let pgn = '';
+
+  // Return empty PGN if no moments are provided
   if (!Array.isArray(moments) || moments.length === 0) {
-    return '';
+    pgn += `[SetUp "1"]\n`;
+    pgn += `[FEN "${initialMoment.fen}"]\n\n`;
+    pgn += '*';
+    return pgn;
   }
 
-  let pgn = '';
   let currentDepth = 1;
   let variationStack = [];
 

package/package.json

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