chess-moments 0.15.2 → 1.0.0

package/functions/flat.js

@@ -1,18 +1,22 @@
 const makeMoments = require('./make-moments');
 
 const flat = (sloppyPgn) => {
-  const moments = makeMoments(sloppyPgn);
+  try {
+    const moments = makeMoments(sloppyPgn);
 
-  // flatten array and add index for every moment
-  const flatten = [].concat.apply([], moments);
+    // flatten array and add index for every moment
+    const flatten = [].concat.apply([], moments);
 
-  let index = 0;
-  for (const moment of flatten) {
-    moment.index = index;
-    index++;
-  }
+    let index = 0;
+    for (const moment of flatten) {
+      moment.index = index;
+      index++;
+    }
 
-  return flatten;
+    return flatten;
+  } catch {
+    return [];
+  }
 };
 
 module.exports = flat;

package/functions/make-moments.js

@@ -1,4 +1,4 @@
-const Chess = require('../chess');
+const { Chess } = require('chess.js');
 const fen = require('./fen');
 const parser = require('./parser');
 const pgn = require('./pgn');
@@ -8,12 +8,12 @@ const make = (sloppyPgn) => {
   const normalizedPgn = pgn.normalize(sloppyPgn);
 
   // load PGN and check headers for existing FEN
-  const chess = new Chess();
-  chess.load_pgn(normalizedPgn);
-  const header = chess.header();
+  const chess = new Chess(); // can throw if PGN is invalid
+  chess.loadPgn(normalizedPgn);
+  const headers = chess.getHeaders();
 
   const store = {
-    fen: fen.normalize(header.FEN) || fen.initial, // current FEN
+    fen: fen.normalize(headers.FEN) || fen.initial, // current FEN
     depth: 1, // current depth
   };
 
@@ -26,7 +26,7 @@ const make = (sloppyPgn) => {
     store.depth = depth;
 
     // parse current moves with the computed FEN
-    const moments = parser(chess, moves, store.fen, depth);
+    const moments = parser(moves, store.fen, depth);
 
     // set history for the current depth
     history.set(depth, fen.history(moments, history, depth));

package/functions/normalize-pgn.js

@@ -16,5 +16,8 @@ module.exports = (pgn) => {
     return match.replace(/\n/g, '\\n');
   });
 
+  // Merge adjacent comments delimited by {}
+  processedPgn = processedPgn.replace(/(\}\s*\{)+/g, ' ');
+
   return processedPgn;
 };

package/functions/parser.js

@@ -1,19 +1,18 @@
+const { Chess } = require('chess.js');
 const { initial } = require('./fen');
 const pgn = require('./pgn');
 const moment = require('./moment');
 
-module.exports = (chess, moves, fen = initial, depth = 1) => {
-  const loaded = chess.load_pgn(pgn.build(moves, fen));
-  if (!loaded) {
-    return [];
-  }
+module.exports = (moves, fen = initial, depth = 1) => {
+  const chess = new Chess();
+  chess.loadPgn(pgn.build(moves, fen)); // can throw if PGN is invalid
 
   const history = chess.history({ verbose: true });
   while (chess.undo()) {
     chess.undo();
   }
 
-  const comment = chess.get_comment();
+  const comment = chess.getComment();
   const first = moment.build({ depth, comment, fen: chess.fen() });
 
   const moments = history.map((item) => {
@@ -24,14 +23,14 @@ module.exports = (chess, moves, fen = initial, depth = 1) => {
       move: item.san,
       from: item.from,
       to: item.to,
-      comment: chess.get_comment(),
+      comment: chess.getComment(),
       fen: chess.fen(),
     });
   });
 
   // finally, add the first chess "moment" when needed
-  const header = chess.header();
-  if (header.FEN || fen === initial || first.comment || first.shapes) {
+  const headers = chess.getHeaders();
+  if (headers.FEN || fen === initial || first.comment || first.shapes) {
     moments.unshift(first);
   }
 

package/functions/previous-fen.js

@@ -20,21 +20,24 @@ const previousFen = (history, moves, currentDepth, previousDepth) => {
       return history.get(previousDepth)[0];
     }
 
-    // try the first candidate from the current depth
-    const candidate = history.get(currentDepth)[0];
-    if (matchesFen(moves, candidate)) {
-      return candidate;
-    }
+    const currentHistory = history.get(currentDepth);
+    if (Array.isArray(currentHistory) && currentHistory.length > 0) {
+      // try the first candidate from the current depth
+      const candidate = currentHistory[0];
+      if (matchesFen(moves, candidate)) {
+        return candidate;
+      }
 
-    // try the second candidate from the current depth
-    const second = history.get(currentDepth)[1];
-    if (matchesFen(moves, second)) {
-      return second;
+      // try the second candidate from the current depth
+      const second = currentHistory[1];
+      if (matchesFen(moves, second)) {
+        return second;
+      }
     }
 
     return previousFen(history, moves, currentDepth - 1, previousDepth);
   } catch (err) {
-    return false;
+    return '';
   }
 };
 

package/functions/tree.js

@@ -1,17 +1,21 @@
 const makeMoments = require('./make-moments');
 
 const tree = (sloppyPgn) => {
-  const moments = makeMoments(sloppyPgn);
+  try {
+    const moments = makeMoments(sloppyPgn);
 
-  let index = 0;
-  for (const lines of moments) {
-    for (const moment of lines) {
-      moment.index = index;
-      index++;
+    let index = 0;
+    for (const lines of moments) {
+      for (const moment of lines) {
+        moment.index = index;
+        index++;
+      }
     }
-  }
 
-  return moments;
+    return moments;
+  } catch {
+    return [];
+  }
 };
 
 module.exports = tree;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chess-moments",
-  "version": "0.15.2",
+  "version": "1.0.0",
   "description": "PGN parser that transforms PGN files into chess \"moments\"",
   "main": "index.js",
   "files": [
@@ -24,7 +24,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "chess.js": "^0.11.0"
+    "chess.js": "^1.4.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",

package/chess.js

@@ -1,15 +0,0 @@
-const isBrowser =
-  typeof window !== 'undefined' && typeof window.document !== 'undefined';
-const isNode = !isBrowser;
-
-let Chess;
-
-if (isNode) {
-  const chess = require('chess.js');
-  Chess = chess.Chess;
-} else {
-  Chess = require('chess.js');
-}
-
-module.exports = Chess;
-module.exports.Chess = Chess;