Fix ESLint config

googlemaps · Jan 14, 2025 · 103d9a1 · 103d9a1
1 parent eab109b
commit 103d9a1
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 50 deletions.
diff --git a/application/backend/.eslintrc.json b/application/backend/.eslintrc.json
diff --git a/application/backend/.gitignore b/application/backend/.gitignore
@@ -1,2 +1,4 @@
 **/*.js
 **/*.map
+
+!eslint.config.js
diff --git a/application/backend/app.ts b/application/backend/app.ts
@@ -36,9 +36,7 @@ app.disable("x-powered-by");
 
 // compression
 app.use(
-  compression({
-    filter: (req: Request, res: Response) => true
-  })
+  compression()
 );
 
 // cors
@@ -71,7 +69,7 @@ app.get("/config.json", async (req: Request, res: Response) => {
   // get config.json from angular app when proxied
   if (process.env.FRONTEND_PROXY) {
     try {
-      const axios = (await import("axios")) as any;
+      const axios = (await import("axios") as any);
       const response = await axios.get(
         process.env.FRONTEND_PROXY + "config.json"
       );

diff --git a/application/backend/eslint.config.js b/application/backend/eslint.config.js
@@ -0,0 +1,21 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  [
+    {
+      ignores: [
+        "node_modules/**",
+        "lib/**",
+        "**/*.js"
+      ],
+    },
+    eslint.configs.recommended,
+    tseslint.configs.recommended,
+  ],
+  {
+    rules: {
+      "@typescript-eslint/no-explicit-any": "warn"
+    }
+  }
+);
diff --git a/application/backend/logging.ts b/application/backend/logging.ts
@@ -55,9 +55,9 @@ if (!process.env.LOG_FORMAT || process.env.LOG_FORMAT === "google") {
 
         return object;
       },
-      log: (o: any) => {
+      log: (o: Record<string, unknown>) => {
         const { err, ...reshaped } = o;
-        if (err) {
+        if (err instanceof Error) {
           reshaped.stack_trace = err.stack;
         }
         return { serviceContext, ...reshaped };

diff --git a/application/backend/package-lock.json b/application/backend/package-lock.json
diff --git a/application/backend/package.json b/application/backend/package.json
@@ -32,8 +32,6 @@
     "@types/node": "^22.10.6",
     "@types/pako": "^2.0.3",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
     "axios": "^1.7.9",
     "concurrently": "^9.1.2",
     "eslint": "^9.18.0",
@@ -43,6 +41,7 @@
     "pino-pretty": "^13.0.0",
     "supertest": "^7.0.0",
     "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0",
     "ts-node": "^10.9.2",
     "ts-jest": "^29.2.5"
   }

diff --git a/application/backend/routes/api.ts b/application/backend/routes/api.ts
@@ -21,6 +21,7 @@ export const router = express.Router();
 
 import { generateFileName, shortName, storage } from "../services/storage";
 import { log } from "../logging";
+import { GetFilesOptions } from "@google-cloud/storage";
 
 router.get("/healthz", async (req: Request, res: Response) => {
   log.logger.debug("Health check (API)");
@@ -61,14 +62,14 @@ router.get("/status/:date?/:name", async (req: Request, res: Response) => {
 router.get("/scenarios", async (req: Request, res: Response) => {
   const queryObject = url.parse(req.url, true).query;
 
-  const options: { [k: string]: any } = {};
+  const options: GetFilesOptions = {};
 
   if ("limit" in queryObject) {
     options.maxResults = parseInt(queryObject.limit as string);
     options.autoPaginate = false;
   }
   if ("pageToken" in queryObject) {
-    options.pageToken = queryObject.pageToken;
+    options.pageToken = queryObject.pageToken as string;
   }
 
   if ("startsWith" in queryObject) {
@@ -87,14 +88,14 @@ router.get("/scenarios", async (req: Request, res: Response) => {
 router.get("/solutions", async (req: Request, res: Response) => {
   const queryObject = url.parse(req.url, true).query;
 
-  const options: { [k: string]: any } = {};
+  const options: GetFilesOptions = {};
 
   if ("limit" in queryObject || "pageToken" in queryObject) {
     options.maxResults = parseInt(queryObject.limit as string);
     options.autoPaginate = true;
 
     if ("pageToken" in queryObject) {
-      options.pageToken = queryObject.pageToken;
+      options.pageToken = queryObject.pageToken as string;
     }
   }
 

diff --git a/application/backend/tsconfig.json b/application/backend/tsconfig.json
@@ -1,16 +1,18 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
+    "esModuleInterop": true,
     "lib": ["ESNext"],
-    "target": "ESNext",
     "module": "CommonJS",
     "moduleResolution": "Node",
+    "sourceMap": true,
+    "target": "ESNext",
+
+    "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "esModuleInterop": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "sourceMap": true,
-    "removeComments": true
+    "noImplicitAny": true,
+    "removeComments": true,
   },
   "include": [
     "**/*.ts"