Merge pull request #1106 from myrotvorets/renovate/linters

chore(deps): update dependency @myrotvorets/eslint-config-myrotvorets-ts to ^2.22.4
myrotvorets · Oct 13, 2023 · 2fe4a1b · 2fe4a1b
2 parents ec9377d + 9195577
commit 2fe4a1b
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 152 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,9 +28,6 @@
     "@myrotvorets/oav-installer": "^4.1.0",
     "@myrotvorets/opentelemetry-configurator": "^6.4.1",
     "@myrotvorets/opentelemetry-plugin-knex": "^0.30.0",
-    "@opentelemetry/instrumentation-express": "^0.33.1",
-    "@opentelemetry/instrumentation-http": "^0.44.0",
-    "@opentelemetry/instrumentation-mysql2": "^0.34.1",
     "envalid": "^8.0.0",
     "express": "^4.18.2",
     "express-openapi-validator": "^5.0.6",
@@ -41,7 +38,7 @@
     "wpautop": "^1.0.0"
   },
   "devDependencies": {
-    "@myrotvorets/eslint-config-myrotvorets-ts": "^2.21.0",
+    "@myrotvorets/eslint-config-myrotvorets-ts": "^2.22.4",
     "@types/chai": "^4.3.8",
     "@types/chai-as-promised": "^7.1.6",
     "@types/express": "^4.17.19",

diff --git a/src/lib/tracing.mts b/src/lib/tracing.mts
@@ -1,22 +1,10 @@
 /* c8 ignore start */
-import { OpenTelemetryConfigurator } from '@myrotvorets/opentelemetry-configurator';
-import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
-import { MySQL2Instrumentation } from '@opentelemetry/instrumentation-mysql2';
+import { OpenTelemetryConfigurator, getExpressInstrumentations } from '@myrotvorets/opentelemetry-configurator';
 import { KnexInstrumentation } from '@myrotvorets/opentelemetry-plugin-knex';
 
-if (!+(process.env.ENABLE_TRACING || 0)) {
-    process.env.OTEL_SDK_DISABLED = 'true';
-}
-
 const configurator = new OpenTelemetryConfigurator({
     serviceName: 'psb-api-identigraf',
-    instrumentations: [
-        new ExpressInstrumentation(),
-        new HttpInstrumentation(),
-        new KnexInstrumentation(),
-        new MySQL2Instrumentation(),
-    ],
+    instrumentations: [...getExpressInstrumentations(), new KnexInstrumentation()],
 });
 
 configurator.start();

diff --git a/src/models/criminal.mts b/src/models/criminal.mts
@@ -10,9 +10,9 @@ export class Criminal extends Model {
     public address!: string;
     public description!: string;
 
-    public static tableName = 'criminals';
+    public static override tableName = 'criminals';
 
-    public static modifiers: Modifiers<QueryBuilder<Model>> = {
+    public static override modifiers: Modifiers<QueryBuilder<Criminal>> = {
         searchByName(builder, s: string, n: number): void {
             void builder
                 .where('active', 1)

diff --git a/src/models/criminalattachment.mts b/src/models/criminalattachment.mts
@@ -6,9 +6,9 @@ export class CriminalAttachment extends Model {
     public path!: string;
     public mime_type!: string;
 
-    public static tableName = 'criminal_attachments';
+    public static override tableName = 'criminal_attachments';
 
-    public static modifiers: Modifiers<QueryBuilder<Model>> = {
+    public static override modifiers: Modifiers<QueryBuilder<CriminalAttachment>> = {
         findByIds(builder, ids: number[]): void {
             void builder.whereIn('id', ids).andWhere('mime_type', 'LIKE', 'image/%').orderBy(['id', 'sort_order']);
         },

diff --git a/src/server.mts b/src/server.mts
@@ -31,7 +31,7 @@ export async function configureApp(app: Express): Promise<void> {
     );
 
     /* c8 ignore start */
-    if (process.env.HAVE_SWAGGER === 'true') {
+    if (process.env['HAVE_SWAGGER'] === 'true') {
         app.get('/', (_req, res) => res.redirect('/swagger/'));
     }
     /* c8 ignore stop */
@@ -47,7 +47,7 @@ export function setupApp(): Express {
     app.set('strict routing', true);
     app.set('x-powered-by', false);
 
-    if (process.env.SKIP_REQUEST_LOGGING !== '1') {
+    if (process.env['SKIP_REQUEST_LOGGING'] !== '1') {
         app.use(
             morgan(
                 '[PSBAPI-dzhura] :req[X-Request-ID]\t:method\t:url\t:status :res[content-length]\t:date[iso]\t:response-time\t:total-time',

diff --git a/test/functional/controllers/monitoring.test.mts b/test/functional/controllers/monitoring.test.mts
@@ -4,7 +4,6 @@ import { expect } from 'chai';
 import request from 'supertest';
 import * as knexpkg from 'knex';
 import mockKnex from 'mock-knex';
-import type { HealthChecker } from '@cloudnative/health-connect';
 import { buildKnexConfig } from '../../../src/knexfile.mjs';
 import { healthChecker, monitoringController } from '../../../src/controllers/monitoring.mjs';
 
@@ -25,7 +24,7 @@ describe('MonitoringController', function () {
 
     beforeEach(function () {
         expect(healthChecker).not.to.be.undefined;
-        (healthChecker as HealthChecker).shutdownRequested = false;
+        healthChecker!.shutdownRequested = false;
     });
 
     after(function () {
@@ -41,7 +40,7 @@ describe('MonitoringController', function () {
         request(app).get(`/monitoring/${endpoint}`).expect('Content-Type', /json/u).expect(200);
 
     const checker503 = (endpoint: string): Promise<unknown> => {
-        (healthChecker as HealthChecker).shutdownRequested = true;
+        healthChecker!.shutdownRequested = true;
         return request(app).get(`/monitoring/${endpoint}`).expect('Content-Type', /json/u).expect(503);
     };
 

diff --git a/test/migrate.mts b/test/migrate.mts
@@ -19,7 +19,7 @@ try {
     process.stdout.write('Creating tables\n');
     await db.migrate.latest();
 
-    if (process.env.SEED_TABLES === 'yes') {
+    if (process.env['SEED_TABLES'] === 'yes') {
         process.stdout.write('Populating tables\n');
         await db.seed.run();
     }

diff --git a/test/migrations/2020071914070000_criminals.mts b/test/migrations/2020071914070000_criminals.mts
@@ -30,8 +30,8 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(knex: Knex): Promise<void> {
-    if (process.env.NODE_ENV !== 'test') {
-        throw new Error(`Refusing to run this in the ${process.env.NODE_ENV} environment`);
+    if (process.env['NODE_ENV'] !== 'test') {
+        throw new Error(`Refusing to run this in the ${process.env['NODE_ENV']} environment`);
     }
 
     await knex.schema.dropTableIfExists('criminals');

diff --git a/test/migrations/2020071914090000_criminal_attachments.mts b/test/migrations/2020071914090000_criminal_attachments.mts
@@ -18,8 +18,8 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(knex: Knex): Promise<void> {
-    if (process.env.NODE_ENV !== 'test') {
-        throw new Error(`Refusing to run this in the ${process.env.NODE_ENV} environment`);
+    if (process.env['NODE_ENV'] !== 'test') {
+        throw new Error(`Refusing to run this in the ${process.env['NODE_ENV']} environment`);
     }
 
     await knex.schema.dropTableIfExists('criminal_attachments');

diff --git a/test/seeds/0000_criminals.mts b/test/seeds/0000_criminals.mts
@@ -53,8 +53,8 @@ const seedData = [
 ];
 
 export async function seed(knex: Knex): Promise<void> {
-    if (!['test', 'development'].includes(process.env.NODE_ENV || '')) {
-        throw new Error(`Refusing to run this in ${process.env.NODE_ENV} environment`);
+    if (!['test', 'development'].includes(process.env['NODE_ENV'] ?? '')) {
+        throw new Error(`Refusing to run this in ${process.env['NODE_ENV']} environment`);
     }
 
     await knex('criminals').del();

diff --git a/test/seeds/0001_criminal_attachments.mts b/test/seeds/0001_criminal_attachments.mts
@@ -78,8 +78,8 @@ const seedData = [
 ];
 
 export async function seed(knex: Knex): Promise<void> {
-    if (!['test', 'development'].includes(process.env.NODE_ENV || '')) {
-        throw new Error(`Refusing to run this in ${process.env.NODE_ENV} environment`);
+    if (!['test', 'development'].includes(process.env['NODE_ENV'] ?? '')) {
+        throw new Error(`Refusing to run this in ${process.env['NODE_ENV']} environment`);
     }
 
     await knex('criminal_attachments').del();

diff --git a/test/unit/services/search.test.mts b/test/unit/services/search.test.mts
@@ -38,7 +38,7 @@ describe('SearchService', function () {
         // eslint-disable-next-line mocha/no-setup-in-describe
         table1.forEach(([input, expected]) =>
             it(`should discard names having less than two unique lexemes ('${input}')`, function () {
-                return tester(input, expected);
+                tester(input, expected);
             }),
         );
 
@@ -52,7 +52,7 @@ describe('SearchService', function () {
         // eslint-disable-next-line mocha/no-setup-in-describe
         table2.forEach(([input, expected]) =>
             it(`should correctly handle names with two lexemes ('${input}' => '${expected}')`, function () {
-                return tester(input, expected);
+                tester(input, expected);
             }),
         );
 
@@ -70,7 +70,7 @@ describe('SearchService', function () {
         // eslint-disable-next-line mocha/no-setup-in-describe
         table3.forEach(([input, expected]) =>
             it(`should correctly handle names with more than two lexemes ('${input}' => '${expected}')`, function () {
-                return tester(input, expected);
+                tester(input, expected);
             }),
         );
     });

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,10 +10,13 @@
         "declaration": false,
         "removeComments": false,
         "strict": true,
-        "strictNullChecks": true,
         "noUnusedLocals": true,
         "noUnusedParameters": false,
         "noFallthroughCasesInSwitch": true,
+        "noPropertyAccessFromIndexSignature": true,
+        "noUncheckedIndexedAccess": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
         "esModuleInterop": true,
         "resolveJsonModule": true
     },