diff --git a/package-lock.json b/package-lock.json index 720ba88..728f840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "dotenv": "^16.4.7", "envalid": "^8.0.0", "express": "^4.21.2", - "express-prom-bundle": "^8.0.0", + "express-prom-bundle": "^7.0.0", "knex": "^3.1.0", "pg": "^8.13.1", "pino": "^9.5.0", @@ -34,6 +34,7 @@ "@types/chai": "^5.0.1", "@types/compression": "^1.7.5", "@types/cors": "^2.8.17", + "@types/express": "^4.0.0", "@types/mocha": "^10.0.10", "@types/node": "^20.17.9", "@types/supertest": "^6.0.2", @@ -1538,21 +1539,21 @@ "license": "MIT" }, "node_modules/@types/express": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz", - "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "license": "MIT", "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^5.0.0", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz", - "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==", + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "license": "MIT", "dependencies": { "@types/node": "*", @@ -3057,12 +3058,13 @@ } }, "node_modules/express-prom-bundle": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-8.0.0.tgz", - "integrity": "sha512-UHdpaMks6Z/tvxQsNzhsE7nkdXb4/zEh/jwN0tfZSZOEF+aD0dlfl085EU4jveOq09v01c5sIUfjV4kJODZ2eQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.2.tgz", + "integrity": "sha512-ffFV4HGHvCKnkNJFqm42sYztRJE5mLgOj8MpGey1HOatuFhtcwXoBD2m5gca7ZbcyjkIf7lOH5ZdrhlrBf0sGw==", "license": "MIT", "dependencies": { - "@types/express": "^5.0.0", + "@types/express": "^4.17.21", + "express": "^4.18.2", "on-finished": "^2.3.0", "url-value-parser": "^2.0.0" }, @@ -4067,30 +4069,6 @@ "node": ">=14" } }, - "node_modules/jwks-rsa/node_modules/@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", - "license": "MIT", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "node_modules/jwks-rsa/node_modules/@types/express-serve-static-core": { - "version": "4.19.6", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", - "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", - "license": "MIT", - "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" - } - }, "node_modules/jwks-rsa/node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", diff --git a/package.json b/package.json index 472425b..efdedfc 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "dotenv": "^16.4.7", "envalid": "^8.0.0", "express": "^4.21.2", - "express-prom-bundle": "^8.0.0", + "express-prom-bundle": "^7.0.0", "knex": "^3.1.0", "pg": "^8.13.1", "pino": "^9.5.0", @@ -56,9 +56,11 @@ "zod": "^3.23.8" }, "devDependencies": { + "@digicatapult/tsimp": "^2.0.12", "@types/chai": "^5.0.1", "@types/compression": "^1.7.5", "@types/cors": "^2.8.17", + "@types/express": "^4.0.0", "@types/mocha": "^10.0.10", "@types/node": "^20.17.9", "@types/supertest": "^6.0.2", @@ -72,7 +74,6 @@ "prettier": "^3.4.2", "prettier-plugin-organize-imports": "^4.1.0", "supertest": "^7.0.0", - "@digicatapult/tsimp": "^2.0.12", "typescript": "^5.7.2" } } diff --git a/src/ioc.ts b/src/ioc.ts index 2eedd18..e12add9 100644 --- a/src/ioc.ts +++ b/src/ioc.ts @@ -2,7 +2,7 @@ import { IocContainer } from '@tsoa/runtime' import { container } from 'tsyringe' export const iocContainer: IocContainer = { - get: (controller: { prototype: T }): T => { - return container.resolve(controller as never) + get: (controller) => { + return container.resolve(controller as never) }, }