Merge dc6cedc into 5fe14e3

import-js · Aug 15, 2020 · dba1651 · dba1651
2 parents 5fe14e3 + dc6cedc
commit dba1651
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/src/rules/max-dependencies.js b/src/rules/max-dependencies.js
@@ -2,6 +2,8 @@ import isStaticRequire from '../core/staticRequire'
 import docsUrl from '../docsUrl'
 
 const DEFAULT_MAX = 10
+const DEFAULT_IGNORE_TYPE_IMPORTS = false
+const TYPE_IMPORT = 'type'
 
 const countDependencies = (dependencies, lastNode, context) => {
   const {max} = context.options[0] || { max: DEFAULT_MAX }
@@ -26,6 +28,7 @@ module.exports = {
         'type': 'object',
         'properties': {
           'max': { 'type': 'number' },
+          'ignoreTypeImports': { 'type': 'boolean' },
         },
         'additionalProperties': false,
       },
@@ -36,9 +39,17 @@ module.exports = {
     const dependencies = new Set() // keep track of dependencies
     let lastNode // keep track of the last node to report on
 
+    const {ignoreTypeImports} = context.options[0] || { ignoreTypeImports: DEFAULT_IGNORE_TYPE_IMPORTS }
+
     return {
       ImportDeclaration(node) {
-        dependencies.add(node.source.value)
+        if (node.importKind === TYPE_IMPORT) {
+          if (!ignoreTypeImports) {
+            dependencies.add(node.source.value)
+          }
+        } else {
+          dependencies.add(node.source.value)
+        }
         lastNode = node.source
       },
 

diff --git a/tests/src/rules/max-dependencies.js b/tests/src/rules/max-dependencies.js
@@ -1,4 +1,4 @@
-import { test } from '../utils'
+import { test, getTSParsers } from '../utils'
 
 import { RuleTester } from 'eslint'
 
@@ -22,6 +22,15 @@ ruleTester.run('max-dependencies', rule, {
     }),
 
     test({ code: 'import {x, y, z} from "./foo"'}),
+
+    test({
+      code: 'import type { x } from \'./foo\'; import { y } from \'./bar\';',
+      parser: require.resolve('babel-eslint'),
+      options: [{
+        max: 1,
+        ignoreTypeImports: true,
+      }],
+    }),
   ],
   invalid: [
     test({
@@ -74,5 +83,58 @@ ruleTester.run('max-dependencies', rule, {
         'Maximum number of dependencies (1) exceeded.',
       ],
     }),
+
+    test({
+      code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'; import type { z } from \'./baz\'',
+      parser: require.resolve('babel-eslint'),
+      options: [{
+        max: 2,
+        ignoreTypeImports: false,
+      }],
+      errors: [
+        'Maximum number of dependencies (2) exceeded.',
+      ],
+    }),
   ],
 })
+
+context('TypeScript', function() {
+  getTSParsers().forEach((parser) => {
+    ruleTester.run('max-dependencies', rule, {
+      valid: [    
+        test({
+          code: 'import type { x } from \'./foo\'; import { y } from \'./bar\';',
+          parser: parser,
+          options: [{
+            max: 1,
+            ignoreTypeImports: true,
+          }],
+        }),
+      ],
+      invalid: [    
+        test({
+          code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'',
+          parser: parser,
+          options: [{
+            max: 1,
+          }],
+          errors: [
+            'Maximum number of dependencies (1) exceeded.',
+          ],
+        }),
+
+        test({
+          code: 'import type { x } from \'./foo\'; import type { y } from \'./bar\'; import type { z } from \'./baz\'',
+          parser: parser,
+          options: [{
+            max: 2,
+            ignoreTypeImports: false,
+          }],
+          errors: [
+            'Maximum number of dependencies (2) exceeded.',
+          ],
+        }),
+      ],
+    })
+  })
+})