cm-chessboard 8.7.0 → 8.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cm-chessboard",
-  "version": "8.7.0",
+  "version": "8.7.2",
   "description": "A JavaScript chessboard which is lightweight, ES6 module based, responsive, SVG rendered and without dependencies.",
   "keywords": [
     "chess",

package/src/Chessboard.js

@@ -15,6 +15,9 @@ export const PIECE = {
     wp: "wp", wb: "wb", wn: "wn", wr: "wr", wq: "wq", wk: "wk",
     bp: "bp", bb: "bb", bn: "bn", br: "br", bq: "bq", bk: "bk"
 }
+export const PIECE_TYPE = {
+    pawn: "p", knight: "n", bishop: "b", rook: "r", queen: "q", king: "k"
+}
 export const PIECES_FILE_TYPE = {
     svgSprite: "svgSprite"
 }

package/src/extensions/accessibility/Accessibility.js

@@ -92,7 +92,7 @@ class BrailleNotationInAlt {
         let listW = piecesTranslations[this.extension.lang].colors.w.toUpperCase() + ":"
         let listB = piecesTranslations[this.extension.lang].colors.b.toUpperCase() + ":"
         for (const piece of pieces) {
-            const pieceName = piece.name === "p" ? "" : piecesTranslations[this.extension.lang].pieces[piece.name].toUpperCase()
+            const pieceName = piece.type === "p" ? "" : piecesTranslations[this.extension.lang].pieces[piece.type].toUpperCase()
             if (piece.color === "w") {
                 listW += " " + pieceName + piece.position
             } else {
@@ -226,9 +226,9 @@ class PiecesAsList {
         let listB = ""
         for (const piece of pieces) {
             if (piece.color === "w") {
-                listW += `<li class="list-inline-item">${renderPieceTitle(this.extension.lang, piece.name)} ${piece.position}</li>`
+                listW += `<li class="list-inline-item">${renderPieceTitle(this.extension.lang, piece.type)} ${piece.position}</li>`
             } else {
-                listB += `<li class="list-inline-item">${renderPieceTitle(this.extension.lang, piece.name)} ${piece.position}</li>`
+                listB += `<li class="list-inline-item">${renderPieceTitle(this.extension.lang, piece.type)} ${piece.position}</li>`
             }
         }
         this.piecesList.innerHTML = `

package/src/model/Position.js

@@ -71,7 +71,7 @@ export class Position {
         return parts.join("/")
     }
 
-    getPieces(sortBy = ['k', 'q', 'r', 'b', 'n', 'p']) {
+    getPieces(pieceType = undefined, pieceColor = undefined, sortBy = ['k', 'q', 'r', 'b', 'n', 'p']) {
         const pieces = []
         const sort = (a, b) => {
             return sortBy.indexOf(a.name) - sortBy.indexOf(b.name)
@@ -79,10 +79,18 @@ export class Position {
         for (let i = 0; i < 64; i++) {
             const piece = this.squares[i]
             if (piece) {
+                const type = piece.charAt(1)
+                const color = piece.charAt(0)
+                const square = Position.indexToSquare(i)
+                if(pieceType && pieceType !== type || pieceColor && pieceColor !== color) {
+                    continue
+                }
                 pieces.push({
-                    name: piece.charAt(1),
-                    color: piece.charAt(0),
-                    position: Position.indexToSquare(i)
+                    name: type, // deprecated, use type
+                    type: type,
+                    color: color,
+                    position: square, // deprecated, use square
+                    square: square
                 })
             }
         }

package/src/view/ChessboardView.js

@@ -61,7 +61,6 @@ export class ChessboardView {
         }
         this.positionsAnimationTask = Promise.resolve()
         this.pointerDownListener = this.pointerDownHandler.bind(this)
-        this.pointerDownListener = this.pointerDownHandler.bind(this)
         this.container.addEventListener("mousedown", this.pointerDownListener)
         this.container.addEventListener("touchstart", this.pointerDownListener, {passive: false})
         this.createSvgAndGroups()

package/test/TestChessboard.js

@@ -10,12 +10,31 @@ import {FEN} from "../src/model/Position.js"
 
 describe("TestChessboard", () => {
 
+    // https://github.com/shaack/cm-chessboard/issues/47
+    it("should create and immediately destroy a board without failure", () => {
+        const chessboard = new Chessboard(document.getElementById("TestBoard"), {
+            assetsUrl: "../assets/",
+            position: FEN.start
+        })
+        chessboard.destroy()
+    })
+
+    it("should create and destroy a board", () => {
+        const chessboard = new Chessboard(document.getElementById("TestBoard"), {
+            assetsUrl: "../assets/",
+            position: FEN.start
+        })
+        assert.equal(chessboard.view.container.childNodes.length, 1)
+        chessboard.destroy()
+        assert.equal(chessboard.state, undefined)
+    })
+
     it("should create and destroy a chessboard", () => {
         const chessboard = new Chessboard(document.getElementById("TestPosition"), {
             assetsUrl: "../assets/",
             position: FEN.start
         })
-        assert.equal(chessboard.getPosition(), "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR")
+        assert.equal("" + chessboard.getPosition(), "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR")
         chessboard.destroy()
     })
 
@@ -23,7 +42,7 @@ describe("TestChessboard", () => {
         const chessboard = new Chessboard(document.getElementById("TestPosition"),
             {assetsUrl: "../assets/"})
         chessboard.setPosition("rn2k1r1/ppp1pp1p/3p2p1/5bn1/P7/2N2B2/1PPPPP2/2BNK1RR w Gkq - 4 11", false).then(() => {
-            assert.equal(chessboard.getPosition(), "rn2k1r1/ppp1pp1p/3p2p1/5bn1/P7/2N2B2/1PPPPP2/2BNK1RR")
+            assert.equal("" + chessboard.getPosition(), "rn2k1r1/ppp1pp1p/3p2p1/5bn1/P7/2N2B2/1PPPPP2/2BNK1RR")
             chessboard.destroy()
         })
     })

package/test/TestPosition.js

@@ -5,7 +5,8 @@
  */
 
 import {describe, it, assert} from "../node_modules/teevi/src/teevi.js"
-import {Position} from "../src/model/Position.js"
+import {FEN, Position} from "../src/model/Position.js"
+import {COLOR, PIECE_TYPE} from "../src/Chessboard.js"
 
 describe("TestPosition", () => {
     it("should convert square to index", () => {
@@ -22,4 +23,21 @@ describe("TestPosition", () => {
         assert.equal(Position.indexToSquare(38), "g5")
         assert.equal(Position.indexToSquare(63), "h8")
     })
+    it("should return the correct FEN string", () => {
+        const position = new Position(FEN.start)
+        assert.equal(position.getFen(), "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR")
+    })
+    it("should find the correct pieces", () => {
+        const position = new Position("8/5P2/8/1P3r2/8/8/1P3P1P/8")
+        const blackPiece = position.getPieces(undefined, COLOR.black)
+        assert.equal(blackPiece.length, 1)
+        assert.equal(blackPiece[0].type, PIECE_TYPE.rook)
+        assert.equal(blackPiece[0].square, "f5")
+        const whitePieces = position.getPieces(undefined, COLOR.white)
+        assert.equal(whitePieces.length, 5)
+        const rooks = position.getPieces(PIECE_TYPE.rook)
+        assert.equal(rooks.length, 1)
+        assert.equal(rooks[0].square, "f5")
+    })
 })
+

package/test/index.html

@@ -23,7 +23,6 @@
 <script type="module">
     import {teevi} from "../node_modules/teevi/src/teevi.js"
     import "./TestChessboard.js"
-    import "./TestBoard.js"
     import "./TestPiecesAnimation.js"
     import "./TestMarkers.js"
     import "./TestPosition.js"

package/test/TestBoard.js

@@ -1,32 +0,0 @@
-/**
- * Author and copyright: Stefan Haack (https://shaack.com)
- * Repository: https://github.com/shaack/cm-chessboard
- * License: MIT, see file 'LICENSE'
- */
-
-import {describe, it, assert} from "../node_modules/teevi/src/teevi.js"
-import {Chessboard} from "../src/Chessboard.js"
-import {FEN} from "../src/model/Position.js"
-
-describe("TestBoard", () => {
-
-    // https://github.com/shaack/cm-chessboard/issues/47
-    it("should create and immediately destroy a board without failure", () => {
-        const chessboard = new Chessboard(document.getElementById("TestBoard"), {
-            assetsUrl: "../assets/",
-            position: FEN.start
-        })
-        chessboard.destroy()
-    })
-
-    it("should create and destroy a board", () => {
-        const chessboard = new Chessboard(document.getElementById("TestBoard"), {
-            assetsUrl: "../assets/",
-            position: FEN.start
-        })
-        assert.equal(chessboard.view.container.childNodes.length, 1)
-        chessboard.destroy()
-        assert.equal(chessboard.state, undefined)
-    })
-
-})