diff --git a/.github/workflows/ci-template.yml b/.github/workflows/ci-template.yml index 808c3ae..9ae94e1 100644 --- a/.github/workflows/ci-template.yml +++ b/.github/workflows/ci-template.yml @@ -12,12 +12,8 @@ jobs: test: defaults: run: - working-directory: '@randsum/${{ inputs.package }}' - - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] + working-directory: 'packages/@randsum/${{ inputs.package }}' + runs-on: [ubuntu-latest] steps: - name: Checkout repo @@ -28,7 +24,7 @@ jobs: with: filters: | changesInPackage: - - '@randsum/${{ inputs.package }}/**' + - 'packages/@randsum/${{ inputs.package }}/**' - name: Use Bun if: steps.changes.outputs.changesInPackage == 'true' @@ -39,27 +35,27 @@ jobs: # Run the build script to build sibling packages - name: core if: steps.changes.outputs.changesInPackage == 'true' - working-directory: '@randsum/core' + working-directory: 'packages/@randsum/core' run: bun install && bun run build - name: notation if: steps.changes.outputs.changesInPackage == 'true' - working-directory: '@randsum/notation' + working-directory: 'packages/@randsum/notation' run: bun install && bun run build - name: dice if: steps.changes.outputs.changesInPackage == 'true' - working-directory: '@randsum/dice' + working-directory: 'packages/@randsum/dice' run: bun install && bun run build - name: tower if: steps.changes.outputs.changesInPackage == 'true' - working-directory: '@randsum/tower' + working-directory: 'packages/@randsum/tower' run: bun install && bun run build - name: customdice if: steps.changes.outputs.changesInPackage == 'true' - working-directory: '@randsum/customdice' + working-directory: 'packages/@randsum/customdice' run: bun install && bun run build - name: Type Check diff --git a/@randsum/core/Randsum .code-workspace b/@randsum/core/Randsum .code-workspace deleted file mode 100644 index 7f0c016..0000000 --- a/@randsum/core/Randsum .code-workspace +++ /dev/null @@ -1,20 +0,0 @@ -{ - "folders": [ - { - "path": "." - }, - { - "path": "../customdice" - }, - { - "path": "../dice" - }, - { - "path": "../notation" - }, - { - "path": "../tower" - } - ], - "settings": {} -} diff --git a/@randsum/tower/tsconfig.json b/@randsum/tower/tsconfig.json deleted file mode 100644 index 0213bb4..0000000 --- a/@randsum/tower/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig", - "include": ["./src", "__tests__"], - "exclude": [], - "compilerOptions": { - "composite": true, - "outDir": "./dist" - } -} diff --git a/bun.lockb b/bun.lockb index c33ce31..17a9b68 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index f4d4260..c6e3495 100644 --- a/package.json +++ b/package.json @@ -4,19 +4,20 @@ "author": "Alex Jarvis", "icon": "https://raw.githubusercontent.com/RANDSUM/randsum/main/icon.webp", "workspaces": [ - "@randsum/*" + "packages/*", + "packages/@randsum/*" ], "repository": { "type": "git", "url": "https://github.com/RANDSUM/randsum.git" }, "scripts": { - "refresh:core": "cd @randsum/core && bun install && bun run build", - "refresh:dice": "cd @randsum/dice && bun install && bun update && bun run build", - "refresh:notation": "cd @randsum/notation && bun install && bun update && bun run build", - "refresh:tower" : "cd @randsum/tower && bun install && bun update && bun run build", - "refresh:customdice": "cd @randsum/customdice && bun install && bun update && bun run build", - "refresh:games": "cd @randsum/games && bun install && bun update && bun run build", + "refresh:core": "cd packages/@randsum/core && bun install && bun run build", + "refresh:dice": "cd packages/@randsum/dice && bun install && bun update && bun run build", + "refresh:notation": "cd packages/@randsum/notation && bun install && bun update && bun run build", + "refresh:tower" : "cd packages/@randsum/tower && bun install && bun update && bun run build", + "refresh:customdice": "cd packages/@randsum/customdice && bun install && bun update && bun run build", + "refresh:games": "cd packages/@randsum/games && bun install && bun update && bun run build", "refresh:all": "bun refresh:core && bun refresh:dice && bun refresh:notation && bun refresh:tower && bun refresh:customdice && bun refresh:games" }, "type": "module" diff --git a/@randsum/core/.prettierignore b/packages/@randsum/core/.prettierignore similarity index 100% rename from @randsum/core/.prettierignore rename to packages/@randsum/core/.prettierignore diff --git a/@randsum/core/.prettierrc b/packages/@randsum/core/.prettierrc similarity index 100% rename from @randsum/core/.prettierrc rename to packages/@randsum/core/.prettierrc diff --git a/@randsum/core/CODE_OF_CONDUCT.md b/packages/@randsum/core/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/core/CODE_OF_CONDUCT.md rename to packages/@randsum/core/CODE_OF_CONDUCT.md diff --git a/@randsum/core/CONTRIBUTING.md b/packages/@randsum/core/CONTRIBUTING.md similarity index 100% rename from @randsum/core/CONTRIBUTING.md rename to packages/@randsum/core/CONTRIBUTING.md diff --git a/@randsum/core/LICENSE b/packages/@randsum/core/LICENSE similarity index 100% rename from @randsum/core/LICENSE rename to packages/@randsum/core/LICENSE diff --git a/@randsum/core/__tests__/configToDescription.test.ts b/packages/@randsum/core/__tests__/configToDescription.test.ts similarity index 94% rename from @randsum/core/__tests__/configToDescription.test.ts rename to packages/@randsum/core/__tests__/configToDescription.test.ts index 31706d7..9f6e346 100644 --- a/@randsum/core/__tests__/configToDescription.test.ts +++ b/packages/@randsum/core/__tests__/configToDescription.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'bun:test' -import { configToDescription } from '../src/utils/configToDescription' +import { configToDescription } from '../src' describe('configToDescription', () => { test('returns an array strings matching the constraints', () => { diff --git a/@randsum/core/__tests__/coreRandom.test.ts b/packages/@randsum/core/__tests__/coreRandom.test.ts similarity index 86% rename from @randsum/core/__tests__/coreRandom.test.ts rename to packages/@randsum/core/__tests__/coreRandom.test.ts index 379fb13..cd50b50 100644 --- a/@randsum/core/__tests__/coreRandom.test.ts +++ b/packages/@randsum/core/__tests__/coreRandom.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'bun:test' -import { coreRandom } from '../src/utils/coreRandom' +import { coreRandom } from '../src' describe('coreRandom', () => { test('it returns an object between 1 and the provided number', () => { diff --git a/@randsum/core/__tests__/formDicePools.test.ts b/packages/@randsum/core/__tests__/formDicePools.test.ts similarity index 88% rename from @randsum/core/__tests__/formDicePools.test.ts rename to packages/@randsum/core/__tests__/formDicePools.test.ts index ee73b7b..e82113a 100644 --- a/@randsum/core/__tests__/formDicePools.test.ts +++ b/packages/@randsum/core/__tests__/formDicePools.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'bun:test' -import { formDicePools } from '../src/utils/formDicePools' +import { formDicePools } from '../src' describe('formDicePools', () => { test('returns an object with each argument transformed into a standalone key', () => { diff --git a/@randsum/core/__tests__/rollDicePools.test.ts b/packages/@randsum/core/__tests__/rollDicePools.test.ts similarity index 89% rename from @randsum/core/__tests__/rollDicePools.test.ts rename to packages/@randsum/core/__tests__/rollDicePools.test.ts index 21a81ca..421eb50 100644 --- a/@randsum/core/__tests__/rollDicePools.test.ts +++ b/packages/@randsum/core/__tests__/rollDicePools.test.ts @@ -1,6 +1,5 @@ import { describe, expect, test } from 'bun:test' -import { type DicePoolLike } from '../src/types' -import { rollDicePools } from '../src/utils/rollDicePools' +import { rollDicePools, type DicePoolLike } from '../src' describe('rollDicePools', () => { test('rolls the provided dice a number of times equal to the quantity', () => { diff --git a/@randsum/core/build.ts b/packages/@randsum/core/build.ts similarity index 100% rename from @randsum/core/build.ts rename to packages/@randsum/core/build.ts diff --git a/packages/@randsum/core/bun.lockb b/packages/@randsum/core/bun.lockb new file mode 100755 index 0000000..e404149 Binary files /dev/null and b/packages/@randsum/core/bun.lockb differ diff --git a/@randsum/core/bunfig.toml b/packages/@randsum/core/bunfig.toml similarity index 100% rename from @randsum/core/bunfig.toml rename to packages/@randsum/core/bunfig.toml diff --git a/@randsum/core/eslint.config.js b/packages/@randsum/core/eslint.config.js similarity index 100% rename from @randsum/core/eslint.config.js rename to packages/@randsum/core/eslint.config.js diff --git a/@randsum/core/icon.webp b/packages/@randsum/core/icon.webp similarity index 100% rename from @randsum/core/icon.webp rename to packages/@randsum/core/icon.webp diff --git a/@randsum/core/package.json b/packages/@randsum/core/package.json similarity index 96% rename from @randsum/core/package.json rename to packages/@randsum/core/package.json index 87cbbc7..8a70fd1 100644 --- a/@randsum/core/package.json +++ b/packages/@randsum/core/package.json @@ -25,7 +25,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/core/src/index.ts b/packages/@randsum/core/src/index.ts similarity index 100% rename from @randsum/core/src/index.ts rename to packages/@randsum/core/src/index.ts diff --git a/@randsum/core/src/types.ts b/packages/@randsum/core/src/types.ts similarity index 100% rename from @randsum/core/src/types.ts rename to packages/@randsum/core/src/types.ts diff --git a/@randsum/core/src/utils/configToDescription/index.ts b/packages/@randsum/core/src/utils/configToDescription/index.ts similarity index 100% rename from @randsum/core/src/utils/configToDescription/index.ts rename to packages/@randsum/core/src/utils/configToDescription/index.ts diff --git a/@randsum/core/src/utils/configToDescription/stringFormatters.ts b/packages/@randsum/core/src/utils/configToDescription/stringFormatters.ts similarity index 99% rename from @randsum/core/src/utils/configToDescription/stringFormatters.ts rename to packages/@randsum/core/src/utils/configToDescription/stringFormatters.ts index 2f28a88..d0de036 100644 --- a/@randsum/core/src/utils/configToDescription/stringFormatters.ts +++ b/packages/@randsum/core/src/utils/configToDescription/stringFormatters.ts @@ -5,7 +5,7 @@ import type { RerollOptions, UniqueOptions, RollConfig -} from '@randsum/core/src/types' +} from '../../../src/types' function formatHumanList(list: (string | number)[]) { return list diff --git a/@randsum/core/src/utils/coreRandom.ts b/packages/@randsum/core/src/utils/coreRandom.ts similarity index 100% rename from @randsum/core/src/utils/coreRandom.ts rename to packages/@randsum/core/src/utils/coreRandom.ts diff --git a/@randsum/core/src/utils/formDicePools.ts b/packages/@randsum/core/src/utils/formDicePools.ts similarity index 100% rename from @randsum/core/src/utils/formDicePools.ts rename to packages/@randsum/core/src/utils/formDicePools.ts diff --git a/@randsum/core/src/utils/rollDicePools.ts b/packages/@randsum/core/src/utils/rollDicePools.ts similarity index 100% rename from @randsum/core/src/utils/rollDicePools.ts rename to packages/@randsum/core/src/utils/rollDicePools.ts diff --git a/@randsum/core/tsconfig.json b/packages/@randsum/core/tsconfig.json similarity index 67% rename from @randsum/core/tsconfig.json rename to packages/@randsum/core/tsconfig.json index 15f2124..8c05561 100644 --- a/@randsum/core/tsconfig.json +++ b/packages/@randsum/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../../tsconfig", "include": [ "./src", "__tests__", @@ -7,6 +7,6 @@ "exclude": [], "compilerOptions": { "composite": true, - "outDir": "q" + "outDir": "./dist" } } diff --git a/@randsum/customdice/.prettierignore b/packages/@randsum/customdice/.prettierignore similarity index 100% rename from @randsum/customdice/.prettierignore rename to packages/@randsum/customdice/.prettierignore diff --git a/@randsum/customdice/.prettierrc b/packages/@randsum/customdice/.prettierrc similarity index 100% rename from @randsum/customdice/.prettierrc rename to packages/@randsum/customdice/.prettierrc diff --git a/@randsum/customdice/CODE_OF_CONDUCT.md b/packages/@randsum/customdice/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/customdice/CODE_OF_CONDUCT.md rename to packages/@randsum/customdice/CODE_OF_CONDUCT.md diff --git a/@randsum/customdice/CONTRIBUTING.md b/packages/@randsum/customdice/CONTRIBUTING.md similarity index 100% rename from @randsum/customdice/CONTRIBUTING.md rename to packages/@randsum/customdice/CONTRIBUTING.md diff --git a/@randsum/customdice/LICENSE b/packages/@randsum/customdice/LICENSE similarity index 100% rename from @randsum/customdice/LICENSE rename to packages/@randsum/customdice/LICENSE diff --git a/@randsum/customdice/__tests__/customNotificationToCustomRollConfig.test.ts b/packages/@randsum/customdice/__tests__/customNotificationToCustomRollConfig.test.ts similarity index 100% rename from @randsum/customdice/__tests__/customNotificationToCustomRollConfig.test.ts rename to packages/@randsum/customdice/__tests__/customNotificationToCustomRollConfig.test.ts diff --git a/@randsum/customdice/__tests__/roll.test.ts b/packages/@randsum/customdice/__tests__/roll.test.ts similarity index 100% rename from @randsum/customdice/__tests__/roll.test.ts rename to packages/@randsum/customdice/__tests__/roll.test.ts diff --git a/@randsum/customdice/__tests__/validate.test.ts b/packages/@randsum/customdice/__tests__/validate.test.ts similarity index 100% rename from @randsum/customdice/__tests__/validate.test.ts rename to packages/@randsum/customdice/__tests__/validate.test.ts diff --git a/@randsum/customdice/build.ts b/packages/@randsum/customdice/build.ts similarity index 100% rename from @randsum/customdice/build.ts rename to packages/@randsum/customdice/build.ts diff --git a/@randsum/customdice/bunfig.toml b/packages/@randsum/customdice/bunfig.toml similarity index 100% rename from @randsum/customdice/bunfig.toml rename to packages/@randsum/customdice/bunfig.toml diff --git a/@randsum/customdice/eslint.config.js b/packages/@randsum/customdice/eslint.config.js similarity index 100% rename from @randsum/customdice/eslint.config.js rename to packages/@randsum/customdice/eslint.config.js diff --git a/@randsum/customdice/icon.webp b/packages/@randsum/customdice/icon.webp similarity index 100% rename from @randsum/customdice/icon.webp rename to packages/@randsum/customdice/icon.webp diff --git a/@randsum/customdice/package.json b/packages/@randsum/customdice/package.json similarity index 97% rename from @randsum/customdice/package.json rename to packages/@randsum/customdice/package.json index 9197bde..872ee14 100644 --- a/@randsum/customdice/package.json +++ b/packages/@randsum/customdice/package.json @@ -30,7 +30,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/customdice/src/customD.ts b/packages/@randsum/customdice/src/customD.ts similarity index 100% rename from @randsum/customdice/src/customD.ts rename to packages/@randsum/customdice/src/customD.ts diff --git a/packages/@randsum/customdice/src/customDice.ts b/packages/@randsum/customdice/src/customDice.ts new file mode 100644 index 0000000..3c8a13c --- /dev/null +++ b/packages/@randsum/customdice/src/customDice.ts @@ -0,0 +1,3 @@ +import { CustomD } from './customD' + +export const Fudge = new CustomD(['-', '-', '+', '+', ' ', ' ']) diff --git a/@randsum/customdice/src/guards.ts b/packages/@randsum/customdice/src/guards.ts similarity index 100% rename from @randsum/customdice/src/guards.ts rename to packages/@randsum/customdice/src/guards.ts diff --git a/@randsum/customdice/src/index.ts b/packages/@randsum/customdice/src/index.ts similarity index 85% rename from @randsum/customdice/src/index.ts rename to packages/@randsum/customdice/src/index.ts index fee2d91..3b8e338 100644 --- a/@randsum/customdice/src/index.ts +++ b/packages/@randsum/customdice/src/index.ts @@ -3,5 +3,6 @@ export * from './guards' export * from './patterns' export * from './customD' +export * from './customDice' export { roll } from './roll' export { validate } from './validate' diff --git a/@randsum/customdice/src/patterns.ts b/packages/@randsum/customdice/src/patterns.ts similarity index 100% rename from @randsum/customdice/src/patterns.ts rename to packages/@randsum/customdice/src/patterns.ts diff --git a/@randsum/customdice/src/roll.ts b/packages/@randsum/customdice/src/roll.ts similarity index 100% rename from @randsum/customdice/src/roll.ts rename to packages/@randsum/customdice/src/roll.ts diff --git a/@randsum/customdice/src/types.ts b/packages/@randsum/customdice/src/types.ts similarity index 100% rename from @randsum/customdice/src/types.ts rename to packages/@randsum/customdice/src/types.ts diff --git a/@randsum/customdice/src/utils/argumentToCustomRollConfig.ts b/packages/@randsum/customdice/src/utils/argumentToCustomRollConfig.ts similarity index 100% rename from @randsum/customdice/src/utils/argumentToCustomRollConfig.ts rename to packages/@randsum/customdice/src/utils/argumentToCustomRollConfig.ts diff --git a/@randsum/customdice/src/utils/argumentToCustomRollParameters.ts b/packages/@randsum/customdice/src/utils/argumentToCustomRollParameters.ts similarity index 100% rename from @randsum/customdice/src/utils/argumentToCustomRollParameters.ts rename to packages/@randsum/customdice/src/utils/argumentToCustomRollParameters.ts diff --git a/@randsum/customdice/src/utils/customConfigToCustomNotation.ts b/packages/@randsum/customdice/src/utils/customConfigToCustomNotation.ts similarity index 100% rename from @randsum/customdice/src/utils/customConfigToCustomNotation.ts rename to packages/@randsum/customdice/src/utils/customConfigToCustomNotation.ts diff --git a/@randsum/customdice/src/utils/customConfigToDescription.ts b/packages/@randsum/customdice/src/utils/customConfigToDescription.ts similarity index 100% rename from @randsum/customdice/src/utils/customConfigToDescription.ts rename to packages/@randsum/customdice/src/utils/customConfigToDescription.ts diff --git a/@randsum/customdice/src/utils/customNotationToCustomRollConfig.ts b/packages/@randsum/customdice/src/utils/customNotationToCustomRollConfig.ts similarity index 100% rename from @randsum/customdice/src/utils/customNotationToCustomRollConfig.ts rename to packages/@randsum/customdice/src/utils/customNotationToCustomRollConfig.ts diff --git a/@randsum/customdice/src/utils/facesFromSides.ts b/packages/@randsum/customdice/src/utils/facesFromSides.ts similarity index 100% rename from @randsum/customdice/src/utils/facesFromSides.ts rename to packages/@randsum/customdice/src/utils/facesFromSides.ts diff --git a/@randsum/customdice/src/utils/resultToFaces.ts b/packages/@randsum/customdice/src/utils/resultToFaces.ts similarity index 100% rename from @randsum/customdice/src/utils/resultToFaces.ts rename to packages/@randsum/customdice/src/utils/resultToFaces.ts diff --git a/@randsum/customdice/src/validate.ts b/packages/@randsum/customdice/src/validate.ts similarity index 100% rename from @randsum/customdice/src/validate.ts rename to packages/@randsum/customdice/src/validate.ts diff --git a/@randsum/customdice/tsconfig.json b/packages/@randsum/customdice/tsconfig.json similarity index 53% rename from @randsum/customdice/tsconfig.json rename to packages/@randsum/customdice/tsconfig.json index af85c6d..4c73a29 100644 --- a/@randsum/customdice/tsconfig.json +++ b/packages/@randsum/customdice/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../tsconfig", - "include": ["src", "__tests__"], + "extends": "../../../tsconfig", + "include": [ + "src", + "__tests__" + ], "exclude": [], "compilerOptions": { "composite": true, diff --git a/@randsum/dice/.prettierignore b/packages/@randsum/dice/.prettierignore similarity index 100% rename from @randsum/dice/.prettierignore rename to packages/@randsum/dice/.prettierignore diff --git a/@randsum/dice/.prettierrc b/packages/@randsum/dice/.prettierrc similarity index 100% rename from @randsum/dice/.prettierrc rename to packages/@randsum/dice/.prettierrc diff --git a/@randsum/dice/CODE_OF_CONDUCT.md b/packages/@randsum/dice/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/dice/CODE_OF_CONDUCT.md rename to packages/@randsum/dice/CODE_OF_CONDUCT.md diff --git a/@randsum/dice/CONTRIBUTING.md b/packages/@randsum/dice/CONTRIBUTING.md similarity index 100% rename from @randsum/dice/CONTRIBUTING.md rename to packages/@randsum/dice/CONTRIBUTING.md diff --git a/@randsum/dice/LICENSE b/packages/@randsum/dice/LICENSE similarity index 100% rename from @randsum/dice/LICENSE rename to packages/@randsum/dice/LICENSE diff --git a/@randsum/dice/__tests__/D.test.ts b/packages/@randsum/dice/__tests__/D.test.ts similarity index 100% rename from @randsum/dice/__tests__/D.test.ts rename to packages/@randsum/dice/__tests__/D.test.ts diff --git a/@randsum/dice/__tests__/dice.test.ts b/packages/@randsum/dice/__tests__/dice.test.ts similarity index 100% rename from @randsum/dice/__tests__/dice.test.ts rename to packages/@randsum/dice/__tests__/dice.test.ts diff --git a/@randsum/dice/build.ts b/packages/@randsum/dice/build.ts similarity index 100% rename from @randsum/dice/build.ts rename to packages/@randsum/dice/build.ts diff --git a/@randsum/dice/bun.lockb b/packages/@randsum/dice/bun.lockb similarity index 100% rename from @randsum/dice/bun.lockb rename to packages/@randsum/dice/bun.lockb diff --git a/@randsum/dice/bunfig.toml b/packages/@randsum/dice/bunfig.toml similarity index 100% rename from @randsum/dice/bunfig.toml rename to packages/@randsum/dice/bunfig.toml diff --git a/@randsum/dice/eslint.config.js b/packages/@randsum/dice/eslint.config.js similarity index 100% rename from @randsum/dice/eslint.config.js rename to packages/@randsum/dice/eslint.config.js diff --git a/@randsum/dice/icon.webp b/packages/@randsum/dice/icon.webp similarity index 100% rename from @randsum/dice/icon.webp rename to packages/@randsum/dice/icon.webp diff --git a/@randsum/dice/package.json b/packages/@randsum/dice/package.json similarity index 97% rename from @randsum/dice/package.json rename to packages/@randsum/dice/package.json index daa0ddc..2a85691 100644 --- a/@randsum/dice/package.json +++ b/packages/@randsum/dice/package.json @@ -28,7 +28,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/dice/src/D.ts b/packages/@randsum/dice/src/D.ts similarity index 100% rename from @randsum/dice/src/D.ts rename to packages/@randsum/dice/src/D.ts diff --git a/@randsum/dice/src/dice.ts b/packages/@randsum/dice/src/dice.ts similarity index 100% rename from @randsum/dice/src/dice.ts rename to packages/@randsum/dice/src/dice.ts diff --git a/@randsum/dice/src/index.ts b/packages/@randsum/dice/src/index.ts similarity index 100% rename from @randsum/dice/src/index.ts rename to packages/@randsum/dice/src/index.ts diff --git a/@randsum/games/tsconfig.json b/packages/@randsum/dice/tsconfig.json similarity index 53% rename from @randsum/games/tsconfig.json rename to packages/@randsum/dice/tsconfig.json index 0213bb4..851e2b7 100644 --- a/@randsum/games/tsconfig.json +++ b/packages/@randsum/dice/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../tsconfig", - "include": ["./src", "__tests__"], + "extends": "../../../tsconfig", + "include": [ + "./src", + "__tests__" + ], "exclude": [], "compilerOptions": { "composite": true, diff --git a/@randsum/games/.prettierignore b/packages/@randsum/games/.prettierignore similarity index 100% rename from @randsum/games/.prettierignore rename to packages/@randsum/games/.prettierignore diff --git a/@randsum/games/.prettierrc b/packages/@randsum/games/.prettierrc similarity index 100% rename from @randsum/games/.prettierrc rename to packages/@randsum/games/.prettierrc diff --git a/@randsum/games/CODE_OF_CONDUCT.md b/packages/@randsum/games/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/games/CODE_OF_CONDUCT.md rename to packages/@randsum/games/CODE_OF_CONDUCT.md diff --git a/@randsum/games/CONTRIBUTING.md b/packages/@randsum/games/CONTRIBUTING.md similarity index 100% rename from @randsum/games/CONTRIBUTING.md rename to packages/@randsum/games/CONTRIBUTING.md diff --git a/@randsum/games/LICENSE b/packages/@randsum/games/LICENSE similarity index 100% rename from @randsum/games/LICENSE rename to packages/@randsum/games/LICENSE diff --git a/@randsum/games/build.ts b/packages/@randsum/games/build.ts similarity index 100% rename from @randsum/games/build.ts rename to packages/@randsum/games/build.ts diff --git a/@randsum/games/bun.lockb b/packages/@randsum/games/bun.lockb similarity index 100% rename from @randsum/games/bun.lockb rename to packages/@randsum/games/bun.lockb diff --git a/@randsum/games/bunfig.toml b/packages/@randsum/games/bunfig.toml similarity index 100% rename from @randsum/games/bunfig.toml rename to packages/@randsum/games/bunfig.toml diff --git a/@randsum/games/eslint.config.js b/packages/@randsum/games/eslint.config.js similarity index 100% rename from @randsum/games/eslint.config.js rename to packages/@randsum/games/eslint.config.js diff --git a/@randsum/games/icon.webp b/packages/@randsum/games/icon.webp similarity index 100% rename from @randsum/games/icon.webp rename to packages/@randsum/games/icon.webp diff --git a/@randsum/games/package.json b/packages/@randsum/games/package.json similarity index 97% rename from @randsum/games/package.json rename to packages/@randsum/games/package.json index 953da81..4a73641 100644 --- a/@randsum/games/package.json +++ b/packages/@randsum/games/package.json @@ -29,7 +29,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/games/src/Blades/index.ts b/packages/@randsum/games/src/Blades/index.ts similarity index 100% rename from @randsum/games/src/Blades/index.ts rename to packages/@randsum/games/src/Blades/index.ts diff --git a/@randsum/games/src/Blades/types.ts b/packages/@randsum/games/src/Blades/types.ts similarity index 100% rename from @randsum/games/src/Blades/types.ts rename to packages/@randsum/games/src/Blades/types.ts diff --git a/@randsum/games/src/DnD5E/index.ts b/packages/@randsum/games/src/FifthEd/index.ts similarity index 95% rename from @randsum/games/src/DnD5E/index.ts rename to packages/@randsum/games/src/FifthEd/index.ts index 61644b9..cf569f8 100644 --- a/@randsum/games/src/DnD5E/index.ts +++ b/packages/@randsum/games/src/FifthEd/index.ts @@ -20,4 +20,4 @@ function roll( return [rollResult.result, rollResult] } -export const DnD5E = { roll } +export const FifthEd = { roll } diff --git a/@randsum/games/src/DnD5E/types.ts b/packages/@randsum/games/src/FifthEd/types.ts similarity index 100% rename from @randsum/games/src/DnD5E/types.ts rename to packages/@randsum/games/src/FifthEd/types.ts diff --git a/@randsum/games/src/Root/index.ts b/packages/@randsum/games/src/Root/index.ts similarity index 100% rename from @randsum/games/src/Root/index.ts rename to packages/@randsum/games/src/Root/index.ts diff --git a/@randsum/games/src/Root/types.ts b/packages/@randsum/games/src/Root/types.ts similarity index 100% rename from @randsum/games/src/Root/types.ts rename to packages/@randsum/games/src/Root/types.ts diff --git a/@randsum/games/src/SalvageUnion/index.ts b/packages/@randsum/games/src/SalvageUnion/index.ts similarity index 100% rename from @randsum/games/src/SalvageUnion/index.ts rename to packages/@randsum/games/src/SalvageUnion/index.ts diff --git a/@randsum/games/src/SalvageUnion/tables.ts b/packages/@randsum/games/src/SalvageUnion/tables.ts similarity index 100% rename from @randsum/games/src/SalvageUnion/tables.ts rename to packages/@randsum/games/src/SalvageUnion/tables.ts diff --git a/@randsum/games/src/SalvageUnion/types.ts b/packages/@randsum/games/src/SalvageUnion/types.ts similarity index 100% rename from @randsum/games/src/SalvageUnion/types.ts rename to packages/@randsum/games/src/SalvageUnion/types.ts diff --git a/@randsum/games/src/index.ts b/packages/@randsum/games/src/index.ts similarity index 52% rename from @randsum/games/src/index.ts rename to packages/@randsum/games/src/index.ts index ed4365d..05a10b6 100644 --- a/@randsum/games/src/index.ts +++ b/packages/@randsum/games/src/index.ts @@ -1,12 +1,8 @@ -// export { default as SalvageUnion } from './SalvageUnion' -// export { default as DnD5E } from './DnD5E' -// export { default as Blades } from './Blades' - export { Blades } from './Blades' export * as BladesTypes from './Blades/types' -export { DnD5E } from './DnD5E' -export * as DnD5ETypes from './DnD5E/types' +export { FifthEd } from './FifthEd' +export * as FifthEdTypes from './FifthEd/types' export { SalvageUnion } from './SalvageUnion' export * as SalvageUnionTypes from './SalvageUnion/types' diff --git a/@randsum/notation/tsconfig.json b/packages/@randsum/games/tsconfig.json similarity index 53% rename from @randsum/notation/tsconfig.json rename to packages/@randsum/games/tsconfig.json index 0213bb4..851e2b7 100644 --- a/@randsum/notation/tsconfig.json +++ b/packages/@randsum/games/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../tsconfig", - "include": ["./src", "__tests__"], + "extends": "../../../tsconfig", + "include": [ + "./src", + "__tests__" + ], "exclude": [], "compilerOptions": { "composite": true, diff --git a/@randsum/notation/.prettierignore b/packages/@randsum/notation/.prettierignore similarity index 100% rename from @randsum/notation/.prettierignore rename to packages/@randsum/notation/.prettierignore diff --git a/@randsum/notation/.prettierrc b/packages/@randsum/notation/.prettierrc similarity index 100% rename from @randsum/notation/.prettierrc rename to packages/@randsum/notation/.prettierrc diff --git a/@randsum/notation/CODE_OF_CONDUCT.md b/packages/@randsum/notation/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/notation/CODE_OF_CONDUCT.md rename to packages/@randsum/notation/CODE_OF_CONDUCT.md diff --git a/@randsum/notation/CONTRIBUTING.md b/packages/@randsum/notation/CONTRIBUTING.md similarity index 100% rename from @randsum/notation/CONTRIBUTING.md rename to packages/@randsum/notation/CONTRIBUTING.md diff --git a/@randsum/notation/LICENSE b/packages/@randsum/notation/LICENSE similarity index 100% rename from @randsum/notation/LICENSE rename to packages/@randsum/notation/LICENSE diff --git a/@randsum/notation/RANDSUM_DICE_NOTATION.md b/packages/@randsum/notation/RANDSUM_DICE_NOTATION.md similarity index 100% rename from @randsum/notation/RANDSUM_DICE_NOTATION.md rename to packages/@randsum/notation/RANDSUM_DICE_NOTATION.md diff --git a/@randsum/notation/__tests__/configToNotation.test.ts b/packages/@randsum/notation/__tests__/configToNotation.test.ts similarity index 100% rename from @randsum/notation/__tests__/configToNotation.test.ts rename to packages/@randsum/notation/__tests__/configToNotation.test.ts diff --git a/@randsum/notation/__tests__/guards.test.ts b/packages/@randsum/notation/__tests__/guards.test.ts similarity index 100% rename from @randsum/notation/__tests__/guards.test.ts rename to packages/@randsum/notation/__tests__/guards.test.ts diff --git a/@randsum/notation/__tests__/notationToRollConfig.test.ts b/packages/@randsum/notation/__tests__/notationToRollConfig.test.ts similarity index 100% rename from @randsum/notation/__tests__/notationToRollConfig.test.ts rename to packages/@randsum/notation/__tests__/notationToRollConfig.test.ts diff --git a/@randsum/notation/__tests__/validate.test.ts b/packages/@randsum/notation/__tests__/validate.test.ts similarity index 100% rename from @randsum/notation/__tests__/validate.test.ts rename to packages/@randsum/notation/__tests__/validate.test.ts diff --git a/@randsum/notation/build.ts b/packages/@randsum/notation/build.ts similarity index 100% rename from @randsum/notation/build.ts rename to packages/@randsum/notation/build.ts diff --git a/@randsum/notation/bun.lockb b/packages/@randsum/notation/bun.lockb similarity index 100% rename from @randsum/notation/bun.lockb rename to packages/@randsum/notation/bun.lockb diff --git a/@randsum/notation/bunfig.toml b/packages/@randsum/notation/bunfig.toml similarity index 100% rename from @randsum/notation/bunfig.toml rename to packages/@randsum/notation/bunfig.toml diff --git a/@randsum/notation/eslint.config.js b/packages/@randsum/notation/eslint.config.js similarity index 100% rename from @randsum/notation/eslint.config.js rename to packages/@randsum/notation/eslint.config.js diff --git a/@randsum/notation/icon.webp b/packages/@randsum/notation/icon.webp similarity index 100% rename from @randsum/notation/icon.webp rename to packages/@randsum/notation/icon.webp diff --git a/@randsum/notation/package.json b/packages/@randsum/notation/package.json similarity index 97% rename from @randsum/notation/package.json rename to packages/@randsum/notation/package.json index 3462814..3b87ba2 100644 --- a/@randsum/notation/package.json +++ b/packages/@randsum/notation/package.json @@ -28,7 +28,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/notation/src/guards.ts b/packages/@randsum/notation/src/guards.ts similarity index 100% rename from @randsum/notation/src/guards.ts rename to packages/@randsum/notation/src/guards.ts diff --git a/@randsum/notation/src/index.ts b/packages/@randsum/notation/src/index.ts similarity index 100% rename from @randsum/notation/src/index.ts rename to packages/@randsum/notation/src/index.ts diff --git a/@randsum/notation/src/patterns.ts b/packages/@randsum/notation/src/patterns.ts similarity index 100% rename from @randsum/notation/src/patterns.ts rename to packages/@randsum/notation/src/patterns.ts diff --git a/@randsum/notation/src/types.ts b/packages/@randsum/notation/src/types.ts similarity index 100% rename from @randsum/notation/src/types.ts rename to packages/@randsum/notation/src/types.ts diff --git a/@randsum/notation/src/utils/configToNotation/configToNotation.ts b/packages/@randsum/notation/src/utils/configToNotation/configToNotation.ts similarity index 100% rename from @randsum/notation/src/utils/configToNotation/configToNotation.ts rename to packages/@randsum/notation/src/utils/configToNotation/configToNotation.ts diff --git a/@randsum/notation/src/utils/configToNotation/notationFormatters.ts b/packages/@randsum/notation/src/utils/configToNotation/notationFormatters.ts similarity index 100% rename from @randsum/notation/src/utils/configToNotation/notationFormatters.ts rename to packages/@randsum/notation/src/utils/configToNotation/notationFormatters.ts diff --git a/@randsum/notation/src/utils/notationToRollConfig/index.ts b/packages/@randsum/notation/src/utils/notationToRollConfig/index.ts similarity index 100% rename from @randsum/notation/src/utils/notationToRollConfig/index.ts rename to packages/@randsum/notation/src/utils/notationToRollConfig/index.ts diff --git a/@randsum/notation/src/utils/notationToRollConfig/optionsParsers.ts b/packages/@randsum/notation/src/utils/notationToRollConfig/optionsParsers.ts similarity index 100% rename from @randsum/notation/src/utils/notationToRollConfig/optionsParsers.ts rename to packages/@randsum/notation/src/utils/notationToRollConfig/optionsParsers.ts diff --git a/@randsum/notation/src/validate.ts b/packages/@randsum/notation/src/validate.ts similarity index 100% rename from @randsum/notation/src/validate.ts rename to packages/@randsum/notation/src/validate.ts diff --git a/@randsum/dice/tsconfig.json b/packages/@randsum/notation/tsconfig.json similarity index 53% rename from @randsum/dice/tsconfig.json rename to packages/@randsum/notation/tsconfig.json index 0213bb4..851e2b7 100644 --- a/@randsum/dice/tsconfig.json +++ b/packages/@randsum/notation/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../tsconfig", - "include": ["./src", "__tests__"], + "extends": "../../../tsconfig", + "include": [ + "./src", + "__tests__" + ], "exclude": [], "compilerOptions": { "composite": true, diff --git a/@randsum/tower/.prettierignore b/packages/@randsum/tower/.prettierignore similarity index 100% rename from @randsum/tower/.prettierignore rename to packages/@randsum/tower/.prettierignore diff --git a/@randsum/tower/.prettierrc b/packages/@randsum/tower/.prettierrc similarity index 100% rename from @randsum/tower/.prettierrc rename to packages/@randsum/tower/.prettierrc diff --git a/@randsum/tower/CODE_OF_CONDUCT.md b/packages/@randsum/tower/CODE_OF_CONDUCT.md similarity index 100% rename from @randsum/tower/CODE_OF_CONDUCT.md rename to packages/@randsum/tower/CODE_OF_CONDUCT.md diff --git a/@randsum/tower/CONTRIBUTING.md b/packages/@randsum/tower/CONTRIBUTING.md similarity index 100% rename from @randsum/tower/CONTRIBUTING.md rename to packages/@randsum/tower/CONTRIBUTING.md diff --git a/@randsum/tower/LICENSE b/packages/@randsum/tower/LICENSE similarity index 100% rename from @randsum/tower/LICENSE rename to packages/@randsum/tower/LICENSE diff --git a/@randsum/tower/__tests__/applyModifiers.test.ts b/packages/@randsum/tower/__tests__/applyModifiers.test.ts similarity index 100% rename from @randsum/tower/__tests__/applyModifiers.test.ts rename to packages/@randsum/tower/__tests__/applyModifiers.test.ts diff --git a/@randsum/tower/__tests__/argumentToRollParameters.test.ts b/packages/@randsum/tower/__tests__/argumentToRollParameters.test.ts similarity index 100% rename from @randsum/tower/__tests__/argumentToRollParameters.test.ts rename to packages/@randsum/tower/__tests__/argumentToRollParameters.test.ts diff --git a/@randsum/tower/__tests__/roll.test.ts b/packages/@randsum/tower/__tests__/roll.test.ts similarity index 100% rename from @randsum/tower/__tests__/roll.test.ts rename to packages/@randsum/tower/__tests__/roll.test.ts diff --git a/@randsum/tower/build.ts b/packages/@randsum/tower/build.ts similarity index 100% rename from @randsum/tower/build.ts rename to packages/@randsum/tower/build.ts diff --git a/@randsum/tower/bun.lockb b/packages/@randsum/tower/bun.lockb similarity index 100% rename from @randsum/tower/bun.lockb rename to packages/@randsum/tower/bun.lockb diff --git a/@randsum/tower/bunfig.toml b/packages/@randsum/tower/bunfig.toml similarity index 100% rename from @randsum/tower/bunfig.toml rename to packages/@randsum/tower/bunfig.toml diff --git a/@randsum/tower/eslint.config.js b/packages/@randsum/tower/eslint.config.js similarity index 100% rename from @randsum/tower/eslint.config.js rename to packages/@randsum/tower/eslint.config.js diff --git a/@randsum/tower/icon.webp b/packages/@randsum/tower/icon.webp similarity index 100% rename from @randsum/tower/icon.webp rename to packages/@randsum/tower/icon.webp diff --git a/@randsum/tower/package.json b/packages/@randsum/tower/package.json similarity index 97% rename from @randsum/tower/package.json rename to packages/@randsum/tower/package.json index 4cd1852..3aa94fd 100644 --- a/@randsum/tower/package.json +++ b/packages/@randsum/tower/package.json @@ -30,7 +30,7 @@ "bun-plugin-dts": "^0.3.0", "bun-types": "latest", "eslint": "^9.15.0", - "prettier": "^3.4.0", + "prettier": "^3.4.1", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0" }, diff --git a/@randsum/tower/src/guards.ts b/packages/@randsum/tower/src/guards.ts similarity index 100% rename from @randsum/tower/src/guards.ts rename to packages/@randsum/tower/src/guards.ts diff --git a/@randsum/tower/src/index.ts b/packages/@randsum/tower/src/index.ts similarity index 100% rename from @randsum/tower/src/index.ts rename to packages/@randsum/tower/src/index.ts diff --git a/@randsum/tower/src/roll.ts b/packages/@randsum/tower/src/roll.ts similarity index 100% rename from @randsum/tower/src/roll.ts rename to packages/@randsum/tower/src/roll.ts diff --git a/@randsum/tower/src/types.ts b/packages/@randsum/tower/src/types.ts similarity index 100% rename from @randsum/tower/src/types.ts rename to packages/@randsum/tower/src/types.ts diff --git a/@randsum/tower/src/utils/applyModifiers/index.ts b/packages/@randsum/tower/src/utils/applyModifiers/index.ts similarity index 100% rename from @randsum/tower/src/utils/applyModifiers/index.ts rename to packages/@randsum/tower/src/utils/applyModifiers/index.ts diff --git a/@randsum/tower/src/utils/applyModifiers/modifierApplicators.ts b/packages/@randsum/tower/src/utils/applyModifiers/modifierApplicators.ts similarity index 100% rename from @randsum/tower/src/utils/applyModifiers/modifierApplicators.ts rename to packages/@randsum/tower/src/utils/applyModifiers/modifierApplicators.ts diff --git a/@randsum/tower/src/utils/applyModifiers/types.ts b/packages/@randsum/tower/src/utils/applyModifiers/types.ts similarity index 100% rename from @randsum/tower/src/utils/applyModifiers/types.ts rename to packages/@randsum/tower/src/utils/applyModifiers/types.ts diff --git a/@randsum/tower/src/utils/argumentToRollConfig.ts b/packages/@randsum/tower/src/utils/argumentToRollConfig.ts similarity index 100% rename from @randsum/tower/src/utils/argumentToRollConfig.ts rename to packages/@randsum/tower/src/utils/argumentToRollConfig.ts diff --git a/@randsum/tower/src/utils/argumentToRollParameters.ts b/packages/@randsum/tower/src/utils/argumentToRollParameters.ts similarity index 100% rename from @randsum/tower/src/utils/argumentToRollParameters.ts rename to packages/@randsum/tower/src/utils/argumentToRollParameters.ts diff --git a/packages/@randsum/tower/tsconfig.json b/packages/@randsum/tower/tsconfig.json new file mode 100644 index 0000000..851e2b7 --- /dev/null +++ b/packages/@randsum/tower/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig", + "include": [ + "./src", + "__tests__" + ], + "exclude": [], + "compilerOptions": { + "composite": true, + "outDir": "./dist" + } +} diff --git a/tsconfig.json b/tsconfig.json index c20216b..e4455fd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,16 +26,19 @@ "files": [], "references": [ { - "path": "./@randsum/notation" + "path": "./packages/@randsum/core" }, { - "path": "./@randsum/dice" + "path": "./packages/@randsum/notation" }, { - "path": "./@randsum/core" + "path": "./packages/@randsum/dice" }, { - "path": "./@randsum/tower" + "path": "./packages/@randsum/tower" + }, + { + "path": "./packages/@randsum/games" } ] }