@nx/eslint-plugin 23.2.0-rc.0 → 23.2.0-rc.2

package/dist/src/rules/enforce-module-boundaries.js

@@ -114,7 +114,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             noImportsOfLazyLoadedLibraries: `Static imports of lazy-loaded libraries are forbidden.\n\nLibrary "{{targetProjectName}}" is lazy-loaded in these files:\n{{filePaths}}`,
             projectWithoutTagsCannotHaveDependencies: `A project without tags matching at least one constraint cannot depend on any libraries`,
             bannedExternalImportsViolation: `A project tagged with "{{sourceTag}}" is not allowed to import "{{imp}}"`,
-            nestedBannedExternalImportsViolation: `A project tagged with "{{sourceTag}}" is not allowed to import "{{imp}}". Nested import found at {{childProjectName}}`,
+            nestedBannedExternalImportsViolation: `A project tagged with "{{sourceTag}}" is not allowed to import "{{imp}}". Nested import of "{{packageName}}" found at {{childProjectName}}`,
             noTransitiveDependencies: `Only packages defined in the "package.json" can be imported. Transitive or unresolvable dependencies are not allowed.`,
             onlyTagsConstraintViolation: `A project tagged with "{{sourceTag}}" can only depend on libs tagged with {{tags}}`,
             emptyOnlyTagsConstraintViolation: 'A project tagged with "{{sourceTag}}" cannot depend on any libs with tags',
@@ -485,9 +485,9 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                         }
                     }
                     if (checkNestedExternalImports &&
-                        constraint.bannedExternalImports &&
-                        constraint.bannedExternalImports.length) {
-                        const matches = (0, runtime_lint_utils_1.hasBannedDependencies)(transitiveExternalDeps, projectGraph, constraint, imp);
+                        (constraint.bannedExternalImports?.length ||
+                            constraint.allowedExternalImports)) {
+                        const matches = (0, runtime_lint_utils_1.hasBannedDependencies)(transitiveExternalDeps, projectGraph, constraint);
                         if (matches.length > 0) {
                             matches.forEach(([target, violatingSource, constraint]) => {
                                 context.report({
@@ -497,6 +497,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                                         sourceTag: (0, runtime_lint_utils_1.isComboDepConstraint)(constraint)
                                             ? constraint.allSourceTags.join('" and "')
                                             : constraint.sourceTag,
+                                        packageName: target.data.packageName,
                                         childProjectName: violatingSource.name,
                                         imp,
                                     },

package/dist/src/utils/runtime-lint-utils.d.ts

@@ -57,7 +57,7 @@ export declare function findTransitiveExternalDependencies(graph: ProjectGraph,
  * @param depConstraint
  * @returns
  */
-export declare function hasBannedDependencies(externalDependencies: ProjectGraphDependency[], graph: ProjectGraph, depConstraint: DepConstraint, imp: string): Array<[ProjectGraphExternalNode, ProjectGraphProjectNode, DepConstraint]> | undefined;
+export declare function hasBannedDependencies(externalDependencies: ProjectGraphDependency[], graph: ProjectGraph, depConstraint: DepConstraint): Array<[ProjectGraphExternalNode, ProjectGraphProjectNode, DepConstraint]> | undefined;
 export declare function isDirectDependency(source: ProjectGraphProjectNode, target: ProjectGraphExternalNode): boolean;
 /**
  * Verifies whether the given node has a builder target

package/dist/src/utils/runtime-lint-utils.js

@@ -171,19 +171,20 @@ function getSourceFilePath(sourceFileName, projectPath) {
  * @param depConstraints
  * @returns
  */
-function isConstraintBanningProject(externalProject, constraint, imp) {
+function isConstraintBanningProject(externalProject, constraint, importSpecifier) {
     const { allowedExternalImports, bannedExternalImports } = constraint;
     const { packageName } = externalProject.data;
-    if (imp !== packageName && !imp.startsWith(`${packageName}/`)) {
+    if (importSpecifier !== packageName &&
+        !importSpecifier.startsWith(`${packageName}/`)) {
         return false;
     }
     /* Check if import is banned... */
-    if (bannedExternalImports?.some((importDefinition) => mapGlobToRegExp(importDefinition).test(imp))) {
+    if (bannedExternalImports?.some((importDefinition) => mapGlobToRegExp(importDefinition).test(importSpecifier))) {
         return true;
     }
     /* ... then check if there is a whitelist and if there is a match in the whitelist.  */
-    return allowedExternalImports?.every((importDefinition) => !imp.startsWith(packageName) ||
-        !mapGlobToRegExp(importDefinition).test(imp));
+    return allowedExternalImports?.every((importDefinition) => !importSpecifier.startsWith(packageName) ||
+        !mapGlobToRegExp(importDefinition).test(importSpecifier));
 }
 function hasBannedImport(source, target, depConstraints, imp) {
     // return those constraints that match source project
@@ -217,13 +218,18 @@ function findTransitiveExternalDependencies(graph, source) {
         }
     }
     const externalDependencies = [];
+    const seen = new Set();
     for (let i = 0; i < allReachableProjects.length; i++) {
         const dependencies = graph.dependencies[allReachableProjects[i]];
         if (dependencies) {
             for (let d = 0; d < dependencies.length; d++) {
                 const dependency = dependencies[d];
                 if (graph.externalNodes[dependency.target]) {
-                    externalDependencies.push(dependency);
+                    const key = `${dependency.source}|${graph.externalNodes[dependency.target].data.packageName}`;
+                    if (!seen.has(key)) {
+                        seen.add(key);
+                        externalDependencies.push(dependency);
+                    }
                 }
             }
         }
@@ -237,9 +243,9 @@ function findTransitiveExternalDependencies(graph, source) {
  * @param depConstraint
  * @returns
  */
-function hasBannedDependencies(externalDependencies, graph, depConstraint, imp) {
+function hasBannedDependencies(externalDependencies, graph, depConstraint) {
     return externalDependencies
-        .filter((dependency) => isConstraintBanningProject(graph.externalNodes[dependency.target], depConstraint, imp))
+        .filter((dependency) => isConstraintBanningProject(graph.externalNodes[dependency.target], depConstraint, graph.externalNodes[dependency.target].data.packageName))
         .map((dep) => [
         graph.externalNodes[dep.target],
         graph.nodes[dep.source],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "23.2.0-rc.0",
+  "version": "23.2.0-rc.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -109,11 +109,11 @@
     "picocolors": "^1.1.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-rc.0",
-    "@nx/js": "23.2.0-rc.0"
+    "@nx/devkit": "23.2.0-rc.2",
+    "@nx/js": "23.2.0-rc.2"
   },
   "devDependencies": {
-    "nx": "23.2.0-rc.0"
+    "nx": "23.2.0-rc.2"
   },
   "publishConfig": {
     "access": "public"