better imports

src/faces/types.ts

@@ -1,6 +1,6 @@
 import { RollConfig } from '~src/types'
 import { NotationValidationResult } from '~notation'
-import { RollArgument } from '~src/tower/types'
+import { RollArgument } from '~tower'
 import { CustomFacesD } from './customFacesD'
 
 export interface CustomFacesRollConfig extends Omit<RollConfig, 'modifiers'> {

src/faces/utils/argumentToCustomFacesRollConfig.ts

@@ -1,5 +1,4 @@
-import { RollArgument } from '~src/tower/types'
-import { argumentToRollConfig } from '~src/tower/utils/argumentToRollConfig'
+import { RollArgument } from '~tower'
 import { CustomFacesD } from '../customFacesD'
 import {
   isCustomFacesDiceNotation,
@@ -8,6 +7,7 @@ import {
 import { CustomFacesRollArgument, CustomFacesRollConfig } from '../types'
 import { customFacesNotationToCustomFacesRollConfig } from './customFacesNotationToCustomFacesRollConfig'
 import { facesFromSides } from './facesFromSides'
+import { argumentToRollConfig } from '~src/utils/argumentToRollConfig'
 
 function baseArgumentToCustomFacesRollConfig(
   arg: RollArgument

src/faces/utils/customFacesNotationToCustomFacesRollConfig.ts

@@ -1,9 +1,9 @@
 import { isDiceNotation } from '~notation'
 import { DiceNotation } from '~src/types'
-import { argumentToRollConfig } from '~src/tower/utils/argumentToRollConfig'
 import { customCoreNotationPattern } from '../patterns'
 import { CustomFacesDiceNotation, CustomFacesRollConfig } from '../types'
 import { facesFromSides } from './facesFromSides'
+import { argumentToRollConfig } from '~src/utils/argumentToRollConfig'
 
 export function customFacesNotationToCustomFacesRollConfig(
   notationString: CustomFacesDiceNotation | DiceNotation

src/tower/__tests__/utils/applyModifiers.test.ts

@@ -1,11 +1,8 @@
 import { describe, expect, spyOn, test } from 'bun:test'
 import { Modifiers } from '~src/types'
 import { D } from '~dice'
-import { RollParameters } from '~src/tower/types'
-import {
-  applyModifiers,
-  InvalidUniqueError
-} from '~src/tower/utils/applyModifiers'
+import { RollParameters } from '~tower'
+import { applyModifiers, InvalidUniqueError } from '../../utils/applyModifiers'
 
 const mockDie = new D(6)
 

src/tower/__tests__/utils/argumentToRollParameters.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'bun:test'
 import { D } from '~dice'
 import { DiceNotation } from '~src/types'
-import { argumentToRollParameters } from '~src/tower/utils/argumentToRollParameters'
+import { argumentToRollParameters } from '../../utils/argumentToRollParameters'
 
 describe('argumentToRollParameters', () => {
   describe('given a number', () => {

src/tower/utils/applyModifiers/index.ts

@@ -1,4 +1,4 @@
-import { RollParameters } from '~src/tower/types'
+import { RollParameters } from '~tower'
 import { RollBonuses } from './types'
 import {
   applyReroll,

src/tower/utils/argumentToRollParameters.ts

@@ -1,7 +1,7 @@
 import { D } from '~dice'
 import { isD } from '../guards'
 import { RollArgument, RollParameters } from '../types'
-import { argumentToRollConfig } from './argumentToRollConfig'
+import { argumentToRollConfig } from '../../utils/argumentToRollConfig'
 import { configToDescription } from '~src/utils/configToDescription'
 import { configToNotation } from '~src/utils/configToNotation'
 

src/tower/utils/argumentToRollConfig.ts → src/utils/argumentToRollConfig.ts

@@ -1,6 +1,6 @@
 import { RollConfig } from '~src/types'
-import { isRollConfigArgument, isD } from '../guards'
-import { RollArgument } from '../types'
+import { isRollConfigArgument, isD } from '../tower/guards'
+import { RollArgument } from '../tower/types'
 import { isDiceNotation } from '~notation'
 import { notationToRollConfig } from '~src/utils/notationToRollConfig'