Move some source files into 2 new folders

src/builder.ts

@@ -11,12 +11,12 @@ import {
   packFormat,
   resolveMinecraftVersionSpecifier,
   ResourcePackMetadata,
-} from "./minecraftHelpers.js"
-import { FunctionMaybe, filter, ensureDir, clearDir } from "./util.js"
-import TransformerLogger, { MessageType } from "./TransformerLogger.js"
-import type Fix from "./Fix.js"
+} from "./helpers/minecraftHelpers.js"
+import { FunctionMaybe, filter, ensureDir, clearDir } from "./helpers/util.js"
+import TransformerLogger, { MessageType } from "./classes/TransformerLogger.js"
+import type Fix from "./classes/Fix.js"
 import { debugReport, packDescription } from "./main.js"
-import { DebugTask } from "./DebugReport.js"
+import { DebugTask } from "./classes/DebugReport.js"
 
 /** The output of a {@link Transformer} */
 export type TransformerResult = {

src/DebugReport.ts → src/classes/DebugReport.ts

@@ -1,5 +1,5 @@
 import { writeFile } from "fs/promises"
-import { ensureDir } from "./util.js"
+import { ensureDir } from "../helpers/util.js"
 import { join as joinPath } from "path"
 
 export interface DebugTaskOptions {

src/Fix.ts → src/classes/Fix.ts

@@ -3,17 +3,16 @@ import {
   MinecraftLanguage,
   MinecraftVersionSpecifier,
   resolveMinecraftVersionSpecifier,
-} from "./minecraftHelpers.js"
-import { MultiTransformer } from "./transformers/MultiTransformer.js"
-import { Transformer } from "./builder.js"
+} from "../helpers/minecraftHelpers.js"
+import { MultiTransformer } from "../transformers/MultiTransformer.js"
+import { Transformer } from "../builder.js"
 import {
   getBug,
-  getBugAffectsVersions,
   getBugFixVersions,
   getBugResolution,
   isFixed,
   Resolution,
-} from "./mojiraHelpers.js"
+} from "../helpers/mojiraHelpers.js"
 import { DebugTask } from "./DebugReport.js"
 
 export interface FixOptions {

src/fixGroups.ts

@@ -1,9 +1,9 @@
 import { Transformer } from "./builder.js"
-import Fix from "./Fix.js"
+import Fix from "./classes/Fix.js"
 import {
   FlexibleSearchValue,
   MinecraftVersionSpecifier,
-} from "./minecraftHelpers.js"
+} from "./helpers/minecraftHelpers.js"
 import {
   CapitaliseFromTranslationStringsTransformer,
   CapitaliseSegmentTransformer,

src/fixes.ts

@@ -1,7 +1,7 @@
-import Fix from "./Fix.js"
+import Fix from "./classes/Fix.js"
 import { fixGroup, autoCapitaliseGroup, multiFixGroup } from "./fixGroups.js"
-import { getMilk } from "./languageHelpers.js"
-import { lang } from "./minecraftHelpers.js"
+import { getMilk } from "./helpers/languageHelpers.js"
+import { lang } from "./helpers/minecraftHelpers.js"
 import {
   CapitaliseFromTranslationStringsTransformer,
   CapitaliseSegmentTransformer,

src/minecraftHelpers.ts → src/helpers/minecraftHelpers.ts

@@ -1,6 +1,6 @@
 import fetch from "node-fetch"
 import path from "path"
-import { cache, debugReport, versionsSummary } from "./main.js"
+import { cache, debugReport, versionsSummary } from "../main.js"
 import {
   FancyRange,
   StartAndEnd,
@@ -12,8 +12,7 @@ import {
   SearchValue,
   ResolvableSync,
   isSimpleRange,
-} from "./util.js"
-import { DebugTask } from "./DebugReport.js"
+} from "../helpers/util.js"
 
 /** A single Minecraft language ID */
 export type MinecraftLanguage = string

src/main.ts

@@ -1,12 +1,12 @@
-import { DebugReport } from "./DebugReport.js"
+import { DebugReport } from "./classes/DebugReport.js"
 import { emitResourcePacks, generateStats } from "./builder.js"
 import fixes from "./fixes.js"
 import {
   MinecraftVersionBranch,
   MinecraftVersionFancyRange,
   MinecraftVersionSpecifier,
   fetchVersionsSummary,
-} from "./minecraftHelpers.js"
+} from "./helpers/minecraftHelpers.js"
 
 export async function printStats(limitToLatest?: MinecraftVersionBranch) {
   const versions: MinecraftVersionSpecifier = limitToLatest

src/publisher/ModrinthClient.ts

@@ -6,7 +6,7 @@ import {
   resolveURLParams,
   toMap,
   URLSearchParamsResolvable,
-} from "../util.js"
+} from "../helpers/util.js"
 import fetch, { Headers, BodyInit, FormData } from "node-fetch"
 
 export interface ModrinthClientOptions {

src/publisher/main.ts

@@ -5,7 +5,7 @@ import { readFile, writeFile } from "fs/promises"
 import { join } from "path"
 import { OutFileIndex, OutFileMetadata } from "../builder.js"
 import { createInterface } from "readline"
-import { ensureDir } from "../util.js"
+import { ensureDir } from "../helpers/util.js"
 
 /**
  * Goes through all the files in the index.

src/report-viewer/loadReport.ts

@@ -1,5 +1,5 @@
 import path from "path"
-import { DebugReportSerialised } from "../DebugReport.js"
+import { DebugReportSerialised } from "../classes/DebugReport.js"
 import { debugReportsFolder } from "./util.js"
 import { readFile, readdir } from "fs/promises"
 

src/report-viewer/viewReport.ts

@@ -2,7 +2,7 @@ import {
   DebugReportSerialised,
   DebugTask,
   DebugTaskSerialised,
-} from "../DebugReport.js"
+} from "../classes/DebugReport.js"
 import { calculateColor, insertString as replaceCharAt, secs } from "./util.js"
 import chalk from "chalk"
 

src/transformers/index.ts

@@ -9,8 +9,8 @@ import {
   getVanillaLanguageFile,
   ReplacerFunction,
   resolveContextSensitiveValue,
-} from "../minecraftHelpers.js"
-import { toTitleCase, StartAndEnd, SearchValue } from "../util.js"
+} from "../helpers/minecraftHelpers.js"
+import { toTitleCase, StartAndEnd, SearchValue } from "../helpers/util.js"
 
 /** Provide a custom callback function to do advanced transformations that aren't covered by existing transformers */
 export class CustomTransformer extends Transformer {