@nx/eslint-plugin 16.6.0-beta.1 → 16.6.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "16.6.0-beta.1",
+  "version": "16.6.0-beta.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.6.0-beta.1",
-    "@nx/devkit": "16.6.0-beta.1",
-    "@nx/js": "16.6.0-beta.1",
+    "@nrwl/eslint-plugin-nx": "16.6.0-beta.3",
+    "@nx/devkit": "16.6.0-beta.3",
+    "@nx/js": "16.6.0-beta.3",
     "@typescript-eslint/type-utils": "^5.60.1",
     "@typescript-eslint/utils": "^5.60.1",
     "chalk": "^4.1.0",
@@ -50,5 +50,5 @@
     "migrations": "./migrations.json"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "cf9f5cbe6a7ce3b916ec6505dc8488f669cbc52b"
+  "gitHead": "cd8c61d7a3b8ab9bc7bab068f5ca49bbf14abbf5"
 }

package/src/rules/dependency-checks.d.ts

@@ -6,6 +6,7 @@ export type Options = [
         checkVersionMismatches?: boolean;
         checkMissingPackageJson?: boolean;
         ignoredDependencies?: string[];
+        includeTransitiveDependencies?: boolean;
     }
 ];
 export type MessageIds = 'missingDependency' | 'obsoleteDependency' | 'versionMismatch' | 'missingDependencySection';

package/src/rules/dependency-checks.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULE_NAME = void 0;
+const path_1 = require("path");
+const semver_1 = require("semver");
 const devkit_1 = require("@nx/devkit");
+const find_npm_dependencies_1 = require("@nx/js/src/utils/find-npm-dependencies");
 const create_eslint_rule_1 = require("../utils/create-eslint-rule");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
-const path_1 = require("path");
-const internal_1 = require("@nx/js/src/internal");
-const semver_1 = require("semver");
-const js_1 = require("@nx/js");
 const package_json_utils_1 = require("../utils/package-json-utils");
 exports.RULE_NAME = 'dependency-checks';
 exports.default = (0, create_eslint_rule_1.createESLintRule)({
@@ -29,6 +28,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                     checkMissingDependencies: { type: 'boolean' },
                     checkObsoleteDependencies: { type: 'boolean' },
                     checkVersionMismatches: { type: 'boolean' },
+                    includeTransitiveDependencies: { type: 'boolean' },
                 },
                 additionalProperties: false,
             },
@@ -47,9 +47,10 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             checkObsoleteDependencies: true,
             checkVersionMismatches: true,
             ignoredDependencies: [],
+            includeTransitiveDependencies: false,
         },
     ],
