Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support initialMove field to have a custom move as the initial positi… #19

Merged
merged 1 commit into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,17 @@ These properties are available both for chess and pgn blocks. when using in a pg

These properties are only available for chess blocks.

| **Property** | **Description** | **Possible values** | **Default** |
| ------------ | ----------------------------------------- | -------------------- | ----------------------------------- |
| **fen** | The initial position | Any valid FEN string | Initial |
| **arrows** | Series of arrows to draw | e2->e4 d2->d4 | Empty |
| **squares** | Series of squares to mark | e5 d5 | Empty |
| **movable** | Force to enable/disable movement | true / false | false if FEN supplied |
| **drawable** | Force to enable/disable drawing | true / false | false if arrows or squares supplied |
| **lastMove** | Highlight last move | e2 e4 | Undefined |
| **moves** | Sequence of moves to view in the position | e4 e5 Nf3 Nf6 Nxe5 | Undefined |
| **variant** | Variant name | Chess960 | Undefined |
| **Property** | **Description** | **Possible values** | **Default** |
| --------------- | ------------------------------------------------ | -------------------- | ----------------------------------- |
| **fen** | The initial position | Any valid FEN string | Initial |
| **arrows** | Series of arrows to draw | e2->e4 d2->d4 | Empty |
| **squares** | Series of squares to mark | e5 d5 | Empty |
| **movable** | Force to enable/disable movement | true / false | false if FEN supplied |
| **drawable** | Force to enable/disable drawing | true / false | false if arrows or squares supplied |
| **lastMove** | Highlight last move | e2 e4 | Undefined |
| **moves** | Sequence of moves to view in the position | e4 e5 Nf3 Nf6 Nxe5 | Undefined |
| **initialMove** | Move to display in initial position. -1 for last | -1,0,1,2,3,... | 0 |
| **variant** | Variant name | Chess960 | Undefined |

## PGN Viewer

Expand Down
29 changes: 22 additions & 7 deletions src/markdown/chessGame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class ChessGame {
private buttonLastMove_: HTMLButtonElement;

private initialPosition_: Position;
private initialDisplayPosition_: Position;
private initialMove_: number | undefined = undefined;
private initialLastMove_: Key[] | undefined = undefined;
private sanMoves_: string[] = [];
private currentMove_ = 0;
Expand Down Expand Up @@ -74,7 +76,12 @@ class ChessGame {
}
}

this.reinitializeChess_();
this.chess_ = (
this.initialDisplayPosition_ !== undefined
? this.initialDisplayPosition_
: this.initialPosition_
).clone();
this.currentMove_ = this.initialMove_ || 0;
this.createMovesElement_();
this.updateMoveButtons_();
this.createChessBoard_(chessOptions);
Expand Down Expand Up @@ -117,9 +124,18 @@ class ChessGame {
.unwrap()
: defaultPosition(rules);

this.initialDisplayPosition_ = this.initialPosition_.clone();
if (chessOptions.moves) {
this.sanMoves_ = chessOptions.moves.split(/\s+/);
this.sanMoves_ = this.sanMoves_.filter((move) => !move.match(/^\d+\./)); // remove move indices

if (chessOptions.initialMove !== undefined) {
const numberOfIndices = this.sanMoves_.length + 1;
this.initialMove_ =
((chessOptions.initialMove % numberOfIndices) + numberOfIndices) %
numberOfIndices;
this.playMovesUntil_(this.initialMove_, this.initialDisplayPosition_);
}
}

if (chessOptions.lastMove) {
Expand Down Expand Up @@ -215,7 +231,7 @@ class ChessGame {

private createChessBoard_(chessOptions: ChessBlockOptions) {
const config: Config = {
fen: makeFen(this.initialPosition_.toSetup()),
fen: makeFen(this.chess_.toSetup()),
disableContextMenu: true,
draggable: {
enabled: false,
Expand All @@ -236,18 +252,19 @@ class ChessGame {

private reinitializeChess_() {
this.chess_ = this.initialPosition_.clone();
this.currentMove_ = 0;
}

private playMovesUntil_(untilMove: number) {
private playMovesUntil_(untilMove: number, position: Position = this.chess_) {
let move: Move | undefined = undefined;
for (; this.currentMove_ < untilMove; this.currentMove_++) {
move = parseSan(this.chess_, this.sanMoves_[this.currentMove_]);
move = parseSan(position, this.sanMoves_[this.currentMove_]);
if (!move) {
// TODO: log error
break;
}

this.chess_.play(move);
position.play(move);
}

return move;
Expand Down Expand Up @@ -304,7 +321,6 @@ class ChessGame {

private goToFirstMove_() {
this.cancelOngoingAnimation_();
this.currentMove_ = 0;
this.reinitializeChess_();
this.updateBoard_();
this.updateMoveButtons_();
Expand Down Expand Up @@ -418,7 +434,6 @@ class ChessGame {
}

const currentMoveTemp = this.currentMove_ - 1;
this.currentMove_ = 0;
this.reinitializeChess_();
const lastMove = this.playMovesUntil_(currentMoveTemp);

Expand Down
6 changes: 6 additions & 0 deletions src/markdown/chessRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ function parseChessBlockOptions(chessElement: HTMLElement): ChessBlockOptions {
drawable: undefined,
lastMove: undefined,
moves: undefined,
initialMove: undefined,
variant: undefined,
};

Expand Down Expand Up @@ -92,6 +93,11 @@ function parseChessBlockOptions(chessElement: HTMLElement): ChessBlockOptions {
case "moves":
options.moves = value.trim();
break;
case "initialmove":
if (value.match(/^-?\d+/g)) {
options.initialMove = parseInt(value);
}
break;
case "variant":
options.variant = value.trim();
break;
Expand Down
1 change: 1 addition & 0 deletions src/shared/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ declare interface ChessBlockOptions {
lastMove: string | undefined;

moves: string | undefined;
initialMove: number | undefined;
variant: string | undefined;
}

Expand Down
Loading