Merge remote-tracking branch 'upstream/master' into 1714-rewriteRelativeImportExtensions-support

Author: WoH

packages/cli/package.json

@@ -33,14 +33,14 @@
     "@tsoa/runtime": "^6.5.1",
     "@types/multer": "^1.4.12",
     "fs-extra": "^11.2.0",
-    "glob": "^10.3.10",
+    "glob": "^11.0.0",
     "handlebars": "^4.7.8",
-    "merge-anything": "^5.1.4",
-    "minimatch": "^9.0.1",
-    "ts-deepmerge": "^7.0.1",
-    "typescript": "^5.6.2",
+    "merge-anything": "^5.1.7",
+    "minimatch": "^10.0.1",
+    "ts-deepmerge": "^7.0.2",
+    "typescript": "^5.7.2",
     "validator": "^13.12.0",
-    "yaml": "^2.5.1",
+    "yaml": "^2.6.1",
     "yargs": "^17.7.1"
   },
   "devDependencies": {

packages/runtime/package.json

@@ -29,17 +29,17 @@
   "license": "MIT",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
-    "@hapi/hapi": "^21.3.10",
+    "@hapi/hapi": "^21.3.12",
     "@types/koa": "^2.15.0",
     "@types/multer": "^1.4.12",
-    "express": "^4.21.0",
+    "express": "^4.21.2",
     "reflect-metadata": "^0.2.2",
     "validator": "^13.12.0"
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
     "@types/validator": "^13.12.2",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.2"
   },
   "repository": {
     "type": "git",

packages/runtime/src/interfaces/iocModule.ts

@@ -1,7 +1,19 @@
-export interface IocContainer {
-  get<T>(controller: { prototype: T }): T;
+export type Newable<
+  T = unknown,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  TArgs extends unknown[] = any[],
+> = new (...args: TArgs) => T;
+
+export type ServiceIdentifier<T = unknown> =
+  | string
+  | symbol
+  | Newable<T>
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  | Function;
 
-  get<T>(controller: { prototype: T }): Promise<T>;
+export interface IocContainer {
+  get<T>(controller: ServiceIdentifier<T>): T;
+  get<T>(controller: ServiceIdentifier<T>): Promise<T>;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/tsoa/package.json

@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.2"
   },
   "repository": {
     "type": "git",

tests/fixtures/inversify-async/ioc.ts

@@ -1,4 +1,4 @@
-import { Container } from 'inversify';
+import { Container, interfaces } from 'inversify';
 import { AsyncController } from './asyncController';
 import { AsyncService } from './asyncService';
 import { AsyncErrorController } from './asyncErrorController';
@@ -15,7 +15,7 @@ container.bind('error').toFactory(() => {
 container.bind<AsyncErrorController>(AsyncErrorController).to(AsyncErrorController).inSingletonScope();
 
 const iocContainer = {
-  async get<T>(controller: { prototype: T }): Promise<T> {
+  async get<T>(controller: interfaces.ServiceIdentifier<T>): Promise<T> {
     return container.get(controller);
   },
 };