Fix linting

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "declared-server",
-  "version": "0.0.15",
+  "version": "0.1.0",
   "description": "Game server for decla.red",
   "keywords": [],
   "author": "András Schmelczer <andras@schmelczer.dev> (https://schmelczer.dev/)",
@@ -29,20 +29,11 @@
     "@types/minimist": "^1.2.0",
     "@types/node": "^14.11.2",
     "@types/socket.io": "^2.1.11",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
     "clean-webpack-plugin": "^3.0.0",
     "concurrently": "^5.3.0",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-json-format": "^2.0.1",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-unused-imports": "^0.1.3",
     "file-loader": "^6.1.0",
     "html-webpack-plugin": "^4.5.0",
     "nodemon": "^2.0.4",
-    "prettier": "^2.0.5",
     "raw-loader": "^4.0.1",
     "resolve-url-loader": "^3.1.1",
     "shared": "file:../shared",

backend/src/commands/generate-points.ts

@@ -1,4 +1,4 @@
-import { Command, GameObject } from 'shared';
+import { Command } from 'shared';
 
 export class GeneratePointsCommand extends Command {
   public constructor(public readonly decla: number, public readonly red: number) {

backend/src/game-server.ts

@@ -143,7 +143,7 @@ export class GameServer extends CommandReceiver {
   private timeSinceLastPointUpdate = 0;
 
   private handlePhysics() {
-    let delta = this.deltaTimeCalculator.getNextDeltaTimeInSeconds();
+    const delta = this.deltaTimeCalculator.getNextDeltaTimeInSeconds();
     if (delta > settings.targetPhysicsDeltaTimeInSeconds) {
       this.deltaTimeCalculator.getNextDeltaTimeInSeconds(true);
 

backend/src/helper/interpolate-angles.ts

@@ -1,6 +1,6 @@
 export const interpolateAngles = (from: number, to: number, q: number) => {
   const max = Math.PI * 2;
   const possibleDistance = (to - from) % max;
-  const shortedDistance = ((2 * possibleDistance) % max) - possibleDistance;
+  const shorterDistance = ((2 * possibleDistance) % max) - possibleDistance;
-  return from + shortedDistance * q;
+  return from + shorterDistance * q;
 };

backend/src/objects/character-physical.ts

@@ -5,7 +5,6 @@ import {
   MoveActionCommand,
   serializesTo,
   last,
-  GameObject,
   Circle,
   CharacterBase,
   CharacterTeam,
@@ -370,10 +369,7 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
 
       const sumForce = vec2.subtract(vec2.create(), leftFootGravity, movementForce);
 
-      this.setDirection(
+      this.setDirection(vec2.length(sumForce) === 0 ? vec2.fromValues(0, -1) : sumForce);
-        vec2.length(sumForce) === 0 ? vec2.fromValues(0, -1) : sumForce,
-        deltaTimeInSeconds,
-      );
     } else {
       const leftFootGravity = this.currentPlanet!.getForce(this.leftFoot.center);
       const rightFootGravity = this.currentPlanet!.getForce(this.rightFoot.center);
@@ -403,7 +399,7 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
       if (vec2.length(gravity) <= 100) {
         this.currentPlanet = undefined;
       }
-      this.setDirection(gravity, deltaTimeInSeconds);
+      this.setDirection(gravity);
     }
 
     this.keepPosture(deltaTimeInSeconds);
@@ -414,7 +410,7 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
     this.setPropertyUpdates(oldHead, oldLeftFoot, oldRightFoot, deltaTimeInSeconds);
   }
 
-  private setDirection(direction: vec2, deltaTime: number) {
+  private setDirection(direction: vec2) {
     this.direction = interpolateAngles(
       this.direction,
       Math.atan2(direction.y, direction.x) + Math.PI / 2,
@@ -423,7 +419,7 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
   }
 
   private keepPosture(deltaTime: number) {
-    let center = this.center;
+    const center = this.center;
     this.springMove(
       this.leftFoot,
       center,

backend/src/objects/circle-physical.ts

@@ -99,7 +99,7 @@ export class CirclePhysical extends CommandReceiver implements Circle, DynamicPh
       .filter((b) => b.gameObject !== this.gameObject && b.canCollide);
     this.radius -= vec2.length(delta);
 
-    let { normal, hitSurface, hitObject } = moveCircle(this, delta, intersecting);
+    const { normal, hitSurface, hitObject } = moveCircle(this, delta, intersecting);
 
     if (hitSurface) {
       vec2.copy(this.lastNormal, normal!);

backend/src/objects/projectile-physical.ts

@@ -4,7 +4,6 @@ import {
   settings,
   serializesTo,
   ProjectileBase,
-  GameObject,
   CharacterTeam,
   PropertyUpdatesForObject,
   UpdatePropertyCommand,

backend/src/physics/functions/move-circle.ts

@@ -1,5 +1,5 @@
 import { vec2 } from 'gl-matrix';
-import { Circle, GameObject, rotate90Deg } from 'shared';
+import { GameObject } from 'shared';
 import { CirclePhysical } from '../../objects/circle-physical';
 import { evaluateSdf } from './evaluate-sdf';
 import { Physical } from '../physicals/physical';
@@ -23,7 +23,7 @@ export const moveCircle = (
 
   const deltaLength = vec2.length(delta);
   let travelled = 0;
-  let rayEnd = vec2.create();
+  const rayEnd = vec2.create();
   let prevMinDistance = 0;
   while (travelled < deltaLength) {
     travelled += prevMinDistance;

frontend/package.json

@@ -23,17 +23,9 @@
   },
   "devDependencies": {
     "@types/socket.io-client": "^1.4.34",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
     "clean-webpack-plugin": "^3.0.0",
     "common-config-webpack-plugin": "^2.0.1",
     "css-loader": "^1.0.1",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-json-format": "^2.0.1",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-unused-imports": "^0.1.3",
     "firebase": "^7.22.0",
     "gl-matrix": "^3.3.0",
     "html-webpack-inline-source-plugin": "^1.0.0-beta.2",
@@ -42,7 +34,6 @@
     "image-config-webpack-plugin": "^2.0.0",
     "mini-css-extract-plugin": "^0.9.0",
     "postcss-loader": "^3.0.0",
-    "prettier": "^2.0.5",
     "resize-observer-polyfill": "^1.5.1",
     "resolve-url-loader": "^3.1.1",
     "sass": "^1.27.0",

frontend/src/scripts/commands/types/render.ts

@@ -1,4 +1,3 @@
-import { vec2 } from 'gl-matrix';
 import { Renderer } from 'sdf-2d';
 import { Command } from 'shared';
 

frontend/src/scripts/game.ts

@@ -11,7 +11,6 @@ import {
   deserialize,
   TransportEvents,
   SetAspectRatioActionCommand,
-  PlayerInformation,
   UpdateOtherPlayerDirections,
   clamp,
   UpdateGameState,
@@ -193,7 +192,7 @@ export class Game extends CommandReceiver {
       }px) translateX(-50%) translateY(-50%) rotate(${-angle + Math.PI / 2}rad) `;
     });
 
-    for (let id in this.arrows) {
+    for (const id in this.arrows) {
       if (
         Object.prototype.hasOwnProperty.call(this.arrows, id) &&
         command.otherPlayerDirections.find((v) => v.id?.toString() === id) === undefined

frontend/src/scripts/helper/extrapolators/circle-extrapolator.ts

@@ -1,4 +1,3 @@
-import { vec2 } from 'gl-matrix';
 import { Circle } from 'shared';
 import { LinearExtrapolator } from './linear-extrapolator';
 import { Vec2Extrapolator } from './vec2-extrapolator';

frontend/src/scripts/helper/extrapolators/linear-extrapolator.ts

@@ -1,5 +1,3 @@
-import { clamp } from 'shared';
-
 export class LinearExtrapolator {
   private velocity = 0;
   private compensationVelocity = 0;

frontend/src/scripts/objects/types/character-view.ts

@@ -1,5 +1,5 @@
 import { vec2 } from 'gl-matrix';
-import { Renderer } from 'sdf-2d';
+
 import {
   Circle,
   Id,

frontend/src/scripts/objects/types/lamp-view.ts

@@ -1,6 +1,6 @@
 import { vec2, vec3 } from 'gl-matrix';
-import { CircleLight, Renderer } from 'sdf-2d';
+import { CircleLight } from 'sdf-2d';
-import { CommandExecutors, Id, LampBase, UpdatePropertyCommand } from 'shared';
+import { CommandExecutors, Id, LampBase } from 'shared';
 import { RenderCommand } from '../../commands/types/render';
 
 export class LampView extends LampBase {

frontend/src/scripts/objects/types/projectile-view.ts

@@ -1,5 +1,5 @@
 import { vec2 } from 'gl-matrix';
-import { CircleLight, Renderer } from 'sdf-2d';
+import { CircleLight } from 'sdf-2d';
 import {
   CharacterTeam,
   CommandExecutors,

frontend/src/scripts/shapes/planet-shape.ts

@@ -117,7 +117,7 @@ export class PlanetShape extends PolygonFactory(settings.planetEdgeCount, 0) {
     super(vertices);
   }
 
-  protected getObjectToSerialize(transform2d: mat2d, transform1d: number): any {
+  protected getObjectToSerialize(transform2d: mat2d, _: number): any {
     const transformedVertices = (this as any).actualVertices.map((v: vec2) =>
       vec2.transformMat2d(vec2.create(), v, transform2d),
     );

frontend/src/scripts/sound-handler.ts

@@ -52,7 +52,7 @@ export abstract class SoundHandler {
     return sound;
   }
 
-  public static play(sound: Sounds, volume: number = 1) {
+  public static play(sound: Sounds, volume = 1) {
     if (!this.initialized || !OptionsHandler.options.soundsEnabled) {
       return;
     }

package.json

@@ -2,11 +2,21 @@
   "name": "root",
   "private": true,
   "devDependencies": {
-    "concurrently": "^5.3.0"
+    "@typescript-eslint/eslint-plugin": "^3.9.1",
+    "@typescript-eslint/parser": "^3.9.1",
+    "concurrently": "^5.3.0",
+    "eslint": "^7.2.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-json-format": "^2.0.1",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-unused-imports": "^0.1.3",
+    "prettier": "^2.0.5",
+    "typescript": "^4.0.3"
   },
   "scripts": {
     "build": "cd shared && npm run build && cd ../frontend && npm run build && cd ../backend && npm run build",
-    "lint": "eslint './**/src/**/*.{js,ts,json}' --fix",
+    "lint": "eslint ./**/src/**/*.{js,ts,json} --fix && prettier --write ./**/src/**/*.{js,ts,json}",
     "init": "cd shared && npm install && cd ../frontend && npm install && cd ../backend && npm install",
     "start": "concurrently --kill-others-on-fail \"cd shared && npm start\"  \"cd backend && npm start\"  \"cd frontend && npm start\""
   }

shared/package.json

@@ -13,15 +13,7 @@
     "try-build-before": "npx webpack --mode production"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
     "clean-webpack-plugin": "^3.0.0",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-json-format": "^2.0.1",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-unused-imports": "^0.1.3",
     "file-loader": "^6.1.0",
     "gl-matrix": "^3.3.0",
     "prettier": "^2.0.5",

shared/src/objects/types/character-base.ts

@@ -25,6 +25,7 @@ export class CharacterBase extends GameObject {
     super(id);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public onShoot(strength: number) {}
 
   public setHealth(health: number) {

shared/src/objects/types/planet-base.ts

@@ -23,6 +23,7 @@ export class PlanetBase extends GameObject {
       this.vertices.length;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public generatedPoints(value: number) {}
 
   public static createPlanetVertices(

shared/src/objects/types/projectile-base.ts

@@ -4,7 +4,6 @@ import { serializable } from '../../serialization/serializable';
 import { GameObject } from '../game-object';
 import { Id } from '../../communication/id';
 import { CharacterTeam } from './character-base';
-import { CommandExecutors } from '../../commands/command-executors';
 
 @serializable
 export class ProjectileBase extends GameObject {