-    create(context, [{ buildTargets, ignoredDependencies, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, },]) {
+    create(context, [{ buildTargets, ignoredDependencies, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, includeTransitiveDependencies, },]) {
         var _a;
         if (!context.parserServices.isJSON) {
             return {};
@@ -59,8 +60,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         if (!fileName.endsWith('/package.json')) {
             return {};
         }
-        const projectPath = (0, devkit_1.normalizePath)(globalThis.projectPath || devkit_1.workspaceRoot);
-        const sourceFilePath = (0, runtime_lint_utils_1.getSourceFilePath)(fileName, projectPath);
+        const sourceFilePath = (0, runtime_lint_utils_1.getSourceFilePath)(fileName, devkit_1.workspaceRoot);
         const { projectGraph, projectRootMappings, projectFileMap } = (0, project_graph_utils_1.readProjectGraph)(exports.RULE_NAME);
         if (!projectGraph) {
             return {};
@@ -75,16 +75,12 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         if (!buildTarget) {
             return {};
         }
-        // gather helper dependencies for @nx/js executors
-        const helperDependencies = (0, js_1.getHelperDependenciesFromProjectGraph)(devkit_1.workspaceRoot, sourceProject.name, projectGraph);
         const rootPackageJson = (0, package_json_utils_1.getPackageJson)((0, path_1.join)(devkit_1.workspaceRoot, 'package.json'));
-        // find all dependencies for the project
-        const npmDeps = (0, internal_1.findProjectsNpmDependencies)(sourceProject, projectGraph, buildTarget, rootPackageJson, {
-            helperDependencies: helperDependencies.map((dep) => dep.target),
-            isProduction: true,
-        }, (0, package_json_utils_1.removePackageJsonFromFileMap)(projectFileMap));
-        const projDependencies = Object.assign(Object.assign({}, npmDeps.dependencies), npmDeps.peerDependencies);
-        const expectedDependencyNames = Object.keys(projDependencies);
+        const npmDependencies = (0, find_npm_dependencies_1.findNpmDependencies)(devkit_1.workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, // TODO: What if child library has a build target different from the parent?
+        {
+            includeTransitiveDependencies,
+        });
+        const expectedDependencyNames = Object.keys(npmDependencies);
         const projPackageJsonPath = (0, path_1.join)(devkit_1.workspaceRoot, sourceProject.data.root, 'package.json');
         (_a = globalThis.projPackageJsonDeps) !== null && _a !== void 0 ? _a : (globalThis.projPackageJsonDeps = (0, package_json_utils_1.getAllDependencies)((0, package_json_utils_1.getPackageJson)(projPackageJsonPath)));
         const projPackageJsonDeps = globalThis.projPackageJsonDeps;
@@ -106,7 +102,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                     fix(fixer) {
                         missingDeps.forEach((d) => {
                             projPackageJsonDeps[d] =
-                                rootPackageJsonDeps[d] || projDependencies[d];
+                                rootPackageJsonDeps[d] || npmDependencies[d];
                         });
                         const deps = node.value.properties;
                         const mappedDeps = missingDeps
@@ -126,8 +122,9 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             if (!checkVersionMismatches) {
                 return;
             }
-            if (projDependencies[packageName] === '*' ||
-                (0, semver_1.satisfies)(projDependencies[packageName], packageRange)) {
+            if (npmDependencies[packageName] === '*' ||
+                packageRange === '*' ||
+                (0, semver_1.satisfies)(npmDependencies[packageName], packageRange)) {
                 return;
             }
             context.report({
@@ -135,9 +132,9 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                 messageId: 'versionMismatch',
                 data: {
                     packageName: packageName,
-                    version: projDependencies[packageName],
+                    version: npmDependencies[packageName],
                 },
-                fix: (fixer) => fixer.replaceText(node, `"${packageName}": "${rootPackageJsonDeps[packageName] || projDependencies[packageName]}"`),
+                fix: (fixer) => fixer.replaceText(node, `"${packageName}": "${rootPackageJsonDeps[packageName] || npmDependencies[packageName]}"`),
             });
         }
         function reportObsoleteDependency(node, packageName) {
@@ -198,13 +195,13 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                             .join(),
                     },
                     fix: (fixer) => {
-                        expectedDependencyNames.sort().reduce((acc, d) => {
-                            acc[d] = rootPackageJsonDeps[d] || projDependencies[d];
-                            return acc;
-                        }, projPackageJsonDeps);
                         const dependencies = Object.keys(projPackageJsonDeps)
                             .map((d) => `\n    "${d}": "${projPackageJsonDeps[d]}"`)
                             .join(',');
+                        expectedDependencyNames.sort().reduce((acc, d) => {
+                            acc[d] = rootPackageJsonDeps[d] || dependencies[d];
+                            return acc;
+                        }, projPackageJsonDeps);
                         if (!node.properties.length) {
                             return fixer.replaceText(node, `{\n  "dependencies": {${dependencies}\n  }\n}`);
                         }
@@ -217,7 +214,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         }
         return {
             ['JSONExpressionStatement > JSONObjectExpression > JSONProperty[key.value=/^(dev|peer|optional)?dependencies$/i]'](node) {
-                return validateMissingDependencies(node);
+                validateMissingDependencies(node);
             },
             ['JSONExpressionStatement > JSONObjectExpression > JSONProperty[key.value=/^(dev|peer|optional)?dependencies$/i] > JSONObjectExpression > JSONProperty'](node) {
                 const packageName = node.key.value;
@@ -226,14 +223,14 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
                     return;
                 }
                 if (expectedDependencyNames.includes(packageName)) {
-                    return validateVersionMatchesInstalled(node, packageName, packageRange);
+                    validateVersionMatchesInstalled(node, packageName, packageRange);
                 }
                 else {
-                    return reportObsoleteDependency(node, packageName);
+                    reportObsoleteDependency(node, packageName);
                 }
             },
             ['JSONExpressionStatement > JSONObjectExpression'](node) {
-                return validateDependenciesSectionExistance(node);
+                validateDependenciesSectionExistance(node);
             },
         };
     },

package/src/utils/package-json-utils.d.ts

@@ -1,5 +1,3 @@
-import { ProjectFileMap } from '@nx/devkit';
 import { PackageJson } from 'nx/src/utils/package-json';
 export declare function getAllDependencies(packageJson: PackageJson): Record<string, string>;
 export declare function getPackageJson(path: string): PackageJson;
-export declare function removePackageJsonFromFileMap(projectFileMap: ProjectFileMap): ProjectFileMap;

package/src/utils/package-json-utils.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePackageJsonFromFileMap = exports.getPackageJson = exports.getAllDependencies = void 0;
+exports.getPackageJson = exports.getAllDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 function getAllDependencies(packageJson) {
-    return Object.assign(Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies), packageJson.peerDependencies);
+    return Object.assign(Object.assign(Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies), packageJson.peerDependencies), packageJson.optionalDependencies);
 }
 exports.getAllDependencies = getAllDependencies;
 function getPackageJson(path) {
@@ -14,11 +14,3 @@ function getPackageJson(path) {
     return {};
 }
 exports.getPackageJson = getPackageJson;
-function removePackageJsonFromFileMap(projectFileMap) {
-    const newFileMap = {};
-    Object.keys(projectFileMap).forEach((key) => {
-        newFileMap[key] = projectFileMap[key].filter((f) => !f.file.endsWith('/package.json'));
-    });
-    return newFileMap;
-}
-exports.removePackageJsonFromFileMap = removePackageJsonFromFileMap;