Enable more lint rules for skin-database

Enable all root ESLint rules except camelcase (333 violations).

Rules now enabled:
- eqeqeq (strict equality)
- prefer-const
- prefer-template
- prefer-arrow-callback
- no-else-return
- no-return-await
- no-undef-init
- dot-notation
- guard-for-in
- no-div-regex
- new-cap

Fixed 51 lint violations across the package.

Author: captbaritone

packages/skin-database/.eslintrc.js

@@ -10,19 +10,8 @@ module.exports = {
     "@typescript-eslint/no-namespace": "off",
     // Override the base no-shadow rule since it conflicts with TypeScript
     "no-shadow": "off",
-    // Relax rules for this project's existing style
+    // camelcase has too many violations (333) to fix now
     camelcase: "off",
-    "dot-notation": "off",
-    eqeqeq: "off",
-    "no-undef-init": "off",
-    "no-return-await": "off",
-    "prefer-arrow-callback": "off",
-    "no-div-regex": "off",
-    "guard-for-in": "off",
-    "prefer-template": "off",
-    "no-else-return": "off",
-    "prefer-const": "off",
-    "new-cap": "off",
   },
   ignorePatterns: ["dist/**"],
 };

packages/skin-database/api/graphql/index.ts

@@ -13,6 +13,7 @@ export function getUserContext(ctx: Ctx): UserContext {
   return ctx.ctx;
 }
 
+// eslint-disable-next-line new-cap -- Express Router uses this pattern
 const router = Router();
 
 const yoga = createYoga({

packages/skin-database/api/graphql/resolvers/ClassicSkinResolver.ts

@@ -26,7 +26,7 @@ export default class ClassicSkinResolver implements NodeResolver, ISkin {
   async filename(normalize_extension?: boolean): Promise<string> {
     const filename = await this._model.getFileName();
     if (normalize_extension) {
-      return path.parse(filename).name + ".wsz";
+      return `${path.parse(filename).name}.wsz`;
     }
     return filename;
   }

packages/skin-database/api/graphql/resolvers/ModernSkinResolver.ts

@@ -25,7 +25,7 @@ export default class ModernSkinResolver implements NodeResolver, ISkin {
   async filename(normalize_extension: boolean): Promise<string> {
     const filename = await this._model.getFileName();
     if (normalize_extension) {
-      return path.parse(filename).name + ".wal";
+      return `${path.parse(filename).name}.wal`;
     }
     return filename;
   }

packages/skin-database/api/graphql/resolvers/SkinResolver.ts

@@ -21,9 +21,8 @@ export default class SkinResolver {
   static fromModel(model: SkinModel): ISkin {
     if (model.getSkinType() === "MODERN") {
       return new ModernSkinResolver(model);
-    } else {
-      return new ClassicSkinResolver(model);
     }
+    return new ClassicSkinResolver(model);
   }
 }
 

packages/skin-database/app/(modern)/scroll/getClientSkins.ts

@@ -13,7 +13,7 @@ export async function getClientSkins(sessionId: string): Promise<ClientSkin[]> {
 
   const page = await getScrollPage(sessionId);
 
-  return await Promise.all(
+  return Promise.all(
     page.map(async (item) => {
       return getSkinForSession(ctx, sessionId, item.md5);
     })

packages/skin-database/app/(modern)/scroll/useScrollHint.ts

@@ -52,9 +52,8 @@ export function useScrollHint({
             return n1 * (t -= 1.5 / d1) * t + 0.75;
           } else if (t < 2.5 / d1) {
             return n1 * (t -= 2.25 / d1) * t + 0.9375;
-          } else {
-            return n1 * (t -= 2.625 / d1) * t + 0.984375;
           }
+          return n1 * (t -= 2.625 / d1) * t + 0.984375;
         };
 
         // Create a bounce effect: scroll down quickly, then bounce back

packages/skin-database/data/KeyValue.ts

@@ -15,10 +15,9 @@ export default class KeyValue {
       .count({ count: "*" })
       .first()) as { count: number };
     if (count) {
-      return await KeyValue.update(key, value);
-    } else {
-      return await KeyValue.insert(key, value);
+      return KeyValue.update(key, value);
     }
+    return KeyValue.insert(key, value);
   }
 
   static async update(key: string, value: any): Promise<void> {

packages/skin-database/data/SkinModel.ts

@@ -242,23 +242,22 @@ export default class SkinModel {
         this.getMd5() + ext
       );
       return fs.readFile(skinPath);
-    } else {
-      const response = await fetch(this.getSkinUrl());
-      if (!response.ok) {
-        const missingModernSkins =
-          (await KeyValue.get<string[]>("missingModernSkins")) ?? [];
-        const missingModernSkinsSet = new Set(missingModernSkins);
-        missingModernSkinsSet.add(this.getMd5());
-        await KeyValue.set(
-          "missingModernSkins",
-          Array.from(missingModernSkinsSet)
-        );
-        throw new Error(
-          `Could not fetch skin at "${this.getSkinUrl()}" (Marked in missingModernSkins in the KeyValue store)`
-        );
-      }
-      return response.buffer();
     }
+    const response = await fetch(this.getSkinUrl());
+    if (!response.ok) {
+      const missingModernSkins =
+        (await KeyValue.get<string[]>("missingModernSkins")) ?? [];
+      const missingModernSkinsSet = new Set(missingModernSkins);
+      missingModernSkinsSet.add(this.getMd5());
+      await KeyValue.set(
+        "missingModernSkins",
+        Array.from(missingModernSkinsSet)
+      );
+      throw new Error(
+        `Could not fetch skin at "${this.getSkinUrl()}" (Marked in missingModernSkins in the KeyValue store)`
+      );
+    }
+    return response.buffer();
   });
 
   getScreenshotBuffer = mem(async (): Promise<Buffer> => {
@@ -385,10 +384,9 @@ export default class SkinModel {
   }
 
   async hasGeneral(): Promise<boolean> {
-    return (
-      (await this._hasSpriteSheet("GEN")) &&
-      (await this._hasSpriteSheet("GENEX"))
-    );
+    const hasGen = await this._hasSpriteSheet("GEN");
+    const hasGenEx = await this._hasSpriteSheet("GENEX");
+    return hasGen && hasGenEx;
   }
 
   async getAlgoliaIndexUpdates(limit?: number): Promise<any[]> {

packages/skin-database/db.ts

@@ -2,4 +2,5 @@ import Knex from "knex";
 import * as knexConfigs from "./knexfile";
 import { NODE_ENV } from "./config";
 
+// eslint-disable-next-line new-cap -- Knex uses this pattern
 export const knex = Knex(knexConfigs[NODE_ENV ?? "test"]);