chess-moments 1.1.3 → 1.2.1

package/functions/extras/add-moment-to-tree.js

@@ -1,6 +1,12 @@
 const { flatten, cloneDeep } = require('lodash');
 const { insertMomentIntoTree } = require('../helpers');
 
+/**
+ * Adds a new chess moment to the tree structure.
+ * @param {*} tree - The current tree structure.
+ * @param {*} newMoment - The new moment to add.
+ * @returns {*} - The updated tree structure.
+ */
 const addMomentToTree = (tree, newMoment) => {
   if (!newMoment || !newMoment.san || !newMoment.before) {
     return tree;
@@ -52,6 +58,15 @@ const addMomentToTree = (tree, newMoment) => {
     }
   }
 
+  // Remove all new flags from existing moments
+  for (const line of clonedTree) {
+    for (const moment of line) {
+      if (moment.new) {
+        delete moment.new;
+      }
+    }
+  }
+
   // Insert the moment into the tree
   const newTree = insertMomentIntoTree(clonedTree, point, newMoment);
 

package/functions/extras/find-inserted-moment.js

@@ -0,0 +1,17 @@
+/**
+ * Finds the most recently inserted moment in the tree.
+ * @param {*} tree - The current tree structure.
+ * @returns {Object|null} - The inserted moment or null if none found.
+ */
+const findInsertedMoment = (tree) => {
+  for (const line of tree) {
+    for (const moment of line) {
+      if (moment.new) {
+        return moment;
+      }
+    }
+  }
+  return null;
+};
+
+module.exports = findInsertedMoment;

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

@@ -62,29 +62,36 @@ const getNextMoments = (moments, current) => {
     // 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 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) {
+    // Process moments in order and stop when we leave the current branch
+    for (const moment of moments) {
+      // Skip moments that are at or before the current moment's index
+      if (moment.index <= current.index + 1) {
+        continue;
+      }
+      // Stop if we hit a moment with lower depth (we've left this branch)
+      if (moment.depth < current.depth) {
+        break;
+      }
+      // Skip moments without moves
+      if (!moment.move) {
+        continue;
+      }
+      // Only consider moments at current depth or one level deeper
+      if (moment.depth > current.depth + 1) {
         continue;
       }
 
       const activeColorAfterMoment = moment.fen.split(' ')[1];
       const fullmove = Number(moment.fen.split(' ')[5]);
 
+      // Only consider moments within the valid move range
+      if (fullmove > current.fullmove + 1) {
+        continue;
+      }
+
       // Check if this is a valid next move based on color and fullmove
       const isValidWhiteMove =
         activeColorAfterCurrent === 'w' &&

package/functions/extras/index.js

@@ -1,4 +1,5 @@
 const addMomentToTree = require('./add-moment-to-tree');
+const findInsertedMoment = require('./find-inserted-moment');
 const getNextMoments = require('./get-next-moments');
 const getPrevMoment = require('./get-prev-moment');
 const momentsToPgn = require('./moments-to-pgn');
@@ -6,6 +7,7 @@ const moveTrainer = require('./move-trainer');
 
 module.exports = {
   addMomentToTree,
+  findInsertedMoment,
   getNextMoments,
   getPrevMoment,
   momentsToPgn,

package/functions/helpers/insert-moment-into-tree.js

@@ -12,6 +12,9 @@ const insertMomentIntoTree = (tree, point, newMoment) => {
   // Prepare the moment to be inserted with only the properties that match normal moments
   const momentToInsert = prepareMoment(tree, point, newMoment);
 
+  // Add flag to indicate this is a new moment
+  momentToInsert.new = true;
+
   // If no matching position found, always create a new line
   if (!point) {
     tree.push([momentToInsert]);

package/index.js

@@ -1,6 +1,7 @@
 const { fen, pgn, flat, tree, mainline } = require('./functions');
 const {
   addMomentToTree,
+  findInsertedMoment,
   getNextMoments,
   getPrevMoment,
   momentsToPgn,
@@ -14,6 +15,7 @@ module.exports = {
   tree,
   mainline,
   addMomentToTree,
+  findInsertedMoment,
   getNextMoments,
   getPrevMoment,
   momentsToPgn,

package/package.json

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