chess-moments 1.4.6 → 1.4.8

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

@@ -8,9 +8,9 @@ const getNextMoments = (moments, current) => {
     const next = [];
 
     // Get next moments for further processing
-    const nextIndex = moments.indexOf(current) + 1;
-    const nextMoment = moments[nextIndex];
-    const nextNextMoment = moments[nextIndex + 1];
+    const currentIndex = moments.findIndex((item) => item.fen === current.fen);
+    const nextMoment = moments[currentIndex + 1];
+    const nextNextMoment = moments[currentIndex + 2];
 
     // Early returns for edge cases
     if (!nextMoment) {

package/functions/extras/get-prev-moment.js

@@ -3,7 +3,9 @@
  */
 const getPrevMoment = (moments, current) => {
   try {
-    const sameDepth = moments[moments.indexOf(current) - 1];
+    const currentIndex = moments.findIndex((item) => item.fen === current.fen);
+
+    const sameDepth = moments[currentIndex - 1];
     if (sameDepth.move && sameDepth.depth === current.depth) {
       return sameDepth;
     }
@@ -13,16 +15,13 @@ const getPrevMoment = (moments, current) => {
       return moments[0];
     }
 
-    const prevIndex = moments.indexOf(current) - 1;
-    const prevMoments = moments[prevIndex];
-
     // If previous moment does not have a move and it's the initial position, return it
+    const prevMoments = moments[currentIndex - 1];
     if (!prevMoments?.move && prevMoments.fen === moments[0].fen) {
       return moments[0];
     }
 
     // Split moments until the current index
-    const currentIndex = moments.indexOf(current);
     const moves = moments.slice(0, currentIndex).filter((m) => m.move);
 
     // Add fullmove number to the current moment

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

@@ -1,3 +1,4 @@
+const { isEmpty } = require('lodash');
 const fen = require('../fen');
 const { getBrushCode } = require('../helpers');
 
@@ -10,7 +11,7 @@ const momentsToPgn = (moments) => {
   let pgn = '';
 
   // Return empty PGN if no moments are provided
-  if (!Array.isArray(moments) || moments.length === 0) {
+  if (isEmpty(moments)) {
     pgn += `[SetUp "1"]\n`;
     pgn += `[FEN "${fen.initial}"]\n\n`;
     pgn += '*';
@@ -20,12 +21,9 @@ const momentsToPgn = (moments) => {
   let currentDepth = 1;
   let variationStack = [];
 
-  // Check if we need to add FEN headers for non-standard starting position
-  const initialMoment = moments[0];
-  if (initialMoment && initialMoment.fen && initialMoment.fen !== fen.initial) {
-    pgn += `[SetUp "1"]\n`;
-    pgn += `[FEN "${initialMoment.fen}"]\n\n`;
-  }
+  // Add FEN headers
+  pgn += `[SetUp "1"]\n`;
+  pgn += `[FEN "${moments[0].fen}"]\n\n`;
 
   for (let i = 0; i < moments.length; i++) {
     const moment = moments[i];

package/package.json

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