kokopu-react 1.5.5 → 1.7.1

package/src/impl/colorsets.js

@@ -25,42 +25,42 @@ export default {
 	original: {
 		b: '#b5876b',
 		w: '#f0dec7',
-		g: '#0e0',
-		r: '#d00',
-		y: '#db0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0e0',
+		cr: '#d00',
+		cy: '#db0',
 	},
 	gray: {
 		b: '#bbbbbb',
 		w: '#f8f8f8',
-		g: '#0a0',
-		r: '#d00',
-		y: '#a90',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0a0',
+		cr: '#d00',
+		cy: '#a90',
 	},
 	scid: {
 		b: '#7389b6',
 		w: '#f3f3f3',
-		g: '#0e0',
-		r: '#d00',
-		y: '#db0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0e0',
+		cr: '#d00',
+		cy: '#db0',
 	},
 	wikipedia: {
 		b: '#d18b47',
 		w: '#ffce9e',
-		g: '#0e0',
-		r: '#d00',
-		y: '#db0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0e0',
+		cr: '#d00',
+		cy: '#db0',
 	},
 	xboard: {
 		b: '#77a26d',
 		w: '#c8c365',
-		g: '#0f0',
-		r: '#d00',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0f0',
+		cr: '#d00',
+		cy: '#ff0',
 	},
 
 	/*
@@ -70,50 +70,50 @@ export default {
 	coral: {
 		b: 'rgb(112,162,163)',
 		w: 'rgb(177,228,185)',
-		g: '#080',
-		r: '#d00',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#080',
+		cr: '#d00',
+		cy: '#ff0',
 	},
 	dusk: {
 		b: 'rgb(112,102,119)',
 		w: 'rgb(204,183,174)',
-		g: '#3f3',
-		r: '#f20',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#3f3',
+		cr: '#f20',
+		cy: '#ff0',
 	},
 	emerald: {
 		b: 'rgb(111,143,114)',
 		w: 'rgb(173,189,143)',
-		g: '#6f6',
-		r: '#d00',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#6f6',
+		cr: '#d00',
+		cy: '#ff0',
 	},
 	marine: {
 		b: 'rgb(111,115,210)',
 		w: 'rgb(157,172,255)',
-		g: '#6f6',
-		r: '#f50',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#6f6',
+		cr: '#f50',
+		cy: '#ff0',
 	},
 	sandcastle: {
 		b: 'rgb(184,139,74)',
 		w: 'rgb(227,193,111)',
-		g: '#0c3',
-		r: '#d02',
-		y: '#ff0',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0c3',
+		cr: '#d02',
+		cy: '#ff0',
 	},
 	wheat: {
 		b: 'rgb(187,190,100)',
 		w: 'rgb(234,240,206)',
-		g: '#0c3',
-		r: '#d00',
-		y: '#ff3',
-		highlight: '#04f',
+		cb: '#04f',
+		cg: '#0c3',
+		cr: '#d00',
+		cy: '#ff3',
 	},
 
 };

package/src/impl/util.js

@@ -51,7 +51,7 @@ export function isValidVector(vect) {
 
 
 export function isValidColor(color) {
-	return color === 'g' || color === 'r' || color === 'y';
+	return color === 'b' || color === 'g' || color === 'r' || color === 'y';
 }
 
 

package/src/index.js

@@ -21,6 +21,7 @@
 
 
 export { flattenSquareMarkers, parseSquareMarkers, flattenTextMarkers, parseTextMarkers, flattenArrowMarkers, parseArrowMarkers } from './markers';
+export { formatMove, moveFormatter } from './formatmove';
 export { default as i18n } from './i18n';
 export { default as Chessboard } from './Chessboard';
 export { default as ErrorBox } from './ErrorBox';

package/src/markers.js

@@ -56,8 +56,8 @@ export function flattenTextMarkers(markers) {
 /**
  * Transform a set of arrow markers defined as a "squareFromSquareTo -> color" struct into a comma-separated string.
  *
- * @param {object} markers For example: `{ e2e4: 'g', g8f6: 'r', g8h6: 'y' }`
- * @returns {string} For example: `'Ge2e4,Rg8f6,Yg8h6'`
+ * @param {object} markers For example: `{ e2e4: 'g', g8f6: 'r', g8h6: 'b' }`
+ * @returns {string} For example: `'Ge2e4,Rg8f6,Bg8h6'`
  */
 export function flattenArrowMarkers(markers) {
 	return Object.entries(markers)
@@ -83,7 +83,7 @@ function parseMarkers(markers, tokenParser) {
  */
 export function parseSquareMarkers(markers) {
 	return parseMarkers(markers, token => {
-		return /^([GRY])([a-h][1-8])$/.test(token) ? { key: RegExp.$2, value: RegExp.$1.toLowerCase() } : undefined;
+		return /^([BGRY])([a-h][1-8])$/.test(token) ? { key: RegExp.$2, value: RegExp.$1.toLowerCase() } : undefined;
 	});
 }
 
@@ -96,7 +96,7 @@ export function parseSquareMarkers(markers) {
  */
 export function parseTextMarkers(markers) {
 	return parseMarkers(markers, token => {
-		return /^([GRY])(?:([A-Za-z0-9])|\((plus|times|dot|circle)\))([a-h][1-8])$/.test(token) ?
+		return /^([BGRY])(?:([A-Za-z0-9])|\((plus|times|dot|circle)\))([a-h][1-8])$/.test(token) ?
 			{ key: RegExp.$4, value: { symbol: RegExp.$2 || RegExp.$3, color: RegExp.$1.toLowerCase() } } : undefined;
 	});
 }
@@ -105,11 +105,11 @@ export function parseTextMarkers(markers) {
 /**
  * Parse a set of arrow markers defined as a comma-separated string into a "squareFromSquareTo -> color" struct.
  *
- * @param {string} markers For example: `'Ge2e4,Rg8f6,Yg8h6'`
- * @returns {object} For example: `{ e2e4: 'g', g8f6: 'r', g8h6: 'y' }`
+ * @param {string} markers For example: `'Ge2e4,Rg8f6,Bg8h6'`
+ * @returns {object} For example: `{ e2e4: 'g', g8f6: 'r', g8h6: 'b' }`
  */
 export function parseArrowMarkers(markers) {
 	return parseMarkers(markers, token => {
-		return /^([GRY])([a-h][1-8][a-h][1-8])$/.test(token) ? { key: RegExp.$2, value: RegExp.$1.toLowerCase() } : undefined;
+		return /^([BGRY])([a-h][1-8][a-h][1-8])$/.test(token) ? { key: RegExp.$2, value: RegExp.$1.toLowerCase() } : undefined;
 	});
 }

package/test/1_markers.js

@@ -28,7 +28,7 @@ describe('Flatten square markers', () => {
 
 	it('Re4', () => { test.value(flattenSquareMarkers({ e4: 'r' })).is('Re4'); });
 	it('Gd3,Yh8', () => { test.value(flattenSquareMarkers({ h8: 'y', d3: 'g' })).is('Gd3,Yh8'); });
-	it('Ga1,Yc5,Rd2,Rh7,Yh8', () => { test.value(flattenSquareMarkers({ c5: 'y', h8: 'y', a1: 'g', h7: 'r', d2: 'r' })).is('Ga1,Yc5,Rd2,Rh7,Yh8'); });
+	it('Ga1,Yc5,Rd2,Bh7,Yh8', () => { test.value(flattenSquareMarkers({ c5: 'y', h8: 'y', a1: 'g', h7: 'b', d2: 'r' })).is('Ga1,Yc5,Rd2,Bh7,Yh8'); });
 	it('<empty>', () => { test.value(flattenSquareMarkers({})).is(''); });
 
 	it('Wrong square', () => { test.value(flattenSquareMarkers({ e1: 'r', k9: 'g', whatever: 'y' })).is('Re1'); });
@@ -40,13 +40,13 @@ describe('Parse square markers', () => {
 
 	it('Re4', () => { test.value(parseSquareMarkers('Re4')).is({ e4: 'r' }); });
 	it('Gd3,Yh8', () => { test.value(parseSquareMarkers('Gd3,Yh8')).is({ h8: 'y', d3: 'g' }); });
-	it('Ga1,Yc5,Rd2,Rh7,Yh8', () => { test.value(parseSquareMarkers(' Ga1,  Yh8,Yc5 ,Rd2, Rh7 ')).is({ c5: 'y', h8: 'y', a1: 'g', h7: 'r', d2: 'r' }); });
+	it('Ga1,Yc5,Rd2,Bh7,Yh8', () => { test.value(parseSquareMarkers(' Ga1,  Yh8,Yc5 ,Rd2, Bh7 ')).is({ c5: 'y', h8: 'y', a1: 'g', h7: 'b', d2: 'r' }); });
 	it('<empty>', () => { test.value(parseSquareMarkers('')).is({}); });
 	it('<blank>', () => { test.value(parseSquareMarkers(' ')).is({}); });
 
 	it('Wrong square', () => { test.value(parseSquareMarkers('Rg9,Ye1')).is({ e1: 'y' }); });
 	it('Duplicated square', () => { test.value(parseSquareMarkers('Ra3,Ya3')).is({ a3: 'y' }); });
-	it('Wrong color', () => { test.value(parseSquareMarkers('Ga6,Bg5')).is({ a6: 'g' }); });
+	it('Wrong color', () => { test.value(parseSquareMarkers('Ga6,Cg5')).is({ a6: 'g' }); });
 	it('Wrong format', () => { test.value(parseSquareMarkers('Something Ra2 invalid, Ye4, G g3')).is({ e4: 'y' }); });
 });
 
@@ -58,13 +58,13 @@ describe('Flatten text markers', () => {
 		h8: { symbol: '1', color: 'y' },
 		d3: { symbol: 'z', color: 'g' },
 	})).is('Gzd3,Y1h8'); });
-	it('G2a1,YMc5,RLd2,Rxh7,Ywh8', () => { test.value(flattenTextMarkers({
+	it('G2a1,YMc5,RLd2,Rxh7,Bwh8', () => { test.value(flattenTextMarkers({
 		c5: { symbol: 'M', color: 'y' },
-		h8: { symbol: 'w', color: 'y' },
+		h8: { symbol: 'w', color: 'b' },
 		a1: { symbol: '2', color: 'g' },
 		h7: { symbol: 'x', color: 'r' },
 		d2: { symbol: 'L', color: 'r' },
-	})).is('G2a1,YMc5,RLd2,Rxh7,Ywh8'); });
+	})).is('G2a1,YMc5,RLd2,Rxh7,Bwh8'); });
 	it('Multi-character symbols', () => { test.value(flattenTextMarkers({
 		a1: { symbol: 'A', color: 'y' },
 		a7: { symbol: 'plus', color: 'g' },
@@ -104,9 +104,9 @@ describe('Parse text markers', () => {
 		h8: { symbol: '1', color: 'y' },
 		d3: { symbol: 'z', color: 'g' },
 	}); });
-	it('G2a1,YMc5,RLd2,Rxh7,Ywh8', () => { test.value(parseTextMarkers(' G2a1, Rxh7  ,YMc5 ,RLd2,Ywh8 ')).is({
+	it('G2a1,YMc5,RLd2,Rxh7,Bwh8', () => { test.value(parseTextMarkers(' G2a1, Rxh7  ,YMc5 ,RLd2,Bwh8 ')).is({
 		c5: { symbol: 'M', color: 'y' },
-		h8: { symbol: 'w', color: 'y' },
+		h8: { symbol: 'w', color: 'b' },
 		a1: { symbol: '2', color: 'g' },
 		h7: { symbol: 'x', color: 'r' },
 		d2: { symbol: 'L', color: 'r' },
@@ -123,7 +123,7 @@ describe('Parse text markers', () => {
 
 	it('Wrong square', () => { test.value(parseTextMarkers('RHg9,Yxe1')).is({ e1: { symbol: 'x', color: 'y' } }); });
 	it('Duplicated square', () => { test.value(parseTextMarkers('Rka3,Gba3')).is({ a3: { symbol: 'b', color: 'g' } }); });
-	it('Wrong color', () => { test.value(parseTextMarkers('G3a6,BAg5')).is({ a6: { symbol: '3', color: 'g' } }); });
+	it('Wrong color', () => { test.value(parseTextMarkers('G3a6,CAg5')).is({ a6: { symbol: '3', color: 'g' } }); });
 	it('Wrong symbol', () => { test.value(parseTextMarkers('Rb2,RAg5,G.d3,Yabcde7')).is({ g5: { symbol: 'A', color: 'r' } }); });
 	it('Wrong multi-character symbol', () => { test.value(parseTextMarkers('RZb2,Y(whatever)e4')).is({ b2: { symbol: 'Z', color: 'r' } }); });
 	it('Wrong format', () => { test.value(parseTextMarkers('Something RHa2 invalid, Yqe4, G g3')).is({ e4: { symbol: 'q', color: 'y' } }); });
@@ -134,8 +134,8 @@ describe('Flatten arrow markers', () => {
 
 	it('Re4d6', () => { test.value(flattenArrowMarkers({ e4d6: 'r' })).is('Re4d6'); });
 	it('Gd3b4,Yh8h7', () => { test.value(flattenArrowMarkers({ h8h7: 'y', d3b4: 'g' })).is('Gd3b4,Yh8h7'); });
-	it('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Yh8c5', () => { test.value(flattenArrowMarkers({ c5a1: 'y', h8c5: 'y', a1h8: 'g', h7h8: 'r', d2d2: 'r' }))
-		.is('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Yh8c5'); });
+	it('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Bh8c5', () => { test.value(flattenArrowMarkers({ c5a1: 'y', h8c5: 'b', a1h8: 'g', h7h8: 'r', d2d2: 'r' }))
+		.is('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Bh8c5'); });
 	it('<empty>', () => { test.value(flattenArrowMarkers({})).is(''); });
 
 	it('Wrong vector', () => { test.value(flattenArrowMarkers({ e1c2: 'r', a1b9: 'g', c0d2: 'r', i3d4: 'r', f2k3: 'g', whatever: 'y' })).is('Re1c2'); });
@@ -147,13 +147,13 @@ describe('Parse arrow markers', () => {
 
 	it('Re4d6', () => { test.value(parseArrowMarkers('Re4d6')).is({ e4d6: 'r' }); });
 	it('Gd3b4,Yh8h7', () => { test.value(parseArrowMarkers('Gd3b4,Yh8h7')).is({ h8h7: 'y', d3b4: 'g' }); });
-	it('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Yh8c5', () => { test.value(parseArrowMarkers(' Yh8c5,Ga1h8  , Yc5a1 ,  Rd2d2,Rh7h8  '))
-		.is({ c5a1: 'y', h8c5: 'y', a1h8: 'g', h7h8: 'r', d2d2: 'r' }); });
+	it('Ga1h8,Yc5a1,Rd2d2,Rh7h8,Bh8c5', () => { test.value(parseArrowMarkers(' Bh8c5,Ga1h8  , Yc5a1 ,  Rd2d2,Rh7h8  '))
+		.is({ c5a1: 'y', h8c5: 'b', a1h8: 'g', h7h8: 'r', d2d2: 'r' }); });
 	it('<empty>', () => { test.value(parseArrowMarkers('')).is({}); });
 	it('<blank>', () => { test.value(parseArrowMarkers(' ')).is({}); });
 
 	it('Wrong vector', () => { test.value(parseArrowMarkers('Re1c2,Ga1b9,Rc0d2,Ri3d4,Gf2k3')).is({ e1c2: 'r' }); });
 	it('Duplicated vector', () => { test.value(parseArrowMarkers('Ya3b4,Ra3b4')).is({ a3b4: 'r' }); });
-	it('Wrong color', () => { test.value(parseArrowMarkers('Ga6c5,Bg5e2')).is({ a6c5: 'g' }); });
+	it('Wrong color', () => { test.value(parseArrowMarkers('Ga6c5,Cg5e2')).is({ a6c5: 'g' }); });
 	it('Wrong format', () => { test.value(parseArrowMarkers('Something Rb1a2 invalid, Ye4c7, G g3b1')).is({ e4c7: 'y' }); });
 });

package/test/common/graphic.js

@@ -34,8 +34,8 @@ const coverageDir = rootDir + '/build/.nyc_output';
 const UNREACHABLE_TEST_CLIENT_MESSAGE =
 	'Cannot reach the dockerized selenium webbrowser used for graphic tests (probably because the test environment is not running).\n' +
 	'\n' +
-	'Use command `npm run start_test_env` to start the test environment.\n' +
-	'Do not forget to run `npm run stop_test_env` when finished.\n';
+	'Use command `npm run test_env:start` to start the test environment.\n' +
+	'Do not forget to run `npm run test_env:stop` when finished.\n';
 
 
 /**

package/scripts/test_graphic/docker-compose.yml

@@ -1,14 +0,0 @@
-version: "3.7"
-
-services:
-  web-client:
-    image: selenium/standalone-firefox:4.1.4-20220427
-    shm_size: '2gb'
-    ports:
-      - 4444:4444 # Driver (http://localhost:4444)
-      - 7900:7900 # VNC (http://localhost:7900, pass: secret)
-    volumes:
-      - type: bind
-        source: ../..
-        target: /app
-        read_only: true