Change order and newline-after-import to exclude "export import"s only

import-js · Jun 19, 2020 · c36429b · c36429b
1 parent a38d6ad
commit c36429b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/rules/newline-after-import.js b/src/rules/newline-after-import.js
@@ -120,9 +120,8 @@ after ${type} statement not followed by another ${type}.`,
         const nodePosition = parent.body.indexOf(node)
         const nextNode = parent.body[nodePosition + 1]
 
-        // skip object imports
-        if (node.type === 'TSImportEqualsDeclaration' &&
-          (!node.moduleReference || node.moduleReference.type !== 'TSExternalModuleReference')) {
+        // skip "export import"s
+        if (node.type === 'TSImportEqualsDeclaration' && node.isExport) {
           return
         }
 

diff --git a/src/rules/order.js b/src/rules/order.js
@@ -615,6 +615,10 @@ module.exports = {
       TSImportEqualsDeclaration: function handleImports(node) {
         let name
         let type
+        // skip "export import"s
+        if (node.isExport) {
+          return
+        }
         if (node.moduleReference.type === 'TSExternalModuleReference') {
           name = node.moduleReference.expression.value
           type = 'import'