Merge pull request #255 from myrotvorets/renovate/express-5.x

chore(deps): update dependency @types/express to v5
myrotvorets · Dec 20, 2024 · e5cbecc · e5cbecc
2 parents d167fa6 + 0f43456
commit e5cbecc
Show file tree

Hide file tree

Showing 12 changed files with 190 additions and 319 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,18 +28,15 @@
     "./dist/src/*.d.mts",
     "./dist/src/*.map"
   ],
-  "peerDependencies": {
-    "express": "^4.18.2"
-  },
   "devDependencies": {
     "@myrotvorets/buffer-stream": "^1.4.1",
     "@myrotvorets/eslint-config-myrotvorets-ts": "^3.0.0",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
     "@types/express-serve-static-core": "^5.0.0",
     "@types/supertest": "^6.0.2",
     "c8": "^10.1.2",
     "eslint-formatter-gha": "^1.5.1",
-    "express": "^5.0.0",
+    "express": "^4.21.2",
     "node-reporter-gha": "^2.0.4",
     "node-reporter-sonarqube": "^1.0.1",
     "supertest": "^7.0.0",

diff --git a/test/date.test.mts b/test/date.test.mts
@@ -1,5 +1,6 @@
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import type { Express } from 'express';
@@ -18,7 +19,7 @@ await describe(':date', async () => {
     afterEach(unmockDate);
 
     const checker = (app: Express, stream: WritableBufferStream, expected: string): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), expected));
 

diff --git a/test/helpers/setup.mts b/test/helpers/setup.mts
@@ -4,7 +4,9 @@ import express, { type Express, type RequestHandler } from 'express';
 export let stream: WritableBufferStream; // NOSONAR
 export let app: Express; // NOSONAR
 
