refactor: utils, i18n folders

misc/i18n/generateTranslations.ts

@@ -4,7 +4,7 @@ import { writeFile } from "fs"
 import { readFile } from "fs/promises"
 //@ts-ignore
 import yaml from "js-yaml"
-import { TsUtils } from '../../src/lib/TsUtils'
+import { TsUtils } from 'src/lib/utils/TsUtils'
 import { betaInformation } from "./betaInformation"
 import pathConfig from './AvatarBaseType.json'
 import AvatarConfig from './AvatarConfig.json'

src/index.tsx

@@ -1,8 +1,8 @@
 import { Typography } from 'antd'
 import WrappedApp from 'App'
-import 'lib/i18n'
+import 'lib/i18n/i18n'
 import { CharacterStats } from 'lib/characters/characterStats'
-import { Constants } from 'lib/constants'
+import { Constants } from 'lib/constants/constants'
 import { verifyWebgpuSupport } from 'lib/gpu/webgpuDevice'
 import 'overlayscrollbars/overlayscrollbars.css'
 import { CharacterConverter } from 'lib/importer/characterConverter'

src/lib/characterPreview/CharacterPreview.jsx

@@ -21,8 +21,8 @@ import {
   ElementToDamage,
   SETTINGS_TEAM,
   SIMULATION_SCORE,
-} from 'lib/constants'
-import { SavedSessionKeys } from 'lib/constantsSession'
+} from 'lib/constants/constants'
+import { SavedSessionKeys } from 'lib/constants/constantsSession'
 import {
   defaultGap,
   innerW,
@@ -33,8 +33,8 @@ import {
   middleColumnWidth,
   parentH,
   parentW,
-} from 'lib/constantsUi'
-import { OptimizerTabController } from 'lib/controllers/optimizerTabController'
+} from 'lib/constants/constantsUi'
+import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController'
 import { Message } from 'lib/interactions/message'
 import { calculateBuild } from 'lib/optimizer/calculateBuild'
 import CharacterModal from 'lib/overlays/modals/CharacterModal'
@@ -50,7 +50,7 @@ import { SaveState } from 'lib/state/saveState'
 import { RelicPreview } from 'lib/tabs/tabRelics/RelicPreview'
 import { HeaderText } from 'lib/ui/HeaderText'
 import { LoadingBlurredImage } from 'lib/ui/LoadingBlurredImage'
