From c981fe56641652164af417d07886cd6fe3ac3907 Mon Sep 17 00:00:00 2001 From: Ean Milligan Date: Thu, 1 May 2025 18:09:18 -0400 Subject: [PATCH] [untested] - apply import order to artigen --- src/artigen/artigen.README.md | 1 + src/artigen/managers/queueManager.ts | 7 +++++-- src/artigen/managers/workerManager.ts | 21 +++++++++++++-------- src/artigen/parser.ts | 7 ++++--- src/artigen/rollFormatter.ts | 6 +++--- src/artigen/rollWorker.ts | 2 ++ src/artigen/roller.ts | 6 ++++-- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/artigen/artigen.README.md b/src/artigen/artigen.README.md index 927c81b..943bbb7 100644 --- a/src/artigen/artigen.README.md +++ b/src/artigen/artigen.README.md @@ -1,2 +1,3 @@ # artigen - The Artificer's Dice and Math Engine + artigen is the core engine powering The Artificer. diff --git a/src/artigen/managers/queueManager.ts b/src/artigen/managers/queueManager.ts index b0fa815..19483ba 100644 --- a/src/artigen/managers/queueManager.ts +++ b/src/artigen/managers/queueManager.ts @@ -1,9 +1,12 @@ -import config from '/config.ts'; import { log, LogTypes as LT } from '@Log4Deno'; + +import config from '/config.ts'; + +import { currentWorkers, handleRollWorker } from 'artigen/managers/workerManager.ts'; + import { infoColor2, rollingEmbed } from 'src/commandUtils.ts'; import { QueuedRoll } from 'src/mod.d.ts'; import utils from 'src/utils.ts'; -import { currentWorkers, handleRollWorker } from 'artigen/managers/workerManager.ts'; const rollQueue: Array = []; diff --git a/src/artigen/managers/workerManager.ts b/src/artigen/managers/workerManager.ts index 65de972..950b9e2 100644 --- a/src/artigen/managers/workerManager.ts +++ b/src/artigen/managers/workerManager.ts @@ -1,15 +1,20 @@ +import { DiscordenoMessage, sendDirectMessage, sendMessage } from '@discordeno'; +import { log, LogTypes as LT } from '@Log4Deno'; + import config from '/config.ts'; +import { DEVMODE } from '/flags.ts'; + +import { loggingEnabled } from 'artigen/rollUtils.ts'; +import { SolvedRoll } from 'artigen/solver.d.ts'; + +import dbClient from 'db/client.ts'; +import { queries } from 'db/common.ts'; + +import stdResp from 'endpoints/stdResponses.ts'; + import { generateCountDetailsEmbed, generateDMFailed, generateRollEmbed } from 'src/commandUtils.ts'; import { QueuedRoll, RollModifiers } from 'src/mod.d.ts'; import utils from 'src/utils.ts'; -import { SolvedRoll } from 'src/artigen/solver.d.ts'; -import { loggingEnabled } from 'src/artigen/rollUtils.ts'; -import { log, LogTypes as LT } from '@Log4Deno'; -import { DEVMODE } from '/flags.ts'; -import dbClient from 'src/db/client.ts'; -import stdResp from 'src/endpoints/stdResponses.ts'; -import { DiscordenoMessage, sendDirectMessage, sendMessage } from '@discordeno'; -import { queries } from 'src/db/common.ts'; export let currentWorkers = 0; diff --git a/src/artigen/parser.ts b/src/artigen/parser.ts index 464f393..992c68a 100644 --- a/src/artigen/parser.ts +++ b/src/artigen/parser.ts @@ -2,11 +2,12 @@ import { log, LogTypes as LT } from '@Log4Deno'; import config from '/config.ts'; -import { RollModifiers } from 'src/mod.d.ts'; -import { CountDetails, ReturnData, SolvedRoll, SolvedStep } from 'artigen/solver.d.ts'; -import { compareTotalRolls, compareTotalRollsReverse, escapeCharacters, legalMathOperators, loggingEnabled } from 'artigen/rollUtils.ts'; import { formatRoll } from 'artigen/rollFormatter.ts'; +import { compareTotalRolls, compareTotalRollsReverse, escapeCharacters, legalMathOperators, loggingEnabled } from 'artigen/rollUtils.ts'; import { fullSolver } from 'artigen/solver.ts'; +import { CountDetails, ReturnData, SolvedRoll, SolvedStep } from 'artigen/solver.d.ts'; + +import { RollModifiers } from 'src/mod.d.ts'; // parseRoll(fullCmd, modifiers) // parseRoll handles converting fullCmd into a computer readable format for processing, and finally executes the solving diff --git a/src/artigen/rollFormatter.ts b/src/artigen/rollFormatter.ts index 217cc22..ca916a2 100644 --- a/src/artigen/rollFormatter.ts +++ b/src/artigen/rollFormatter.ts @@ -1,10 +1,10 @@ import { log, LogTypes as LT } from '@Log4Deno'; -import { roll } from 'artigen/roller.ts'; import { rollCounter } from 'artigen/counter.ts'; -import { RollFormat } from 'artigen/solver.d.ts'; -import { loggingEnabled } from 'artigen/rollUtils.ts'; import { RollModifiers } from 'src/mod.d.ts'; +import { roll } from 'artigen/roller.ts'; +import { loggingEnabled } from 'artigen/rollUtils.ts'; +import { RollFormat } from 'artigen/solver.d.ts'; // formatRoll(rollConf, modifiers) returns one SolvedStep // formatRoll handles creating and formatting the completed rolls into the SolvedStep format diff --git a/src/artigen/rollWorker.ts b/src/artigen/rollWorker.ts index 100ebb8..eb0aa25 100644 --- a/src/artigen/rollWorker.ts +++ b/src/artigen/rollWorker.ts @@ -1,5 +1,7 @@ import { closeLog, initLog } from '@Log4Deno'; + import { DEBUG } from '/flags.ts'; + import { parseRoll } from 'artigen/parser.ts'; import { loggingEnabled } from 'artigen/rollUtils.ts'; diff --git a/src/artigen/roller.ts b/src/artigen/roller.ts index 0fb3e43..8b49b9b 100644 --- a/src/artigen/roller.ts +++ b/src/artigen/roller.ts @@ -1,8 +1,10 @@ -import config from '/config.ts'; import { log, LogTypes as LT } from '@Log4Deno'; -import { RollConf, RollSet, RollType } from 'artigen/solver.d.ts'; +import config from '/config.ts'; + import { compareOrigIdx, compareRolls, genFateRoll, genRoll, loggingEnabled } from 'artigen/rollUtils.ts'; +import { RollConf, RollSet, RollType } from 'artigen/solver.d.ts'; + import { RollModifiers } from 'src/mod.d.ts'; // Call with loopCountCheck(++loopCount);