-export const genericHandler: RequestHandler = (_req, res) => res.json({ hello: 'world' });
+export const genericHandler: RequestHandler = (_req, res) => {
+    res.json({ hello: 'world' });
+};
 
 export function beforeSuite(): void {
     stream = new WritableBufferStream();

diff --git a/test/logger.test.mts b/test/logger.test.mts
@@ -1,5 +1,6 @@
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import { app, beforeSuite, beforeTest, genericHandler, stream } from './helpers/setup.mjs';
 import { requestLogger } from '../src/index.mjs';
@@ -24,7 +25,7 @@ await describe('RequestLogger', async () => {
         const expectedURL = '/';
         const expectedUA = 'WeirdBot/1.2.4';
 
-        await request(app)
+        await request(app as RequestListener)
             .get(expectedURL)
             .set('X-Forwarded-For', expectedIP)
             .set('User-Agent', expectedUA)
@@ -48,7 +49,7 @@ await describe('RequestLogger', async () => {
             const expectedIP = '192.168.1.1';
             const expectedURL = '/';
             const expectedUA = 'WeirdBot/1.2.4';
-            await request(app)
+            await request(app as RequestListener)
                 .get(expectedURL)
                 .set('X-Forwarded-For', expectedIP)
                 .set('User-Agent', expectedUA)
@@ -72,7 +73,7 @@ await describe('RequestLogger', async () => {
                 genericHandler,
             );
 
-            await request(app)
+            await request(app as RequestListener)
                 .get('/')
                 .expect(() => equal(stream.toString().trimEnd(), 'LOGGER says: 200'));
         });
@@ -87,7 +88,7 @@ await describe('RequestLogger', async () => {
                 genericHandler,
             );
 
-            await request(app)
+            await request(app as RequestListener)
                 .get('/')
                 .expect(() => equal(stream.toString(), ''));
         });

diff --git a/test/mode.test.mts b/test/mode.test.mts
@@ -1,5 +1,6 @@
 import { before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import type { Express } from 'express';
@@ -17,7 +18,7 @@ await describe('Operation Mode', async () => {
         expectedURL: string,
         expected: string,
     ): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get(expectedURL)
             .expect(() => equal(stream.toString().trimEnd(), expected));
 

diff --git a/test/remote-user.test.mts b/test/remote-user.test.mts
@@ -1,5 +1,6 @@
 import { before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import type { Express } from 'express';
@@ -12,7 +13,7 @@ await describe(':remote-user', async () => {
     beforeEach(beforeTest);
 
     const checker = (app: Express, stream: WritableBufferStream, expected: string): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), expected));
 

diff --git a/test/req.test.mts b/test/req.test.mts
@@ -1,5 +1,6 @@
 import { before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import { app, beforeSuite, beforeTest, genericHandler, stream } from './helpers/setup.mjs';
@@ -16,15 +17,15 @@ await describe(':req', async () => {
     await it('should handle the case when header is not available', async () => {
         app.use(requestLogger({ format: ':req[x-ping]', stream }), genericHandler);
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => checker(stream, '-'));
     });
 
     await it('should handle the case with no parameters', async () => {
         app.use(requestLogger({ format: ':req', stream }), genericHandler);
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => checker(stream, '-'));
     });
@@ -33,7 +34,7 @@ await describe(':req', async () => {
         app.use(requestLogger({ format: ':req[x-ping]', stream }), genericHandler);
 
         const expected = 'pong';
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .set('x-ping', expected)
             .expect(() => checker(stream, expected));
@@ -42,7 +43,7 @@ await describe(':req', async () => {
     await it('should handle the case when header is available, but empty', async () => {
         app.use(requestLogger({ format: ':req[x-ping]', stream }), genericHandler);
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .set('x-ping', '')
             .expect(() => checker(stream, '-'));
@@ -58,7 +59,7 @@ await describe(':req', async () => {
             genericHandler,
         );
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => checker(stream, 'pong, pong'));
     });

diff --git a/test/res.test.mts b/test/res.test.mts
@@ -1,4 +1,5 @@
 import { before, beforeEach, describe, it } from 'node:test';
+import type { RequestListener } from 'node:http';
 import { equal } from 'node:assert/strict';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
@@ -12,7 +13,7 @@ await describe(':res', async () => {
     beforeEach(beforeTest);
 
     const checker = (app: Express, stream: WritableBufferStream, expected: string): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), expected));
 

diff --git a/test/settokenhandler.test.mts b/test/settokenhandler.test.mts
@@ -1,5 +1,6 @@
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import type { Express } from 'express';
@@ -14,7 +15,7 @@ await describe('setTokenHandler', async () => {
     afterEach(() => setTokenHandler('test', undefined));
 
     const checker = (app: Express, stream: WritableBufferStream, expected: string): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), expected));
 

diff --git a/test/total-time.test.mts b/test/total-time.test.mts
@@ -1,5 +1,6 @@
 import { before, beforeEach, describe, it } from 'node:test';
 import { equal, match } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import { hrtime } from 'node:process';
 import request from 'supertest';
 import type { Response } from 'express';
@@ -18,7 +19,7 @@ await describe(':total-time', async () => {
     await it('should log the total time', async () => {
         app.use(requestLogger({ format: ':total-time', stream }), genericHandler);
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => {
                 const line = stream.toString().trimEnd();
@@ -35,12 +36,14 @@ await describe(':total-time', async () => {
                 format: ':total-time',
                 stream,
             }),
-            (_req, _res, next) => setTimeout(next, timeout),
+            (_req, _res, next) => {
+                setTimeout(next, timeout);
+            },
             genericHandler,
         );
 
         const now = hrtime.bigint();
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => {
                 const duration = +Number((hrtime.bigint() - now) / BigInt(1e6)).toFixed(3);
@@ -62,7 +65,7 @@ await describe(':total-time', async () => {
             genericHandler,
         );
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), '-'));
     });
@@ -80,7 +83,7 @@ await describe(':total-time', async () => {
             genericHandler,
         );
 
-        await request(app)
+        await request(app as RequestListener)
             .get('/')
             .expect(() => equal(stream.toString().trimEnd(), '-'));
     });

diff --git a/test/url.test.mts b/test/url.test.mts
@@ -1,5 +1,6 @@
 import { before, beforeEach, describe, it } from 'node:test';
 import { equal } from 'node:assert/strict';
+import type { RequestListener } from 'node:http';
 import request from 'supertest';
 import type { WritableBufferStream } from '@myrotvorets/buffer-stream';
 import type { Express } from 'express';
@@ -12,7 +13,7 @@ await describe(':url', async () => {
     beforeEach(beforeTest);
 
     const checker = (app: Express, stream: WritableBufferStream, expectedURL: string): Promise<unknown> =>
-        request(app)
+        request(app as RequestListener)
             .get(expectedURL)
             .expect(() => equal(stream.toString().trimEnd(), expectedURL));