Fix interface declarations for Typescript

import-js · May 13, 2020 · 313837b · 313837b
1 parent 92caa35
commit 313837b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/ExportMap.js b/src/ExportMap.js
@@ -543,7 +543,10 @@ ExportMap.parse = function (path, content, context) {
       ]
       const exportedDecls = ast.body.filter(({ type, id, declarations }) => 
         declTypes.includes(type) && 
-        (id && id.name === exportedName || declarations.find(d => d.id.name === exportedName))
+        (
+          (id && id.name === exportedName) ||
+          (declarations && declarations.find(d => d.id.name === exportedName))
+        )
       )
       if (exportedDecls.length === 0) {
         // Export is not referencing any local declaration, must be re-exporting

diff --git a/tests/files/typescript-declare-interface.d.ts b/tests/files/typescript-declare-interface.d.ts
@@ -0,0 +1,11 @@
+declare interface foo {
+  a: string;
+}
+
+declare namespace SomeNamespace {
+  type foobar = foo & {
+    b: string;
+  }
+}
+
+export = SomeNamespace
diff --git a/tests/src/rules/namespace.js b/tests/src/rules/namespace.js
@@ -1,4 +1,4 @@
-import { test, SYNTAX_CASES } from '../utils'
+import { test, SYNTAX_CASES, getTSParsers } from '../utils'
 import { RuleTester } from 'eslint'
 
 var ruleTester = new RuleTester({ env: { es6: true }})
@@ -120,6 +120,15 @@ const valid = [
     },
   }),
 
+  ...getTSParsers().map((parser) => test({
+    code: `import { foobar } from "./typescript-declare-interface"`,
+    parser: parser,
+    settings: {
+      'import/parsers': { [parser]: ['.ts'] },
+      'import/resolver': { 'eslint-import-resolver-typescript': true },
+    },
+  })),
+
   ...SYNTAX_CASES,
 ]