-import { Utils } from 'lib/utils'
+import { Utils } from 'lib/utils/utils'
 import PropTypes from 'prop-types'
 import React, { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'

src/lib/characterPreview/CharacterScoringSummary.tsx

@@ -4,18 +4,18 @@ import { CharacterStatSummary } from 'lib/characterPreview/CharacterStatSummary'
 import { damageStats } from 'lib/characterPreview/StatRow'
 import { StatTextSm } from 'lib/characterPreview/StatText'
 import { diminishingReturnsFormula, SimulationScore, SimulationStatUpgrade } from 'lib/characters/characterScorer'
-import { ElementToDamage, MainStats, Parts, Stats, StatsValues, SubStats } from 'lib/constants'
-import { defaultGap, iconSize } from 'lib/constantsUi'
-import { Simulation } from 'lib/controllers/statSimulationController'
+import { ElementToDamage, MainStats, Parts, Stats, StatsValues, SubStats } from 'lib/constants/constants'
+import { defaultGap, iconSize } from 'lib/constants/constantsUi'
+import { Simulation } from 'lib/simulations/statSimulationController'
 import { SortOption } from 'lib/optimizer/sortOptions'
 import { StatCalculator } from 'lib/relics/statCalculator'
 import { Assets } from 'lib/rendering/assets'
 import DB from 'lib/state/db'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink'
 import { VerticalDivider } from 'lib/ui/Dividers'
 import { HeaderText } from 'lib/ui/HeaderText'
-import { Utils } from 'lib/utils'
+import { Utils } from 'lib/utils/utils'
 import React, { ReactElement } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 

src/lib/characterPreview/CharacterStatSummary.tsx

@@ -1,6 +1,6 @@
 import { Flex } from 'antd'
 import StatRow from 'lib/characterPreview/StatRow'
-import { Constants, Stats } from 'lib/constants'
+import { Constants, Stats } from 'lib/constants/constants'
 
 const epsilon = 0.001
 

src/lib/characterPreview/StatRow.tsx

@@ -1,11 +1,11 @@
 import { Divider, Flex } from 'antd'
 
 import StatText from 'lib/characterPreview/StatText'
-import { Constants, StatsValues } from 'lib/constants'
-import { iconSize } from 'lib/constantsUi'
+import { Constants, StatsValues } from 'lib/constants/constants'
+import { iconSize } from 'lib/constants/constantsUi'
 
 import { Assets } from 'lib/rendering/assets'
-import { Utils } from 'lib/utils'
+import { Utils } from 'lib/utils/utils'
 import { useTranslation } from 'react-i18next'
 
 const checkSpeedInBreakpoint = (speedValue: number): boolean => {

src/lib/characters/characterScorer.ts

@@ -1,7 +1,7 @@
 import { CharacterConditionals } from 'lib/conditionals/characterConditionals'
 import { ComputedStatsObject } from 'lib/conditionals/conditionalConstants'
 import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals'
-import { CUSTOM_TEAM, Parts, Sets, Stats, SubStats } from 'lib/constants'
+import { CUSTOM_TEAM, Parts, Sets, Stats, SubStats } from 'lib/constants/constants'
 import {
   calculateOrnamentSets,
   calculateRelicSets,
@@ -10,16 +10,16 @@ import {
   Simulation,
   SimulationRequest,
   SimulationStats,
-} from 'lib/controllers/statSimulationController'
+} from 'lib/simulations/statSimulationController'
 import { generateContext } from 'lib/optimizer/context/calculateContext'
 import { getDefaultForm } from 'lib/optimizer/defaultForm'
 import { emptyRelic } from 'lib/optimizer/optimizerUtils'
 import { SortOptionProperties } from 'lib/optimizer/sortOptions'
 import { StatCalculator } from 'lib/relics/statCalculator'
 import DB from 'lib/state/db'
 import { StatSimTypes } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay'
-import { TsUtils } from 'lib/TsUtils'
-import { Utils } from 'lib/utils'
+import { TsUtils } from 'lib/utils/TsUtils'
+import { Utils } from 'lib/utils/utils'
 import { Character } from 'types/Character'
 import { Conditional } from 'types/Conditionals'
 import { Form } from 'types/Form'

src/lib/characters/characterStats.ts

@@ -1,4 +1,4 @@
-import { Stats } from 'lib/constants'
+import { Stats } from 'lib/constants/constants'
 
 export const CharacterStats = {
   getZeroes: function () {

src/lib/conditionals/character/Acheron.ts

@@ -2,7 +2,7 @@ import { BASIC_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalCo
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityResPen, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'
 import { NumberToNumberMap } from 'types/Common'

src/lib/conditionals/character/Argenti.ts

@@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Arlan.ts

@@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Asta.ts

@@ -1,6 +1,6 @@
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Aventurine.ts

@@ -8,11 +8,11 @@ import {
   standardDefFinalizer,
   standardDefShieldFinalizer,
 } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'
 import { OptimizerAction, OptimizerContext } from 'types/Optimizer'

src/lib/conditionals/character/Bailu.ts

@@ -9,7 +9,7 @@ import {
   standardHpHealFinalizer,
 } from 'lib/conditionals/conditionalUtils'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/BlackSwan.ts

@@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalize
 import { BlackSwanConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals'
 import { buffAbilityDefPen, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Blade.ts

@@ -3,7 +3,7 @@ import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition
 import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Boothill.ts

@@ -1,9 +1,9 @@
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Bronya.ts

@@ -1,11 +1,11 @@
 import { ASHBLAZING_ATK_STACK, BASIC_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
 import { buffAbilityCr } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Clara.ts

@@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalCons
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/DanHeng.ts

@@ -2,7 +2,7 @@ import { BASIC_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/DrRatio.ts

@@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalCons
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Feixiao.ts

@@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/condi
 import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityCd } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Firefly.ts

@@ -4,7 +4,7 @@ import { FireflyConversionConditional } from 'lib/gpu/conditionals/dynamicCondit
 import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
 import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/FuXuan.ts

@@ -8,11 +8,11 @@ import {
   standardHpFinalizer,
   standardHpHealFinalizer,
 } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Fugue.ts

@@ -1,7 +1,7 @@
 import i18next from 'i18next'
 import { BREAK_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
-import { CURRENT_DATA_VERSION } from 'lib/constants'
+import { CURRENT_DATA_VERSION } from 'lib/constants/constants'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
 

src/lib/conditionals/character/Gallagher.ts

@@ -11,7 +11,7 @@ import {
 import { GallagherConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals'
 import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'
 import { OptimizerAction, OptimizerContext } from 'types/Optimizer'

src/lib/conditionals/character/Gepard.ts

@@ -7,10 +7,10 @@ import {
   standardAtkFinalizer,
   standardDefShieldFinalizer,
 } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'
 import { OptimizerAction, OptimizerContext } from 'types/Optimizer'

src/lib/conditionals/character/Guinaifen.ts

@@ -1,6 +1,6 @@
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Hanya.ts

@@ -1,9 +1,9 @@
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
-import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants'
+import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
 import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
 import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
 import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Herta.ts

@@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/condit
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'

src/lib/conditionals/character/Himeko.ts

@@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, SKILL_TYPE } from 'lib/conditionals/conditionalCo
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'
 import { NumberToNumberMap } from 'types/Common'

src/lib/conditionals/character/Hook.ts

@@ -2,7 +2,7 @@ import { SKILL_TYPE } from 'lib/conditionals/conditionalConstants'
 import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils'
 import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
 import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
-import { TsUtils } from 'lib/TsUtils'
+import { TsUtils } from 'lib/utils/TsUtils'
 
 import { Eidolon } from 'types/Character'
 import { CharacterConditional } from 'types/CharacterConditional'