Merge remote-tracking branch 'upstream/master'

Author: WoH

.eslintrc.js

@@ -31,7 +31,6 @@ module.exports = {
     ],
     '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/no-unsafe-assignment': 'off',
-    '@typescript-eslint/no-unsafe-call': 'off',
     '@typescript-eslint/no-unsafe-argument': 'off',
     '@typescript-eslint/no-unsafe-member-access': 'off',
     '@typescript-eslint/no-unsafe-return': 'off',

.github/workflows/closeStaleIssuesAndPRs.yml

@@ -12,7 +12,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days'
           stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days'
-          days-before-stale: 30
-          days-before-close: 5
+          days-before-stale: 150
+          days-before-close: 30
           exempt-issue-labels: 'help wanted,Pending feedback'
           exempt-pr-labels: 'help wanted,breaking change'

.github/workflows/runTestsOnPush.yml

@@ -8,13 +8,13 @@ jobs:
       matrix:
         node-version: [18, 20, 21]
         os: [macos-latest, ubuntu-latest, windows-latest]
-        typescript-version: ['^4.9.5', '^5.2.2']
+        typescript-version: ['^5.0.0']
 
     steps:
       - uses: actions/checkout@master
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.4.0",
+  "version": "6.5.1",
   "npmClient": "yarn",
   "command": {
     "version": {

package.json

@@ -49,11 +49,11 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^4.3.0",
-    "lerna": "^8.0.1",
-    "lint-staged": "^15.2.0",
-    "prettier": "^3.1.1",
+    "lerna": "^8.1.8",
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.12"
+    "typedoc": "^0.26.7"
   },
   "resolutions": {
     "typescript": "^5.2.2"

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsoa/cli",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "6.4.0",
+  "version": "6.5.1",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "files": [
@@ -30,25 +30,25 @@
   "author": "Luke Autry <[email protected]> (http://www.lukeautry.com)",
   "license": "MIT",
   "dependencies": {
-    "@tsoa/runtime": "^6.4.0",
-    "@types/multer": "^1.4.11",
+    "@tsoa/runtime": "^6.5.1",
+    "@types/multer": "^1.4.12",
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
     "handlebars": "^4.7.8",
-    "merge-anything": "^5.1.4",
+    "merge-anything": "^5.1.7",
     "minimatch": "^9.0.1",
-    "ts-deepmerge": "^7.0.0",
-    "typescript": "^5.3.3",
-    "validator": "^13.11.0",
-    "yaml": "^2.4.1",
+    "ts-deepmerge": "^7.0.2",
+    "typescript": "^5.7.2",
+    "validator": "^13.12.0",
+    "yaml": "^2.6.1",
     "yargs": "^17.7.1"
   },
   "devDependencies": {
     "@types/glob": "^8.1.0",
     "@types/minimatch": "^5.1.0",
     "@types/node": "^18.0.0",
-    "@types/validator": "^13.11.7",
-    "@types/yargs": "^17.0.32",
+    "@types/validator": "^13.12.2",
+    "@types/yargs": "^17.0.33",
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.5"
   },

packages/cli/src/cli.ts

@@ -397,3 +397,11 @@ export async function generateSpecAndRoutes(args: SwaggerArgs, metadata?: Tsoa.M
     throw err;
   }
 }
+export type RouteGeneratorModule<Config extends ExtendedRoutesConfig> = {
+  default: new (
+    metadata: Tsoa.Metadata,
+    routesConfig: Config,
+  ) => {
+    GenerateCustomRoutes: () => Promise<void>;
+  };
+};

packages/cli/src/metadataGeneration/exceptions.ts

@@ -11,7 +11,11 @@ export class GenerateMetadataError extends Error {
 }
 
 export class GenerateMetaDataWarning {
-  constructor(private message: string, private node: Node | TypeNode, private onlyCurrent = false) { }
+  constructor(
+    private message: string,
+    private node: Node | TypeNode,
+    private onlyCurrent = false,
+  ) {}
 
   toString() {
     return `Warning: ${this.message}\n${prettyLocationOfNode(this.node)}\n${prettyTroubleCause(this.node, this.onlyCurrent)}`;
@@ -34,9 +38,9 @@ export function prettyLocationOfNode(node: Node | TypeNode) {
 export function prettyTroubleCause(node: Node | TypeNode, onlyCurrent = false) {
   let name: string;
   if (onlyCurrent || !node.parent) {
-    name = node.pos !== -1 ? node.getText() : ((node as any).name?.text || '<unknown name>');
+    name = node.pos !== -1 && node.parent ? node.getText() : (node as any).name?.text || '<unknown name>';
   } else {
-    name = node.parent.pos !== -1 ? node.parent.getText() : ((node as any).parent.name?.text || '<unknown name>');
+    name = node.parent.pos !== -1 ? node.parent.getText() : (node as any).parent.name?.text || '<unknown name>';
   }
   return `This was caused by '${name}'`;
 }

packages/cli/src/metadataGeneration/extension.ts

@@ -12,11 +12,15 @@ export function getExtensions(decorators: ts.Identifier[], metadataGenerator: Me
 
     const [decoratorKeyArg, decoratorValueArg] = extensionDecorator.parent.arguments;
 
-    if (!ts.isStringLiteral(decoratorKeyArg)) {
+    if (!ts.isStringLiteral(decoratorKeyArg) && !ts.isIdentifier(decoratorKeyArg)) {
       throw new Error('The first argument of @Extension must be a string');
     }
 
-    const attributeKey = decoratorKeyArg.text;
+    const attributeKey = ts.isIdentifier(decoratorKeyArg) ? getInitializerValue(decoratorKeyArg, metadataGenerator.typeChecker) : decoratorKeyArg.text;
+
+    if (typeof attributeKey !== 'string') {
+      throw new Error('The first argument of @Extension must be a string');
+    }
 
     if (!decoratorValueArg) {
       throw new Error(`Extension '${attributeKey}' must contain a value`);

packages/cli/src/metadataGeneration/methodGenerator.ts

@@ -197,7 +197,11 @@ export class MethodGenerator {
 
     return decorators.map(decorator => {
       const [name, description, example, produces] = getDecoratorValues(decorator, this.current.typeChecker);
-      responseExamplesByName[name] = responseExamplesByName[name] ? [...responseExamplesByName[name], example] : [example];
+
+      if (example !== undefined) {
+        responseExamplesByName[name] = responseExamplesByName[name] ? [...responseExamplesByName[name], example] : [example];
+      }
+
       return {
         description: description || '',
         examples: responseExamplesByName[name] || undefined,