Use color type

Author: 370417

ui/learn/src/chess.ts

@@ -4,12 +4,12 @@ import { isRole, PromotionChar, PromotionRole, roleToSan, setFenTurn } from './u
 
 export interface ChessCtrl {
   dests(opts?: { illegal?: boolean }): Partial<Record<Key, Key[]>>;
-  color(c: 'black' | 'white'): void;
-  color(): 'black' | 'white';
+  color(c: Color): void;
+  color(): Color;
   fen(): string;
   move(orig: Key, dest: Key, prom?: PromotionRole | PromotionChar | ''): Move | null;
   occupation(): Partial<Record<Key, Piece>>;
-  kingKey(color: 'black' | 'white'): Key | undefined;
+  kingKey(color: Color): Key | undefined;
   findCapture(): CgMove;
   findUnprotectedCapture(): CgMove | undefined;
   checks(): CgMove[] | null;
@@ -46,7 +46,7 @@ export default function (fen: string, appleKeys: Key[]): ChessCtrl {
     return chess.turn() == 'w' ? 'white' : 'black';
   }
 
-  function setColor(c: 'black' | 'white') {
+  function setColor(c: Color) {
     const turn = c === 'white' ? 'w' : 'b';
     let newFen = setFenTurn(chess.fen(), turn);
     chess.load(newFen);
@@ -73,9 +73,9 @@ export default function (fen: string, appleKeys: Key[]): ChessCtrl {
       });
   };
 
-  function color(): 'black' | 'white';
-  function color(c: 'black' | 'white'): void;
-  function color(c?: 'black' | 'white') {
+  function color(): Color;
+  function color(c: Color): void;
+  function color(c?: Color) {
     if (c) return setColor(c);
     else return getColor();
   }
@@ -113,7 +113,7 @@ export default function (fen: string, appleKeys: Key[]): ChessCtrl {
       });
       return map;
     },
-    kingKey: function (color: 'black' | 'white') {
+    kingKey: function (color: Color) {
       for (const i in chess.SQUARES) {
         const p = chess.get(chess.SQUARES[i]);
         if (p && p.type === 'k' && p.color === (color === 'white' ? 'w' : 'b')) return chess.SQUARES[i];

ui/learn/src/ground.ts

@@ -26,7 +26,7 @@ interface GroundOpts {
   chess: ChessCtrl;
   offerIllegalMove?: boolean;
   autoCastle?: boolean;
-  orientation: 'black' | 'white';
+  orientation: Color;
   onMove(orig: Key, dest: Key): void;
   items: {
     render(pos: unknown, key: Key): MNode | undefined;
@@ -87,7 +87,7 @@ export function set(opts: GroundOpts) {
 
 export const stop = cg.stop;
 
-export function color(color: 'black' | 'white', dests: Dests) {
+export function color(color: Color, dests: Dests) {
   cg.set({
     turnColor: color,
     movable: {
@@ -97,7 +97,7 @@ export function color(color: 'black' | 'white', dests: Dests) {
   });
 }
 
-export function fen(fen: string, color: 'black' | 'white', dests: Dests, lastMove?: [Key, Key, ...unknown[]]) {
+export function fen(fen: string, color: Color, dests: Dests, lastMove?: [Key, Key, ...unknown[]]) {
   const config = {
     turnColor: color,
     fen: fen,
@@ -127,7 +127,7 @@ export function check(chess: ChessCtrl) {
 }
 
 interface Piece {
-  color: 'black' | 'white';
+  color: Color;
   role: PromotionRole;
   promoted: boolean;
 }

ui/learn/src/promotion.ts

@@ -48,8 +48,8 @@ function renderPromotion(
   ctrl: Ctrl,
   dest: Key,
   pieces: PromotionRole[],
-  color: 'black' | 'white',
-  orientation: 'black' | 'white',
+  color: Color,
+  orientation: Color,
   explain: boolean
 ) {
   if (!promoting) return;

ui/learn/src/stage/list.ts

@@ -50,7 +50,7 @@ export interface LevelBase {
 export interface LevelDefaults {
   id: number;
   apples: string | Key[];
-  color: 'black' | 'white';
+  color: Color;
   detectCapture: 'unprotected' | boolean;
 }