chore: clean up types

Author: kevinjosethomas

src/types/analysis.ts

@@ -1,13 +1,18 @@
+import { Player } from './player'
 import { AvailableMoves } from './puzzle'
-import { Game, GameNode, GameTree } from './common'
+import { BaseGame, GameNode, GameTree } from './common'
 
 export interface MoveValueMapping {
   [move: string]: number
 }
 
-export interface AnalyzedGame extends Game {
+export interface AnalyzedGame extends BaseGame {
   availableMoves: AvailableMoves[]
   type: EvaluationType
+  gameType: string
+  blackPlayer: Player
+  whitePlayer: Player
+  termination?: Termination
 }
 
 export interface BaseTreeControllerContext {

src/types/common.ts

@@ -1,10 +1,11 @@
-import { Player } from '.'
 import { GameTree } from './tree'
-import { Termination } from './analysis'
 
 export * from './tree'
 
-export type Check = false | 'white' | 'black'
+export interface BaseGame {
+  id: string
+  tree: GameTree
+}
 
 export interface RawMove {
   board: string
@@ -15,16 +16,6 @@ export interface RawMove {
   uci?: string
 }
 
-export interface BaseGame {
-  id: string
-  tree: GameTree
-}
-
-export interface Game extends BaseGame {
-  gameType: string
-  blackPlayer: Player
-  whitePlayer: Player
-  termination?: Termination
-}
+export type Check = false | 'white' | 'black'
 
 export type Color = 'white' | 'black'

src/types/play.ts

@@ -23,7 +23,7 @@ export interface PlayGameConfig {
   playType: PlayType
   isBrain: boolean
   sampleMoves: boolean
-  simulateMaiaTime?: boolean // Made optional since it's now managed in-game
+  simulateMaiaTime?: boolean
   startFen?: string
   maiaPartnerVersion?: string
 }

src/types/puzzle.ts

@@ -1,11 +1,22 @@
-import { Game, RawMove, MoveValueMapping, GameTree } from '.'
+import {
+  Termination,
+  Player,
+  RawMove,
+  MoveValueMapping,
+  GameTree,
+  BaseGame,
+} from '.'
 
 export interface AvailableMoves {
   [uci: string]: RawMove
 }
 
-export interface PuzzleGame extends Game {
+export interface PuzzleGame extends BaseGame {
   puzzle_elo: number
+  gameType: string
+  blackPlayer: Player
+  whitePlayer: Player
+  termination?: Termination
   stockfishEvaluation: MoveValueMapping
   maiaEvaluation: MoveValueMapping
   availableMoves: AvailableMoves