feat: loop over each from element to look for restricted imports

hide whitespace changes to ease the review of this commit
import-js · Jun 1, 2022 · b6916a8 · b6916a8
1 parent 9baed5d
commit b6916a8
Showing 1 changed file with 34 additions and 31 deletions.
diff --git a/src/rules/no-restricted-paths.js b/src/rules/no-restricted-paths.js
@@ -156,22 +156,25 @@ module.exports = {
       };
     }
 
-    const makePathValidator = (zoneFrom, zoneExcept = []) => {
+    const makePathValidators = (zoneFrom, zoneExcept = []) => {
       const allZoneFrom = zoneFrom instanceof Array ? zoneFrom : [zoneFrom];
       const areGlobPatterns = allZoneFrom.map(isGlob);
 
       if (areBothGlobPatternAndAbsolutePath(areGlobPatterns)) {
-        return computeMixedGlobAndAbsolutePathValidator();
+        return [computeMixedGlobAndAbsolutePathValidator()];
       }
 
-      const absoluteFrom = path.resolve(basePath, zoneFrom);
-      const isGlobPattern = isGlob(zoneFrom);
+      const isGlobPattern = areGlobPatterns.includes(true);
 
-      if (isGlobPattern) {
-        return computeGlobPatternPathValidator(absoluteFrom, zoneExcept);
-      } else {
-        return computeAbsolutePathValidator(absoluteFrom, zoneExcept);
-      }
+      return allZoneFrom.map(singleZoneFrom => {
+        const absoluteFrom = path.resolve(basePath, singleZoneFrom);
+
+        if (isGlobPattern) {
+          return computeGlobPatternPathValidator(absoluteFrom, zoneExcept);
+        } else {
+          return computeAbsolutePathValidator(absoluteFrom, zoneExcept);
+        }
+      });
     };
 
     const validators = [];
@@ -185,34 +188,34 @@ module.exports = {
 
       matchingZones.forEach((zone, index) => {
         if (!validators[index]) {
-          validators[index] = makePathValidator(zone.from, zone.except);
+          validators[index] = makePathValidators(zone.from, zone.except);
         }
 
-        const {
+        validators[index].forEach(({
           isPathRestricted,
           hasValidExceptions,
           isPathException,
           reportInvalidException,
-        } = validators[index];
-
-        if (!isPathRestricted(absoluteImportPath)) {
-          return;
-        }
-
-        if (!hasValidExceptions) {
-          reportInvalidException(node);
-          return;
-        }
-
-        const pathIsExcepted = isPathException(absoluteImportPath);
-        if (pathIsExcepted) {
-          return;
-        }
-
-        context.report({
-          node,
-          message: `Unexpected path "{{importPath}}" imported in restricted zone.${zone.message ? ` ${zone.message}` : ''}`,
-          data: { importPath },
+        }) => {
+          if (!isPathRestricted(absoluteImportPath)) {
+            return;
+          }
+
+          if (!hasValidExceptions) {
+            reportInvalidException(node);
+            return;
+          }
+
+          const pathIsExcepted = isPathException(absoluteImportPath);
+          if (pathIsExcepted) {
+            return;
+          }
+
+          context.report({
+            node,
+            message: `Unexpected path "{{importPath}}" imported in restricted zone.${zone.message ? ` ${zone.message}` : ''}`,
+            data: { importPath },
+          });
         });
       });
     }