From 897681d14c583a9f1dda3858a96e3153e07c3cc1 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:45:08 +0200 Subject: [PATCH 1/2] Disable no-explicit-any warning --- .eslintrc | 2 +- src/controllers/api/crewShipFusionController.ts | 1 - src/controllers/dynamic/getProfileViewingDataController.ts | 2 +- src/services/configService.ts | 2 +- src/types/inventoryTypes/inventoryTypes.ts | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.eslintrc b/.eslintrc index 00926e21..aa166037 100644 --- a/.eslintrc +++ b/.eslintrc @@ -21,7 +21,7 @@ "@typescript-eslint/no-unsafe-argument": "error", "@typescript-eslint/no-unsafe-call": "error", "@typescript-eslint/no-unsafe-assignment": "error", - "@typescript-eslint/no-explicit-any": "error", + "@typescript-eslint/no-explicit-any": "off", "no-loss-of-precision": "error", "@typescript-eslint/no-unnecessary-condition": "error", "@typescript-eslint/no-base-to-string": "off", diff --git a/src/controllers/api/crewShipFusionController.ts b/src/controllers/api/crewShipFusionController.ts index 87cfd2ce..160c19b7 100644 --- a/src/controllers/api/crewShipFusionController.ts +++ b/src/controllers/api/crewShipFusionController.ts @@ -88,7 +88,6 @@ export const crewShipFusionController: RequestHandler = async (req, res) => { } } superiorItem.UpgradeFingerprint = JSON.stringify(fingerprint); - // eslint-disable-next-line @typescript-eslint/no-explicit-any inventoryChanges[category] = [superiorItem.toJSON() as any]; await inventory.save(); diff --git a/src/controllers/dynamic/getProfileViewingDataController.ts b/src/controllers/dynamic/getProfileViewingDataController.ts index 221eaebb..b89ab917 100644 --- a/src/controllers/dynamic/getProfileViewingDataController.ts +++ b/src/controllers/dynamic/getProfileViewingDataController.ts @@ -141,7 +141,7 @@ export const getProfileViewingDataGetController: RequestHandler = async (req, re } } } else { - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument combinedStats[arrayName].push(entry as any); } } diff --git a/src/services/configService.ts b/src/services/configService.ts index 95a2bd4e..3fd0483e 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -114,7 +114,7 @@ export const loadConfig = (): void => { // Set all values to undefined now so if the new config.json omits some fields that were previously present, it's correct in-memory. for (const key of Object.keys(config)) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access (config as any)[key] = undefined; } diff --git a/src/types/inventoryTypes/inventoryTypes.ts b/src/types/inventoryTypes/inventoryTypes.ts index 4fa39f93..9df4e4ba 100644 --- a/src/types/inventoryTypes/inventoryTypes.ts +++ b/src/types/inventoryTypes/inventoryTypes.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ import { Types } from "mongoose"; import { IOid, IMongoDate, IOidWithLegacySupport, ITypeCount } from "@/src/types/commonTypes"; import { -- 2.47.2 From 0ca13492a7c422aaef491d877b0b5cf843aa4e55 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:49:02 +0200 Subject: [PATCH 2/2] Update mongoose --- package-lock.json | 8 +-- package.json | 2 +- src/models/inboxModel.ts | 2 +- src/models/inventoryModels/inventoryModel.ts | 62 ++++++++++---------- src/models/inventoryModels/loadoutModel.ts | 4 +- src/models/loginModel.ts | 2 +- src/models/personalRoomsModel.ts | 8 +-- src/models/shipModel.ts | 2 +- src/models/statsModel.ts | 2 +- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef818de3..d5267be9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "crc-32": "^1.2.2", "express": "^5", "json-with-bigint": "^3.4.4", - "mongoose": ">=8.11.0 <8.16.2", + "mongoose": "^8.11.0", "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", @@ -3889,9 +3889,9 @@ } }, "node_modules/mongoose": { - "version": "8.16.1", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.1.tgz", - "integrity": "sha512-Q+0TC+KLdY4SYE+u9gk9pdW1tWu/pl0jusyEkMGTgBoAbvwQdfy4f9IM8dmvCwb/blSfp7IfLkob7v76x6ZGpQ==", + "version": "8.16.4", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.4.tgz", + "integrity": "sha512-jslgdQ8pY2vcNSKPv3Dbi5ogo/NT8zcvf6kPDyD8Sdsjsa1at3AFAF0F5PT+jySPGSPbvlNaQ49nT9h+Kx2UDA==", "license": "MIT", "dependencies": { "bson": "^6.10.4", diff --git a/package.json b/package.json index 3391ccf5..af6631ab 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "crc-32": "^1.2.2", "express": "^5", "json-with-bigint": "^3.4.4", - "mongoose": ">=8.11.0 <8.16.2", + "mongoose": "^8.11.0", "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", diff --git a/src/models/inboxModel.ts b/src/models/inboxModel.ts index ab5c8b9d..0ec39442 100644 --- a/src/models/inboxModel.ts +++ b/src/models/inboxModel.ts @@ -150,7 +150,7 @@ messageSchema.virtual("messageId").get(function (this: IMessageDatabase) { messageSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { const messageDatabase = returnedObject as IMessageDatabase; const messageClient = returnedObject as IMessageClient; diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 32595cdd..4fb863a6 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -121,7 +121,7 @@ import { export const typeCountSchema = new Schema({ ItemType: String, ItemCount: Number }, { _id: false }); typeCountSchema.set("toJSON", { - transform(_doc, obj) { + transform(_doc, obj: Record) { if (obj.ItemCount > 2147483647) { obj.ItemCount = 2147483647; } else if (obj.ItemCount < -2147483648) { @@ -189,7 +189,7 @@ operatorConfigSchema.virtual("ItemId").get(function () { operatorConfigSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; } @@ -226,7 +226,7 @@ const ItemConfigSchema = new Schema( ); ItemConfigSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject.__v; } }); @@ -261,7 +261,7 @@ RawUpgrades.virtual("LastAdded").get(function () { RawUpgrades.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; } @@ -282,7 +282,7 @@ upgradeSchema.virtual("ItemId").get(function () { upgradeSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; } @@ -325,7 +325,7 @@ const crewMemberSchema = new Schema( crewMemberSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as ICrewMemberDatabase; const client = obj as ICrewMemberClient; @@ -353,7 +353,7 @@ const FlavourItemSchema = new Schema( ); FlavourItemSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; } @@ -367,7 +367,7 @@ FlavourItemSchema.set("toJSON", { ); MailboxSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { const mailboxDatabase = returnedObject as HydratedDocument; delete mailboxDatabase.__v; (returnedObject as IMailboxClient).LastInboxId = toOid(mailboxDatabase.LastInboxId); @@ -386,7 +386,7 @@ const DuviriInfoSchema = new Schema( ); DuviriInfoSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject.__v; } }); @@ -416,7 +416,7 @@ const droneSchema = new Schema( ); droneSchema.set("toJSON", { virtuals: true, - transform(_document, obj) { + transform(_document, obj: Record) { const client = obj as IDroneClient; const db = obj as IDroneDatabase; @@ -457,7 +457,7 @@ const personalGoalProgressSchema = new Schema( personalGoalProgressSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as IPersonalGoalProgressDatabase; const client = obj as IPersonalGoalProgressClient; @@ -502,7 +502,7 @@ StepSequencersSchema.virtual("ItemId").get(function () { StepSequencersSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; } @@ -516,7 +516,7 @@ const kubrowPetEggSchema = new Schema( ); kubrowPetEggSchema.set("toJSON", { virtuals: true, - transform(_document, obj) { + transform(_document, obj: Record) { const client = obj as IKubrowPetEggClient; const db = obj as IKubrowPetEggDatabase; @@ -586,7 +586,7 @@ personalTechProjectSchema.virtual("ItemId").get(function () { personalTechProjectSchema.set("toJSON", { virtuals: true, - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { delete ret._id; delete ret.__v; @@ -687,7 +687,7 @@ const questKeysSchema = new Schema( ); questKeysSchema.set("toJSON", { - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { const questKeysDatabase = ret as IQuestKeyDatabase; if (questKeysDatabase.CompletionDate) { @@ -709,7 +709,7 @@ const invasionProgressSchema = new Schema( ); invasionProgressSchema.set("toJSON", { - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as IInvasionProgressDatabase; const client = obj as IInvasionProgressClient; @@ -748,7 +748,7 @@ weaponSkinsSchema.virtual("ItemId").get(function () { weaponSkinsSchema.set("toJSON", { virtuals: true, - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { delete ret._id; delete ret.__v; } @@ -772,7 +772,7 @@ const periodicMissionCompletionsSchema = new Schema) { const periodicMissionCompletionDatabase = ret as IPeriodicMissionCompletionDatabase; (periodicMissionCompletionDatabase as unknown as IPeriodicMissionCompletionResponse).date = toMongoDate( @@ -849,7 +849,7 @@ const endlessXpProgressSchema = new Schema( ); endlessXpProgressSchema.set("toJSON", { - transform(_doc, ret) { + transform(_doc, ret: Record) { const db = ret as IEndlessXpProgressDatabase; const client = ret as IEndlessXpProgressClient; @@ -898,7 +898,7 @@ const crewShipMemberSchema = new Schema( ); crewShipMemberSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as ICrewShipMemberDatabase; const client = obj as ICrewShipMemberClient; if (db.ItemId) { @@ -951,7 +951,7 @@ const dialogueSchema = new Schema( ); dialogueSchema.set("toJSON", { virtuals: true, - transform(_doc, ret) { + transform(_doc, ret: Record) { const db = ret as IDialogueDatabase; const client = ret as IDialogueClient; @@ -997,7 +997,7 @@ const kubrowPetPrintSchema = new Schema({ }); kubrowPetPrintSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as IKubrowPetPrintDatabase; const client = obj as IKubrowPetPrintClient; @@ -1025,7 +1025,7 @@ const detailsSchema = new Schema( ); detailsSchema.set("toJSON", { - transform(_doc, returnedObject) { + transform(_doc, returnedObject: Record) { delete returnedObject.__v; const db = returnedObject as IKubrowPetDetailsDatabase; @@ -1081,7 +1081,7 @@ EquipmentSchema.virtual("ItemId").get(function () { EquipmentSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; @@ -1132,7 +1132,7 @@ pendingRecipeSchema.virtual("ItemId").get(function () { pendingRecipeSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; delete returnedObject.LongGuns; @@ -1170,7 +1170,7 @@ const infestedFoundrySchema = new Schema( ); infestedFoundrySchema.set("toJSON", { - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { if (ret.AbilityOverrideUnlockCooldown) { // eslint-disable-next-line @typescript-eslint/no-unsafe-argument ret.AbilityOverrideUnlockCooldown = toMongoDate(ret.AbilityOverrideUnlockCooldown); @@ -1243,7 +1243,7 @@ const vendorPurchaseHistoryEntrySchema = new Schema) { const db = obj as IVendorPurchaseHistoryEntryDatabase; const client = obj as IVendorPurchaseHistoryEntryClient; client.Expiry = toMongoDate(db.Expiry); @@ -1286,7 +1286,7 @@ const pendingCouponSchema = new Schema( ); pendingCouponSchema.set("toJSON", { - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { (ret as IPendingCouponClient).Expiry = toMongoDate((ret as IPendingCouponDatabase).Expiry); } }); @@ -1353,7 +1353,7 @@ const nemesisSchema = new Schema( nemesisSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as INemesisDatabase; const client = obj as INemesisClient; @@ -1383,7 +1383,7 @@ const lastSortieRewardSchema = new Schema( lastSortieRewardSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as ILastSortieRewardDatabase; const client = obj as ILastSortieRewardClient; @@ -1790,7 +1790,7 @@ const inventorySchema = new Schema( ); inventorySchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; delete returnedObject.accountOwnerId; diff --git a/src/models/inventoryModels/loadoutModel.ts b/src/models/inventoryModels/loadoutModel.ts index a06a7846..9f99ca93 100644 --- a/src/models/inventoryModels/loadoutModel.ts +++ b/src/models/inventoryModels/loadoutModel.ts @@ -49,7 +49,7 @@ loadoutConfigSchema.virtual("ItemId").get(function () { loadoutConfigSchema.set("toJSON", { virtuals: true, - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { delete ret._id; delete ret.__v; } @@ -71,7 +71,7 @@ export const loadoutSchema = new Schema({ }); loadoutSchema.set("toJSON", { - transform(_doc, ret, _options) { + transform(_doc, ret: Record) { delete ret._id; delete ret.__v; delete ret.loadoutOwnerId; diff --git a/src/models/loginModel.ts b/src/models/loginModel.ts index aea5b993..a42a7229 100644 --- a/src/models/loginModel.ts +++ b/src/models/loginModel.ts @@ -32,7 +32,7 @@ const databaseAccountSchema = new Schema( ); databaseAccountSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; }, diff --git a/src/models/personalRoomsModel.ts b/src/models/personalRoomsModel.ts index dfe316e2..a33effb5 100644 --- a/src/models/personalRoomsModel.ts +++ b/src/models/personalRoomsModel.ts @@ -55,7 +55,7 @@ placedDecosSchema.virtual("id").get(function (this: IPlacedDecosDatabase) { placedDecosSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; } }); @@ -78,7 +78,7 @@ const favouriteLoadoutSchema = new Schema( ); favouriteLoadoutSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { // eslint-disable-next-line @typescript-eslint/no-unsafe-argument returnedObject.LoadoutId = toOid(returnedObject.LoadoutId); } @@ -95,7 +95,7 @@ const plantSchema = new Schema( plantSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const client = obj as IPlantClient; const db = obj as IPlantDatabase; @@ -158,7 +158,7 @@ const orbiterSchema = new Schema( ); orbiterSchema.set("toJSON", { virtuals: true, - transform(_doc, obj) { + transform(_doc, obj: Record) { const db = obj as IOrbiterDatabase; const client = obj as IOrbiterClient; diff --git a/src/models/shipModel.ts b/src/models/shipModel.ts index 9b4bd98d..ee8df2fe 100644 --- a/src/models/shipModel.ts +++ b/src/models/shipModel.ts @@ -22,7 +22,7 @@ shipSchema.virtual("ItemId").get(function () { shipSchema.set("toJSON", { virtuals: true, - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { const shipResponse = returnedObject as IShipInventory; const shipDatabase = returnedObject as IShipDatabase; delete returnedObject._id; diff --git a/src/models/statsModel.ts b/src/models/statsModel.ts index 62e53c04..d3377cc7 100644 --- a/src/models/statsModel.ts +++ b/src/models/statsModel.ts @@ -101,7 +101,7 @@ const statsSchema = new Schema({ }); statsSchema.set("toJSON", { - transform(_document, returnedObject) { + transform(_document, returnedObject: Record) { delete returnedObject._id; delete returnedObject.__v; delete returnedObject.accountOwnerId; -- 2.47.2