use globs instead of regexp

import-js · Aug 6, 2021 · 7e191f5 · 7e191f5
1 parent 0c4e324
commit 7e191f5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/rules/no-namespace.js b/src/rules/no-namespace.js
@@ -3,6 +3,7 @@
  * @author Radek Benkel
  */
 
+import minimatch from 'minimatch';
 import docsUrl from '../docsUrl';
 
 //------------------------------------------------------------------------------
@@ -20,23 +21,27 @@ module.exports = {
     schema: [{
       type: 'object',
       properties: {
-        ignoreFromPattern: {
-          type: 'string',
+        ignoreFromPatterns: {
+          type: 'array',
+          items: {
+            type: 'string',
+          },
         },
       },
     }],
   },
 
   create: function (context) {
     const firstOption = context.options[0] || {};
-    const ignoreFromPatternExpression =
-      firstOption.ignoreFromPattern &&
-      new RegExp(firstOption.ignoreFromPattern);
+    const ignoreFromPatterns = firstOption.ignoreFromPatterns;
 
     return {
       'ImportNamespaceSpecifier': function (node) {
         if (
-          ignoreFromPatternExpression && ignoreFromPatternExpression.test(node.parent.source.value)
+          ignoreFromPatterns
+          && ignoreFromPatterns.find(
+            glob => minimatch(node.parent.source.value, glob, { matchBase: true })
+          )
         ) {
           return;
         }

diff --git a/tests/src/rules/no-namespace.js b/tests/src/rules/no-namespace.js
@@ -79,7 +79,7 @@ ruleTester.run('no-namespace', require('rules/no-namespace'), {
     { code: 'import bar from \'bar\';', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
     { code: 'import bar from \'./bar\';', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
     { code: 'import * as bar from \'./ignored-module.ext\';', parserOptions: { ecmaVersion: 2015, sourceType: 'module' }, options: [{
-      ignoreFromPattern: '\\S+\\.ext',
+      ignoreFromPatterns: ['*.ext'],
     }] },
   ],