From e6376ad059343b717fc88cdfc53ed80d34e0fdd6 Mon Sep 17 00:00:00 2001 From: schmelczerandras Date: Tue, 17 Nov 2020 10:13:31 +0100 Subject: [PATCH] Fix linting --- backend/package.json | 11 +---------- backend/src/commands/generate-points.ts | 2 +- backend/src/game-server.ts | 2 +- backend/src/helper/interpolate-angles.ts | 4 ++-- backend/src/objects/character-physical.ts | 12 ++++-------- backend/src/objects/circle-physical.ts | 2 +- backend/src/objects/projectile-physical.ts | 1 - backend/src/physics/functions/move-circle.ts | 4 ++-- frontend/package.json | 9 --------- frontend/src/scripts/commands/types/render.ts | 1 - frontend/src/scripts/game.ts | 3 +-- .../helper/extrapolators/circle-extrapolator.ts | 1 - .../helper/extrapolators/linear-extrapolator.ts | 2 -- .../src/scripts/objects/types/character-view.ts | 2 +- frontend/src/scripts/objects/types/lamp-view.ts | 4 ++-- .../src/scripts/objects/types/projectile-view.ts | 2 +- frontend/src/scripts/shapes/planet-shape.ts | 2 +- frontend/src/scripts/sound-handler.ts | 2 +- package.json | 14 ++++++++++++-- shared/package.json | 8 -------- shared/src/objects/types/character-base.ts | 1 + shared/src/objects/types/planet-base.ts | 1 + shared/src/objects/types/projectile-base.ts | 1 - 23 files changed, 33 insertions(+), 58 deletions(-) diff --git a/backend/package.json b/backend/package.json index 1149e30..fe436f2 100644 --- a/backend/package.json +++ b/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 (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", diff --git a/backend/src/commands/generate-points.ts b/backend/src/commands/generate-points.ts index 289361e..1949ca9 100644 --- a/backend/src/commands/generate-points.ts +++ b/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) { diff --git a/backend/src/game-server.ts b/backend/src/game-server.ts index 5eecdbb..d15a1fc 100644 --- a/backend/src/game-server.ts +++ b/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); diff --git a/backend/src/helper/interpolate-angles.ts b/backend/src/helper/interpolate-angles.ts index d0529c4..1fb46d6 100644 --- a/backend/src/helper/interpolate-angles.ts +++ b/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; - return from + shortedDistance * q; + const shorterDistance = ((2 * possibleDistance) % max) - possibleDistance; + return from + shorterDistance * q; }; diff --git a/backend/src/objects/character-physical.ts b/backend/src/objects/character-physical.ts index 6485f8b..21ac869 100644 --- a/backend/src/objects/character-physical.ts +++ b/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( - vec2.length(sumForce) === 0 ? vec2.fromValues(0, -1) : sumForce, - deltaTimeInSeconds, - ); + this.setDirection(vec2.length(sumForce) === 0 ? vec2.fromValues(0, -1) : sumForce); } 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, diff --git a/backend/src/objects/circle-physical.ts b/backend/src/objects/circle-physical.ts index d6b29e8..b6fa481 100644 --- a/backend/src/objects/circle-physical.ts +++ b/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!); diff --git a/backend/src/objects/projectile-physical.ts b/backend/src/objects/projectile-physical.ts index 683a8ec..655ba42 100644 --- a/backend/src/objects/projectile-physical.ts +++ b/backend/src/objects/projectile-physical.ts @@ -4,7 +4,6 @@ import { settings, serializesTo, ProjectileBase, - GameObject, CharacterTeam, PropertyUpdatesForObject, UpdatePropertyCommand, diff --git a/backend/src/physics/functions/move-circle.ts b/backend/src/physics/functions/move-circle.ts index d59dd86..7c82fdc 100644 --- a/backend/src/physics/functions/move-circle.ts +++ b/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; diff --git a/frontend/package.json b/frontend/package.json index 41eb319..fd503a4 100644 --- a/frontend/package.json +++ b/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", diff --git a/frontend/src/scripts/commands/types/render.ts b/frontend/src/scripts/commands/types/render.ts index 670309b..c83f5a1 100644 --- a/frontend/src/scripts/commands/types/render.ts +++ b/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'; diff --git a/frontend/src/scripts/game.ts b/frontend/src/scripts/game.ts index 70f7f0d..1f82b70 100644 --- a/frontend/src/scripts/game.ts +++ b/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 diff --git a/frontend/src/scripts/helper/extrapolators/circle-extrapolator.ts b/frontend/src/scripts/helper/extrapolators/circle-extrapolator.ts index aef9d0c..e5b4d45 100644 --- a/frontend/src/scripts/helper/extrapolators/circle-extrapolator.ts +++ b/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'; diff --git a/frontend/src/scripts/helper/extrapolators/linear-extrapolator.ts b/frontend/src/scripts/helper/extrapolators/linear-extrapolator.ts index dcf3a8c..9154fc1 100644 --- a/frontend/src/scripts/helper/extrapolators/linear-extrapolator.ts +++ b/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; diff --git a/frontend/src/scripts/objects/types/character-view.ts b/frontend/src/scripts/objects/types/character-view.ts index f4e8c88..d06d56e 100644 --- a/frontend/src/scripts/objects/types/character-view.ts +++ b/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, diff --git a/frontend/src/scripts/objects/types/lamp-view.ts b/frontend/src/scripts/objects/types/lamp-view.ts index 445af82..885ab85 100644 --- a/frontend/src/scripts/objects/types/lamp-view.ts +++ b/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 { CommandExecutors, Id, LampBase, UpdatePropertyCommand } from 'shared'; +import { CircleLight } from 'sdf-2d'; +import { CommandExecutors, Id, LampBase } from 'shared'; import { RenderCommand } from '../../commands/types/render'; export class LampView extends LampBase { diff --git a/frontend/src/scripts/objects/types/projectile-view.ts b/frontend/src/scripts/objects/types/projectile-view.ts index b09aabc..a433ccd 100644 --- a/frontend/src/scripts/objects/types/projectile-view.ts +++ b/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, diff --git a/frontend/src/scripts/shapes/planet-shape.ts b/frontend/src/scripts/shapes/planet-shape.ts index bc7a129..62105e9 100644 --- a/frontend/src/scripts/shapes/planet-shape.ts +++ b/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), ); diff --git a/frontend/src/scripts/sound-handler.ts b/frontend/src/scripts/sound-handler.ts index 304d361..f772049 100644 --- a/frontend/src/scripts/sound-handler.ts +++ b/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; } diff --git a/package.json b/package.json index 411a30f..5f012b9 100644 --- a/package.json +++ b/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\"" } diff --git a/shared/package.json b/shared/package.json index a75cd34..9f272e1 100644 --- a/shared/package.json +++ b/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", diff --git a/shared/src/objects/types/character-base.ts b/shared/src/objects/types/character-base.ts index c8dae73..11540bd 100644 --- a/shared/src/objects/types/character-base.ts +++ b/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) { diff --git a/shared/src/objects/types/planet-base.ts b/shared/src/objects/types/planet-base.ts index 9adb944..1ac50e3 100644 --- a/shared/src/objects/types/planet-base.ts +++ b/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( diff --git a/shared/src/objects/types/projectile-base.ts b/shared/src/objects/types/projectile-base.ts index ac65d19..c334cb8 100644 --- a/shared/src/objects/types/projectile-base.ts +++ b/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 {