chess-moments 1.4.1 → 1.4.3

package/functions/extras/index.js

@@ -4,6 +4,7 @@ const getNextMoments = require('./get-next-moments');
 const getPrevMoment = require('./get-prev-moment');
 const momentsToPgn = require('./moments-to-pgn');
 const moveTrainer = require('./move-trainer');
+const promoteMainlineTree = require('./promote-mainline-tree');
 const promoteMainline = require('./promote-mainline');
 
 module.exports = {
@@ -13,5 +14,6 @@ module.exports = {
   getPrevMoment,
   momentsToPgn,
   moveTrainer,
+  promoteMainlineTree,
   promoteMainline,
 };

package/functions/extras/promote-mainline-tree.js

@@ -0,0 +1,24 @@
+const { flatten } = require('lodash');
+const promoteMainline = require('./promote-mainline');
+const { makeTree } = require('../helpers');
+
+const promoteMainlineTree = (moments, current) => {
+  try {
+    const isNested = moments.length > 0 && Array.isArray(moments[0]);
+    if (!isNested) {
+      return moments;
+    }
+
+    // Flatten nested array
+    const flatMoments = flatten(moments);
+    const newMoments = promoteMainline(flatMoments, current);
+
+    // Group by consecutive depth sequences
+    return makeTree(newMoments);
+  } catch {
+    // In case of any error, return the original moments array
+    return moments;
+  }
+};
+
+module.exports = promoteMainlineTree;

package/functions/extras/promote-mainline.js

@@ -89,6 +89,15 @@ const promoteMainline = (moments, current) => {
     result.push(move);
   }
 
+  // First, add the position marker that separates sideline from mainline continuation
+  for (let i = sidelineEndIndex; i < moments.length; i++) {
+    if (!demotedIndices.has(i) && !moments[i].move) {
+      result.push({ ...moments[i] });
+      break; // Only add the first position marker
+    }
+  }
+
+  // Then add the promoted sideline moves (the continuation of the new mainline)
   for (let i = sidelinePositionIndex + 1; i < sidelineEndIndex; i++) {
     if (i === current.index) continue;
 
@@ -100,12 +109,18 @@ const promoteMainline = (moments, current) => {
     }
   }
 
+  // Finally, add any remaining non-demoted moves
   for (let i = sidelineEndIndex; i < moments.length; i++) {
-    if (!demotedIndices.has(i)) {
+    if (!demotedIndices.has(i) && moments[i].move) {
       result.push({ ...moments[i] });
     }
   }
 
+  // Remove trailing position markers that don't precede any moves
+  while (result.length > 0 && !result[result.length - 1].move) {
+    result.pop();
+  }
+
   // Reassign indices
   result.forEach((m, i) => {
     m.index = i;

package/functions/helpers/index.js

@@ -3,6 +3,7 @@ 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 makeTree = require('./make-tree');
 const prepareMoment = require('./prepare-moment');
 
 module.exports = {
@@ -11,5 +12,6 @@ module.exports = {
   getMoveNumber,
   insertMomentIntoTree,
   isNextFen,
+  makeTree,
   prepareMoment,
 };

package/functions/helpers/make-tree.js

@@ -0,0 +1,29 @@
+/**
+ * Converts a flat array of moments into a tree structure.
+ */
+const makeTree = (moments) => {
+  if (!Array.isArray(moments) || moments.length === 0) {
+    return [];
+  }
+
+  const tree = [];
+  for (const item of moments) {
+    // Check if the current object does NOT have the 'move' property.
+    const isSplitPoint = !('move' in item);
+
+    if (isSplitPoint) {
+      // If it's a split point, we start a new sub-array.
+      tree.push([item]);
+    } else {
+      if (tree.length === 0) {
+        tree.push([]);
+      }
+      // Add the item to the last sub-array in the result.
+      tree[tree.length - 1].push(item);
+    }
+  }
+
+  return tree;
+};
+
+module.exports = makeTree;

package/functions/shape.js

@@ -1,4 +1,4 @@
-const { getBrushColor } = require('./helpers');
+const getBrushColor = require('./helpers/get-brush-color');
 
 module.exports = (comment) => {
   try {

package/index.js

@@ -6,7 +6,8 @@ const {
   getPrevMoment,
   momentsToPgn,
   moveTrainer,
-  promoteMainline
+  promoteMainlineTree,
+  promoteMainline,
 } = require('./functions/extras');
 
 module.exports = {
@@ -21,5 +22,6 @@ module.exports = {
   getPrevMoment,
   momentsToPgn,
   moveTrainer,
-  promoteMainline
+  promoteMainlineTree,
+  promoteMainline,
 };

package/package.json

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