chore: clean up types directory

kevinjosethomas · kevinjosethomas · commit 4313b93c5865 · 2025-08-09T22:01:36.000-04:00
diff --git a/__tests__/analysis/makeMove-fen.test.ts b/__tests__/analysis/makeMove-fen.test.ts
@@ -1,4 +1,4 @@
-import { GameTree, GameNode } from 'src/types/base/tree'
+import { GameTree, GameNode } from 'src/types/tree'
 import { Chess, PieceSymbol } from 'chess.ts'
 
 describe('Analysis Page makeMove Logic for FEN Positions', () => {
diff --git a/__tests__/analysis/makeMove-variation-fix.test.ts b/__tests__/analysis/makeMove-variation-fix.test.ts
@@ -1,4 +1,4 @@
-import { GameTree, GameNode } from 'src/types/base/tree'
+import { GameTree, GameNode } from 'src/types/tree'
 import { Chess, PieceSymbol } from 'chess.ts'
 
 describe('makeMove Logic - Variation Continuation Test', () => {
diff --git a/__tests__/types/tree-fen-moves.test.ts b/__tests__/types/tree-fen-moves.test.ts
@@ -1,4 +1,4 @@
-import { GameTree, GameNode } from 'src/types/base/tree'
+import { GameTree, GameNode } from 'src/types/tree'
 import { Chess, Move } from 'chess.ts'
 
 describe('GameTree FEN Position Move Handling', () => {
diff --git a/__tests__/types/tree.test.ts b/__tests__/types/tree.test.ts
@@ -1,4 +1,4 @@
-import { GameNode } from 'src/types/base/tree'
+import { GameNode } from 'src/types/tree'
 import { StockfishEvaluation, MaiaEvaluation } from 'src/types'
 
 describe('GameNode Move Classification', () => {
diff --git a/src/components/Openings/DrillPerformanceModal.tsx b/src/components/Openings/DrillPerformanceModal.tsx
@@ -34,7 +34,7 @@ import {
 import { MOVE_CLASSIFICATION_THRESHOLDS } from 'src/constants/analysis'
 import { useTreeController } from 'src/hooks'
 import { generateColorSanMapping } from 'src/hooks/useAnalysisController/utils'
-import { GameNode, GameTree } from 'src/types/base/tree'
+import { GameNode, GameTree } from 'src/types/tree'
 
 interface Props {
   performanceData: DrillPerformanceData
diff --git a/src/components/Openings/OpeningDrillAnalysis.tsx b/src/components/Openings/OpeningDrillAnalysis.tsx
@@ -7,7 +7,7 @@ import {
   AnalysisSidebar,
 } from '../Analysis'
 import { GameNode } from 'src/types'
-import { GameTree } from 'src/types/base/tree'
+import { GameTree } from 'src/types/tree'
 import type { DrawShape } from 'chessground/draw'
 import { useAnalysisController } from 'src/hooks/useAnalysisController'
 import { WindowSizeContext } from 'src/contexts'
diff --git a/src/lib/analysis/mistakeDetection.ts b/src/lib/analysis/mistakeDetection.ts
@@ -1,5 +1,5 @@
 import { Chess } from 'chess.ts'
-import { GameNode, GameTree } from 'src/types/base/tree'
+import { GameNode, GameTree } from 'src/types/tree'
 import { MistakePosition } from 'src/types/analysis'
 
 /**
diff --git a/src/lib/openings/drillAnalysis.ts b/src/lib/openings/drillAnalysis.ts
@@ -1,6 +1,6 @@
 import { Chess } from 'chess.ts'
 import { StockfishEvaluation, MaiaEvaluation } from 'src/types'
-import { GameNode } from 'src/types/base/tree'
+import { GameNode } from 'src/types/tree'
 import {
   MoveAnalysis,
   RatingComparison,
diff --git a/src/pages/analysis/stream/[gameId].tsx b/src/pages/analysis/stream/[gameId].tsx
@@ -12,7 +12,7 @@ import { useAnalysisController } from 'src/hooks'
 import { TreeControllerContext } from 'src/contexts'
 import { StreamAnalysis } from 'src/components/Analysis/StreamAnalysis'
 import { AnalyzedGame } from 'src/types'
-import { GameTree } from 'src/types/base/tree'
+import { GameTree } from 'src/types/tree'
 
 const StreamAnalysisPage: NextPage = () => {
   const router = useRouter()
diff --git a/src/pages/openings/index.tsx b/src/pages/openings/index.tsx
@@ -14,7 +14,7 @@ import {
   MaiaEngineContext,
 } from 'src/contexts'
 import { DrillConfiguration, AnalyzedGame } from 'src/types'
-import { GameNode } from 'src/types/base/tree'
+import { GameNode } from 'src/types/tree'
 import { MIN_STOCKFISH_DEPTH } from 'src/constants/analysis'
 import openings from 'src/lib/openings/openings.json'
 import { OpeningDrillAnalysis } from 'src/components/Openings/OpeningDrillAnalysis'
diff --git a/src/types/analysis.ts b/src/types/analysis.ts
@@ -1,6 +1,6 @@
 import Maia from 'src/lib/engine/maia'
-import { AvailableMoves } from '../training'
-import { Game, GameNode, GameTree } from '../base'
+import { AvailableMoves } from './training'
+import { Game, GameNode, GameTree } from './common'
 
 export interface BaseTreeControllerContext {
   gameTree: GameTree
diff --git a/src/types/auth.ts b/src/types/auth.ts
diff --git a/src/types/blog.ts b/src/types/blog.ts
diff --git a/src/types/common.ts b/src/types/common.ts
@@ -1,6 +1,6 @@
-import { Player } from '..'
+import { Player } from '.'
 import { GameTree } from './tree'
-import { Termination } from '../analysis'
+import { Termination } from './analysis'
 
 export * from './tree'
 
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -2,7 +2,7 @@ export * from './play'
 export * from './player'
 export * from './analysis'
 export * from './openings'
-export * from './base'
+export * from './common'
 export * from './auth'
 export * from './turing'
 export * from './modal'
diff --git a/src/types/modal.ts b/src/types/modal.ts
diff --git a/src/types/modal/index.ts b/src/types/modal/index.ts
diff --git a/src/types/openings.ts b/src/types/openings.ts
@@ -1,4 +1,4 @@
-import { GameTree, GameNode } from '../base'
+import { GameTree, GameNode } from './common'
 
 export interface Opening {
   id: string
diff --git a/src/types/play.ts b/src/types/play.ts
@@ -1,5 +1,5 @@
-import { Termination } from '../analysis'
-import { BaseGame, Color, GameTree } from '../base'
+import { Termination } from './analysis'
+import { BaseGame, Color } from './common'
 
 export const TimeControlOptions = ['3+0', '5+2', '10+0', '15+10', 'unlimited']
 export const TimeControlOptionNames = [
diff --git a/src/types/play/index.ts b/src/types/play/index.ts
diff --git a/src/types/player.ts b/src/types/player.ts
diff --git a/src/types/stream.ts b/src/types/stream.ts
diff --git a/src/types/training.ts b/src/types/training.ts
@@ -1,4 +1,4 @@
-import { Game, Move, MoveMap, GameTree } from '..'
+import { Game, Move, MoveMap, GameTree } from '.'
 
 export interface AvailableMoves {
   [fromTo: string]: Move
diff --git a/src/types/tree.ts b/src/types/tree.ts
@@ -1,5 +1,5 @@
 import { Chess, Color } from 'chess.ts'
-import { StockfishEvaluation, MaiaEvaluation } from '..'
+import { StockfishEvaluation, MaiaEvaluation } from '.'
 import { MOVE_CLASSIFICATION_THRESHOLDS } from 'src/constants/analysis'
 import { calculateMoveColor } from 'src/hooks/useAnalysisController/utils'
 
diff --git a/src/types/turing.ts b/src/types/turing.ts
@@ -1,5 +1,5 @@
-import { Termination, Color, Player, GameTree } from '..'
-import { BaseGame } from '../base'
+import { BaseGame } from './common'
+import { Termination, Color, Player } from '.'
 
 export interface TuringGame extends BaseGame {
   termination: Termination

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GameTree, GameNode } from 'src/types/base/tree'`
	`1`	`+import { GameTree, GameNode } from 'src/types/tree'`
`2`	`2`	`import { Chess, PieceSymbol } from 'chess.ts'`
`3`	`3`
`4`	`4`	`describe('Analysis Page makeMove Logic for FEN Positions', () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GameNode } from 'src/types/base/tree'`
	`1`	`+import { GameNode } from 'src/types/tree'`
`2`	`2`	`import { StockfishEvaluation, MaiaEvaluation } from 'src/types'`
`3`	`3`
`4`	`4`	`describe('GameNode Move Classification', () => {`