[Fix] named/ExportMap: Fix ExportMap for a merged typescript name…

…space A typescript namespace may be declared multiple times, it is then merged together and considered to be a single declaration from consuming code. In the case where a merged namespace is assigned as the export from a module then the declarations from all the instances of the namespace in the AST need to be considered as exported.
import-js · Oct 7, 2019 · c14c9bd · c14c9bd
1 parent d030d8e
commit c14c9bd
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 
 ### Fixed
 - `default`: make error message less confusing ([#1470], thanks [@golopot])
+- Support export of a merged typescript namespace declaration ([#1495], thanks [@benmunro])
 
 ## [2.18.2] - 2019-07-19
 - Skip warning on type interfaces ([#1425], thanks [@lencioni])
@@ -609,6 +610,7 @@ for info on changes for earlier releases.
 
 [`memo-parser`]: ./memo-parser/README.md
 
+[#1495]: https://github.com/benmosher/eslint-plugin-import/pull/1495
 [#1472]: https://github.com/benmosher/eslint-plugin-import/pull/1472
 [#1470]: https://github.com/benmosher/eslint-plugin-import/pull/1470
 [#1436]: https://github.com/benmosher/eslint-plugin-import/pull/1436
@@ -992,3 +994,4 @@ for info on changes for earlier releases.
 [@atikenny]: https://github.com/atikenny
 [@schmidsi]: https://github.com/schmidsi
 [@TrevorBurnham]: https://github.com/TrevorBurnham
+[@benmunro]: https://github.com/benmunro
diff --git a/src/ExportMap.js b/src/ExportMap.js
@@ -514,30 +514,32 @@ ExportMap.parse = function (path, content, context) {
 
     // This doesn't declare anything, but changes what's being exported.
     if (n.type === 'TSExportAssignment') {
-      const moduleDecl = ast.body.find((bodyNode) =>
+      const moduleDecls = ast.body.filter((bodyNode) =>
         bodyNode.type === 'TSModuleDeclaration' && bodyNode.id.name === n.expression.name
       )
-      if (moduleDecl && moduleDecl.body && moduleDecl.body.body) {
-        moduleDecl.body.body.forEach((moduleBlockNode) => {
-          // Export-assignment exports all members in the namespace, explicitly exported or not.
-          const exportedDecl = moduleBlockNode.type === 'ExportNamedDeclaration' ?
-            moduleBlockNode.declaration :
-            moduleBlockNode
-
-          if (exportedDecl.type === 'VariableDeclaration') {
-            exportedDecl.declarations.forEach((decl) =>
-              recursivePatternCapture(decl.id,(id) => m.namespace.set(
-                id.name,
-                captureDoc(source, docStyleParsers, decl, exportedDecl, moduleBlockNode))
+      moduleDecls.forEach((moduleDecl) => {
+        if (moduleDecl && moduleDecl.body && moduleDecl.body.body) {
+          moduleDecl.body.body.forEach((moduleBlockNode) => {
+            // Export-assignment exports all members in the namespace, explicitly exported or not.
+            const exportedDecl = moduleBlockNode.type === 'ExportNamedDeclaration' ?
+              moduleBlockNode.declaration :
+              moduleBlockNode
+
+            if (exportedDecl.type === 'VariableDeclaration') {
+              exportedDecl.declarations.forEach((decl) =>
+                recursivePatternCapture(decl.id,(id) => m.namespace.set(
+                  id.name,
+                  captureDoc(source, docStyleParsers, decl, exportedDecl, moduleBlockNode))
+                )
               )
-            )
-          } else {
-            m.namespace.set(
-              exportedDecl.id.name,
-              captureDoc(source, docStyleParsers, moduleBlockNode))
-          }
-        })
-      }
+            } else {
+              m.namespace.set(
+                exportedDecl.id.name,
+                captureDoc(source, docStyleParsers, moduleBlockNode))
+            }
+          })
+        }
+      })
     }
   })
 

diff --git a/tests/files/typescript-export-assign-merged.d.ts b/tests/files/typescript-export-assign-merged.d.ts
@@ -0,0 +1,41 @@
+export = AssignedNamespace;
+
+declare namespace AssignedNamespace {
+  type MyType = string
+  enum MyEnum {
+    Foo,
+    Bar,
+    Baz
+  }
+}
+
+declare namespace AssignedNamespace {
+  interface Foo {
+    native: string | number
+    typedef: MyType
+    enum: MyEnum
+  }
+
+  abstract class Bar {
+    abstract foo(): Foo
+
+    method();
+  }
+
+  export function getFoo() : MyType;
+
+  export module MyModule {
+    export function ModuleFunction();
+  }
+
+  export namespace MyNamespace {
+    export function NamespaceFunction();
+
+    export module NSModule {
+      export function NSModuleFunction();
+    }
+  }
+
+  // Export-assignment exports all members in the namespace, explicitly exported or not.
+  // interface NotExported {}
+}
diff --git a/tests/src/rules/named.js b/tests/src/rules/named.js
@@ -284,7 +284,7 @@ ruleTester.run('named (export *)', rule, {
 
 context('Typescript', function () {
   getTSParsers().forEach((parser) => {
-    ['typescript', 'typescript-declare', 'typescript-export-assign'].forEach((source) => {
+    ['typescript', 'typescript-declare', 'typescript-export-assign', 'typescript-export-assign-merged'].forEach((source) => {
       ruleTester.run(`named`, rule, {
         valid: [
           test({