Fix builds

build.ts

@@ -1,13 +1,7 @@
 import dts from 'bun-plugin-dts'
 
 const results = await Bun.build({
-  entrypoints: [
-    './src/core/index.ts',
-    './src/dice/index.ts',
-    './src/faces/index.ts',
-    './src/notation/index.ts',
-    './src/tower/index.ts'
-  ],
+  entrypoints: ['./src/index.ts'],
   outdir: './dist',
   splitting: true,
   sourcemap: 'inline',

src/dice/D.ts

@@ -1,5 +1,5 @@
-import { coreRandom } from '~src/core/utils/coreRandom'
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
+import { coreRandom } from '~src/utils/coreRandom'
 
 export class D {
   constructor(public sides: number) {

src/faces/rollCustomFaces.ts

@@ -6,7 +6,7 @@ import type {
   CustomFacesDicePools
 } from './types'
 import { argumentToCustomFacesRollParameters } from './utils/argumentToCustomFacesRollParameters'
-import { rollDicePools } from '~src/core/utils/rollDicePools'
+import { rollDicePools } from '~src/utils/rollDicePools'
 
 export function rollCustomFaces(
   ...args: CustomFacesRollArgument[]

src/faces/types.ts

@@ -1,4 +1,4 @@
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 import { NotationValidationResult } from '~src/notation/types'
 import { RollArgument } from '~src/tower/types'
 import type { CustomFacesD } from './customFacesD'

src/faces/utils/customFacesConfigToDescription.ts

@@ -1,5 +1,5 @@
-import { formatCoreDescriptions } from '~src/core/utils/configToDescription'
-import type { CustomFacesRollConfig } from '../types'
+import { formatCoreDescriptions } from '~src/utils/configToDescription'
+import { CustomFacesRollConfig } from '../types'
 
 export function customFacesConfigToDescriptions({
   quantity,

src/index.ts

@@ -0,0 +1,5 @@
+export * from './types'
+export * from './dice'
+export * from './notation'
+export * from './tower'
+export * from './faces'

src/notation/types.ts

@@ -1,4 +1,4 @@
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 
 export interface NotationValidationResult<V = boolean> {
   valid: V

src/notation/utils/configToNotation/index.ts

@@ -3,7 +3,7 @@ import {
   formatModifierNotation
 } from './notationFormatters'
 import type { DiceNotation } from '../../types'
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 
 export function configToNotation(options: RollConfig): DiceNotation {
   return `${formatCoreNotation(options)}${formatModifierNotation(options)}`

src/notation/utils/configToNotation/notationFormatters.ts

@@ -5,7 +5,7 @@ import {
   RerollOptions,
   UniqueOptions,
   RollConfig
-} from '~src/core/types'
+} from '~src/types'
 import { DiceNotation } from '~src/notation/types'
 
 function capNotation(cap: GreaterLessOptions) {

src/notation/utils/notationToRollConfig/index.ts

@@ -1,6 +1,6 @@
 import { parseCoreNotation, parseModifiers } from './optionsParsers'
 import { coreNotationPattern } from '../../patterns'
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 import { DiceNotation } from '~src/notation/types'
 
 export function notationToRollConfig(notationString: DiceNotation): RollConfig {

src/notation/utils/notationToRollConfig/optionsParsers.ts

@@ -4,7 +4,7 @@ import {
   Modifiers,
   RequiredCoreDiceParameters,
   RerollOptions
-} from '~src/core/types'
+} from '~src/types'
 import {
   dropHighestPattern,
   dropLowestPattern,

src/notation/validateNotation.ts

@@ -2,7 +2,7 @@ import { isDiceNotation } from './guards'
 import { NotationValidationResult } from './types'
 import { notationToRollConfig } from './utils/notationToRollConfig'
 import { configToNotation } from './utils/configToNotation'
-import { configToDescription } from '~src/core/utils/configToDescription'
+import { configToDescription } from '~src/utils/configToDescription'
 
 function validateNotation(arg: string): NotationValidationResult {
   if (!isDiceNotation(arg)) {

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

@@ -1,5 +1,5 @@
 import { describe, expect, spyOn, test } from 'bun:test'
-import { Modifiers } from '~src/core/types'
+import { Modifiers } from '~src/types'
 import { D } from '~src/dice/D'
 import { RollParameters } from '~src/tower/types'
 import {

src/tower/roll.ts

@@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid'
 import type { DicePools, RollArgument, RollResult } from './types'
 import { applyModifiers, calculateTotal } from './utils/applyModifiers'
 import { argumentToRollParameters } from './utils/argumentToRollParameters'
-import { rollDicePools } from '~src/core/utils/rollDicePools'
+import { rollDicePools } from '~src/utils/rollDicePools'
 
 export function roll(...args: RollArgument[]): RollResult {
   const dicePools = args.reduce(

src/tower/types.ts

@@ -1,4 +1,4 @@
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 import { D } from '~src/dice/D'
 import { DiceNotation } from '~src/notation/types'
 

src/tower/utils/applyModifiers/modifierApplicators.ts

@@ -5,7 +5,7 @@ import {
   ReplaceOptions,
   RequiredCoreDiceParameters,
   RerollOptions
-} from '~src/core/types'
+} from '~src/types'
 
 export class InvalidUniqueError extends Error {
   constructor() {

src/tower/utils/argumentToRollConfig.ts

@@ -1,4 +1,4 @@
-import { RollConfig } from '~src/core/types'
+import { RollConfig } from '~src/types'
 import { isRollConfigArgument, isD } from '../guards'
 import type { RollArgument } from '../types'
 import { isDiceNotation } from '~src/notation/guards'

src/tower/utils/argumentToRollParameters.ts

@@ -3,7 +3,7 @@ import { isD } from '../guards'
 import type { RollArgument, RollParameters } from '../types'
 import { argumentToRollConfig } from './argumentToRollConfig'
 import { configToNotation } from '~src/notation/utils/configToNotation'
-import { configToDescription } from '~src/core/utils/configToDescription'
+import { configToDescription } from '~src/utils/configToDescription'
 
 export function argumentToRollParameters(
   argument: RollArgument

src/core/utils/__tests__/configToDescription.test.ts → src/utils/__tests__/configToDescription.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test'
-import { configToDescription } from '~src/core/utils/configToDescription'
+import { configToDescription } from '../configToDescription'
 
 describe('configToDescription', () => {
   test('returns an array strings matching the constraints', () => {

src/core/utils/__tests__/coreRandom.test.ts → src/utils/__tests__/coreRandom.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test'
-import { coreRandom } from '~src/core/utils/coreRandom'
+import { coreRandom } from '../coreRandom'
 
 describe('coreRandom', () => {
   test('it returns an object between 1 and the provided number', () => {

src/core/utils/__tests__/rollDicePools.test.ts → src/utils/__tests__/rollDicePools.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test'
-import { rollDicePools } from '~src/core/utils/rollDicePools'
-import { DicePoolLike } from '~src/core/types'
+import { DicePoolLike } from '~src/types'
+import { rollDicePools } from '../rollDicePools'
 
 describe('rollDicePools', () => {
   test('rolls the provided dice a number of times equal to the quantity', () => {

src/utils/rollDicePools.ts

@@ -1,4 +1,4 @@
-import { DicePoolLike, DicePoolRollReturn } from '~src/core/types'
+import { DicePoolLike, DicePoolRollReturn } from '~src/types'
 
 export function rollDicePools<R>(
   dicePools: DicePoolLike<R>