upd: Updated to ESLint 9.

Byloth · Oct 11, 2024 · 74f23ef · 74f23ef
1 parent 81415a8
commit 74f23ef
Show file tree

Hide file tree

Showing 24 changed files with 403 additions and 470 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,16 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import eslintTs from "@byloth/eslint-config-typescript";
+import { includeIgnoreFile } from "@eslint/compat";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const gitignorePath = path.resolve(__dirname, ".gitignore");
+
+export default [includeIgnoreFile(gitignorePath), ...eslintTs, {
+    rules: {
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/unified-signatures": "off"
+    }
+}];
diff --git a/package.json b/package.json
@@ -51,20 +51,17 @@
     "build": "vite build",
     "preview": "vite preview",
     "typecheck": "tsc",
-    "lint": "eslint --ext .cjs,.js,.json,.ts --ignore-path .gitignore .",
+    "lint": "eslint .",
     "test": "vitest",
     "prepare": "husky",
     "ci": "pnpm install --frozen-lockfile"
   },
   "devDependencies": {
-    "@byloth/eslint-config-typescript": "^2.8.3",
-    "@types/node": "^20.16.5",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "eslint": "^8.57.1",
+    "@byloth/eslint-config-typescript": "^3.0.0",
+    "@types/node": "^20.16.11",
     "husky": "^9.1.6",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.7"
+    "typescript": "^5.6.3",
+    "vite": "^5.4.8"
   },
   "packageManager": "pnpm@9.3.0+sha512.ee7b93e0c2bd11409c6424f92b866f31d3ea1bef5fbe47d3c7500cdc3c9668833d2e55681ad66df5b640c61fa9dc25d546efa54d76d7f8bf54b13614ac293631"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1,3 +1,10 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
+// @ts-ignore
 export const isBrowser = ((typeof window !== "undefined") && (typeof window.document !== "undefined"));
+
+// @ts-ignore
 export const isNode = ((typeof process !== "undefined") && (process.versions?.node));
+
+// @ts-ignore
 export const isWebWorker = ((typeof self === "object") && (self.constructor?.name === "DedicatedWorkerGlobalScope"));
diff --git a/src/models/aggregators/aggregated-async-iterator.ts b/src/models/aggregators/aggregated-async-iterator.ts
@@ -204,11 +204,11 @@ export default class AggregatedAsyncIterator<K extends PropertyKey, T>
         });
     }
 
-    public async find(predicate: MaybeAsyncKeyedIteratee<K, T, boolean>): Promise<ReducedIterator<K, T | void>>;
+    public async find(predicate: MaybeAsyncKeyedIteratee<K, T, boolean>): Promise<ReducedIterator<K, T | undefined>>;
     public async find<S extends T>(predicate: MaybeAsyncKeyedTypeGuardIteratee<K, T, S>)
-        : Promise<ReducedIterator<K, S | void>>;
+        : Promise<ReducedIterator<K, S | undefined>>;
 
-    public async find(predicate: MaybeAsyncKeyedIteratee<K, T, boolean>): Promise<ReducedIterator<K, T | void>>
+    public async find(predicate: MaybeAsyncKeyedIteratee<K, T, boolean>): Promise<ReducedIterator<K, T | undefined>>
     {
         const values = new Map<K, [number, T | undefined]>();
 
@@ -347,5 +347,5 @@ export default class AggregatedAsyncIterator<K extends PropertyKey, T>
         return groups;
     }
 
-    public get [Symbol.toStringTag]() { return "AggregatedAsyncIterator"; }
+    public readonly [Symbol.toStringTag]: string = "AggregatedAsyncIterator";
 }
diff --git a/src/models/aggregators/aggregated-iterator.ts b/src/models/aggregators/aggregated-iterator.ts
@@ -192,9 +192,9 @@ export default class AggregatedIterator<K extends PropertyKey, T>
         });
     }
 
