@nx/eslint-plugin 16.4.2 → 16.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "16.4.2",
+  "version": "16.4.3",
   "private": false,
   "description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
   "repository": {
@@ -33,9 +33,9 @@
     }
   },
   "dependencies": {
-    "@nrwl/eslint-plugin-nx": "16.4.2",
-    "@nx/devkit": "16.4.2",
-    "@nx/js": "16.4.2",
+    "@nrwl/eslint-plugin-nx": "16.4.3",
+    "@nx/devkit": "16.4.3",
+    "@nx/js": "16.4.3",
     "@typescript-eslint/type-utils": "^5.58.0",
     "@typescript-eslint/utils": "^5.58.0",
     "chalk": "^4.1.0",
@@ -50,5 +50,5 @@
     "migrations": "./migrations.json"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "2032bd2dac96f8eb97217e0df8db960a85826d9b"
+  "gitHead": "30ea694c017a9e9956e007d009df18cf5347e6a5"
 }

package/src/rules/dependency-checks.js

@@ -34,7 +34,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             },
         ],
         messages: {
-            missingDependency: `The "{{projectName}}" uses the package "{{packageName}}", but it is missing from the project's "package.json".`,
+            missingDependency: `The "{{projectName}}" uses the following packages, but they are missing from the "{{section}}":{{packageNames}}`,
             obsoleteDependency: `The "{{packageName}}" package is not used by "{{projectName}}".`,
             versionMismatch: `The version specifier does not contain the installed version of "{{packageName}}" package: {{version}}.`,
             missingDependencySection: `Dependency sections are missing from the "package.json" but following dependencies were detected:{{dependencies}}`,
@@ -91,27 +91,34 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             if (!checkMissingDependencies) {
                 return;
             }
-            const missingDeps = expectedDependencyNames.filter((d) => !projPackageJsonDeps[d]);
-            missingDeps.forEach((d) => {
-                if (!ignoredDependencies.includes(d)) {
-                    context.report({
-                        node: node,
-                        messageId: 'missingDependency',
-                        data: { packageName: d, projectName: sourceProject.name },
-                        fix(fixer) {
+            const missingDeps = expectedDependencyNames.filter((d) => !projPackageJsonDeps[d] && !ignoredDependencies.includes(d));
+            if (missingDeps.length) {
+                context.report({
+                    node: node,
+                    messageId: 'missingDependency',
+                    data: {
+                        packageNames: missingDeps.map((d) => `\n    - ${d}`).join(''),
+                        section: node.key.value,
+                        projectName: sourceProject.name,
+                    },
+                    fix(fixer) {
+                        missingDeps.forEach((d) => {
                             projPackageJsonDeps[d] =
                                 rootPackageJsonDeps[d] || projDependencies[d];
-                            const deps = node.value.properties;
-                            if (deps.length) {
-                                return fixer.insertTextAfter(deps[deps.length - 1], `,\n    "${d}": "${projPackageJsonDeps[d]}"`);
-                            }
-                            else {
-                                return fixer.replaceTextRange([node.value.range[0] + 1, node.value.range[1] - 1], `\n    "${d}": "${projPackageJsonDeps[d]}"\n  `);
-                            }
-                        },
-                    });
-                }
-            });
+                        });
+                        const deps = node.value.properties;
+                        const mappedDeps = missingDeps
+                            .map((d) => `\n    "${d}": "${projPackageJsonDeps[d]}"`)
+                            .join(',');
+                        if (deps.length) {
+                            return fixer.insertTextAfter(deps[deps.length - 1], `,${mappedDeps}`);
+                        }
+                        else {
+                            return fixer.insertTextAfterRange([node.value.range[0] + 1, node.value.range[1] - 1], `${mappedDeps}\n  `);
+                        }
+                    },
+                });
+            }
         }
         function validateVersionMatchesInstalled(node, packageName, packageRange) {
             if (!checkVersionMismatches) {
@@ -145,7 +152,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                     if (index > 0) {
                         const previousNode = node.parent.properties[index - 1];
                         return fixer.removeRange([
-                            previousNode.range[1] + 1,
+                            previousNode.range[1] + (isLastProperty ? 0 : 1),
                             node.range[1] + (isLastProperty ? 0 : 1),
                         ]);
                     }
@@ -165,13 +172,6 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                             ]);
                         }
                     }
-                    // remove 4 spaces, new line and potential comma from previous line
-                    const shouldRemoveSiblingComma = isLastProperty && node.parent.properties.length > 1;
-                    const leadingChars = 5 + (shouldRemoveSiblingComma ? 1 : 0);
-                    return fixer.removeRange([
-                        node.range[0] - leadingChars,
-                        node.range[1] + (isLastProperty ? 0 : 1),
-                    ]);
                 },
             });
         }