Update deps and fix ts errors (#1868)

* remove eslint and update deps * remove obsolete eslint config file * fix all typescript errors
keldaanCommunity · Jun 23, 2024 · 6cc635a · 6cc635a
1 parent 941cb50
commit 6cc635a
Show file tree

Hide file tree

Showing 37 changed files with 507 additions and 1,780 deletions.
diff --git a/app/app.config.ts b/app/app.config.ts
@@ -203,11 +203,8 @@ export default config({
     connect(process.env.MONGO_URI!)
     admin.initializeApp({
       credential: admin.credential.cert({
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         projectId: process.env.FIREBASE_PROJECT_ID!,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         clientEmail: process.env.FIREBASE_CLIENT_EMAIL!,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         privateKey: process.env.FIREBASE_PRIVATE_KEY!.replace(/\\n/g, "\n")
       })
     })

diff --git a/app/core/pokemon-entity.ts b/app/core/pokemon-entity.ts
@@ -536,8 +536,6 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
       this.count.staticHolderCount++
       if (this.count.staticHolderCount > 2) {
         this.count.staticHolderCount = 0
-        // eslint-disable-next-line no-unused-vars
-
         const nbBounces = 3
         const closestEnemies = new Array<PokemonEntity>()
         board.forEach(
@@ -1353,7 +1351,6 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
       } else if (isAngerPoint) {
         speedBoost = 30
       }
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
       const _pokemon = this // beware of closure vars
       this.simulation.room.clock.setTimeout(() => {
         board.forEach((x, y, value) => {

diff --git a/app/core/pokemon-state.ts b/app/core/pokemon-state.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
 import Player from "../models/colyseus-models/player"
 import { IPokemonEntity, Transfer } from "../types"
 import { FIGHTING_PHASE_DURATION, ARMOR_FACTOR } from "../types/Config"

diff --git a/app/core/simulation.ts b/app/core/simulation.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-extra-semi */
 import { MapSchema, Schema, SetSchema, type } from "@colyseus/schema"
 import Player from "../models/colyseus-models/player"
 import { Pokemon } from "../models/colyseus-models/pokemon"

diff --git a/app/core/terrain.ts b/app/core/terrain.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-var */
 const F = (Math.sqrt(3) - 1) / 2
 const G = (3 - Math.sqrt(3)) / 6
 const GRAD = [

diff --git a/app/models/colyseus-models/game-record.ts b/app/models/colyseus-models/game-record.ts
@@ -4,7 +4,7 @@ import { Item } from "../../types/enum/Item"
 import { Pkm, PkmIndex } from "../../types/enum/Pokemon"
 export interface IPokemonRecord {
   name: Pkm
-  items: Item[]
+  items: Item[] | ArraySchema<Item>
   avatar: string
 }
 export class PokemonRecord extends Schema implements IPokemonRecord {
@@ -28,7 +28,7 @@ export class PokemonRecord extends Schema implements IPokemonRecord {
 export interface IGameRecord {
   time: number
   rank: number
-  pokemons: IPokemonRecord[]
+  pokemons: IPokemonRecord[] | ArraySchema<IPokemonRecord>
   elo: number
 }
 

diff --git a/app/models/colyseus-models/lobby-user.ts b/app/models/colyseus-models/lobby-user.ts
@@ -1,4 +1,4 @@
-import { ArraySchema, Schema, type } from "@colyseus/schema"
+import { ArraySchema, MapSchema, Schema, type } from "@colyseus/schema"
 import { Role, Title } from "../../types"
 import { Language } from "../../types/enum/Language"
 import { IPokemonConfig } from "../mongo-models/user-metadata"
@@ -17,11 +17,11 @@ export interface ILobbyUser {
   exp: number
   level: number
   donor: boolean
-  honors: string[]
-  history: IGameRecord[]
-  pokemonCollection: Map<string, IPokemonConfig>
+  honors: string[] | ArraySchema<string>
+  history: IGameRecord[] | ArraySchema<IGameRecord>
+  pokemonCollection: Map<string, IPokemonConfig> | MapSchema<IPokemonConfig>
   booster: number
-  titles: Title[]
+  titles: Title[] | ArraySchema<Title>
   title: "" | Title
   role: Role
   anonymous: boolean
@@ -61,7 +61,7 @@ export default class LobbyUser extends Schema implements ILobbyUser {
     exp: number,
     level: number,
     donor: boolean,
-    history: GameRecord[],
+    history: GameRecord[] | ArraySchema<GameRecord>,
     honors: string[],
     pokemonCollection: Map<string, IPokemonConfig> | null,
     booster: number,
@@ -71,7 +71,7 @@ export default class LobbyUser extends Schema implements ILobbyUser {
     anonymous: boolean,
     creationTime: string,
     lastSignInTime: string,
-    language: Language | ""
+    language: Language | "",
   ) {
     super()
     this.id = id

diff --git a/app/models/colyseus-models/pokemon.ts b/app/models/colyseus-models/pokemon.ts
@@ -1,6 +1,3 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable max-len */
-
 import { MapSchema, Schema, SetSchema, type } from "@colyseus/schema"
 import { nanoid } from "nanoid"
 import {
@@ -499,15 +496,11 @@ export class Scyther extends Pokemon {
   passive = Passive.SCYTHER
 
   evolutionRule = new ItemEvolutionRule(
-    [
-      Item.METAL_COAT, 
-      Item.BLACK_AUGURITE
-    ],
+    [Item.METAL_COAT, Item.BLACK_AUGURITE],
     (pokemon, player, item) => {
-      if (item === Item.METAL_COAT){
+      if (item === Item.METAL_COAT) {
         return Pkm.SCIZOR
-      }
-      else {
+      } else {
         return Pkm.KLEAVOR
       }
     }

diff --git a/app/models/colyseus-models/simple-player.ts b/app/models/colyseus-models/simple-player.ts
@@ -34,12 +34,14 @@ export default class SimplePlayer extends Schema implements ISimplePlayer {
     name: string,
     avatar: string,
     rank: number,
-    pokemons: IPokemonRecord[],
+    pokemons: IPokemonRecord[] | ArraySchema<IPokemonRecord>,
     exp: number,
     title: string,
     role: Role,
-    synergies: Array<{ name: Synergy; value: number }>,
-    elo: number
+    synergies:
+      | Array<{ name: Synergy; value: number }>
+      | ArraySchema<{ name: Synergy; value: number }>,
+    elo: number,
   ) {
     super()
     this.id = id

diff --git a/app/models/colyseus-models/tournament.ts b/app/models/colyseus-models/tournament.ts
@@ -2,7 +2,7 @@ import { Schema, MapSchema, ArraySchema, type } from "@colyseus/schema"
 import {
   ITournament,
   ITournamentBracket,
-  ITournamentPlayer
+  ITournamentPlayer,
 } from "../../types/interfaces/Tournament"
 import { resetArraySchema } from "../../utils/schemas"
 
@@ -20,8 +20,8 @@ export class TournamentPlayerSchema
     name: string,
     avatar: string,
     elo: number,
-    ranks: number[] = [],
-    eliminated: boolean = false
+    ranks: number[] | ArraySchema<number> = [],
+    eliminated: boolean = false,
   ) {
     super()
     this.name = name
@@ -40,7 +40,11 @@ export class TournamentBracketSchema
   @type(["string"]) playersId = new ArraySchema<string>()
   @type("boolean") finished: boolean
 
-  constructor(name: string, playersId: string[], finished: boolean = false) {
+  constructor(
+    name: string,
+    playersId: string[] | ArraySchema<string>,
+    finished: boolean = false,
+  ) {
     super()
     this.name = name
     this.finished = finished
@@ -64,7 +68,7 @@ export class TournamentSchema extends Schema implements ITournament {
     startDate: string,
     players: Map<string, ITournamentPlayer>,
     brackets: Map<string, ITournamentBracket>,
-    finished: boolean = false
+    finished: boolean = false,
   ) {
     super()
     this.id = id
@@ -81,8 +85,8 @@ export class TournamentSchema extends Schema implements ITournament {
             p.avatar,
             p.elo,
             p.ranks,
-            p.eliminated
-          )
+            p.eliminated,
+          ),
         )
       })
     }
@@ -91,7 +95,7 @@ export class TournamentSchema extends Schema implements ITournament {
       brackets.forEach((b, bracketId) => {
         this.brackets.set(
           bracketId,
-          new TournamentBracketSchema(b.name, b.playersId, b.finished)
+          new TournamentBracketSchema(b.name, b.playersId, b.finished),
         )
       })
     }