From c7c7fd4ea0de0940f9d34345e8f3fc7923bb1ec8 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Fri, 4 Jul 2025 17:40:06 -0700 Subject: [PATCH] chore: enforce consistent imports (#2408) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2408 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- .github/workflows/build.yml | 1 + package.json | 4 +- scripts/fix-imports.js | 46 +++++++++++++++++++ .../api/missionInventoryUpdateController.ts | 2 +- src/controllers/api/saveSettingsController.ts | 2 +- src/helpers/customHelpers/customHelpers.ts | 2 +- src/helpers/modularWeaponHelper.ts | 2 +- src/helpers/nemesisHelpers.ts | 6 +-- src/helpers/relicHelper.ts | 4 +- src/helpers/rivenHelper.ts | 2 +- src/index.ts | 4 +- src/middleware/errorHandler.ts | 2 +- src/models/guildModel.ts | 4 +- src/models/inventoryModels/inventoryModel.ts | 8 ++-- src/models/leaderboardModel.ts | 2 +- src/models/personalRoomsModel.ts | 2 +- src/models/shipModel.ts | 2 +- src/services/configWatcherService.ts | 10 ++-- src/services/friendService.ts | 12 ++--- src/services/guildService.ts | 20 ++++---- src/services/importService.ts | 14 +++--- src/services/inboxService.ts | 4 +- src/services/infestedFoundryService.ts | 10 ++-- src/services/inventoryService.ts | 36 +++++++++------ src/services/itemDataService.ts | 2 +- src/services/leaderboardService.ts | 6 +-- src/services/loginRewardService.ts | 14 +++--- src/services/loginService.ts | 2 +- src/services/missionInventoryUpdateService.ts | 26 +++++------ src/services/personalRoomsService.ts | 4 +- src/services/purchaseService.ts | 12 ++--- src/services/questService.ts | 6 +-- src/services/saveLoadoutService.ts | 4 +- src/services/serversideVendorsService.ts | 2 +- src/services/shipCustomizationsService.ts | 12 ++--- src/services/statsService.ts | 2 +- src/services/webService.ts | 8 ++-- src/services/worldStateService.ts | 8 ++-- src/services/wsService.ts | 6 +-- src/types/equipmentTypes.ts | 9 +++- src/types/friendTypes.ts | 2 +- src/types/genericUpdate.ts | 2 +- src/types/guildTypes.ts | 4 +- src/types/inventoryTypes/inventoryTypes.ts | 8 ++-- src/types/missionTypes.ts | 2 +- src/types/personalRoomsTypes.ts | 4 +- src/types/purchaseTypes.ts | 6 +-- src/types/requestTypes.ts | 10 ++-- src/types/saveLoadoutTypes.ts | 2 +- src/types/vendorTypes.ts | 2 +- src/types/worldStateTypes.ts | 2 +- 51 files changed, 214 insertions(+), 154 deletions(-) create mode 100644 scripts/fix-imports.js diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f265a60..375beec1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: - run: npm run lint:ci - run: npm run prettier - run: npm run update-translations + - run: npm run fix-imports - name: Fail if there are uncommitted changes run: | if [[ -n "$(git status --porcelain)" ]]; then diff --git a/package.json b/package.json index ef29ea57..640a0a0b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,9 @@ "lint:ci": "eslint --ext .ts --rule \"prettier/prettier: off\" .", "lint:fix": "eslint --fix --ext .ts .", "prettier": "prettier --write .", - "update-translations": "cd scripts && node update-translations.js" + "update-translations": "cd scripts && node update-translations.js", + "fix-imports": "cd scripts && node fix-imports.js", + "fix": "npm run update-translations && npm run fix-imports && npm run prettier" }, "license": "GNU", "dependencies": { diff --git a/scripts/fix-imports.js b/scripts/fix-imports.js new file mode 100644 index 00000000..66878694 --- /dev/null +++ b/scripts/fix-imports.js @@ -0,0 +1,46 @@ +/* eslint-disable */ +const fs = require("fs"); +const path = require("path"); + +const root = path.join(process.cwd(), ".."); + +function listFiles(dir) { + const entries = fs.readdirSync(dir, { withFileTypes: true }); + let results = []; + for (const entry of entries) { + const fullPath = path.join(dir, entry.name); + if (entry.isDirectory()) { + results = results.concat(listFiles(fullPath)); + } else { + results.push(fullPath); + } + } + return results; +} + +const files = listFiles(path.join(root, "src")); + +for (const file of files) { + let content; + try { + content = fs.readFileSync(file, "utf8"); + } catch (e) { + continue; + } + const dir = path.dirname(file); + const fixedContent = content.replaceAll(/} from "([^"]+)";/g, (sub, importPath) => { + if (!importPath.startsWith("@/")) { + const fullImportPath = path.resolve(dir, importPath); + if (fs.existsSync(fullImportPath + ".ts")) { + const relative = path.relative(root, fullImportPath).replace(/\\/g, "/"); + const fixedPath = "@/" + relative; + console.log(`${importPath} -> ${fixedPath}`); + return sub.split(importPath).join(fixedPath); + } + } + return sub; + }); + if (content != fixedContent) { + fs.writeFileSync(file, fixedContent, "utf8"); + } +} diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index 6e57a2b9..49eb6e1b 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -4,7 +4,7 @@ import { getAccountForRequest } from "@/src/services/loginService"; import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes"; import { addMissionInventoryUpdates, addMissionRewards } from "@/src/services/missionInventoryUpdateService"; import { getInventory } from "@/src/services/inventoryService"; -import { getInventoryResponse } from "./inventoryController"; +import { getInventoryResponse } from "@/src/controllers/api/inventoryController"; import { logger } from "@/src/utils/logger"; import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes"; import { sendWsBroadcastTo } from "@/src/services/wsService"; diff --git a/src/controllers/api/saveSettingsController.ts b/src/controllers/api/saveSettingsController.ts index 15304626..8aba0cfe 100644 --- a/src/controllers/api/saveSettingsController.ts +++ b/src/controllers/api/saveSettingsController.ts @@ -2,7 +2,7 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; import { getJSONfromString } from "@/src/helpers/stringHelpers"; import { getInventory } from "@/src/services/inventoryService"; import { RequestHandler } from "express"; -import { ISettings } from "../../types/inventoryTypes/inventoryTypes"; +import { ISettings } from "@/src/types/inventoryTypes/inventoryTypes"; interface ISaveSettingsRequest { Settings: ISettings; diff --git a/src/helpers/customHelpers/customHelpers.ts b/src/helpers/customHelpers/customHelpers.ts index 02defc8c..0f920406 100644 --- a/src/helpers/customHelpers/customHelpers.ts +++ b/src/helpers/customHelpers/customHelpers.ts @@ -1,7 +1,7 @@ import { IAccountCreation } from "@/src/types/customTypes"; import { IDatabaseAccountRequiredFields } from "@/src/types/loginTypes"; import crypto from "crypto"; -import { isString, parseEmail, parseString } from "../general"; +import { isString, parseEmail, parseString } from "@/src/helpers/general"; const getWhirlpoolHash = (rawPassword: string): string => { const whirlpool = crypto.createHash("whirlpool"); diff --git a/src/helpers/modularWeaponHelper.ts b/src/helpers/modularWeaponHelper.ts index 5651f373..3e00531d 100644 --- a/src/helpers/modularWeaponHelper.ts +++ b/src/helpers/modularWeaponHelper.ts @@ -1,4 +1,4 @@ -import { TEquipmentKey } from "../types/inventoryTypes/inventoryTypes"; +import { TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes"; export const modularWeaponTypes: Record = { "/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimary": "LongGuns", diff --git a/src/helpers/nemesisHelpers.ts b/src/helpers/nemesisHelpers.ts index 677ad8fa..641ccb27 100644 --- a/src/helpers/nemesisHelpers.ts +++ b/src/helpers/nemesisHelpers.ts @@ -1,9 +1,9 @@ import { ExportRegions, ExportWarframes } from "warframe-public-export-plus"; import { IInfNode, TNemesisFaction } from "@/src/types/inventoryTypes/inventoryTypes"; import { generateRewardSeed, getRewardAtPercentage, SRng } from "@/src/services/rngService"; -import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel"; -import { IOid } from "../types/commonTypes"; -import { isArchwingMission } from "../services/worldStateService"; +import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; +import { IOid } from "@/src/types/commonTypes"; +import { isArchwingMission } from "@/src/services/worldStateService"; type TInnateDamageTag = | "InnateElectricityDamage" diff --git a/src/helpers/relicHelper.ts b/src/helpers/relicHelper.ts index 6889514e..3c663692 100644 --- a/src/helpers/relicHelper.ts +++ b/src/helpers/relicHelper.ts @@ -5,8 +5,8 @@ import { getRandomWeightedReward, IRngResult } from "@/src/services/rngService"; import { logger } from "@/src/utils/logger"; import { addMiscItems, combineInventoryChanges } from "@/src/services/inventoryService"; import { handleStoreItemAcquisition } from "@/src/services/purchaseService"; -import { IInventoryChanges } from "../types/purchaseTypes"; -import { config } from "../services/configService"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; +import { config } from "@/src/services/configService"; export const crackRelic = async ( inventory: TInventoryDatabaseDocument, diff --git a/src/helpers/rivenHelper.ts b/src/helpers/rivenHelper.ts index 34a7babc..7b2be304 100644 --- a/src/helpers/rivenHelper.ts +++ b/src/helpers/rivenHelper.ts @@ -1,5 +1,5 @@ import { IUpgrade } from "warframe-public-export-plus"; -import { getRandomElement, getRandomInt, getRandomReward } from "../services/rngService"; +import { getRandomElement, getRandomInt, getRandomReward } from "@/src/services/rngService"; export type RivenFingerprint = IVeiledRivenFingerprint | IUnveiledRivenFingerprint; diff --git a/src/index.ts b/src/index.ts index 53dfcd90..383e9123 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,10 +19,10 @@ logger.info("Starting up..."); // Proceed with normal startup: bring up config watcher service, validate config, connect to MongoDB, and finally start listening for HTTP. import mongoose from "mongoose"; import { JSONStringify } from "json-with-bigint"; -import { startWebServer } from "./services/webService"; +import { startWebServer } from "@/src/services/webService"; import { syncConfigWithDatabase, validateConfig } from "@/src/services/configWatcherService"; -import { updateWorldStateCollections } from "./services/worldStateService"; +import { updateWorldStateCollections } from "@/src/services/worldStateService"; // Patch JSON.stringify to work flawlessly with Bigints. JSON.stringify = JSONStringify; diff --git a/src/middleware/errorHandler.ts b/src/middleware/errorHandler.ts index 45f69062..3ffb61cf 100644 --- a/src/middleware/errorHandler.ts +++ b/src/middleware/errorHandler.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import { logger } from "../utils/logger"; +import { logger } from "@/src/utils/logger"; export const errorHandler = (err: Error, req: Request, res: Response, _next: NextFunction): void => { if (err.message == "Invalid accountId-nonce pair") { diff --git a/src/models/guildModel.ts b/src/models/guildModel.ts index c393a38d..75492bc2 100644 --- a/src/models/guildModel.ts +++ b/src/models/guildModel.ts @@ -17,8 +17,8 @@ import { GuildPermission } from "@/src/types/guildTypes"; import { Document, Model, model, Schema, Types } from "mongoose"; -import { fusionTreasuresSchema, typeCountSchema } from "./inventoryModels/inventoryModel"; -import { pictureFrameInfoSchema } from "./personalRoomsModel"; +import { fusionTreasuresSchema, typeCountSchema } from "@/src/models/inventoryModels/inventoryModel"; +import { pictureFrameInfoSchema } from "@/src/models/personalRoomsModel"; const dojoDecoSchema = new Schema({ Type: String, diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 1c7b0f2a..fe9a683a 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -89,8 +89,8 @@ import { IPersonalGoalProgressClient, IKubrowPetPrintClient, IKubrowPetPrintDatabase -} from "../../types/inventoryTypes/inventoryTypes"; -import { IOid, ITypeCount } from "../../types/commonTypes"; +} from "@/src/types/inventoryTypes/inventoryTypes"; +import { IOid, ITypeCount } from "@/src/types/commonTypes"; import { IAbilityOverride, ICrewShipCustomization, @@ -101,9 +101,9 @@ import { IPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers"; -import { EquipmentSelectionSchema, oidSchema } from "./loadoutModel"; +import { EquipmentSelectionSchema, oidSchema } from "@/src/models/inventoryModels/loadoutModel"; import { ICountedStoreItem } from "warframe-public-export-plus"; -import { colorSchema, shipCustomizationSchema } from "../commonModel"; +import { colorSchema, shipCustomizationSchema } from "@/src/models/commonModel"; import { IArchonCrystalUpgrade, ICrewShipMemberClient, diff --git a/src/models/leaderboardModel.ts b/src/models/leaderboardModel.ts index 2db984d3..591f36e3 100644 --- a/src/models/leaderboardModel.ts +++ b/src/models/leaderboardModel.ts @@ -1,5 +1,5 @@ import { Document, model, Schema, Types } from "mongoose"; -import { ILeaderboardEntryDatabase } from "../types/leaderboardTypes"; +import { ILeaderboardEntryDatabase } from "@/src/types/leaderboardTypes"; const leaderboardEntrySchema = new Schema( { diff --git a/src/models/personalRoomsModel.ts b/src/models/personalRoomsModel.ts index d462177b..965fa1dd 100644 --- a/src/models/personalRoomsModel.ts +++ b/src/models/personalRoomsModel.ts @@ -16,7 +16,7 @@ import { PersonalRoomsModelType } from "@/src/types/personalRoomsTypes"; import { Schema, Types, model } from "mongoose"; -import { colorSchema, shipCustomizationSchema } from "./commonModel"; +import { colorSchema, shipCustomizationSchema } from "@/src/models/commonModel"; export const pictureFrameInfoSchema = new Schema( { diff --git a/src/models/shipModel.ts b/src/models/shipModel.ts index 2e2c66d6..9b4bd98d 100644 --- a/src/models/shipModel.ts +++ b/src/models/shipModel.ts @@ -1,5 +1,5 @@ import { Document, Schema, Types, model } from "mongoose"; -import { IShipDatabase } from "../types/shipTypes"; +import { IShipDatabase } from "@/src/types/shipTypes"; import { toOid } from "@/src/helpers/inventoryHelpers"; import { colorSchema } from "@/src/models/commonModel"; import { IShipInventory } from "@/src/types/inventoryTypes/inventoryTypes"; diff --git a/src/services/configWatcherService.ts b/src/services/configWatcherService.ts index e22a7def..99a0dd64 100644 --- a/src/services/configWatcherService.ts +++ b/src/services/configWatcherService.ts @@ -1,10 +1,10 @@ import chokidar from "chokidar"; import fsPromises from "fs/promises"; -import { logger } from "../utils/logger"; -import { config, configPath, loadConfig } from "./configService"; -import { getWebPorts, startWebServer, stopWebServer } from "./webService"; -import { sendWsBroadcast } from "./wsService"; -import { Inbox } from "../models/inboxModel"; +import { logger } from "@/src/utils/logger"; +import { config, configPath, loadConfig } from "@/src/services/configService"; +import { getWebPorts, startWebServer, stopWebServer } from "@/src/services/webService"; +import { sendWsBroadcast } from "@/src/services/wsService"; +import { Inbox } from "@/src/models/inboxModel"; import varzia from "@/static/fixed_responses/worldState/varzia.json"; let amnesia = false; diff --git a/src/services/friendService.ts b/src/services/friendService.ts index 7affefec..125dfda1 100644 --- a/src/services/friendService.ts +++ b/src/services/friendService.ts @@ -1,10 +1,10 @@ -import { IFriendInfo } from "../types/friendTypes"; -import { getInventory } from "./inventoryService"; -import { config } from "./configService"; -import { Account } from "../models/loginModel"; +import { IFriendInfo } from "@/src/types/friendTypes"; +import { getInventory } from "@/src/services/inventoryService"; +import { config } from "@/src/services/configService"; +import { Account } from "@/src/models/loginModel"; import { Types } from "mongoose"; -import { Friendship } from "../models/friendModel"; -import { fromOid, toMongoDate } from "../helpers/inventoryHelpers"; +import { Friendship } from "@/src/models/friendModel"; +import { fromOid, toMongoDate } from "@/src/helpers/inventoryHelpers"; export const addAccountDataToFriendInfo = async (info: IFriendInfo): Promise => { const account = (await Account.findById(fromOid(info._id), "DisplayName LastLogin"))!; diff --git a/src/services/guildService.ts b/src/services/guildService.ts index e48328d3..2b4e4f2f 100644 --- a/src/services/guildService.ts +++ b/src/services/guildService.ts @@ -22,17 +22,17 @@ import { import { toMongoDate, toOid, toOid2 } from "@/src/helpers/inventoryHelpers"; import { Types } from "mongoose"; import { ExportDojoRecipes, ExportResources, IDojoBuild, IDojoResearch } from "warframe-public-export-plus"; -import { logger } from "../utils/logger"; -import { config } from "./configService"; -import { getRandomInt } from "./rngService"; -import { Inbox } from "../models/inboxModel"; -import { IFusionTreasure } from "../types/inventoryTypes/inventoryTypes"; -import { IInventoryChanges } from "../types/purchaseTypes"; -import { parallelForeach } from "../utils/async-utils"; +import { logger } from "@/src/utils/logger"; +import { config } from "@/src/services/configService"; +import { getRandomInt } from "@/src/services/rngService"; +import { Inbox } from "@/src/models/inboxModel"; +import { IFusionTreasure } from "@/src/types/inventoryTypes/inventoryTypes"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; +import { parallelForeach } from "@/src/utils/async-utils"; import allDecoRecipes from "@/static/fixed_responses/allDecoRecipes.json"; -import { createMessage } from "./inboxService"; -import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "./friendService"; -import { ITypeCount } from "../types/commonTypes"; +import { createMessage } from "@/src/services/inboxService"; +import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "@/src/services/friendService"; +import { ITypeCount } from "@/src/types/commonTypes"; export const getGuildForRequest = async (req: Request): Promise => { const accountId = await getAccountIdForRequest(req); diff --git a/src/services/importService.ts b/src/services/importService.ts index 31289c94..0e07dbb3 100644 --- a/src/services/importService.ts +++ b/src/services/importService.ts @@ -3,8 +3,8 @@ import { IItemConfig, IOperatorConfigClient, IOperatorConfigDatabase -} from "../types/inventoryTypes/commonInventoryTypes"; -import { IMongoDate } from "../types/commonTypes"; +} from "@/src/types/inventoryTypes/commonInventoryTypes"; +import { IMongoDate } from "@/src/types/commonTypes"; import { equipmentKeys, IDialogueClient, @@ -25,15 +25,15 @@ import { IUpgradeDatabase, IWeaponSkinClient, IWeaponSkinDatabase -} from "../types/inventoryTypes/inventoryTypes"; -import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel"; +} from "@/src/types/inventoryTypes/inventoryTypes"; +import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; import { ILoadoutConfigClient, ILoadoutConfigDatabase, ILoadoutDatabase, ILoadOutPresets -} from "../types/saveLoadoutTypes"; -import { slotNames } from "../types/purchaseTypes"; +} from "@/src/types/saveLoadoutTypes"; +import { slotNames } from "@/src/types/purchaseTypes"; import { ICrewShipMemberClient, ICrewShipMemberDatabase, @@ -43,7 +43,7 @@ import { IEquipmentDatabase, IKubrowPetDetailsClient, IKubrowPetDetailsDatabase -} from "../types/equipmentTypes"; +} from "@/src/types/equipmentTypes"; const convertDate = (value: IMongoDate): Date => { return new Date(parseInt(value.$date.$numberLong)); diff --git a/src/services/inboxService.ts b/src/services/inboxService.ts index d623030d..7129adf3 100644 --- a/src/services/inboxService.ts +++ b/src/services/inboxService.ts @@ -2,8 +2,8 @@ import { IMessageDatabase, Inbox } from "@/src/models/inboxModel"; import { getAccountForRequest } from "@/src/services/loginService"; import { HydratedDocument, Types } from "mongoose"; import { Request } from "express"; -import { unixTimesInMs } from "../constants/timeConstants"; -import { config } from "./configService"; +import { unixTimesInMs } from "@/src/constants/timeConstants"; +import { config } from "@/src/services/configService"; export const getAllMessagesSorted = async (accountId: string): Promise[]> => { const inbox = await Inbox.find({ ownerId: accountId }).sort({ date: -1 }); diff --git a/src/services/infestedFoundryService.ts b/src/services/infestedFoundryService.ts index c7bb700e..3349047b 100644 --- a/src/services/infestedFoundryService.ts +++ b/src/services/infestedFoundryService.ts @@ -1,9 +1,9 @@ import { ExportRecipes } from "warframe-public-export-plus"; -import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel"; -import { IInfestedFoundryClient, IInfestedFoundryDatabase } from "../types/inventoryTypes/inventoryTypes"; -import { addRecipes } from "./inventoryService"; -import { config } from "./configService"; -import { ITypeCount } from "../types/commonTypes"; +import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; +import { IInfestedFoundryClient, IInfestedFoundryDatabase } from "@/src/types/inventoryTypes/inventoryTypes"; +import { addRecipes } from "@/src/services/inventoryService"; +import { config } from "@/src/services/configService"; +import { ITypeCount } from "@/src/types/commonTypes"; export const addInfestedFoundryXP = (infestedFoundry: IInfestedFoundryDatabase, delta: number): ITypeCount[] => { const recipeChanges: ITypeCount[] = []; diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 7ca8015b..6042e34f 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -27,11 +27,11 @@ import { IDialogueDatabase, IKubrowPetPrintClient } from "@/src/types/inventoryTypes/inventoryTypes"; -import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate"; -import { IKeyChainRequest, IMissionInventoryUpdateRequest } from "../types/requestTypes"; +import { IGenericUpdate, IUpdateNodeIntrosResponse } from "@/src/types/genericUpdate"; +import { IKeyChainRequest, IMissionInventoryUpdateRequest } from "@/src/types/requestTypes"; import { logger } from "@/src/utils/logger"; import { convertInboxMessage, fromStoreItem, getKeyChainItems } from "@/src/services/itemDataService"; -import { IFlavourItem, IItemConfig } from "../types/inventoryTypes/commonInventoryTypes"; +import { IFlavourItem, IItemConfig } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { ExportArcanes, ExportBoosters, @@ -59,7 +59,7 @@ import { ISentinel, TStandingLimitBin } from "warframe-public-export-plus"; -import { createShip } from "./shipService"; +import { createShip } from "@/src/services/shipService"; import { catbrowDetails, fromMongoDate, @@ -68,19 +68,25 @@ import { kubrowFurPatternsWeights, kubrowWeights, toOid -} from "../helpers/inventoryHelpers"; +} from "@/src/helpers/inventoryHelpers"; import { addQuestKey, completeQuest } from "@/src/services/questService"; -import { handleBundleAcqusition } from "./purchaseService"; +import { handleBundleAcqusition } from "@/src/services/purchaseService"; import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json"; -import { generateRewardSeed, getRandomElement, getRandomInt, getRandomWeightedReward, SRng } from "./rngService"; -import { createMessage, IMessageCreationTemplate } from "./inboxService"; +import { + generateRewardSeed, + getRandomElement, + getRandomInt, + getRandomWeightedReward, + SRng +} from "@/src/services/rngService"; +import { createMessage, IMessageCreationTemplate } from "@/src/services/inboxService"; import { getMaxStanding, getMinStanding } from "@/src/helpers/syndicateStandingHelper"; -import { getNightwaveSyndicateTag, getWorldState } from "./worldStateService"; +import { getNightwaveSyndicateTag, getWorldState } from "@/src/services/worldStateService"; import { ICalendarSeason } from "@/src/types/worldStateTypes"; -import { generateNemesisProfile, INemesisProfile } from "../helpers/nemesisHelpers"; -import { TAccountDocument } from "./loginService"; -import { unixTimesInMs } from "../constants/timeConstants"; -import { addString } from "../helpers/stringHelpers"; +import { generateNemesisProfile, INemesisProfile } from "@/src/helpers/nemesisHelpers"; +import { TAccountDocument } from "@/src/services/loginService"; +import { unixTimesInMs } from "@/src/constants/timeConstants"; +import { addString } from "@/src/helpers/stringHelpers"; import { EquipmentFeatures, IEquipmentClient, @@ -88,8 +94,8 @@ import { IKubrowPetDetailsDatabase, ITraits, Status -} from "../types/equipmentTypes"; -import { ITypeCount } from "../types/commonTypes"; +} from "@/src/types/equipmentTypes"; +import { ITypeCount } from "@/src/types/commonTypes"; export const createInventory = async ( accountOwnerId: Types.ObjectId, diff --git a/src/services/itemDataService.ts b/src/services/itemDataService.ts index 84c99eb9..954099ff 100644 --- a/src/services/itemDataService.ts +++ b/src/services/itemDataService.ts @@ -33,7 +33,7 @@ import { IRecipe, TReward } from "warframe-public-export-plus"; -import { IMessage } from "../models/inboxModel"; +import { IMessage } from "@/src/models/inboxModel"; export type WeaponTypeInternal = | "LongGuns" diff --git a/src/services/leaderboardService.ts b/src/services/leaderboardService.ts index 2ef908f7..2032d442 100644 --- a/src/services/leaderboardService.ts +++ b/src/services/leaderboardService.ts @@ -1,6 +1,6 @@ -import { Guild } from "../models/guildModel"; -import { Leaderboard, TLeaderboardEntryDocument } from "../models/leaderboardModel"; -import { ILeaderboardEntryClient } from "../types/leaderboardTypes"; +import { Guild } from "@/src/models/guildModel"; +import { Leaderboard, TLeaderboardEntryDocument } from "@/src/models/leaderboardModel"; +import { ILeaderboardEntryClient } from "@/src/types/leaderboardTypes"; export const submitLeaderboardScore = async ( schedule: "weekly" | "daily", diff --git a/src/services/loginRewardService.ts b/src/services/loginRewardService.ts index 49a6501a..548ba1bb 100644 --- a/src/services/loginRewardService.ts +++ b/src/services/loginRewardService.ts @@ -1,10 +1,10 @@ import randomRewards from "@/static/fixed_responses/loginRewards/randomRewards.json"; -import { IInventoryChanges } from "../types/purchaseTypes"; -import { TAccountDocument } from "./loginService"; -import { mixSeeds, SRng } from "./rngService"; -import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel"; -import { addBooster, updateCurrency } from "./inventoryService"; -import { handleStoreItemAcquisition } from "./purchaseService"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; +import { TAccountDocument } from "@/src/services/loginService"; +import { mixSeeds, SRng } from "@/src/services/rngService"; +import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; +import { addBooster, updateCurrency } from "@/src/services/inventoryService"; +import { handleStoreItemAcquisition } from "@/src/services/purchaseService"; import { ExportBoosterPacks, ExportBoosters, @@ -12,7 +12,7 @@ import { ExportWarframes, ExportWeapons } from "warframe-public-export-plus"; -import { toStoreItem } from "./itemDataService"; +import { toStoreItem } from "@/src/services/itemDataService"; export interface ILoginRewardsReponse { DailyTributeInfo: { diff --git a/src/services/loginService.ts b/src/services/loginService.ts index 44366f5c..338f43db 100644 --- a/src/services/loginService.ts +++ b/src/services/loginService.ts @@ -1,7 +1,7 @@ import { Account } from "@/src/models/loginModel"; import { createInventory } from "@/src/services/inventoryService"; import { IDatabaseAccountJson, IDatabaseAccountRequiredFields } from "@/src/types/loginTypes"; -import { createShip } from "./shipService"; +import { createShip } from "@/src/services/shipService"; import { Document, Types } from "mongoose"; import { Loadout } from "@/src/models/inventoryModels/loadoutModel"; import { PersonalRooms } from "@/src/models/personalRoomsModel"; diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 9082ace2..cc8bd0c2 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -8,7 +8,7 @@ import { IRegion, IReward } from "warframe-public-export-plus"; -import { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes"; +import { IMissionInventoryUpdateRequest, IRewardInfo } from "@/src/types/requestTypes"; import { logger } from "@/src/utils/logger"; import { IRngResult, SRng, generateRewardSeed, getRandomElement, getRandomReward } from "@/src/services/rngService"; import { equipmentKeys, IMission, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes"; @@ -47,10 +47,10 @@ import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes"; import { fromStoreItem, getLevelKeyRewards, isStoreItem, toStoreItem } from "@/src/services/itemDataService"; import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; import { getEntriesUnsafe } from "@/src/utils/ts-utils"; -import { handleStoreItemAcquisition } from "./purchaseService"; -import { IMissionCredits, IMissionReward } from "../types/missionTypes"; +import { handleStoreItemAcquisition } from "@/src/services/purchaseService"; +import { IMissionCredits, IMissionReward } from "@/src/types/missionTypes"; import { crackRelic } from "@/src/helpers/relicHelper"; -import { createMessage } from "./inboxService"; +import { createMessage } from "@/src/services/inboxService"; import kuriaMessage50 from "@/static/fixed_responses/kuriaMessages/fiftyPercent.json"; import kuriaMessage75 from "@/static/fixed_responses/kuriaMessages/seventyFivePercent.json"; import kuriaMessage100 from "@/static/fixed_responses/kuriaMessages/oneHundredPercent.json"; @@ -63,8 +63,8 @@ import { getNemesisManifest, getNemesisPasscode } from "@/src/helpers/nemesisHelpers"; -import { Loadout } from "../models/inventoryModels/loadoutModel"; -import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes"; +import { Loadout } from "@/src/models/inventoryModels/loadoutModel"; +import { ILoadoutConfigDatabase } from "@/src/types/saveLoadoutTypes"; import { getLiteSortie, getSortie, @@ -73,14 +73,14 @@ import { idToDay, idToWeek, pushClassicBounties -} from "./worldStateService"; -import { config } from "./configService"; +} from "@/src/services/worldStateService"; +import { config } from "@/src/services/configService"; import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json"; -import { ISyndicateMissionInfo } from "../types/worldStateTypes"; -import { fromOid } from "../helpers/inventoryHelpers"; -import { TAccountDocument } from "./loginService"; -import { ITypeCount } from "../types/commonTypes"; -import { IEquipmentClient } from "../types/equipmentTypes"; +import { ISyndicateMissionInfo } from "@/src/types/worldStateTypes"; +import { fromOid } from "@/src/helpers/inventoryHelpers"; +import { TAccountDocument } from "@/src/services/loginService"; +import { ITypeCount } from "@/src/types/commonTypes"; +import { IEquipmentClient } from "@/src/types/equipmentTypes"; const getRotations = (rewardInfo: IRewardInfo, tierOverride?: number): number[] => { // For Spy missions, e.g. 3 vaults cracked = A, B, C diff --git a/src/services/personalRoomsService.ts b/src/services/personalRoomsService.ts index 2188c133..2ce19289 100644 --- a/src/services/personalRoomsService.ts +++ b/src/services/personalRoomsService.ts @@ -1,7 +1,7 @@ import { PersonalRooms } from "@/src/models/personalRoomsModel"; import { addItem, getInventory } from "@/src/services/inventoryService"; -import { IGardeningDatabase, TPersonalRoomsDatabaseDocument } from "../types/personalRoomsTypes"; -import { getRandomElement } from "./rngService"; +import { IGardeningDatabase, TPersonalRoomsDatabaseDocument } from "@/src/types/personalRoomsTypes"; +import { getRandomElement } from "@/src/services/rngService"; export const getPersonalRooms = async ( accountId: string, diff --git a/src/services/purchaseService.ts b/src/services/purchaseService.ts index 0dc47d11..cae3743e 100644 --- a/src/services/purchaseService.ts +++ b/src/services/purchaseService.ts @@ -20,7 +20,7 @@ import { IPurchaseParams } from "@/src/types/purchaseTypes"; import { logger } from "@/src/utils/logger"; -import { getWorldState } from "./worldStateService"; +import { getWorldState } from "@/src/services/worldStateService"; import { ExportBoosterPacks, ExportBoosters, @@ -32,11 +32,11 @@ import { ExportVendors, TRarity } from "warframe-public-export-plus"; -import { config } from "./configService"; -import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel"; -import { fromStoreItem, toStoreItem } from "./itemDataService"; -import { DailyDeal } from "../models/worldStateModel"; -import { fromMongoDate, toMongoDate } from "../helpers/inventoryHelpers"; +import { config } from "@/src/services/configService"; +import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; +import { fromStoreItem, toStoreItem } from "@/src/services/itemDataService"; +import { DailyDeal } from "@/src/models/worldStateModel"; +import { fromMongoDate, toMongoDate } from "@/src/helpers/inventoryHelpers"; export const getStoreItemCategory = (storeItem: string): string => { const storeItemString = getSubstringFromKeyword(storeItem, "StoreItems/"); diff --git a/src/services/questService.ts b/src/services/questService.ts index 0bf2a6e7..550bad2f 100644 --- a/src/services/questService.ts +++ b/src/services/questService.ts @@ -8,10 +8,10 @@ import { IQuestKeyClient, IQuestKeyDatabase, IQuestStage } from "@/src/types/inv import { logger } from "@/src/utils/logger"; import { Types } from "mongoose"; import { ExportKeys } from "warframe-public-export-plus"; -import { addFixedLevelRewards } from "./missionInventoryUpdateService"; -import { IInventoryChanges } from "../types/purchaseTypes"; +import { addFixedLevelRewards } from "@/src/services/missionInventoryUpdateService"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; import questCompletionItems from "@/static/fixed_responses/questCompletionRewards.json"; -import { ITypeCount } from "../types/commonTypes"; +import { ITypeCount } from "@/src/types/commonTypes"; export interface IUpdateQuestRequest { QuestKeys: Omit[]; diff --git a/src/services/saveLoadoutService.ts b/src/services/saveLoadoutService.ts index ed51befd..c3f63a0a 100644 --- a/src/services/saveLoadoutService.ts +++ b/src/services/saveLoadoutService.ts @@ -13,8 +13,8 @@ import { Types } from "mongoose"; import { isEmptyObject } from "@/src/helpers/general"; import { logger } from "@/src/utils/logger"; import { equipmentKeys, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes"; -import { IItemConfig } from "../types/inventoryTypes/commonInventoryTypes"; -import { importCrewMemberId } from "./importService"; +import { IItemConfig } from "@/src/types/inventoryTypes/commonInventoryTypes"; +import { importCrewMemberId } from "@/src/services/importService"; //TODO: setup default items on account creation or like originally in giveStartingItems.php diff --git a/src/services/serversideVendorsService.ts b/src/services/serversideVendorsService.ts index ebdfc882..50232776 100644 --- a/src/services/serversideVendorsService.ts +++ b/src/services/serversideVendorsService.ts @@ -6,7 +6,7 @@ import { mixSeeds, SRng } from "@/src/services/rngService"; import { IItemManifest, IVendorInfo, IVendorManifest } from "@/src/types/vendorTypes"; import { logger } from "@/src/utils/logger"; import { ExportVendors, IRange, IVendor, IVendorOffer } from "warframe-public-export-plus"; -import { config } from "./configService"; +import { config } from "@/src/services/configService"; interface IGeneratableVendorInfo extends Omit { cycleOffset?: number; diff --git a/src/services/shipCustomizationsService.ts b/src/services/shipCustomizationsService.ts index 223d35bf..f49f62d8 100644 --- a/src/services/shipCustomizationsService.ts +++ b/src/services/shipCustomizationsService.ts @@ -8,14 +8,14 @@ import { RoomsType, TBootLocation, TPersonalRoomsDatabaseDocument -} from "../types/personalRoomsTypes"; +} from "@/src/types/personalRoomsTypes"; import { logger } from "@/src/utils/logger"; import { Types } from "mongoose"; -import { addFusionTreasures, addShipDecorations, getInventory } from "./inventoryService"; -import { config } from "./configService"; -import { Guild } from "../models/guildModel"; -import { hasGuildPermission } from "./guildService"; -import { GuildPermission } from "../types/guildTypes"; +import { addFusionTreasures, addShipDecorations, getInventory } from "@/src/services/inventoryService"; +import { config } from "@/src/services/configService"; +import { Guild } from "@/src/models/guildModel"; +import { hasGuildPermission } from "@/src/services/guildService"; +import { GuildPermission } from "@/src/types/guildTypes"; import { ExportResources } from "warframe-public-export-plus"; export const setShipCustomizations = async ( diff --git a/src/services/statsService.ts b/src/services/statsService.ts index a074b637..8dccd312 100644 --- a/src/services/statsService.ts +++ b/src/services/statsService.ts @@ -10,7 +10,7 @@ import { } from "@/src/types/statTypes"; import { logger } from "@/src/utils/logger"; import { addEmailItem, getInventory } from "@/src/services/inventoryService"; -import { submitLeaderboardScore } from "./leaderboardService"; +import { submitLeaderboardScore } from "@/src/services/leaderboardService"; export const createStats = async (accountId: string): Promise => { const stats = new Stats({ accountOwnerId: accountId }); diff --git a/src/services/webService.ts b/src/services/webService.ts index 68164298..e8162663 100644 --- a/src/services/webService.ts +++ b/src/services/webService.ts @@ -1,12 +1,12 @@ import http from "http"; import https from "https"; import fs from "node:fs"; -import { config } from "./configService"; -import { logger } from "../utils/logger"; -import { app } from "../app"; +import { config } from "@/src/services/configService"; +import { logger } from "@/src/utils/logger"; +import { app } from "@/src/app"; import { AddressInfo } from "node:net"; import { Agent, WebSocket as UnidiciWebSocket } from "undici"; -import { startWsServer, startWssServer, stopWsServers } from "./wsService"; +import { startWsServer, startWssServer, stopWsServers } from "@/src/services/wsService"; let httpServer: http.Server | undefined; let httpsServer: https.Server | undefined; diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts index bcb5495a..dcf8b786 100644 --- a/src/services/worldStateService.ts +++ b/src/services/worldStateService.ts @@ -28,10 +28,10 @@ import { IVoidTraderOffer, IWorldState, TCircuitGameMode -} from "../types/worldStateTypes"; -import { toMongoDate, toOid, version_compare } from "../helpers/inventoryHelpers"; -import { logger } from "../utils/logger"; -import { DailyDeal, Fissure } from "../models/worldStateModel"; +} from "@/src/types/worldStateTypes"; +import { toMongoDate, toOid, version_compare } from "@/src/helpers/inventoryHelpers"; +import { logger } from "@/src/utils/logger"; +import { DailyDeal, Fissure } from "@/src/models/worldStateModel"; const sortieBosses = [ "SORTIE_BOSS_HYENA", diff --git a/src/services/wsService.ts b/src/services/wsService.ts index 3eb11048..209b1bc9 100644 --- a/src/services/wsService.ts +++ b/src/services/wsService.ts @@ -1,9 +1,9 @@ import http from "http"; import https from "https"; import ws from "ws"; -import { Account } from "../models/loginModel"; -import { createAccount, createNonce, getUsernameFromEmail, isCorrectPassword } from "./loginService"; -import { IDatabaseAccountJson } from "../types/loginTypes"; +import { Account } from "@/src/models/loginModel"; +import { createAccount, createNonce, getUsernameFromEmail, isCorrectPassword } from "@/src/services/loginService"; +import { IDatabaseAccountJson } from "@/src/types/loginTypes"; import { HydratedDocument } from "mongoose"; let wsServer: ws.Server | undefined; diff --git a/src/types/equipmentTypes.ts b/src/types/equipmentTypes.ts index 8123c106..4053430a 100644 --- a/src/types/equipmentTypes.ts +++ b/src/types/equipmentTypes.ts @@ -1,6 +1,11 @@ import { Types } from "mongoose"; -import { IMongoDate, IOid, IOidWithLegacySupport } from "./commonTypes"; -import { ICrewShipCustomization, IFlavourItem, IItemConfig, IPolarity } from "./inventoryTypes/commonInventoryTypes"; +import { IMongoDate, IOid, IOidWithLegacySupport } from "@/src/types/commonTypes"; +import { + ICrewShipCustomization, + IFlavourItem, + IItemConfig, + IPolarity +} from "@/src/types/inventoryTypes/commonInventoryTypes"; export interface IEquipmentSelection { ItemId: IOid; diff --git a/src/types/friendTypes.ts b/src/types/friendTypes.ts index f4799201..0318c0ae 100644 --- a/src/types/friendTypes.ts +++ b/src/types/friendTypes.ts @@ -1,5 +1,5 @@ import { Types } from "mongoose"; -import { IMongoDate, IOidWithLegacySupport } from "./commonTypes"; +import { IMongoDate, IOidWithLegacySupport } from "@/src/types/commonTypes"; export interface IFriendInfo { _id: IOidWithLegacySupport; diff --git a/src/types/genericUpdate.ts b/src/types/genericUpdate.ts index 93551b05..e51d41bc 100644 --- a/src/types/genericUpdate.ts +++ b/src/types/genericUpdate.ts @@ -1,4 +1,4 @@ -import { IInventoryChanges } from "./purchaseTypes"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; export interface IGenericUpdate { NodeIntrosCompleted: string | string[]; diff --git a/src/types/guildTypes.ts b/src/types/guildTypes.ts index af2bb9d5..ec1b4899 100644 --- a/src/types/guildTypes.ts +++ b/src/types/guildTypes.ts @@ -1,8 +1,8 @@ import { Types } from "mongoose"; import { IOid, IMongoDate, IOidWithLegacySupport, ITypeCount } from "@/src/types/commonTypes"; import { IFusionTreasure, IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes"; -import { IPictureFrameInfo } from "./personalRoomsTypes"; -import { IFriendInfo } from "./friendTypes"; +import { IPictureFrameInfo } from "@/src/types/personalRoomsTypes"; +import { IFriendInfo } from "@/src/types/friendTypes"; export interface IGuildClient { _id: IOidWithLegacySupport; diff --git a/src/types/inventoryTypes/inventoryTypes.ts b/src/types/inventoryTypes/inventoryTypes.ts index 90b156c6..b10d3282 100644 --- a/src/types/inventoryTypes/inventoryTypes.ts +++ b/src/types/inventoryTypes/inventoryTypes.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Types } from "mongoose"; -import { IOid, IMongoDate, IOidWithLegacySupport, ITypeCount } from "../commonTypes"; +import { IOid, IMongoDate, IOidWithLegacySupport, ITypeCount } from "@/src/types/commonTypes"; import { IColor, IItemConfig, @@ -11,10 +11,10 @@ import { IShipCustomization } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { IFingerprintStat, RivenFingerprint } from "@/src/helpers/rivenHelper"; -import { IOrbiterClient } from "../personalRoomsTypes"; +import { IOrbiterClient } from "@/src/types/personalRoomsTypes"; import { ICountedStoreItem } from "warframe-public-export-plus"; -import { IEquipmentClient, IEquipmentDatabase, ITraits } from "../equipmentTypes"; -import { ILoadOutPresets } from "../saveLoadoutTypes"; +import { IEquipmentClient, IEquipmentDatabase, ITraits } from "@/src/types/equipmentTypes"; +import { ILoadOutPresets } from "@/src/types/saveLoadoutTypes"; export type InventoryDatabaseEquipment = { [_ in TEquipmentKey]: IEquipmentDatabase[]; diff --git a/src/types/missionTypes.ts b/src/types/missionTypes.ts index bb70fc30..04317c3a 100644 --- a/src/types/missionTypes.ts +++ b/src/types/missionTypes.ts @@ -1,4 +1,4 @@ -import { IAffiliationMods, IInventoryChanges } from "./purchaseTypes"; +import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes"; export const inventoryFields = ["RawUpgrades", "MiscItems", "Consumables", "Recipes"] as const; export type IInventoryFieldType = (typeof inventoryFields)[number]; diff --git a/src/types/personalRoomsTypes.ts b/src/types/personalRoomsTypes.ts index b48f8b25..d418fafc 100644 --- a/src/types/personalRoomsTypes.ts +++ b/src/types/personalRoomsTypes.ts @@ -1,7 +1,7 @@ import { IColor, IShipAttachments, IShipCustomization } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { Document, Model, Types } from "mongoose"; -import { ILoadoutClient } from "./saveLoadoutTypes"; -import { IMongoDate, IOid } from "./commonTypes"; +import { ILoadoutClient } from "@/src/types/saveLoadoutTypes"; +import { IMongoDate, IOid } from "@/src/types/commonTypes"; export interface IGetShipResponse { ShipOwnerId: string; diff --git a/src/types/purchaseTypes.ts b/src/types/purchaseTypes.ts index f3151462..1dcb0914 100644 --- a/src/types/purchaseTypes.ts +++ b/src/types/purchaseTypes.ts @@ -1,5 +1,5 @@ -import { ITypeCount } from "./commonTypes"; -import { IEquipmentClient } from "./equipmentTypes"; +import { ITypeCount } from "@/src/types/commonTypes"; +import { IEquipmentClient } from "@/src/types/equipmentTypes"; import { IDroneClient, IInfestedFoundryClient, @@ -9,7 +9,7 @@ import { TEquipmentKey, ICrewMemberClient, IKubrowPetPrintClient -} from "./inventoryTypes/inventoryTypes"; +} from "@/src/types/inventoryTypes/inventoryTypes"; export enum PurchaseSource { Market = 0, diff --git a/src/types/requestTypes.ts b/src/types/requestTypes.ts index 98e82273..c9292fc4 100644 --- a/src/types/requestTypes.ts +++ b/src/types/requestTypes.ts @@ -1,4 +1,4 @@ -import { IOid, ITypeCount } from "./commonTypes"; +import { IOid, ITypeCount } from "@/src/types/commonTypes"; import { ArtifactPolarity, IPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { IBooster, @@ -22,10 +22,10 @@ import { IWeaponSkinClient, IKubrowPetEggClient, INemesisClient -} from "./inventoryTypes/inventoryTypes"; -import { IGroup } from "./loginTypes"; -import { ILoadOutPresets } from "./saveLoadoutTypes"; -import { IEquipmentClient } from "./equipmentTypes"; +} from "@/src/types/inventoryTypes/inventoryTypes"; +import { IGroup } from "@/src/types/loginTypes"; +import { ILoadOutPresets } from "@/src/types/saveLoadoutTypes"; +import { IEquipmentClient } from "@/src/types/equipmentTypes"; export interface IAffiliationChange { Tag: string; diff --git a/src/types/saveLoadoutTypes.ts b/src/types/saveLoadoutTypes.ts index d8780b2f..a4f76e12 100644 --- a/src/types/saveLoadoutTypes.ts +++ b/src/types/saveLoadoutTypes.ts @@ -7,7 +7,7 @@ import { IOperatorConfigClient } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { Types } from "mongoose"; -import { ICrewShipMembersClient, ICrewShipWeapon, IEquipmentSelection } from "./equipmentTypes"; +import { ICrewShipMembersClient, ICrewShipWeapon, IEquipmentSelection } from "@/src/types/equipmentTypes"; export interface ISaveLoadoutRequest { LoadOuts: ILoadoutClient; diff --git a/src/types/vendorTypes.ts b/src/types/vendorTypes.ts index 9249a9a0..2b64b5a3 100644 --- a/src/types/vendorTypes.ts +++ b/src/types/vendorTypes.ts @@ -1,4 +1,4 @@ -import { IMongoDate, IOid } from "./commonTypes"; +import { IMongoDate, IOid } from "@/src/types/commonTypes"; export interface IItemPrice { ItemType: string; diff --git a/src/types/worldStateTypes.ts b/src/types/worldStateTypes.ts index bf3ebdc4..b83b787c 100644 --- a/src/types/worldStateTypes.ts +++ b/src/types/worldStateTypes.ts @@ -1,5 +1,5 @@ import { IMissionReward } from "warframe-public-export-plus"; -import { IMongoDate, IOid } from "./commonTypes"; +import { IMongoDate, IOid } from "@/src/types/commonTypes"; export interface IWorldState { Version: number; // for goals