build: upgrade eslint to v10 and adopt eslint-config v8.1.0 API

eslint.config.mjs

@@ -1,5 +1,5 @@
 import tsBaseConfig, { namingConventions } from '@map-colonies/eslint-config/ts-base';
-import { config } from '@map-colonies/eslint-config/helpers';
+import { defineConfig } from '@map-colonies/eslint-config/helpers';
 import vitestConfig from '@map-colonies/eslint-config/vitest';
 
 const AllowedSqlOperators = {
@@ -19,13 +19,8 @@ const customConfig = {
     '@typescript-eslint/naming-convention': namingConvention,
     'no-console': 'error',
   },
-  languageOptions: {
-    parserOptions: {
-      project: './tsconfig.json',
-    },
-  },
 };
 
-export default config(vitestConfig, tsBaseConfig, customConfig, {
+export default defineConfig(vitestConfig, tsBaseConfig, customConfig, {
   ignores: ['src/db/prisma/generated', 'src/common/generated', 'vitest.config.mts'],
 });

package.json

@@ -51,9 +51,9 @@
     "@map-colonies/js-logger": "^4.0.0",
     "@map-colonies/openapi-express-viewer": "^5.0.0",
     "@map-colonies/openapi-helpers": "^5.1.0",
+    "@map-colonies/prometheus": "^1.0.0",
     "@map-colonies/read-pkg": "^2.0.0",
     "@map-colonies/schemas": "^1.14.0",
-    "@map-colonies/prometheus": "^1.0.0",
     "@map-colonies/semantic-conventions": "^1.0.0",
     "@map-colonies/tracing": "^1.0.0",
     "@map-colonies/tracing-utils": "^1.0.0",
@@ -78,8 +78,7 @@
     "@commitlint/cli": "^20.2.0",
     "@faker-js/faker": "^9.9.0",
     "@map-colonies/commitlint-config": "^2.0.0",
-    "@map-colonies/eslint-config": "^8.0.0",
-    "@vitest/eslint-plugin": "^1.6.9",
+    "@map-colonies/eslint-config": "file:../infra-packages/packages/eslint-config/map-colonies-eslint-config-8.1.0.tgz",
     "@map-colonies/infra-copilot-instructions": "^1.2.0",
     "@map-colonies/prettier-config": "^1.0.0",
     "@map-colonies/tsconfig": "^2.0.0",
@@ -96,11 +95,12 @@
     "@types/supertest": "^6.0.2",
     "@types/swagger-ui-express": "^4.1.8",
     "@vitest/coverage-v8": "^4.0.16",
+    "@vitest/eslint-plugin": "^1.6.9",
     "@vitest/ui": "^4.0.16",
     "copyfiles": "^2.4.1",
     "cross-env": "^10.1.0",
     "docker-compose": "^1.3.0",
-    "eslint": "^9.39.1",
+    "eslint": "^10.0.0",
     "get-port-please": "^3.2.0",
     "husky": "^9.1.7",
     "is-ci": "^4.1.0",

src/db/createConnection.ts

@@ -29,7 +29,9 @@ export const createConnectionOptions = (dbConfig: DbConfig): PoolConfig => {
         ca: readFileSync(ssl.ca),
       };
     } catch (error) {
-      throw new Error(`Failed to load SSL certificates. Ensure the files exist and are accessible. Details: ${(error as Error).message}`);
+      throw new Error(`Failed to load SSL certificates. Ensure the files exist and are accessible. Details: ${(error as Error).message}`, {
+        cause: error,
+      });
     }
   }
   return poolConfig;
@@ -75,6 +77,6 @@ export async function verifyDbSetup(prisma: PrismaClient, schema: string): Promi
     await prisma.stage.count(); // validate migration deployed stage table
     await prisma.task.count(); // validate migration deployed task table
   } catch (error) {
-    throw new Error(`Error on db connection: ${(error as Error).message}`);
+    throw new Error(`Error on db connection: ${(error as Error).message}`, { cause: error });
   }
 }

src/stages/models/manager.ts

@@ -388,7 +388,7 @@ export class StageManager {
         },
       });
 
