Support modules that are reopened

Author: endor

src/metadataGeneration/typeResolver.ts

@@ -689,19 +689,21 @@ export class TypeResolver {
       if (!moduleDeclarations.length) {
         throw new GenerateMetadataError(`No matching module declarations found for ${leftmostName}.`);
       }
-      if (moduleDeclarations.length > 1) {
-        throw new GenerateMetadataError(`Multiple matching module declarations found for ${leftmostName}; please make module declarations unique.`);
-      }
 
-      if (ts.isEnumDeclaration(moduleDeclarations[0])) {
-        statements = moduleDeclarations[0].members;
-      } else {
-        const moduleBlock = moduleDeclarations[0].body as ts.ModuleBlock;
-        if (moduleBlock === null || moduleBlock.kind !== ts.SyntaxKind.ModuleBlock) {
-          throw new GenerateMetadataError(`Module declaration found for ${leftmostName} has no body.`);
-        }
-        statements = moduleBlock.statements;
-      }
+      statements = Array.prototype.concat(
+        ...moduleDeclarations.map(declaration => {
+          if (ts.isEnumDeclaration(declaration)) {
+            return declaration.members;
+          } else {
+            const moduleBlock = declaration.body as ts.ModuleBlock;
+            if (moduleBlock === null || moduleBlock.kind !== ts.SyntaxKind.ModuleBlock) {
+              throw new GenerateMetadataError(`Module declaration found for ${leftmostName} has no body.`);
+            }
+            return moduleBlock.statements;
+          }
+        }),
+      );
+
       leftmost = leftmost.parent as ts.EntityName;
     }
 

tests/fixtures/controllers/getController.ts

@@ -1,8 +1,10 @@
+///<reference path="../tsoaTestModule.d.ts" />
 import { Readable } from 'stream';
 import { Controller, Example, Get, OperationId, Query, Request, Route, SuccessResponse, Tags } from '../../../src';
 import '../duplicateTestModel';
 import { GenericModel, GetterClass, GetterInterface, GetterInterfaceHerited, TestClassModel, TestModel, TestSubModel, SimpleClassWithToJSON } from '../testModel';
 import { ModelService } from './../services/modelService';
+import * as tsoaTestModule from 'tsoaTestModule';
 
 @Route('GetTest')
 export class GetTestController extends Controller {
@@ -78,6 +80,11 @@ export class GetTestController extends Controller {
     return {} as GetterInterfaceHerited;
   }
 
+  @Get('ModuleRedeclaration')
+  public async getModuleRedeclaration(): Promise<tsoaTestModule.TestModel73> {
+    return {} as tsoaTestModule.TestModel73;
+  }
+
   @Get('Multi')
   public async getMultipleModels(): Promise<TestModel[]> {
     return [new ModelService().getModel(), new ModelService().getModel(), new ModelService().getModel()];

tests/fixtures/testModel.ts

@@ -722,7 +722,7 @@ interface GenericContainer<T, TSameNameDifferentValue> {
 }
 
 /**
- * This should only be used inside GenericContainer to check it\'s
+ * This should only be used inside GenericContainer to check its
  * type argument T gets propagated while TSameNameDifferentValue does not
  * and instead, the interface {@link TSameNameDifferentValue} is used.
  */

tests/fixtures/tsoaTestModule.d.ts

@@ -0,0 +1,11 @@
+declare module 'tsoaTestModule' {
+  interface TestModel72 {
+    value?: string;
+  }
+}
+
+declare module 'tsoaTestModule' {
+  interface TestModel73 {
+    value?: string;
+  }
+}