Merge pull request #1340 from Nowadays/main

chore: migrate to eslint flat package to support eslint V9
jorenn92 · Nov 10, 2024 · 29d3e10 · 29d3e10
2 parents ef8a333 + 149dc78
commit 29d3e10
Show file tree

Hide file tree

Showing 28 changed files with 154 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 data/
 docs-output/
 node_modules
-.yarn
+.yarn
+.idea
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "start:ui": "cd ui && next start -p 80",
     "start:server": "cd server && node dist/main",
     "lint:ui": "cd ui && next lint",
-    "lint:server": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint:server": "cd server && eslint \"{src,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:clear": "jest --clearCache",
     "test:watch": "jest --watch",
@@ -74,6 +74,8 @@
   "devDependencies": {
     "@automock/jest": "^1.4.0",
     "@babel/core": "^7.26.0",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.13.0",
     "@nestjs/cli": "^10.4.5",
     "@nestjs/schematics": "^10.2.3",
     "@nestjs/testing": "^10.4.4",

diff --git a/server/.eslintrc.js b/server/.eslintrc.js
diff --git a/server/eslint.config.mjs b/server/eslint.config.mjs
@@ -0,0 +1,55 @@
+import typescriptEslintEslintPlugin from "@typescript-eslint/eslint-plugin";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["**/eslint.config.mjs"],
+}, ...compat.extends("plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslintEslintPlugin,
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+            ...globals.jest,
+        },
+
+        parser: tsParser,
+        ecmaVersion: 5,
+        sourceType: "module",
+
+        parserOptions: {
+            project: "tsconfig.json",
+            tsconfigRootDir: ".",
+        },
+    },
+
+    rules: {
+        "@typescript-eslint/interface-name-prefix": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+                caughtErrors: "none"
+            }
+        ],
+        "prettier/prettier": ["error", {
+            endOfLine: "auto",
+        }],
+    },
+}];
diff --git a/server/src/database/migrations/1728503476668-Update_tautulli_URL.ts b/server/src/database/migrations/1728503476668-Update_tautulli_URL.ts
@@ -9,5 +9,5 @@ export class UpdateTautulliURL1728503476668 implements MigrationInterface {
     );
   }
 
-  public async down(queryRunner: QueryRunner): Promise<void> {}
+  public async down(): Promise<void> {}
 }
diff --git a/server/src/modules/api/lib/cache.ts b/server/src/modules/api/lib/cache.ts
@@ -93,7 +93,7 @@ class CacheManager {
   }
 
   public flushAll(): void {
-    for (const [key, value] of Object.entries(this.getAllCaches())) {
+    for (const [, value] of Object.entries(this.getAllCaches())) {
       value.flush();
     }
   }

diff --git a/server/src/modules/api/lib/plexApi.ts b/server/src/modules/api/lib/plexApi.ts
@@ -87,13 +87,13 @@ class PlexApi extends NodePlexAPI {
     }
   }
 