-    public find(predicate: KeyedIteratee<K, T, boolean>): ReducedIterator<K, T | void>;
-    public find<S extends T>(predicate: KeyedTypeGuardIteratee<K, T, S>): ReducedIterator<K, S | void>;
-    public find(predicate: KeyedIteratee<K, T, boolean>): ReducedIterator<K, T | void>
+    public find(predicate: KeyedIteratee<K, T, boolean>): ReducedIterator<K, T | undefined>;
+    public find<S extends T>(predicate: KeyedTypeGuardIteratee<K, T, S>): ReducedIterator<K, S | undefined>;
+    public find(predicate: KeyedIteratee<K, T, boolean>): ReducedIterator<K, T | undefined>
     {
         const values = new Map<K, [number, T | undefined]>();
 
@@ -337,5 +337,5 @@ export default class AggregatedIterator<K extends PropertyKey, T>
         return groups;
     }
 
-    public get [Symbol.toStringTag]() { return "AggregatedIterator"; }
+    public readonly [Symbol.toStringTag]: string = "AggregatedIterator";
 }
diff --git a/src/models/aggregators/reduced-iterator.ts b/src/models/aggregators/reduced-iterator.ts
@@ -209,5 +209,5 @@ export default class ReducedIterator<K extends PropertyKey, T>
         return Object.fromEntries(this.items()) as Record<K, T>;
     }
 
-    public get [Symbol.toStringTag]() { return "ReducedIterator"; }
+    public readonly [Symbol.toStringTag]: string = "ReducedIterator";
 }
diff --git a/src/models/exceptions/core.ts b/src/models/exceptions/core.ts
@@ -39,7 +39,7 @@ export default class Exception extends Error
         }
     }
 
-    public get [Symbol.toStringTag]() { return "Exception"; }
+    public readonly [Symbol.toStringTag]: string = "Exception";
 }
 
 export class FatalErrorException extends Exception
@@ -55,7 +55,7 @@ export class FatalErrorException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "FatalErrorException"; }
+    public readonly [Symbol.toStringTag]: string = "FatalErrorException";
 }
 export class NotImplementedException extends FatalErrorException
 {
@@ -69,5 +69,5 @@ export class NotImplementedException extends FatalErrorException
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "NotImplementedException"; }
+    public readonly [Symbol.toStringTag]: string = "NotImplementedException";
 }
diff --git a/src/models/exceptions/index.ts b/src/models/exceptions/index.ts
@@ -7,7 +7,7 @@ export class FileException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "FileException"; }
+    public readonly [Symbol.toStringTag]: string = "FileException";
 }
 export class FileExistsException extends FileException
 {
@@ -16,7 +16,7 @@ export class FileExistsException extends FileException
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "FileExistsException"; }
+    public readonly [Symbol.toStringTag]: string = "FileExistsException";
 }
 export class FileNotFoundException extends FileException
 {
@@ -25,7 +25,7 @@ export class FileNotFoundException extends FileException
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "FileNotFoundException"; }
+    public readonly [Symbol.toStringTag]: string = "FileNotFoundException";
 }
 
 export class KeyException extends Exception
@@ -35,7 +35,7 @@ export class KeyException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "KeyException"; }
+    public readonly [Symbol.toStringTag]: string = "KeyException";
 }
 export class NetworkException extends Exception
 {
@@ -44,7 +44,7 @@ export class NetworkException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "NetworkException"; }
+    public readonly [Symbol.toStringTag]: string = "NetworkException";
 }
 export class PermissionException extends Exception
 {
@@ -53,7 +53,7 @@ export class PermissionException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "PermissionException"; }
+    public readonly [Symbol.toStringTag]: string = "PermissionException";
 }
 export class ReferenceException extends Exception
 {
@@ -62,7 +62,7 @@ export class ReferenceException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "ReferenceException"; }
+    public readonly [Symbol.toStringTag]: string = "ReferenceException";
 }
 
 export class RuntimeException extends Exception
