Infra/no import rule multiple

eslint-rules/index.js

@@ -9,6 +9,8 @@ module.exports = {
     'function-deprecation': require('./lib/rules/function-deprecation'),
     'prop-value-shape-deprecation': require('./lib/rules/prop-value-shape-deprecation'),
     // for duplicate rules usage
+    'no-direct-import_warn': require('./lib/rules/no-direct-import'),
+    'no-direct-import_error': require('./lib/rules/no-direct-import'),
     'component-deprecation_warn': require('./lib/rules/component-deprecation'),
     'component-prop-deprecation_warn': require('./lib/rules/component-prop-deprecation'),
     'assets-deprecation_warn': require('./lib/rules/assets-deprecation'),

eslint-rules/lib/rules/no-direct-import.js

@@ -12,32 +12,49 @@ const MAP_SCHEMA = {
     },
     applyAutofix: {
       type: 'boolean'
+    },
+    rules: {
+      type: 'array',
+      items: [
+        {
+          type: 'object',
+          properties: {
+            origin: {
+              type: 'string'
+            },
+            destination: {
+              type: 'string'
+            },
+            applyAutofix: {
+              type: 'boolean'
+            }
+          }
+        }
+      ]
     }
   },
-  additionalProperties: false
+  additionalProperties: true
 };
 
 module.exports = {
   meta: {
     docs: {
       description: 'Do not import directly from open source project',
       category: 'Best Practices',
-      recommended: true,
+      recommended: true
     },
     messages: {
-      uiLib: 'Do not import directly from this source. Please use another import source (autofix may be available).',
+      uiLib: 'Do not import directly from this source. Please use another import source (autofix may be available).'
     },
     fixable: 'code',
-    schema: [
-      MAP_SCHEMA,
-    ],
+    schema: [MAP_SCHEMA]
   },
   create(context) {
-    function reportDirectImport(node) {
+    function reportDirectImport(node, rule) {
       try {
-        const origin = context.options[0].origin;
-        const destination = context.options[0].destination;
-        const applyAutofix = context.options[0].applyAutofix;
+        const origin = rule.origin;
+        const destination = rule.destination;
+        const applyAutofix = rule.applyAutofix;
         const autofixMessage = applyAutofix ? ' (autofix available)' : '';
         const message = `Do not import directly from '${origin}'. Please use '${destination}'${autofixMessage}.`;
         context.report({
@@ -47,23 +64,29 @@ module.exports = {
             if (node && applyAutofix && destination) {
               return fixer.replaceText(node.source, `'${destination}'`);
             }
-          },
+          }
         });
       } catch (err) {
         handleError(RULE_ID, err, context.getFilename());
       }
     }
 
+    function getRules() {
+      // To support both structures; single rule or array of rules
+      return context.options[0].rules || [context.options[0]];
+    }
+
     function checkImportDeclaration(node) {
-      const origin = context.options[0].origin;
       const source = node.source.value;
-      if (source && origin && source === origin) {
-        reportDirectImport(node);
+      const rule = getRules().find((rule) => rule.origin === source);
+
+      if (rule) {
+        reportDirectImport(node, rule);
       }
     }
 
     return {
       ImportDeclaration: checkImportDeclaration
     };
-  },
+  }
 };

eslint-rules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-uilib",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "description": "uilib set of eslint rules",
   "keywords": [
     "eslint",

eslint-rules/tests/lib/rules/no-direct-import.js

@@ -1,7 +1,18 @@
 const RuleTester = require('eslint').RuleTester;
 const rule = require('../../../lib/rules/no-direct-import');
 
-const ruleOptions = [{origin: 'some-module', destination: 'another-module', applyAutofix: true}];
+const ruleOptions = [
+  {origin: 'some-module', destination: 'another-module', applyAutofix: true}
+];
+
+const ruleOptionsArray = [
+  {
+    rules: [
+      {origin: 'some-module', destination: 'another-module', applyAutofix: true},
+      {origin: 'old-module', destination: 'new-module', applyAutofix: true}
+    ]
+  }
+];
 
 RuleTester.setDefaultConfig({
   parser: 'babel-eslint',
@@ -10,23 +21,53 @@ RuleTester.setDefaultConfig({
 
 const ruleTester = new RuleTester();
 
-const validExample = `import {Component} from 'another-module';`;
-const invalidExample = `import {Component} from 'some-module';`;
+const validExample1 = `import {Component} from 'another-module';`;
+const validExample2 = `import {Component} from 'new-module';`;
+
+const invalidExample1 = `import {Component} from 'some-module';`;
+const invalidExample2 = `import {Component} from 'old-module';`;
+
+const error1 = `Do not import directly from 'some-module'. Please use 'another-module' (autofix available).`;
+const error2 = `Do not import directly from 'old-module'. Please use 'new-module' (autofix available).`;
 
 ruleTester.run('no-direct-import', rule, {
   valid: [
     {
       options: ruleOptions,
-      code: validExample
+      code: validExample1 
+    },
+    {
+      options: ruleOptionsArray,
+      code: validExample1
+    },
+    {
+      options: ruleOptionsArray,
+      code: validExample2 
     }
   ],
   invalid: [
     {
       options: ruleOptions,
-      code: invalidExample,
+      code: invalidExample1,
+      output: `import {Component} from 'another-module';`,
+      errors: [
+        {message: error1}
+      ]
+    },
+    {
+      options: ruleOptionsArray,
+      code: invalidExample1,
       output: `import {Component} from 'another-module';`,
       errors: [
-        {message: `Do not import directly from 'some-module'. Please use 'another-module' (autofix available).`}
+        {message: error1}
+      ]
+    },
+    {
+      options: ruleOptionsArray,
+      code: invalidExample2,
+      output: `import {Component} from 'new-module';`,
+      errors: [
+        {message: error2}
       ]
     }
   ]