chess-moments 0.8.4 → 0.10.0

package/functions/build-pgn.js

@@ -1,5 +1,9 @@
+const decodeMoves = require('./decode-moves');
+
 module.exports = (moves, fen) => {
-  const decodedMoves = decodeURIComponent(moves);
+  // Remove opposing brackets and whitespace
+  const decodedMoves = decodeMoves(moves).replace(/}\s*{/g, '');
+
   const pgn = [
     `[FEN "${fen}"]`, // mandatory header info
     '[SetUp "1"]', // mandatory header info

package/functions/decode-moves.js

@@ -0,0 +1,7 @@
+module.exports = (moves) => {
+  try {
+    return decodeURIComponent(moves);
+  } catch {
+    return moves;
+  }
+};

package/functions/normalize-pgn.js

@@ -1,13 +1,20 @@
 const castle = require('./replace-castling');
 
 module.exports = (pgn) => {
+  let processedPgn = null;
+
   if (typeof pgn === 'string') {
-    return castle(pgn.trim());
+    processedPgn = castle(pgn.trim());
+  } else if (Array.isArray(pgn)) {
+    processedPgn = castle(pgn.join('\n').trim());
+  } else {
+    throw new Error('Unsupported PGN type');
   }
 
-  if (Array.isArray(pgn)) {
-    return castle(pgn.join('\n').trim());
-  }
+  // Remove newlines from comments delimited by curly braces
+  processedPgn = processedPgn.replace(/\{[^}]*\}/g, (match) => {
+    return match.replace(/\n/g, '\\n');
+  });
 
-  throw new Error('Unsupported PGN type');
+  return processedPgn;
 };

package/functions/shape.js

@@ -3,10 +3,8 @@ const brush = require('./brush');
 module.exports = (comment) => {
   try {
     const draw = [];
-    const shapeComments = comment
-      .split(']')
-      .map((it) => it.trim())
-      .filter((it) => it.indexOf('[') === 0);
+    // Find all shape comments
+    const shapeComments = comment.match(/\[.*?\]/g);
 
     for (const shapeComment of shapeComments) {
       // transform "[%csl Ya7" into "Ya7"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chess-moments",
-  "version": "0.8.4",
+  "version": "0.10.0",
   "description": "PGN reader is a javascript chess library that transforms PGN files into chess moments",
   "main": "dist/index.js",
   "files": [