@@ -72,7 +72,7 @@ export class RuntimeException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "RuntimeException"; }
+    public readonly [Symbol.toStringTag]: string = "RuntimeException";
 }
 export class EnvironmentException extends RuntimeException
 {
@@ -81,7 +81,7 @@ export class EnvironmentException extends RuntimeException
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "EnvironmentException"; }
+    public readonly [Symbol.toStringTag]: string = "EnvironmentException";
 }
 
 export class TimeoutException extends Exception
@@ -91,7 +91,7 @@ export class TimeoutException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "TimeoutException"; }
+    public readonly [Symbol.toStringTag]: string = "TimeoutException";
 }
 export class TypeException extends Exception
 {
@@ -100,7 +100,7 @@ export class TypeException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "TypeException"; }
+    public readonly [Symbol.toStringTag]: string = "TypeException";
 }
 
 export class ValueException extends Exception
@@ -110,7 +110,7 @@ export class ValueException extends Exception
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "ValueException"; }
+    public readonly [Symbol.toStringTag]: string = "ValueException";
 }
 export class RangeException extends ValueException
 {
@@ -119,7 +119,7 @@ export class RangeException extends ValueException
         super(message, cause, name);
     }
 
-    public get [Symbol.toStringTag]() { return "RangeException"; }
+    public readonly [Symbol.toStringTag]: string = "RangeException";
 }
 
 export { Exception };

diff --git a/src/models/game-loop.ts b/src/models/game-loop.ts
@@ -80,4 +80,6 @@ export default class GameLoop
         this._handle = undefined;
         this._isRunning = false;
     }
+
+    public readonly [Symbol.toStringTag]: string = "GameLoop";
 }
diff --git a/src/models/iterators/smart-async-iterator.ts b/src/models/iterators/smart-async-iterator.ts
@@ -97,7 +97,6 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
     {
         let index = 0;
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -112,7 +111,6 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
     {
         let index = 0;
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -179,7 +177,6 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
             index += 1;
         }
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -216,11 +213,11 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
         });
     }
 
-    public drop(count: number): SmartAsyncIterator<T, R | void>
+    public drop(count: number): SmartAsyncIterator<T, R | undefined>
     {
         const iterator = this._iterator;
 
-        return new SmartAsyncIterator<T, R | void>(async function* ()
+        return new SmartAsyncIterator<T, R | undefined>(async function* ()
         {
             let index = 0;
 
@@ -241,11 +238,11 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
             }
         });
     }
-    public take(limit: number): SmartAsyncIterator<T, R | void>
+    public take(limit: number): SmartAsyncIterator<T, R | undefined>
     {
         const iterator = this._iterator;
 
-        return new SmartAsyncIterator<T, R | void>(async function* ()
+        return new SmartAsyncIterator<T, R | undefined>(async function* ()
         {
             let index = 0;
 
@@ -263,11 +260,10 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
         });
     }
 
-    public async find(predicate: MaybeAsyncIteratee<T, boolean>): Promise<T | void>
+    public async find(predicate: MaybeAsyncIteratee<T, boolean>): Promise<T | undefined>
     {
         let index = 0;
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -309,7 +305,6 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
     {
         let index = 0;
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -322,7 +317,6 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
     {
         let index = 0;
 
-        // eslint-disable-next-line no-constant-condition
         while (true)
         {
             const result = await this._iterator.next();
@@ -354,7 +348,7 @@ export default class SmartAsyncIterator<T, R = void, N = undefined> implements A
         return Array.fromAsync(this as AsyncIterable<T>);
     }
 
-    public get [Symbol.toStringTag]() { return "SmartAsyncIterator"; }
+    public readonly [Symbol.toStringTag]: string = "SmartAsyncIterator";
 
     public [Symbol.asyncIterator](): SmartAsyncIterator<T, R, N> { return this; }
 }