-      if (nextStage && nextStage.status === StageOperationStatus.CREATED) {
+      if (nextStage?.status === StageOperationStatus.CREATED) {
         await this.executeUpdateStatus(nextStage.id, StageOperationStatus.PENDING, tx);
         trace.getActiveSpan()?.addEvent('Next stage set to PENDING', { nextStageId: nextStage.id });
       }

tests/integration/jobs/jobs.spec.ts

@@ -4,7 +4,12 @@ import { jsLogger } from '@map-colonies/js-logger';
 import { InMemorySpanExporter, NodeTracerProvider, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 import { trace } from '@opentelemetry/api';
 import { StatusCodes } from 'http-status-codes';
-import { createRequestSender, type RequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import {
+  createRequestSender,
+  expectResponseStatusFactory,
+  type ExpectResponseStatus,
+  type RequestSender,
+} from '@map-colonies/openapi-helpers/requestSender';
 import type { paths, operations } from '@openapi';
 import { JobOperationStatus, Priority, StageOperationStatus, type PrismaClient } from '@prismaClient';
 import type { PrismaTransaction } from '@src/db/types';
@@ -26,6 +31,8 @@ const spanProcessor = new SimpleSpanProcessor(memoryExporter);
 const provider = new NodeTracerProvider({ spanProcessors: [spanProcessor] });
 provider.register();
 
+const expectResponseStatus: ExpectResponseStatus = expectResponseStatusFactory(expect);
+
 describe('job', function () {
   let requestSender: RequestSender<paths, operations>;
   let prisma: PrismaClient;
@@ -69,9 +76,7 @@ describe('job', function () {
 
         const response = await requestSender.findJobsV1({ queryParams: { should_return_stages: true } });
 
-        if (response.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(response, 200);
 
         expect(response).toSatisfyApiSpec();
         expect(response.body).toBeArray();
@@ -88,9 +93,7 @@ describe('job', function () {
 
         const response = await requestSender.findJobsV1({ queryParams: { should_return_stages: false } });
 
-        if (response.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(response, 200);
 
         expect(response).toSatisfyApiSpec();
         expect(response.body[0]).toMatchObject(jobRequestBody);
@@ -105,9 +108,7 @@ describe('job', function () {
         });
 
         const response = await requestSender.findJobsV1({ queryParams: {} });
-        if (response.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(response, 200);
 
         expect(response).toSatisfyApiSpec();
         expect(response.body[0]).toMatchObject(jobRequestBody);

tests/integration/stages/stages.spec.ts

@@ -4,7 +4,12 @@ import { jsLogger } from '@map-colonies/js-logger';
 import { trace } from '@opentelemetry/api';
 import { StatusCodes } from 'http-status-codes';
 import { InMemorySpanExporter, NodeTracerProvider, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
-import { createRequestSender, type RequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import {
+  createRequestSender,
+  expectResponseStatusFactory,
+  type ExpectResponseStatus,
+  type RequestSender,
+} from '@map-colonies/openapi-helpers/requestSender';
 import { faker } from '@faker-js/faker';
 import type { paths, operations } from '@openapi';
 import { JobOperationStatus, StageOperationStatus, TaskOperationStatus, type PrismaClient } from '@prismaClient';
@@ -30,6 +35,8 @@ import { createProxyMock } from '@tests/configurations/mockPrisma';
 import { createJobRecord, createJobRequestBody, testJobId, testStageId } from '../jobs/helpers';
 import { createJobnikTree, createMockPrismaError, createMockUnknownDbError } from '../common/utils';
 
+const expectResponseStatus: ExpectResponseStatus = expectResponseStatusFactory(expect);
+
 describe('stage', function () {
   let requestSender: RequestSender<paths, operations>;
   let prisma: PrismaClient;
@@ -150,9 +157,7 @@ describe('stage', function () {
 
         const response = await requestSender.getStagesV1({ queryParams: { job_id: job.id, should_return_tasks: false } });
 
-        if (response.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(response, 200);
 
         expect(response).toSatisfyApiSpec();
         expect(response).toMatchObject({
@@ -328,9 +333,7 @@ describe('stage', function () {
 
         const getStageResponse = await requestSender.getStagesByJobIdV1({ pathParams: { jobId: job.id } });
 
-        if (getStageResponse.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(getStageResponse, 200);
 
         expect(getStageResponse).toSatisfyApiSpec();
         expect(getStageResponse).toMatchObject({ status: StatusCodes.OK, body: [{ status: StageOperationStatus.CREATED, id: stage.id }] });
@@ -347,9 +350,7 @@ describe('stage', function () {
           queryParams: { should_return_tasks: true },
         });
 
-        if (getStageResponse.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(getStageResponse, 200);
 
         expect(getStageResponse).toSatisfyApiSpec();
         expect(getStageResponse).toMatchObject({ status: StatusCodes.OK, body: [{ status: StageOperationStatus.CREATED, id: stage.id }] });
@@ -367,9 +368,7 @@ describe('stage', function () {
           queryParams: { should_return_tasks: false },
         });
 
-        if (getStageResponse.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(getStageResponse, 200);
 
         expect(getStageResponse).toSatisfyApiSpec();
         expect(getStageResponse).toMatchObject({ status: StatusCodes.OK, body: [{ status: StageOperationStatus.CREATED, id: stage.id }] });

tests/integration/tasks/tasks.spec.ts

@@ -4,7 +4,12 @@ import { jsLogger } from '@map-colonies/js-logger';
 import { trace } from '@opentelemetry/api';
 import { StatusCodes } from 'http-status-codes';
 import { InMemorySpanExporter, NodeTracerProvider, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
-import { createRequestSender, type RequestSender } from '@map-colonies/openapi-helpers/requestSender';
+import {
+  createRequestSender,
+  expectResponseStatusFactory,
+  type ExpectResponseStatus,
+  type RequestSender,
+} from '@map-colonies/openapi-helpers/requestSender';
 import { faker } from '@faker-js/faker';
 import type { paths, operations } from '@openapi';
 import { JobOperationStatus, Priority, Prisma, StageOperationStatus, TaskOperationStatus, type PrismaClient } from '@prismaClient';
@@ -31,6 +36,8 @@ import { addJobRecord, addStageRecord, createStageBody } from '../stages/helpers
 import { createJobnikTree, createMockPrismaError, createMockUnknownDbError } from '../common/utils';
 import { createTaskBody, createTaskRecords } from './helpers';
 
+const expectResponseStatus: ExpectResponseStatus = expectResponseStatusFactory(expect);
+
 describe('task', function () {
   let requestSender: RequestSender<paths, operations>;
   let prisma: PrismaClient;
@@ -96,9 +103,7 @@ describe('task', function () {
 
         const response = await requestSender.getTasksByCriteriaV1();
 
-        if (response.status !== StatusCodes.OK) {
-          throw new Error();
-        }
+        expectResponseStatus(response, 200);
 
         expect(response).toSatisfyApiSpec();
         expect(response).toHaveProperty('status', StatusCodes.OK);
@@ -905,9 +910,7 @@ describe('task', function () {
           },
         });
 
-        if (secondStage.status !== StatusCodes.CREATED) {
-          throw new Error('Failed to create second stage');
-        }
+        expectResponseStatus(secondStage, 201);
 
         const taskId = tasks[0]!.id;
         const stageId = stage.id;

tests/unit/db/helpers.spec.ts

@@ -21,8 +21,8 @@ function createJobEntity(override: Partial<commonDbFullV1Type>) {
 function createQueryParamsObject(paramsString: string) {
   const queryParamsArr = paramsString.split('&');
   const queryParamsPairs = queryParamsArr.map((params) => params.split('='));
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const queryObject: object = Object.fromEntries(queryParamsPairs);
+
+  const queryObject: Record<string, string> = Object.fromEntries(queryParamsPairs as [string, string][]);
   return queryObject;
 }
 

tests/unit/stages/stages.spec.ts

@@ -763,9 +763,7 @@ describe('JobManager', () => {
           prisma.$transaction.mockImplementationOnce(async (callback) => {
             const mockTx = {
               stage: {
-                findUnique: vi
-                  .fn()
-                  .mockResolvedValue({ ...stageEntity, job: { status: JobOperationStatus.IN_PROGRESS } } as unknown as StageWithTasks),
+                findUnique: vi.fn().mockResolvedValue({ ...stageEntity, job: { status: JobOperationStatus.IN_PROGRESS } }),
               },
             } as unknown as Omit<PrismaClient, '$connect' | '$disconnect' | '$on' | '$transaction' | '$use' | '$extends'>;