cm-chess 2.1.3 → 2.1.7

package/README.md

@@ -13,7 +13,7 @@ PGN header values, Nags and Comments.
 - It has a similar API to chess.js
 - It can handle history variants
 - It can add Nags, Comments and Annotations
-- It is used by the 7,000 users from [chessmail](https://www.chessmail.eu) (it works)
+- It is used by the 7,000 users of [chessmail](https://www.chessmail.de) (it works)
 
 ## API
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "cm-chess",
-  "version": "2.1.3",
+  "version": "2.1.7",
   "description": "Like chess.js, but in ES6 and can handle variants (tree-structured move history)",
-  "main": "index.html",
+  "main": "./src/cm-chess/Chess.js",
   "scripts": {
     "test": "mocha --require babel-core/register ./test/*.js",
     "postinstall": "node postinstall.js"

package/src/cm-chess/Chess.js

@@ -32,8 +32,18 @@ export const FEN = {
  */
 export class Chess {
 
-    constructor(fen = FEN.start) {
-        this.load(fen)
+    constructor(fenOrProps = FEN.start) {
+        if(typeof fenOrProps === "string") {
+            this.load(fenOrProps)
+        } else {
+            if(fenOrProps.fen) {
+                this.load(fenOrProps.fen)
+            } else if(fenOrProps.pgn) {
+                this.loadPgn(fenOrProps.pgn)
+            } else {
+                this.load(FEN.start)
+            }
+        }
     }
 
     /**
@@ -258,8 +268,17 @@ export class Chess {
         move.variation = move.variation.splice(index)
     }
 
-    static plyToTurnNumber(ply) {
-        return (ply - 1) / 2 + 1
+    plyCount() {
+        return this.history().length
     }
 
+    fenOfPly(plyNumber) {
+        if(plyNumber > 0) {
+            return this.history()[plyNumber - 1].fen
+        } else {
+            return this.setUpFen()
+        }
+    }
+
+
 }

package/src/cm-chess/Fen.js

@@ -14,12 +14,22 @@ export class Fen {
         return this._fen
     }
 
+    /**
+     * https://en.wikipedia.org/wiki/Forsyth%E2%80%93Edwards_Notation
+     * @param fen
+     */
     set fen(fen) {
         this._fen = fen
         const fenParts = fen.split(" ")
         this.position = fenParts[0]
         this.colorToPlay = fenParts[1]
         this.castlings = fenParts[2].split("")
+        this.enPassantTargetSquare = fenParts[3]
+        if(this.enPassantTargetSquare === "-") {
+            this.enPassantTargetSquare = undefined
+        }
+        this.plyClock = parseInt(fenParts[4], 10)
+        this.moveNumber = parseInt(fenParts[5], 10)
     }
 
 }

package/test/TestChess.js

@@ -13,26 +13,25 @@ describe("Chess", function () {
         assert.equals(chess.fen(), FEN.start)
     })
 
-    it("should load a game from FEN", function() {
+    it("should load a game from FEN", function () {
         const fen = "4k3/pppppppp/8/8/8/8/PPPPPPPP/4K3 w - - 0 1"
         const chess = new Chess(fen)
         assert.equals(chess.pgn.header.tags[TAGS.FEN], fen)
         assert.equals(chess.fen(), fen)
     })
 
-    it("should load a pgn with SetUp and FEN", function() {
+    it("should load a pgn with SetUp and FEN", function () {
         const pgn = `[SetUp "1"]
 [FEN "4k3/pppppppp/8/8/8/8/PPPPPPPP/4K3 w - - 0 1"]
 
 1. e4 (1. d4 {Die Variante} d5) e5 {Ein Kommentar} 2. a3`
-        const chess = new Chess()
-        chess.loadPgn(pgn)
+        const chess = new Chess({pgn: pgn})
         assert.equals(chess.move("Nc6"), undefined)
         const result = chess.move("h6")
         assert.equals(result.fen, "4k3/pppp1pp1/7p/4p3/4P3/P7/1PPP1PPP/4K3 w - - 0 3")
     })
 
-    it("should load a pgn", function() {
+    it("should load a pgn", function () {
         const chess = new Chess()
         const pgn = `[Event "IBM Kasparov vs. Deep Blue Rematch"]
 [Site "New York, NY USA"]
@@ -59,7 +58,6 @@ describe("Chess", function () {
     })
 
     it("should load a pgn with SetUp", () => {
-        const chess = new Chess()
         const pgn = `[Event "?"]
 [White "?"]
 [Black "?"]
@@ -69,7 +67,7 @@ describe("Chess", function () {
 
 1. Qc1 Qe6 2. Qxc7 
 0-1`
-        chess.loadPgn(pgn)
+        const chess = new Chess({pgn: pgn})
         assert.equals(chess.history()[2].san, "Qxc7")
     })
 
@@ -89,7 +87,7 @@ describe("Chess", function () {
 
 1... Bf8 (1... Qf8? 2. Qxf8+ Bxf8 3. exd4) 2. exd4 Qxd4+ {%Q} 3. Kh1 Bh3 
 0-1`
-        chess.loadPgn(pgn, {}, true)
+        chess.loadPgn(pgn)
         assert.equals(5, chess.pgn.history.moves.length)
         assert.equals("Schaak opheffen", chess.pgn.header.tags[TAGS.White])
         assert.equals("app 037-1", chess.pgn.header.tags[TAGS.Annotator])
@@ -180,9 +178,12 @@ describe("Chess", function () {
         chess.undo(chess.history()[5])
         // console.log(chess.history());
         assert.equals(chess.history().length, 5)
+        assert.equals(chess.plyCount(), 5)
+        assert.equals(chess.fenOfPly(0), "8/8/b2Bq3/7Q/3kp3/5pP1/8/3K4 w - - 0 1")
+        assert.equals(chess.fenOfPly(3), "8/8/b2Bq3/8/4p3/3k1pP1/2Q5/3K4 b - - 3 2")
     })
 
-    it("should not load incorrect FEN", function() {
+    it("should not load incorrect FEN", function () {
         const fen = "4k3/pppppppp/8/8/8/8/PPPPPP/4K3 w - - 0 1"
         try {
             new Chess(fen)
@@ -199,9 +200,9 @@ describe("Chess", function () {
         }
     })
 
-    it("should load different PGNs and then work correctly", function() {
+    it("should load different PGNs and then work correctly", function () {
         const fen = "ppppkppp/pppppppp/pppppppp/pppppppp/8/8/8/RNBQKBNR w KQ - 0 1"
-        const chess = new Chess(fen)
+        const chess = new Chess({fen: fen})
         assert.true(chess.move("e4") === undefined)
         assert.true(chess.move("Ke2") !== undefined)
         chess.load(FEN.start)

package/test/TestFen.js

@@ -8,5 +8,8 @@ describe("Fen", function () {
         assert.equals(fen.position, "rnbqkbnr/pp1ppppp/8/2p5/4P3/5N2/PPPP1PPP/RNBQKB1R")
         assert.equals(fen.colorToPlay, "b")
         assert.equals(fen.castlings.length, 4)
+        assert.equals(fen.enPassantTargetSquare, undefined)
+        assert.equals(fen.plyClock, 1)
+        assert.equals(fen.moveNumber, 2)
     })
 })