-  deleteQuery<T>(arg) {
+  deleteQuery(arg) {
     return super.deleteQuery(arg);
   }
-  postQuery<T>(arg) {
+  postQuery(arg) {
     return super.postQuery(arg);
   }
-  putQuery<T>(arg) {
+  putQuery(arg) {
     return super.putQuery(arg);
   }
 

diff --git a/server/src/modules/api/overseerr-api/overseerr-api.service.ts b/server/src/modules/api/overseerr-api/overseerr-api.service.ts
@@ -201,10 +201,10 @@ export class OverseerrApiService {
       let hasNext = true;
       let skip = 0;
 
-      let users: OverseerrUserResponseResult[] = [];
+      const users: OverseerrUserResponseResult[] = [];
 
       while (hasNext) {
-        let resp: OverseerrUserResponse = await this.api.get(
+        const resp: OverseerrUserResponse = await this.api.get(
           `/user?take=${size}&skip=${skip}`,
         );
 

diff --git a/server/src/modules/api/plex-api/plex-api.service.ts b/server/src/modules/api/plex-api/plex-api.service.ts
@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
-import { PlexSettings } from '../../../modules/settings/interfaces/plex-settings.interface';
-import { SettingsService } from '../../..//modules/settings/settings.service';
+import { PlexSettings } from '../../settings/interfaces/plex-settings.interface';
+import { SettingsService } from '../../settings/settings.service';
 import { BasicResponseDto } from './dto/basic-response.dto';
 import { CollectionHubSettingsDto } from './dto/collection-hub-settings.dto';
 import {
@@ -35,7 +35,6 @@ import PlexTvApi, { PlexUser } from '../lib/plextvApi';
 import cacheManager from '../../api/lib/cache';
 import { Settings } from '../../settings/entities/settings.entities';
 import PlexCommunityApi, {
-  GraphQLQuery,
   PlexCommunityWatchHistory,
   PlexCommunityWatchList,
 } from '../../api/lib/plexCommunityApi';
@@ -47,6 +46,7 @@ export class PlexApiService {
   private plexCommunityClient: PlexCommunityApi;
   private machineId: string;
   private readonly logger = new Logger(PlexApiService.name);
+
   constructor(
     @Inject(forwardRef(() => SettingsService))
     private readonly settings: SettingsService,
@@ -73,6 +73,7 @@ export class PlexApiService {
       webAppUrl: this.settings.plex_hostname,
     };
   }
+
   public async initialize({
     plexToken,
     timeout,
@@ -153,15 +154,17 @@ export class PlexApiService {
             }),
           )
         : [];
-      const fileteredResults: PlexMetadata[] = [];
+      const filteredResults: PlexMetadata[] = [];
       (await results).forEach((el: PlexMetadata) => {
-        fileteredResults.find(
-          (e: PlexMetadata) => e.ratingKey === el.ratingKey,
-        ) === undefined
-          ? fileteredResults.push(el)
-          : undefined;
+        if (
+          filteredResults.find(
+            (e: PlexMetadata) => e.ratingKey === el.ratingKey,
+          ) === undefined
+        ) {
+          filteredResults.push(el);
+        }
       });
-      return fileteredResults;
+      return filteredResults;
     } catch (err) {
       this.logger.warn(
         'Plex api communication failure.. Is the application running?',
@@ -444,7 +447,7 @@ export class PlexApiService {
       `[Plex] Removed media with ID ${plexId} from Plex library.`,
     );
     try {
-      await this.plexClient.deleteQuery<void>({
+      await this.plexClient.deleteQuery({
         uri: `/library/metadata/${plexId}`,
       });
     } catch (e) {
@@ -480,7 +483,7 @@ export class PlexApiService {
 
   public async createCollection(params: CreateUpdateCollection) {
     try {
-      const response = await this.plexClient.postQuery<PlexLibraryResponse>({
+      const response = await this.plexClient.postQuery({
         uri: `/library/collections?type=${
           params.type
         }&title=${encodeURIComponent(params.title)}&sectionId=${
@@ -505,7 +508,7 @@ export class PlexApiService {
 
   public async updateCollection(body: CreateUpdateCollection) {
     try {
-      await this.plexClient.putQuery<PlexLibraryResponse>({
+      await this.plexClient.putQuery({
         uri: `/library/sections/${body.libraryId}/all?type=18&id=${
           body.collectionId
         }&title.value=${encodeURIComponent(
@@ -527,7 +530,7 @@ export class PlexApiService {
     collectionId: string,
   ): Promise<BasicResponseDto> {
     try {
-      await this.plexClient.deleteQuery<PlexLibraryResponse>({
+      await this.plexClient.deleteQuery({
         uri: `/library/collections/${collectionId}`,
       });
     } catch (err) {
@@ -955,15 +958,15 @@ export class PlexApiService {
           const data = await this.getChildrenMetadata(context.id.toString());
 
           // transform & add eps
-          data
-            ? handleMedia.push(
-                ...data.map((el) => {
-                  return {
-                    plexId: +el.ratingKey,
-                  };
-                }),
-              )
-            : undefined;
+          if (data) {
+            handleMedia.push(
+              ...data.map((el) => {
+                return {
+                  plexId: +el.ratingKey,
+                };
+              }),
+            );
+          }
           break;
         case EPlexDataType.EPISODES:
           // transform & push episode
@@ -993,15 +996,15 @@ export class PlexApiService {
               season.ratingKey.toString(),
             );
             // transform & add eps
-            eps
-              ? handleMedia.push(
-                  ...eps.map((el) => {
-                    return {
-                      plexId: +el.ratingKey,
-                    };
-                  }),
-                )
-              : undefined;
+            if (eps) {
+              handleMedia.push(
+                ...eps.map((el) => {
+                  return {
+                    plexId: +el.ratingKey,
+                  };
+                }),
+              );
+            }
           }
           break;
         case EPlexDataType.MOVIES:

diff --git a/server/src/modules/api/tautulli-api/tautulli-api.service.ts b/server/src/modules/api/tautulli-api/tautulli-api.service.ts
@@ -84,7 +84,7 @@ interface Response<T> {
     | {
         message: string | null;
         result: 'error';
-        data: {};
+        data: object;
       };
 }
 

diff --git a/server/src/modules/api/tmdb-api/tmdb-id.service.ts b/server/src/modules/api/tmdb-api/tmdb-id.service.ts
@@ -23,8 +23,8 @@ export class TmdbIdService {
               libItem.grandparentRatingKey.toString(),
             )
           : libItem.parentRatingKey
-          ? await this.plexApi.getMetadata(libItem.parentRatingKey.toString())
-          : libItem;
+            ? await this.plexApi.getMetadata(libItem.parentRatingKey.toString())
+            : libItem;
 
         return this.getTmdbIdFromPlexData(libItem);
       } else {

diff --git a/server/src/modules/api/tmdb-api/tmdb.service.ts b/server/src/modules/api/tmdb-api/tmdb.service.ts
@@ -26,8 +26,6 @@ import {
   TmdbUpcomingMoviesResponse,
 } from './interfaces/tmdb.interface';
 
-const ANIME_KEYWORD_ID = 210024;
-
 export class TmdbApiService extends ExternalApiService {
   private region?: string;
   private originalLanguage?: string;

diff --git a/server/src/modules/collections/collections.service.ts b/server/src/modules/collections/collections.service.ts
@@ -33,9 +33,11 @@ interface addCollectionDbResponse {
   deleteAfterDays: number;
   manualCollection: boolean;
 }
+
 @Injectable()
 export class CollectionsService {
   private readonly logger = new Logger(CollectionsService.name);
+
   constructor(
     @InjectRepository(Collection)
     private readonly collectionRepo: Repository<Collection>,
@@ -562,11 +564,11 @@ export class CollectionsService {
                 sharedHome: collection.visibleOnHome,
               });
             } else {
-              collection.manualCollection
-                ? this.logger.warn(
-                    `Manual Collection '${collection.manualCollectionName}' doesn't exist in Plex..`,
-                  )
-                : undefined;
+              if (collection.manualCollection) {
+                this.logger.warn(
+                  `Manual Collection '${collection.manualCollectionName}' doesn't exist in Plex..`,
+                );
+              }
             }
           }
           // add children to collection
@@ -696,9 +698,7 @@ export class CollectionsService {
       });
 
       if (!collection.manualCollection) {
-        const status = await this.plexApi.deleteCollection(
-          collection.plexId.toString(),
-        );
+        await this.plexApi.deleteCollection(collection.plexId.toString());
       }
 
       await this.CollectionMediaRepo.delete({ collectionId: collection.id });

diff --git a/server/src/modules/collections/entities/collection.entities.ts b/server/src/modules/collections/entities/collection.entities.ts
@@ -92,16 +92,14 @@ export class Collection {
   sonarrSettings: SonarrSettings;
 
   @OneToMany(
-    (type) => CollectionMedia,
+    () => CollectionMedia,
     (collectionMedia) => collectionMedia.collectionId,
     { onDelete: 'CASCADE' },
   )
   collectionMedia: CollectionMedia[];
 
-  @OneToMany(
-    (type) => CollectionLog,
-    (collectionLog) => collectionLog.collection,
-    { onDelete: 'CASCADE' },
-  )
+  @OneToMany(() => CollectionLog, (collectionLog) => collectionLog.collection, {
+    onDelete: 'CASCADE',
+  })
   collectionLog: CollectionLog[];
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         );
       }
-      public async down(queryRunner: QueryRunner): Promise<void> {}
+      public async down(): Promise<void> {}
     }