Merge branch 'master' of github.com:lukeautry/tsoa into ts-4.1

Author: WoH

.eslintignore

@@ -1,3 +1,3 @@
 node_modules
-packages/**/dist
+dist
 .eslintrc.js

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.4.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

package.json

@@ -1,7 +1,6 @@
 {
   "name": "tsoa-monorepo",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "3.2.1",
   "private": true,
   "keywords": [
     "typescript",

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsoa/cli",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "keywords": [
@@ -28,7 +28,7 @@
   "author": "Luke Autry <lukeautry@gmail.com> (http://www.lukeautry.com)",
   "license": "MIT",
   "dependencies": {
-    "@tsoa/runtime": "^3.3.0",
+    "@tsoa/runtime": "^3.4.0",
     "deepmerge": "^4.2.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",

packages/cli/src/index.ts

@@ -1,3 +1,4 @@
 export * from './module/generate-spec';
 export * from './module/generate-routes';
+export { Config } from '@tsoa/runtime';
 export { runCLI, ExtendedRoutesConfig, ExtendedSpecConfig } from './cli';

packages/cli/src/metadataGeneration/typeResolver.ts

@@ -295,6 +295,10 @@ export class TypeResolver {
       }
     }
 
+    if (ts.isParenthesizedTypeNode(this.typeNode)) {
+      return new TypeResolver(this.typeNode.type, this.current, this.typeNode, this.context, this.referencer).resolve();
+    }
+
     if (this.typeNode.kind !== ts.SyntaxKind.TypeReference) {
       throw new GenerateMetadataError(`Unknown type: ${ts.SyntaxKind[this.typeNode.kind]}`, this.typeNode);
     }
@@ -775,7 +779,7 @@ export class TypeResolver {
       }
 
       const modelTypeDeclaration = node as UsableDeclaration | ts.EnumMember;
-      return (modelTypeDeclaration.name as ts.Identifier).text === typeName;
+      return (modelTypeDeclaration.name as ts.Identifier)?.text === typeName;
     }) as Array<Exclude<UsableDeclaration | ts.EnumMember, ts.PropertySignature>>;
 
     if (!modelTypes.length) {

packages/cli/src/module/generate-spec.ts

@@ -7,6 +7,13 @@ import { SpecGenerator2 } from '../swagger/specGenerator2';
 import { SpecGenerator3 } from '../swagger/specGenerator3';
 import { fsExists, fsMkDir, fsWriteFile } from '../utils/fs';
 
+export const getSwaggerOutputPath = (swaggerConfig: ExtendedSpecConfig) => {
+  const ext = swaggerConfig.yaml ? 'yaml' : 'json';
+  const specFileBaseName = swaggerConfig.specFileBaseName || 'swagger';
+
+  return `${swaggerConfig.outputDirectory}/${specFileBaseName}.${ext}`;
+};
+
 export const generateSpec = async (
   swaggerConfig: ExtendedSpecConfig,
   compilerOptions?: ts.CompilerOptions,
@@ -36,9 +43,9 @@ export const generateSpec = async (
   if (swaggerConfig.yaml) {
     data = YAML.stringify(JSON.parse(data), 10);
   }
-  const ext = swaggerConfig.yaml ? 'yaml' : 'json';
 
-  await fsWriteFile(`${swaggerConfig.outputDirectory}/swagger.${ext}`, data, { encoding: 'utf8' });
+  const outputPath = getSwaggerOutputPath(swaggerConfig);
+  await fsWriteFile(outputPath, data, { encoding: 'utf8' });
 
   return metadata;
 };

packages/cli/src/routeGeneration/templates/express.hbs

@@ -11,6 +11,7 @@ import { expressAuthentication } from '{{authenticationModule}}';
 {{/if}}
 {{#if iocModule}}
 import { iocContainer } from '{{iocModule}}';
+import { IocContainer, IocContainerFactory } from '@tsoa/runtime';
 {{/if}}
 import * as express from 'express';
 
@@ -44,7 +45,7 @@ const validationService = new ValidationService(models);
 
 // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
 
-export function RegisterRoutes(app: express.Express) {
+export function RegisterRoutes(app: express.Router) {
     // ###########################################################################################################
     //  NOTE: If you do not see routes for all of your controllers in this file, then you might not have informed tsoa of where to look
     //      Please look into the "controllerPathGlobs" config option described in the readme: https://github.com/lukeautry/tsoa
@@ -72,7 +73,9 @@ export function RegisterRoutes(app: express.Express) {
             }
 
             {{#if ../../iocModule}}
-            const controller: any = iocContainer.get<{{../name}}>({{../name}});
+            const container: IocContainer = typeof iocContainer === 'function' ? (iocContainer as IocContainerFactory)(request) : iocContainer;
+
+            const controller: any = container.get<{{../name}}>({{../name}});
             if (typeof controller['setStatus'] === 'function') {
                 controller.setStatus(undefined);
             }

packages/cli/src/routeGeneration/templates/hapi.hbs

@@ -11,6 +11,7 @@ import { hapiAuthentication } from '{{authenticationModule}}';
 {{/if}}
 {{#if iocModule}}
 import { iocContainer } from '{{iocModule}}';
+import { IocContainer, IocContainerFactory } from '@tsoa/runtime';
 {{/if}}
 import { boomify, Payload } from '@hapi/boom';
 
@@ -85,7 +86,9 @@ export function RegisterRoutes(server: any) {
                     }
 
                     {{#if ../../iocModule}}
-                    const controller: any = iocContainer.get<{{../name}}>({{../name}});
+                    const container: IocContainer = typeof iocContainer === 'function' ? (iocContainer as IocContainerFactory)(request) : iocContainer;
+
+                    const controller: any = container.get<{{../name}}>({{../name}});
                     if (typeof controller['setStatus'] === 'function') {
                         controller.setStatus(undefined);
                     }

packages/cli/src/routeGeneration/templates/koa.hbs

@@ -15,6 +15,7 @@ import { koaAuthentication } from '{{authenticationModule}}';
 {{/if}}
 {{#if iocModule}}
 import { iocContainer } from '{{iocModule}}';
+import { IocContainer, IocContainerFactory } from '@tsoa/runtime';
 {{/if}}
 import * as KoaRouter from '@koa/router';
 
@@ -75,7 +76,9 @@ export function RegisterRoutes(router: KoaRouter) {
             }
 
             {{#if ../../iocModule}}
-            const controller: any = iocContainer.get<{{../name}}>({{../name}});
+            const container: IocContainer = typeof iocContainer === 'function' ? (iocContainer as IocContainerFactory)(request) : iocContainer;
+
+            const controller: any = container.get<{{../name}}>({{../name}});
             if (typeof controller['setStatus'] === 'function') {
                 controller.setStatus(undefined);
             }