chore: clean up types

Author: kevinjosethomas

__tests__/lib/favorites.test.ts

@@ -7,7 +7,7 @@ import {
   getFavoriteGame,
   getFavoritesAsWebGames,
 } from 'src/lib/favorites'
-import { AnalysisWebGame } from 'src/types'
+import { MaiaGameEntry } from 'src/types'
 
 // Mock localStorage
 const localStorageMock = (() => {
@@ -46,7 +46,7 @@ describe('favorites', () => {
     localStorageMock.clear()
   })
 
-  const mockGame: AnalysisWebGame = {
+  const mockGame: MaiaGameEntry = {
     id: 'test-game-1',
     type: 'play',
     label: 'You vs. Maia 1600',
@@ -124,7 +124,7 @@ describe('favorites', () => {
     it('should limit favorites to 100 entries', async () => {
       // Add 101 favorites
       for (let i = 0; i < 101; i++) {
-        const game: AnalysisWebGame = {
+        const game: MaiaGameEntry = {
           id: `game-${i}`,
           type: 'play',
           label: `Game ${i}`,

src/api/analysis.ts

@@ -8,7 +8,7 @@ import {
   MaiaEvaluation,
   PositionEvaluation,
   StockfishEvaluation,
-  AnalysisTournamentGame,
+  WorldChampionshipGameEntry,
 } from 'src/types'
 import {
   readLichessStream,
@@ -17,15 +17,15 @@ import {
 } from 'src/lib'
 import { buildUrl } from './utils'
 import { Chess } from 'chess.ts'
-import { AvailableMoves } from 'src/types/training'
+import { AvailableMoves } from 'src/types/puzzle'
 
 import {
   saveCustomAnalysis,
   getCustomAnalysisById,
 } from 'src/lib/customAnalysis'
 
 export const fetchWorldChampionshipGameList = async (): Promise<
-  Map<string, AnalysisTournamentGame[]>
+  Map<string, WorldChampionshipGameEntry[]>
 > => {
   const res = await fetch(buildUrl('analysis/list'))
 

src/api/train.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { buildUrl } from './utils'
 import { MoveMap, GameTree } from 'src/types'
-import { AvailableMoves, TrainingGame } from 'src/types/training'
+import { AvailableMoves, PuzzleGame } from 'src/types/puzzle'
 
 export const fetchPuzzle = async () => {
   const res = await fetch(buildUrl('puzzle/new_puzzle'))
@@ -111,7 +111,7 @@ export const fetchPuzzle = async () => {
     termination,
     availableMoves,
     targetIndex: data['target_move_index'],
-  } as any as TrainingGame
+  } as any as PuzzleGame
 }
 
 export const logPuzzleGuesses = async (

src/components/Analysis/AnalysisGameList.tsx

@@ -20,7 +20,7 @@ import {
   updateFavoriteName,
   isFavoriteGame,
 } from 'src/lib/favorites'
-import { AnalysisWebGame } from 'src/types'
+import { MaiaGameEntry } from 'src/types'
 import { useRouter } from 'next/router'
 
 interface GameData {
@@ -81,7 +81,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
   const [loading, setLoading] = useState(false)
 
   const [gamesByPage, setGamesByPage] = useState<{
-    [gameType: string]: { [page: number]: AnalysisWebGame[] }
+    [gameType: string]: { [page: number]: MaiaGameEntry[] }
   }>({
     play: {},
     hand: {},
@@ -90,7 +90,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
     custom: {},
   })
 
-  const [favoriteGames, setFavoriteGames] = useState<AnalysisWebGame[]>([])
+  const [favoriteGames, setFavoriteGames] = useState<MaiaGameEntry[]>([])
   const [favoritedGameIds, setFavoritedGameIds] = useState<Set<string>>(
     new Set(),
   )
@@ -99,7 +99,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
   // Modal state for favoriting
   const [favoriteModal, setFavoriteModal] = useState<{
     isOpen: boolean
-    game: AnalysisWebGame | null
+    game: MaiaGameEntry | null
   }>({ isOpen: false, game: null })
 
   useEffect(() => {
@@ -226,7 +226,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
 
         fetchMaiaGameList(selected, currentPage)
           .then((data) => {
-            let parsedGames: AnalysisWebGame[] = []
+            let parsedGames: MaiaGameEntry[] = []
 
             if (selected === 'favorites') {
               // Handle favorites response format
@@ -463,7 +463,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
     setSelected(newTab)
   }
 
-  const handleFavoriteGame = (game: AnalysisWebGame) => {
+  const handleFavoriteGame = (game: MaiaGameEntry) => {
     setFavoriteModal({ isOpen: true, game })
   }
 
@@ -541,7 +541,7 @@ export const AnalysisGameList: React.FC<AnalysisGameListProps> = ({
     }
   }
 
-  const handleDirectUnfavorite = async (game: AnalysisWebGame) => {
+  const handleDirectUnfavorite = async (game: MaiaGameEntry) => {
     await removeFavoriteGame(game.id, game.type)
     const updatedFavorites = await getFavoritesAsWebGames()
     setFavoriteGames(updatedFavorites)

src/components/Analysis/Tournament.tsx

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react'
-import { AnalysisTournamentGame } from 'src/types'
+import { WorldChampionshipGameEntry } from 'src/types'
 import { useRouter } from 'next/router'
 type Props = {
   id: string
@@ -11,7 +11,7 @@ type Props = {
   setLoadingIndex: (index: number | null) => void
   openElement: React.RefObject<HTMLDivElement>
   selectedGameElement: React.RefObject<HTMLButtonElement>
-  analysisTournamentList: Map<string, AnalysisTournamentGame[]>
+  analysisTournamentList: Map<string, WorldChampionshipGameEntry[]>
   loadNewTournamentGame: (
     id: string[],
     setCurrentMove?: Dispatch<SetStateAction<number>>,

src/components/Profile/GameList.tsx

@@ -2,7 +2,7 @@ import { motion } from 'framer-motion'
 import React, { useState, useEffect, useContext } from 'react'
 
 import { AuthContext } from 'src/contexts'
-import { AnalysisWebGame } from 'src/types'
+import { MaiaGameEntry } from 'src/types'
 import { streamLichessGames, fetchMaiaGameList } from 'src/api'
 import { getCustomAnalysesAsWebGames } from 'src/lib/customAnalysis'
 import { FavoriteModal } from 'src/components/Common/FavoriteModal'
@@ -44,10 +44,10 @@ export const GameList = ({
     'play' | 'hb' | 'custom' | 'lichess' | 'favorites'
   >(showCustom ? 'favorites' : 'play')
   const [hbSubsection, setHbSubsection] = useState<'hand' | 'brain'>('hand')
-  const [games, setGames] = useState<AnalysisWebGame[]>([])
+  const [games, setGames] = useState<MaiaGameEntry[]>([])
 
   const [gamesByPage, setGamesByPage] = useState<{
-    [gameType: string]: { [page: number]: AnalysisWebGame[] }
+    [gameType: string]: { [page: number]: MaiaGameEntry[] }
   }>({
     play: {},
     hand: {},
@@ -61,7 +61,7 @@ export const GameList = ({
     }
     return []
   })
-  const [favoriteGames, setFavoriteGames] = useState<AnalysisWebGame[]>([])
+  const [favoriteGames, setFavoriteGames] = useState<MaiaGameEntry[]>([])
   const [favoritedGameIds, setFavoritedGameIds] = useState<Set<string>>(
     new Set(),
   )
@@ -72,7 +72,7 @@ export const GameList = ({
   // Modal state for favoriting
   const [favoriteModal, setFavoriteModal] = useState<{
     isOpen: boolean
-    game: AnalysisWebGame | null
+    game: MaiaGameEntry | null
   }>({ isOpen: false, game: null })
 
   const [fetchedCache, setFetchedCache] = useState<{
@@ -127,7 +127,7 @@ export const GameList = ({
       streamLichessGames(targetUser, (data) => {
         const result = data.pgn.match(/\[Result\s+"(.+?)"\]/)[1] || '?'
 
-        const game: AnalysisWebGame = {
+        const game: MaiaGameEntry = {
           id: data.id,
           label: `${data.players.white.user?.id || 'Unknown'} vs. ${data.players.black.user?.id || 'Unknown'}`,
           result: result,
@@ -155,7 +155,7 @@ export const GameList = ({
 
         fetchMaiaGameList(gameType, currentPage, lichessId)
           .then((data) => {
-            let parsedGames: AnalysisWebGame[] = []
+            let parsedGames: MaiaGameEntry[] = []
 
             if (gameType === 'favorites') {
               // Handle favorites response format
@@ -309,7 +309,7 @@ export const GameList = ({
     setSelected(newTab)
   }
 
-  const handleFavoriteGame = (game: AnalysisWebGame) => {
+  const handleFavoriteGame = (game: MaiaGameEntry) => {
     setFavoriteModal({ isOpen: true, game })
   }
 
@@ -377,7 +377,7 @@ export const GameList = ({
     }
   }
 
-  const handleDirectUnfavorite = async (game: AnalysisWebGame) => {
+  const handleDirectUnfavorite = async (game: MaiaGameEntry) => {
     await removeFavoriteGame(game.id, game.type)
     const updatedFavorites = await getFavoritesAsWebGames()
     setFavoriteGames(updatedFavorites)

src/components/Puzzles/Feedback.tsx

@@ -3,11 +3,11 @@ import { useMemo, Dispatch, SetStateAction } from 'react'
 
 import { Markdown } from 'src/components'
 import { useTrainingController } from 'src/hooks'
-import { TrainingGame, Status } from 'src/types/training'
+import { PuzzleGame, Status } from 'src/types/puzzle'
 
 interface Props {
   status: string
-  game: TrainingGame
+  game: PuzzleGame
   setAndGiveUp: () => void
   getNewGame: () => Promise<void>
   setStatus: Dispatch<SetStateAction<Status>>

src/components/Puzzles/PuzzleLog.tsx

@@ -1,9 +1,9 @@
 import { Dispatch, SetStateAction } from 'react'
 
-import { TrainingGame } from 'src/types/training'
+import { PuzzleGame } from 'src/types/puzzle'
 
 interface Props {
-  previousGameResults: (TrainingGame & {
+  previousGameResults: (PuzzleGame & {
     result?: boolean
     ratingDiff?: number
   })[]

src/contexts/AnalysisListContext.tsx

@@ -1,19 +1,19 @@
 import { useRouter } from 'next/router'
 import { AuthContext } from 'src/contexts'
 import React, { ReactNode, useContext, useEffect, useState } from 'react'
-import { AnalysisWebGame, AnalysisTournamentGame } from 'src/types'
+import { MaiaGameEntry, WorldChampionshipGameEntry } from 'src/types'
 import {
   fetchWorldChampionshipGameList,
   streamLichessGames,
   fetchMaiaGameList,
 } from 'src/api'
 
 interface IAnalysisListContext {
-  analysisTournamentList: Map<string, AnalysisTournamentGame[]> | null
-  analysisLichessList: AnalysisWebGame[]
-  analysisPlayList: AnalysisWebGame[]
-  analysisHandList: AnalysisWebGame[]
-  analysisBrainList: AnalysisWebGame[]
+  analysisTournamentList: Map<string, WorldChampionshipGameEntry[]> | null
+  analysisLichessList: MaiaGameEntry[]
+  analysisPlayList: MaiaGameEntry[]
+  analysisHandList: MaiaGameEntry[]
+  analysisBrainList: MaiaGameEntry[]
 }
 
 export const AnalysisListContext = React.createContext<IAnalysisListContext>({
@@ -34,18 +34,14 @@ export const AnalysisListContextProvider: React.FC<{ children: ReactNode }> = ({
 
   const [analysisTournamentList, setAnalysisTournamentList] = useState<Map<
     string,
-    AnalysisTournamentGame[]
+    WorldChampionshipGameEntry[]
   > | null>(null)
   const [analysisLichessList, setAnalysisLichessList] = useState<
-    AnalysisWebGame[]
+    MaiaGameEntry[]
   >([])
-  const [analysisPlayList, setAnalysisPlayList] = useState<AnalysisWebGame[]>(
-    [],
-  )
-  const [analysisHandList, setAnalysisHandList] = useState<AnalysisWebGame[]>(
-    [],
-  )
-  const [analysisBrainList, setAnalysisBrainList] = useState<AnalysisWebGame[]>(
+  const [analysisPlayList, setAnalysisPlayList] = useState<MaiaGameEntry[]>([])
+  const [analysisHandList, setAnalysisHandList] = useState<MaiaGameEntry[]>([])
+  const [analysisBrainList, setAnalysisBrainList] = useState<MaiaGameEntry[]>(
     [],
   )
 
@@ -71,7 +67,7 @@ export const AnalysisListContextProvider: React.FC<{ children: ReactNode }> = ({
       streamLichessGames(user?.lichessId, (data) => {
         const result = data.pgn.match(/\[Result\s+"(.+?)"\]/)[1] || '?'
 
-        const game: AnalysisWebGame = {
+        const game: MaiaGameEntry = {
           id: data.id,
           type: 'pgn',
           label: `${data.players.white.user?.id || 'Unknown'} vs. ${data.players.black.user?.id || 'Unknown'}`,

src/hooks/useTrainingController/useTrainingController.ts

@@ -1,10 +1,10 @@
 import { Chess } from 'chess.ts'
 import { GameTree } from 'src/types'
-import { TrainingGame } from 'src/types/training'
+import { PuzzleGame } from 'src/types/puzzle'
 import { useMemo, useCallback, useEffect } from 'react'
 import { useTreeController } from '../useTreeController'
 
-const buildTrainingGameTree = (game: TrainingGame): GameTree => {
+const buildTrainingGameTree = (game: PuzzleGame): GameTree => {
   if (!game.moves || game.moves.length === 0) {
     return new GameTree(new Chess().fen())
   }
@@ -28,7 +28,7 @@ const buildTrainingGameTree = (game: TrainingGame): GameTree => {
   return tree
 }
 
-export const useTrainingController = (game: TrainingGame) => {
+export const useTrainingController = (game: PuzzleGame) => {
   const gameTree = useMemo(() => buildTrainingGameTree(game), [game])
   const initialOrientation = useMemo(() => {
     const puzzleFen = game.moves[game.targetIndex].board