diff --git a/src/index.ts b/src/index.ts index 586dfc6..a9052ca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,12 +9,12 @@ import { ValidateError } from "tsoa"; import responseTime from "response-time"; import cors from "cors"; import apiErrorHandler from "api-error-handler"; +import { readFileSync, readdirSync } from "fs"; import { RegisterRoutes } from "../build/routes"; import { ApiError } from "./v2/tools/ApiError"; import { AddonChangeController } from "./v2/controller/addonChange.controller"; import formHandler from "./v2/tools/FormHandler"; -// eslint-disable-next-line @typescript-eslint/no-unused-vars const NO_CACHE = process.env.NO_CACHE === "true"; const PORT = process.env.PORT || 8000; @@ -82,12 +82,13 @@ app.all("/v1/*", (req, res) => { res.status(400).json({ message: "API v1 has been discontinued; please switch to API v2 for all new endpoints.", }); - }); RegisterRoutes(app); -let swaggerDoc = require("../public/swagger.json"); +// for some reason TS reads this file as being in the root dir +//! DO NOT add an extra dot so the path is actually correct (no idea why) +let swaggerDoc = JSON.parse(readFileSync("./public/swagger.json", { encoding: "utf8" })); // manual things const adc = new AddonChangeController(); diff --git a/src/v2/firestorm/addons/index.ts b/src/v2/firestorm/addons/index.ts index a745542..0f96f55 100644 --- a/src/v2/firestorm/addons/index.ts +++ b/src/v2/firestorm/addons/index.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormAddon, AddonAll, Files } from "~/v2/interfaces"; +import { FirestormAddon, AddonAll, Files } from "../../interfaces"; import "../config"; import { files } from "../posts/files"; diff --git a/src/v2/firestorm/modding/index.ts b/src/v2/firestorm/modding/index.ts index 2051854..4ebf36e 100644 --- a/src/v2/firestorm/modding/index.ts +++ b/src/v2/firestorm/modding/index.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormMod } from "~/v2/interfaces"; +import { FirestormMod } from "../../interfaces"; import "../config"; export const mods = firestorm.collection("mods"); diff --git a/src/v2/firestorm/modding/modpacks.ts b/src/v2/firestorm/modding/modpacks.ts index 268967e..2b55d67 100644 --- a/src/v2/firestorm/modding/modpacks.ts +++ b/src/v2/firestorm/modding/modpacks.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormModpack } from "~/v2/interfaces"; +import { FirestormModpack } from "../../interfaces"; import "../config"; export const modpacks = firestorm.collection("modpacks"); diff --git a/src/v2/firestorm/packs/index.ts b/src/v2/firestorm/packs/index.ts index 61638a6..f41ca4d 100644 --- a/src/v2/firestorm/packs/index.ts +++ b/src/v2/firestorm/packs/index.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormPack } from "~/v2/interfaces"; +import { FirestormPack } from "../../interfaces"; import "../config"; import { submissions } from "./submissions"; diff --git a/src/v2/firestorm/packs/submissions.ts b/src/v2/firestorm/packs/submissions.ts index ebbd65d..6f63280 100644 --- a/src/v2/firestorm/packs/submissions.ts +++ b/src/v2/firestorm/packs/submissions.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormSubmission } from "~/v2/interfaces"; +import { FirestormSubmission } from "../../interfaces"; import "../config"; export const submissions = firestorm.collection("submissions"); diff --git a/src/v2/firestorm/posts/files.ts b/src/v2/firestorm/posts/files.ts index 79b59d1..a276df9 100644 --- a/src/v2/firestorm/posts/files.ts +++ b/src/v2/firestorm/posts/files.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormFile } from "~/v2/interfaces"; +import { FirestormFile } from "../../interfaces"; import "../config"; export const files = firestorm.collection("files"); diff --git a/src/v2/firestorm/textures/contributions.ts b/src/v2/firestorm/textures/contributions.ts index b9710df..9154d07 100644 --- a/src/v2/firestorm/textures/contributions.ts +++ b/src/v2/firestorm/textures/contributions.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormContribution } from "~/v2/interfaces"; +import { FirestormContribution } from "../../interfaces"; import "../config"; export const contributions = firestorm.collection("contributions"); diff --git a/src/v2/firestorm/textures/index.ts b/src/v2/firestorm/textures/index.ts index 9f77108..5028c16 100644 --- a/src/v2/firestorm/textures/index.ts +++ b/src/v2/firestorm/textures/index.ts @@ -12,7 +12,7 @@ import { MCMETA, PackGitHub, Edition, -} from "~/v2/interfaces"; +} from "../../interfaces"; import "../config"; import { uses } from "./uses"; diff --git a/src/v2/firestorm/textures/paths.ts b/src/v2/firestorm/textures/paths.ts index 53231fa..a8f17b9 100644 --- a/src/v2/firestorm/textures/paths.ts +++ b/src/v2/firestorm/textures/paths.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { FirestormPath } from "~/v2/interfaces"; +import { FirestormPath } from "../../interfaces"; import "../config"; export const paths = firestorm.collection("paths"); diff --git a/src/v2/firestorm/textures/uses.ts b/src/v2/firestorm/textures/uses.ts index 8bd92ad..134c4d7 100644 --- a/src/v2/firestorm/textures/uses.ts +++ b/src/v2/firestorm/textures/uses.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { Paths, FirestormUse } from "~/v2/interfaces"; +import { Paths, FirestormUse } from "../../interfaces"; import "../config"; import { paths } from "./paths"; diff --git a/src/v2/firestorm/users/index.ts b/src/v2/firestorm/users/index.ts index f1540e7..4d2f2df 100644 --- a/src/v2/firestorm/users/index.ts +++ b/src/v2/firestorm/users/index.ts @@ -1,5 +1,5 @@ import firestorm from "firestorm-db"; -import { Contributions, Addons, FirestormUser } from "~/v2/interfaces"; +import { Contributions, Addons, FirestormUser } from "../../interfaces"; import { contributions } from ".."; import { addons } from "../addons"; import "../config"; diff --git a/src/v2/repository/packs.repository.ts b/src/v2/repository/packs.repository.ts index d0fe79e..9cf651f 100644 --- a/src/v2/repository/packs.repository.ts +++ b/src/v2/repository/packs.repository.ts @@ -8,7 +8,7 @@ import { PackID, CreationPackAll, PackSearch, -} from "~/v2/interfaces"; +} from "../interfaces"; import { contributions, packs } from "../firestorm"; import SubmissionFirestormRepository from "./submissions.repository"; diff --git a/src/v2/repository/path.repository.ts b/src/v2/repository/path.repository.ts index 9552c89..3c8a1bb 100644 --- a/src/v2/repository/path.repository.ts +++ b/src/v2/repository/path.repository.ts @@ -1,5 +1,5 @@ -import { InputPath, Path, Paths, PathRepository } from "~/v2/interfaces"; import { ID_FIELD, WriteConfirmation } from "firestorm-db"; +import { InputPath, Path, Paths, PathRepository } from "../interfaces"; import { paths } from "../firestorm/textures/paths"; export default class PathFirestormRepository implements PathRepository { diff --git a/src/v2/repository/submissions.repository.ts b/src/v2/repository/submissions.repository.ts index d891440..b789980 100644 --- a/src/v2/repository/submissions.repository.ts +++ b/src/v2/repository/submissions.repository.ts @@ -5,7 +5,7 @@ import { CreationSubmission, PackAll, PackID, -} from "~/v2/interfaces"; +} from "../interfaces"; import { submissions } from "../firestorm/packs/submissions"; import { packs } from "../firestorm/packs"; diff --git a/src/v2/repository/texture.repository.ts b/src/v2/repository/texture.repository.ts index e51e7bc..48297bd 100644 --- a/src/v2/repository/texture.repository.ts +++ b/src/v2/repository/texture.repository.ts @@ -8,7 +8,7 @@ import { Textures, TextureRepository, PropertyToOutput, -} from "~/v2/interfaces"; +} from "../interfaces"; import { NotFoundError } from "../tools/ApiError"; import { textures, paths, uses, contributions, settings } from "../firestorm"; import { MinecraftSorter } from "../tools/sorter"; diff --git a/src/v2/repository/use.repository.ts b/src/v2/repository/use.repository.ts index 96ddfb7..7022953 100644 --- a/src/v2/repository/use.repository.ts +++ b/src/v2/repository/use.repository.ts @@ -1,6 +1,6 @@ /* eslint-disable arrow-body-style */ -import { Use, UseRepository, Uses } from "~/v2/interfaces"; import { ID_FIELD, WriteConfirmation } from "firestorm-db"; +import { Use, UseRepository, Uses } from "../interfaces"; import { paths, uses } from "../firestorm"; export default class UseFirestormRepository implements UseRepository { diff --git a/src/v2/service/modpacks.service.ts b/src/v2/service/modpacks.service.ts index 1b0d2d0..fdcad22 100644 --- a/src/v2/service/modpacks.service.ts +++ b/src/v2/service/modpacks.service.ts @@ -1,4 +1,4 @@ -import { Modpack } from "~/v2/interfaces"; +import { Modpack } from "../interfaces"; import { modpacks } from "../firestorm"; import ModpacksFirestormRepository from "../repository/modpacks.repository"; diff --git a/src/v2/service/mods.service.ts b/src/v2/service/mods.service.ts index 9d7d665..232e810 100644 --- a/src/v2/service/mods.service.ts +++ b/src/v2/service/mods.service.ts @@ -1,4 +1,4 @@ -import { Mod } from "~/v2/interfaces"; +import { Mod } from "../interfaces"; import { mods } from "../firestorm"; import ModsFirestormRepository from "../repository/mods.repository"; diff --git a/tsconfig.json b/tsconfig.json index 9463220..029e266 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,10 +18,6 @@ "allowJs": true, "resolveJsonModule": true, "baseUrl": "src", - "paths": { - "@/*": ["../*"], - "~/*": ["*"], - } }, "exclude": [ "node_modules"