chess-moments 1.4.7 → 1.5.0

package/functions/build-moment.js

@@ -1,7 +1,7 @@
 const prettify = require('./prettify');
 const shape = require('./shape');
 
-module.exports = ({ depth, move, fen, comment, suffix, from, to }) => {
+module.exports = ({ depth, move, fen, comment, suffix, from, to, headers }) => {
   const moment = { depth, fen };
   if (move) {
     moment.move = move;
@@ -23,6 +23,9 @@ module.exports = ({ depth, move, fen, comment, suffix, from, to }) => {
   if (suffix) {
     moment.suffix = suffix;
   }
+  if (headers) {
+    moment.headers = headers;
+  }
 
   return 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,13 +21,47 @@ 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`;
+  const headers = moments[0].headers;
+  const standardHeaders = [
+    'Event',
+    'Site',
+    'Date',
+    'Round',
+    'White',
+    'Black',
+    'Result',
+  ];
+
+  if (headers) {
+    // Add standard headers (excluding placeholder values)
+    for (const key of standardHeaders) {
+      if (
+        headers[key] &&
+        headers[key] !== '?' &&
+        headers[key] !== '????.??.??'
+      ) {
+        pgn += `[${key} "${headers[key]}"]\n`;
+      }
+    }
+
+    // Add custom headers
+    for (const key in headers) {
+      if (!standardHeaders.includes(key) && key !== 'FEN' && key !== 'SetUp') {
+        pgn += `[${key} "${headers[key]}"]\n`;
+      }
+    }
   }
 
+  const fenString = headers?.FEN || moments[0].fen;
+
+  if (fenString !== fen.initial) {
+    const setUp = headers?.SetUp || '1';
+    pgn += `[SetUp "${setUp}"]\n`;
+    pgn += `[FEN "${fenString}"]\n`;
+  }
+
+  pgn += '\n';
+
   for (let i = 0; i < moments.length; i++) {
     const moment = moments[i];
     const depth = moment.depth || 1;
@@ -166,8 +201,8 @@ const momentsToPgn = (moments) => {
     pgn += ')';
   }
 
-  // Add default result
-  pgn += ' *';
+  // Add result from headers if available, otherwise default to *
+  pgn += ` ${headers?.Result || '*'}`;
 
   return pgn.trim();
 };

package/functions/make-moments.js

@@ -5,7 +5,11 @@ const pgn = require('./pgn');
 const split = require('./split');
 
 const make = (sloppyPgn) => {
-  const normalizedPgn = pgn.normalize(sloppyPgn);
+  let normalizedPgn = pgn.normalize(sloppyPgn);
+  // when PGN is empty, create a default one with initial FEN
+  if (!normalizedPgn) {
+    normalizedPgn = pgn.build([], fen.initial);
+  }
 
   // load PGN and check headers for existing FEN
   const chess = new Chess(); // can throw if PGN is invalid
@@ -18,7 +22,7 @@ const make = (sloppyPgn) => {
   };
 
   const history = new Map();
-  const variations = split(normalizedPgn).map(({ moves, depth }) => {
+  const variations = split(normalizedPgn).map(({ moves, depth }, index) => {
     // find previous FEN
     if (history.get(store.depth)) {
       store.fen = fen.previous(history, moves, depth, store.depth);
@@ -26,7 +30,13 @@ const make = (sloppyPgn) => {
     store.depth = depth;
 
     // parse current moves with the computed FEN
-    const moments = parser(moves, store.fen, depth);
+    // only pass headers to the first move
+    const moments = parser(
+      moves,
+      store.fen,
+      depth,
+      index === 0 ? headers : null
+    );
 
     // set history for the current depth
     history.set(depth, fen.history(moments, history, depth));

package/functions/parser.js

@@ -3,7 +3,7 @@ const { initial } = require('./fen');
 const pgn = require('./pgn');
 const moment = require('./moment');
 
-module.exports = (moves, fen = initial, depth = 1) => {
+module.exports = (moves, fen = initial, depth = 1, headers = null) => {
   const chess = new Chess();
   chess.loadPgn(pgn.build(moves, fen)); // can throw if PGN is invalid
 
@@ -17,6 +17,7 @@ module.exports = (moves, fen = initial, depth = 1) => {
     depth,
     comment: chess.getComment(),
     fen: chess.fen(),
+    headers,
   });
 
   const moments = history.map((item) => {
@@ -34,8 +35,8 @@ module.exports = (moves, fen = initial, depth = 1) => {
   });
 
   // finally, add the first chess "moment" when needed
-  const headers = chess.getHeaders();
-  if (headers.FEN || fen === initial || first.comment || first.shapes) {
+  const pgnHeaders = chess.getHeaders();
+  if (pgnHeaders.FEN || fen === initial || first.comment || first.shapes) {
     moments.unshift(first);
   }
 

package/package.json

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