Extend no-extraneous-dependencies to support globs and arrays.

Author: knpwrs

docs/rules/no-extraneous-dependencies.md

@@ -19,10 +19,16 @@ You can set the options like this:
 "import/no-extraneous-dependencies": ["error", {"devDependencies": false, "optionalDependencies": false, "peerDependencies": false}]
 ```
 
-You can also use regular expressions instead of literal booleans:
+You can also use globs instead of literal booleans:
 
 ```js
-"import/no-extraneous-dependencies": ["error", {"devDependencies": "test|spec"}]
+"import/no-extraneous-dependencies": ["error", {"devDependencies": "*.test.js"}]
+```
+
+You can also use regular expressions instead of literal booleans or globs (note: the string must begin and end with `/`):
+
+```js
+"import/no-extraneous-dependencies": ["error", {"devDependencies": "/test|spec/"}]
 ```
 
 If you are using JavaScript configuration (e.g., `.eslintrc.js`), then you can use a RegExp literal instead of a string:
@@ -31,7 +37,13 @@ If you are using JavaScript configuration (e.g., `.eslintrc.js`), then you can u
 "import/no-extraneous-dependencies": ["error", {"devDependencies": /test|spec/}]
 ```
 
-When using a regular expression, the setting will be activated if the name of the file being linted matches the given regular expression. For example, the above configurations will allow the import of `devDependencies` in files whose names include `test` or `spec`.
+When using a glob or regular expression, the setting will be activated if the name of the file being linted matches the given glob or regular expression. In addition, you can use an array to specify multiple globs or regular expressions:
+
+```js
+"import/no-extraneous-dependencies": ["error", {"devDependencies": [/test/, '/spec/', '*.test.js', '*.spec.js']}]
+```
+
+When using an array of globs or regular expressions, the setting will be activated if the name of the file being linted matches a single glob or regular expression in the array.
 
 ## Rule Details
 

package.json

@@ -81,6 +81,7 @@
     "lodash.endswith": "^4.0.1",
     "lodash.find": "^4.3.0",
     "lodash.findindex": "^4.3.0",
+    "minimatch": "^3.0.3",
     "object-assign": "^4.0.1",
     "pkg-dir": "^1.0.0",
     "pkg-up": "^1.0.0"

src/rules/no-extraneous-dependencies.js

@@ -1,5 +1,6 @@
 import fs from 'fs'
 import pkgUp from 'pkg-up'
+import minimatch from 'minimatch'
 import importType from '../core/importType'
 import isStaticRequire from '../core/staticRequire'
 
@@ -72,11 +73,25 @@ function reportIfMissing(context, deps, depsOptions, node, name) {
 }
 
 function testConfig(config, filename) {
+  // Simplest configuration first
   if (typeof config === 'boolean' || typeof config === 'undefined') {
     return config
   }
-  const pattern = new RegExp(config) // `config` is either a string or RegExp
-  return pattern.test(filename)
+  // Account for the possibility of an array for multiple configuration
+  return [].concat(config).some(c => {
+    if (typeof c === 'object') {
+      // `c` is a literal RegExp
+      return c.test(filename)
+    }
+    // By this point `c` must be a string.
+    if (/^\/.+\/$/.test(c)) {
+      // `c` is a string representation of a RegExp.
+      const pattern = new RegExp(c.substring(1, c.length - 1))
+      return pattern.test(filename)
+    }
+    // `c` must be a string representing a glob
+    return minimatch(filename, c)
+  })
 }
 
 module.exports = function (context) {
@@ -111,9 +126,9 @@ module.exports.schema = [
   {
     'type': 'object',
     'properties': {
-      'devDependencies': { 'type': ['boolean', 'string', 'object'] },
-      'optionalDependencies': { 'type': ['boolean', 'string', 'object'] },
-      'peerDependencies': { 'type': ['boolean', 'string', 'object'] },
+      'devDependencies': { 'type': ['boolean', 'string', 'object', 'array'] },
+      'optionalDependencies': { 'type': ['boolean', 'string', 'object', 'array'] },
+      'peerDependencies': { 'type': ['boolean', 'string', 'object', 'array'] },
     },
     'additionalProperties': false,
   },

tests/src/rules/no-extraneous-dependencies.js

@@ -38,12 +38,27 @@ ruleTester.run('no-extraneous-dependencies', rule, {
     test({
       code: 'import chai from "chai"',
       options: [{devDependencies: /test|spec/}],
-      filename: 'glob.test.js',
+      filename: 'foo.test.js',
     }),
     test({
       code: 'import chai from "chai"',
-      options: [{devDependencies: 'test|spec'}],
-      filename: 'glob.spec.js',
+      options: [{devDependencies: '/test|spec/'}],
+      filename: 'foo.spec.js',
+    }),
+    test({
+      code: 'import chai from "chai"',
+      options: [{devDependencies: '*.spec.js'}],
+      filename: 'foo.spec.js',
+    }),
+    test({
+      code: 'import chai from "chai"',
+      options: [{devDependencies: ['*.test.js', '*.spec.js']}],
+      filename: 'foo.spec.js',
+    }),
+    test({
+      code: 'import chai from "chai"',
+      options: [{devDependencies: [/\.test\.js$/, /\.spec\.js$/]}],
+      filename: 'foo.spec.js',
     }),
   ],
   invalid: [
@@ -110,7 +125,25 @@ ruleTester.run('no-extraneous-dependencies', rule, {
     }),
     test({
       code: 'import chai from "chai"',
-      options: [{devDependencies: 'test|spec'}],
+      options: [{devDependencies: '/test|spec/'}],
+      filename: 'foo.tes.js',
+      errors: [{
+        ruleId: 'no-extraneous-dependencies',
+        message: '\'chai\' should be listed in the project\'s dependencies, not devDependencies.',
+      }],
+    }),
+    test({
+      code: 'import chai from "chai"',
+      options: [{devDependencies: '*.test.js'}],
+      filename: 'foo.tes.js',
+      errors: [{
+        ruleId: 'no-extraneous-dependencies',
+        message: '\'chai\' should be listed in the project\'s dependencies, not devDependencies.',
+      }],
+    }),
+    test({
+      code: 'import chai from "chai"',
+      options: [{devDependencies: ['*.test.js', /test\.js$/, '/test/']}],
       filename: 'foo.tes.js',
       errors: [{
         ruleId: 'no-extraneous-dependencies',