From e709b6c1110faa1bc49942d72d71829132ee6350 Mon Sep 17 00:00:00 2001 From: Refringe Date: Mon, 13 Nov 2023 11:43:37 -0500 Subject: [PATCH] Reformatted imports with (only) Biome. --- project/gulpfile.mjs | 6 ++-- project/src/Program.ts | 2 +- .../src/controllers/InsuranceController.ts | 2 +- project/src/di/Container.ts | 32 +++++++++---------- project/src/generators/BotWeaponGenerator.ts | 2 +- project/src/generators/LocationGenerator.ts | 2 +- project/src/routers/HttpRouter.ts | 2 +- project/src/routers/ItemEventRouter.ts | 2 +- project/src/servers/HttpServer.ts | 4 +-- project/src/servers/SaveServer.ts | 2 +- project/src/servers/http/AkiHttpListener.ts | 2 +- project/src/services/LocalisationService.ts | 2 +- project/src/utils/App.ts | 2 +- project/src/utils/ImporterUtil.ts | 2 +- project/src/utils/VFS.ts | 4 +-- project/tests/CustomEnvironment.ts | 4 +-- project/tests/generators/BotGenerator.test.ts | 6 ++-- .../services/ItemBaseClassService.test.ts | 4 +-- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/project/gulpfile.mjs b/project/gulpfile.mjs index 26ba5a31..613e916c 100644 --- a/project/gulpfile.mjs +++ b/project/gulpfile.mjs @@ -1,10 +1,10 @@ -import gulp from "gulp"; -import { exec } from "gulp-execa"; -import rename from "gulp-rename"; import crypto from "node:crypto"; import fs from "node:fs/promises"; import os from "node:os"; import path from "node:path"; +import gulp from "gulp"; +import { exec } from "gulp-execa"; +import rename from "gulp-rename"; import pkg from "pkg"; import pkgfetch from "pkg-fetch"; import * as ResEdit from "resedit"; diff --git a/project/src/Program.ts b/project/src/Program.ts index 7ea38751..476e69e0 100644 --- a/project/src/Program.ts +++ b/project/src/Program.ts @@ -1,7 +1,7 @@ import { container } from "tsyringe"; -import { Container } from "@spt-aki/di/Container"; import { ErrorHandler } from "@spt-aki/ErrorHandler"; +import { Container } from "@spt-aki/di/Container"; import type { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; import { App } from "@spt-aki/utils/App"; import { Watermark } from "@spt-aki/utils/Watermark"; diff --git a/project/src/controllers/InsuranceController.ts b/project/src/controllers/InsuranceController.ts index 271ad0bd..f27fc583 100644 --- a/project/src/controllers/InsuranceController.ts +++ b/project/src/controllers/InsuranceController.ts @@ -10,7 +10,7 @@ import { IGetInsuranceCostRequestData } from "@spt-aki/models/eft/insurance/IGet import { IGetInsuranceCostResponseData } from "@spt-aki/models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "@spt-aki/models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; -import { Insurance, ISystemData } from "@spt-aki/models/eft/profile/IAkiProfile"; +import { ISystemData, Insurance } from "@spt-aki/models/eft/profile/IAkiProfile"; import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; import { MessageType } from "@spt-aki/models/enums/MessageType"; diff --git a/project/src/di/Container.ts b/project/src/di/Container.ts index 9e13eb14..e80d5579 100644 --- a/project/src/di/Container.ts +++ b/project/src/di/Container.ts @@ -69,17 +69,17 @@ import { BotWeaponGenerator } from "@spt-aki/generators/BotWeaponGenerator"; import { FenceBaseAssortGenerator } from "@spt-aki/generators/FenceBaseAssortGenerator"; import { LocationGenerator } from "@spt-aki/generators/LocationGenerator"; import { LootGenerator } from "@spt-aki/generators/LootGenerator"; -import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; import { PMCLootGenerator } from "@spt-aki/generators/PMCLootGenerator"; +import { PlayerScavGenerator } from "@spt-aki/generators/PlayerScavGenerator"; import { RagfairAssortGenerator } from "@spt-aki/generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator"; import { RepeatableQuestGenerator } from "@spt-aki/generators/RepeatableQuestGenerator"; import { ScavCaseRewardGenerator } from "@spt-aki/generators/ScavCaseRewardGenerator"; +import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; import { BarrelInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/BarrelInventoryMagGen"; import { ExternalInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/ExternalInventoryMagGen"; import { InternalMagazineInventoryMagGen } from "@spt-aki/generators/weapongen/implementations/InternalMagazineInventoryMagGen"; import { UbglExternalMagGen } from "@spt-aki/generators/weapongen/implementations/UbglExternalMagGen"; -import { WeatherGenerator } from "@spt-aki/generators/WeatherGenerator"; import { AssortHelper } from "@spt-aki/helpers/AssortHelper"; import { BotDifficultyHelper } from "@spt-aki/helpers/BotDifficultyHelper"; import { BotGeneratorHelper } from "@spt-aki/helpers/BotGeneratorHelper"; @@ -124,6 +124,10 @@ import { PostAkiModLoader } from "@spt-aki/loaders/PostAkiModLoader"; import { PostDBModLoader } from "@spt-aki/loaders/PostDBModLoader"; import { PreAkiModLoader } from "@spt-aki/loaders/PreAkiModLoader"; import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; +import { HttpRouter } from "@spt-aki/routers/HttpRouter"; +import { ImageRouter } from "@spt-aki/routers/ImageRouter"; +import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; import { BotDynamicRouter } from "@spt-aki/routers/dynamic/BotDynamicRouter"; import { BundleDynamicRouter } from "@spt-aki/routers/dynamic/BundleDynamicRouter"; import { CustomizationDynamicRouter } from "@spt-aki/routers/dynamic/CustomizationDynamicRouter"; @@ -133,9 +137,6 @@ import { InraidDynamicRouter } from "@spt-aki/routers/dynamic/InraidDynamicRoute import { LocationDynamicRouter } from "@spt-aki/routers/dynamic/LocationDynamicRouter"; import { NotifierDynamicRouter } from "@spt-aki/routers/dynamic/NotifierDynamicRouter"; import { TraderDynamicRouter } from "@spt-aki/routers/dynamic/TraderDynamicRouter"; -import { EventOutputHolder } from "@spt-aki/routers/EventOutputHolder"; -import { HttpRouter } from "@spt-aki/routers/HttpRouter"; -import { ImageRouter } from "@spt-aki/routers/ImageRouter"; import { CustomizationItemEventRouter } from "@spt-aki/routers/item_events/CustomizationItemEventRouter"; import { HealthItemEventRouter } from "@spt-aki/routers/item_events/HealthItemEventRouter"; import { HideoutItemEventRouter } from "@spt-aki/routers/item_events/HideoutItemEventRouter"; @@ -148,7 +149,6 @@ import { RagfairItemEventRouter } from "@spt-aki/routers/item_events/RagfairItem import { RepairItemEventRouter } from "@spt-aki/routers/item_events/RepairItemEventRouter"; import { TradeItemEventRouter } from "@spt-aki/routers/item_events/TradeItemEventRouter"; import { WishlistItemEventRouter } from "@spt-aki/routers/item_events/WishlistItemEventRouter"; -import { ItemEventRouter } from "@spt-aki/routers/ItemEventRouter"; import { HealthSaveLoadRouter } from "@spt-aki/routers/save_load/HealthSaveLoadRouter"; import { InraidSaveLoadRouter } from "@spt-aki/routers/save_load/InraidSaveLoadRouter"; import { InsuranceSaveLoadRouter } from "@spt-aki/routers/save_load/InsuranceSaveLoadRouter"; @@ -179,11 +179,11 @@ import { TraderStaticRouter } from "@spt-aki/routers/static/TraderStaticRouter"; import { WeatherStaticRouter } from "@spt-aki/routers/static/WeatherStaticRouter"; import { ConfigServer } from "@spt-aki/servers/ConfigServer"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { AkiHttpListener } from "@spt-aki/servers/http/AkiHttpListener"; import { HttpServer } from "@spt-aki/servers/HttpServer"; import { RagfairServer } from "@spt-aki/servers/RagfairServer"; import { SaveServer } from "@spt-aki/servers/SaveServer"; import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; +import { AkiHttpListener } from "@spt-aki/servers/http/AkiHttpListener"; import { BotEquipmentFilterService } from "@spt-aki/services/BotEquipmentFilterService"; import { BotEquipmentModPoolService } from "@spt-aki/services/BotEquipmentModPoolService"; import { BotGenerationCacheService } from "@spt-aki/services/BotGenerationCacheService"; @@ -201,13 +201,6 @@ import { LocalisationService } from "@spt-aki/services/LocalisationService"; import { MailSendService } from "@spt-aki/services/MailSendService"; import { MatchBotDetailsCacheService } from "@spt-aki/services/MatchBotDetailsCacheService"; import { MatchLocationService } from "@spt-aki/services/MatchLocationService"; -import { CustomItemService } from "@spt-aki/services/mod/CustomItemService"; -import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService"; -import { HttpListenerModService } from "@spt-aki/services/mod/httpListener/HttpListenerModService"; -import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; -import { OnLoadModService } from "@spt-aki/services/mod/onLoad/OnLoadModService"; -import { OnUpdateModService } from "@spt-aki/services/mod/onUpdate/OnUpdateModService"; -import { StaticRouterModService } from "@spt-aki/services/mod/staticRouter/StaticRouterModService"; import { ModCompilerService } from "@spt-aki/services/ModCompilerService"; import { NotificationService } from "@spt-aki/services/NotificationService"; import { OpenZoneService } from "@spt-aki/services/OpenZoneService"; @@ -226,6 +219,13 @@ import { RepairService } from "@spt-aki/services/RepairService"; import { SeasonalEventService } from "@spt-aki/services/SeasonalEventService"; import { TraderAssortService } from "@spt-aki/services/TraderAssortService"; import { TraderPurchasePersisterService } from "@spt-aki/services/TraderPurchasePersisterService"; +import { CustomItemService } from "@spt-aki/services/mod/CustomItemService"; +import { DynamicRouterModService } from "@spt-aki/services/mod/dynamicRouter/DynamicRouterModService"; +import { HttpListenerModService } from "@spt-aki/services/mod/httpListener/HttpListenerModService"; +import { ImageRouteService } from "@spt-aki/services/mod/image/ImageRouteService"; +import { OnLoadModService } from "@spt-aki/services/mod/onLoad/OnLoadModService"; +import { OnUpdateModService } from "@spt-aki/services/mod/onUpdate/OnUpdateModService"; +import { StaticRouterModService } from "@spt-aki/services/mod/staticRouter/StaticRouterModService"; import { App } from "@spt-aki/utils/App"; import { AsyncQueue } from "@spt-aki/utils/AsyncQueue"; import { DatabaseImporter } from "@spt-aki/utils/DatabaseImporter"; @@ -235,14 +235,14 @@ import { HttpFileUtil } from "@spt-aki/utils/HttpFileUtil"; import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; -import { WinstonRequestLogger } from "@spt-aki/utils/logging/WinstonRequestLogger"; import { MathUtil } from "@spt-aki/utils/MathUtil"; import { ObjectId } from "@spt-aki/utils/ObjectId"; import { RandomUtil } from "@spt-aki/utils/RandomUtil"; import { TimeUtil } from "@spt-aki/utils/TimeUtil"; import { VFS } from "@spt-aki/utils/VFS"; import { Watermark, WatermarkLocale } from "@spt-aki/utils/Watermark"; +import { WinstonMainLogger } from "@spt-aki/utils/logging/WinstonMainLogger"; +import { WinstonRequestLogger } from "@spt-aki/utils/logging/WinstonRequestLogger"; /** * Handle the registration of classes to be used by the Dependency Injection code diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index db97c19f..ad7fc5ef 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -1,4 +1,4 @@ -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { BotEquipmentModGenerator } from "@spt-aki/generators/BotEquipmentModGenerator"; import { IInventoryMagGen } from "@spt-aki/generators/weapongen/IInventoryMagGen"; diff --git a/project/src/generators/LocationGenerator.ts b/project/src/generators/LocationGenerator.ts index a43d738f..bdb1bd8e 100644 --- a/project/src/generators/LocationGenerator.ts +++ b/project/src/generators/LocationGenerator.ts @@ -6,7 +6,7 @@ import { PresetHelper } from "@spt-aki/helpers/PresetHelper"; import { RagfairServerHelper } from "@spt-aki/helpers/RagfairServerHelper"; import { IContainerMinMax, IStaticContainer } from "@spt-aki/models/eft/common/ILocation"; import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase"; -import { ILooseLoot, Spawnpoint, SpawnpointsForced, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot"; +import { ILooseLoot, Spawnpoint, SpawnpointTemplate, SpawnpointsForced } from "@spt-aki/models/eft/common/ILooseLoot"; import { Item } from "@spt-aki/models/eft/common/tables/IItem"; import { IStaticAmmoDetails, diff --git a/project/src/routers/HttpRouter.ts b/project/src/routers/HttpRouter.ts index 3e2f41f2..620c53d3 100644 --- a/project/src/routers/HttpRouter.ts +++ b/project/src/routers/HttpRouter.ts @@ -1,5 +1,5 @@ import { IncomingMessage } from "node:http"; -import { injectable, injectAll } from "tsyringe"; +import { injectAll, injectable } from "tsyringe"; import { DynamicRouter, Router, StaticRouter } from "@spt-aki/di/Router"; diff --git a/project/src/routers/ItemEventRouter.ts b/project/src/routers/ItemEventRouter.ts index bd1fd158..a1bf45fb 100644 --- a/project/src/routers/ItemEventRouter.ts +++ b/project/src/routers/ItemEventRouter.ts @@ -1,4 +1,4 @@ -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { ItemEventRouterDefinition } from "@spt-aki/di/Router"; import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; diff --git a/project/src/servers/HttpServer.ts b/project/src/servers/HttpServer.ts index c8f59b5d..ae163092 100644 --- a/project/src/servers/HttpServer.ts +++ b/project/src/servers/HttpServer.ts @@ -1,5 +1,5 @@ import http, { IncomingMessage, ServerResponse } from "node:http"; -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { ApplicationContext } from "@spt-aki/context/ApplicationContext"; import { ContextVariableType } from "@spt-aki/context/ContextVariableType"; @@ -9,8 +9,8 @@ import { IHttpConfig } from "@spt-aki/models/spt/config/IHttpConfig"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { ConfigServer } from "@spt-aki/servers/ConfigServer"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; -import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; import { WebSocketServer } from "@spt-aki/servers/WebSocketServer"; +import { IHttpListener } from "@spt-aki/servers/http/IHttpListener"; import { LocalisationService } from "@spt-aki/services/LocalisationService"; @injectable() diff --git a/project/src/servers/SaveServer.ts b/project/src/servers/SaveServer.ts index d5edf855..8105ab79 100644 --- a/project/src/servers/SaveServer.ts +++ b/project/src/servers/SaveServer.ts @@ -1,4 +1,4 @@ -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { SaveLoadRouter } from "@spt-aki/di/Router"; import { IAkiProfile, Info } from "@spt-aki/models/eft/profile/IAkiProfile"; diff --git a/project/src/servers/http/AkiHttpListener.ts b/project/src/servers/http/AkiHttpListener.ts index 6cc436bc..ef795e91 100644 --- a/project/src/servers/http/AkiHttpListener.ts +++ b/project/src/servers/http/AkiHttpListener.ts @@ -1,6 +1,6 @@ import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from "node:http"; import zlib from "node:zlib"; -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { Serializer } from "@spt-aki/di/Serializer"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; diff --git a/project/src/services/LocalisationService.ts b/project/src/services/LocalisationService.ts index d946dfab..6a75cb7f 100644 --- a/project/src/services/LocalisationService.ts +++ b/project/src/services/LocalisationService.ts @@ -1,5 +1,5 @@ -import { I18n } from "i18n"; import path from "node:path"; +import { I18n } from "i18n"; import { inject, injectable } from "tsyringe"; import { ILocaleConfig } from "@spt-aki/models/spt/config/ILocaleConfig"; diff --git a/project/src/utils/App.ts b/project/src/utils/App.ts index 15985000..eac8989d 100644 --- a/project/src/utils/App.ts +++ b/project/src/utils/App.ts @@ -1,5 +1,5 @@ import os from "node:os"; -import { inject, injectable, injectAll } from "tsyringe"; +import { inject, injectAll, injectable } from "tsyringe"; import { OnLoad } from "@spt-aki/di/OnLoad"; import { OnUpdate } from "@spt-aki/di/OnUpdate"; diff --git a/project/src/utils/ImporterUtil.ts b/project/src/utils/ImporterUtil.ts index 7bdb87c1..ee92c21e 100644 --- a/project/src/utils/ImporterUtil.ts +++ b/project/src/utils/ImporterUtil.ts @@ -1,8 +1,8 @@ import { inject, injectable } from "tsyringe"; -import { Queue } from "@spt-aki/utils/collections/queue/Queue"; import { JsonUtil } from "@spt-aki/utils/JsonUtil"; import { VFS } from "@spt-aki/utils/VFS"; +import { Queue } from "@spt-aki/utils/collections/queue/Queue"; /* eslint-disable @typescript-eslint/no-empty-function */ /* eslint-disable @typescript-eslint/brace-style */ diff --git a/project/src/utils/VFS.ts b/project/src/utils/VFS.ts index 0d357769..05198a83 100644 --- a/project/src/utils/VFS.ts +++ b/project/src/utils/VFS.ts @@ -1,12 +1,12 @@ import "reflect-metadata"; import { inject, injectable } from "tsyringe"; -import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; -import { writeFileSync } from "atomically"; import crypto from "node:crypto"; import fs from "node:fs"; import path, { resolve } from "node:path"; import { promisify } from "node:util"; +import { IAsyncQueue } from "@spt-aki/models/spt/utils/IAsyncQueue"; +import { writeFileSync } from "atomically"; import lockfile from "proper-lockfile"; @injectable() diff --git a/project/tests/CustomEnvironment.ts b/project/tests/CustomEnvironment.ts index 0307444e..4dd917dd 100644 --- a/project/tests/CustomEnvironment.ts +++ b/project/tests/CustomEnvironment.ts @@ -1,11 +1,11 @@ import "reflect-metadata"; -import { container, DependencyContainer, Lifecycle } from "tsyringe"; +import { DependencyContainer, Lifecycle, container } from "tsyringe"; +import path from "node:path"; import { Container } from "@spt-aki/di/Container"; import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; import { ImporterUtil } from "@spt-aki/utils/ImporterUtil"; -import path from "node:path"; import type { Environment } from "vitest"; // Manually mock the logger. diff --git a/project/tests/generators/BotGenerator.test.ts b/project/tests/generators/BotGenerator.test.ts index 7545a69d..a6e781de 100644 --- a/project/tests/generators/BotGenerator.test.ts +++ b/project/tests/generators/BotGenerator.test.ts @@ -1,10 +1,10 @@ -/* eslint-disable @typescript-eslint/naming-convention */ import "reflect-metadata"; -import { BotGenerator } from "@spt-aki/generators/BotGenerator"; -import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { BotGenerator } from "@spt-aki/generators/BotGenerator"; +import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; + describe("BotGenerator", () => { let botGenerator: any; diff --git a/project/tests/services/ItemBaseClassService.test.ts b/project/tests/services/ItemBaseClassService.test.ts index d2dbe193..eee0d619 100644 --- a/project/tests/services/ItemBaseClassService.test.ts +++ b/project/tests/services/ItemBaseClassService.test.ts @@ -1,9 +1,9 @@ -/* eslint-disable @typescript-eslint/naming-convention */ import "reflect-metadata"; -import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; import { container } from "tsyringe"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { ItemBaseClassService } from "@spt-aki/services/ItemBaseClassService"; + describe("ItemBaseClassService", () => { let itemBaseClassService: any;