@nx/eslint-plugin 22.6.0-beta.10 → 22.6.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "22.6.0-beta.10",
+  "version": "22.6.0-beta.11",
   "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": {
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.6.0-beta.10",
-    "@nx/js": "22.6.0-beta.10",
+    "@nx/devkit": "22.6.0-beta.11",
+    "@nx/js": "22.6.0-beta.11",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
@@ -47,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0-beta.10"
+    "nx": "22.6.0-beta.11"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1 +1 @@
-{"version":3,"file":"dependency-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/dependency-checks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAmBvD,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,6BAA6B,CAAC,EAAE,OAAO,CAAC;QACxC,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,uBAAuB,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;KACrD;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;AAE7C,wBAqbG"}
+{"version":3,"file":"dependency-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/dependency-checks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAmBvD,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,6BAA6B,CAAC,EAAE,OAAO,CAAC;QACxC,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,uBAAuB,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;KACrD;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;AAE7C,wBAkgBG"}

package/src/rules/dependency-checks.js

@@ -100,6 +100,67 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
         const packageJson = JSON.parse(context.sourceCode.getText());
         const projPackageJsonDeps = (0, package_json_utils_1.getProductionDependencies)(packageJson);
         const rootPackageJsonDeps = (0, package_json_utils_1.getAllDependencies)(rootPackageJson);
+        const catalogManager = (0, catalog_1.getCatalogManager)(devkit_1.workspaceRoot);
+        const catalogDefs = catalogManager?.getCatalogDefinitions(devkit_1.workspaceRoot);
+        function catalogEntryMatchesInstalled(catalogVersionSpec, installedVersion) {
+            if (installedVersion === '*') {
+                return true;
+            }
+            // For non-semver values (file:, link:, etc.), use exact comparison
+            if (installedVersion.includes(':') || catalogVersionSpec.includes(':')) {
+                return installedVersion === catalogVersionSpec;
+            }
+            return (0, semver_1.satisfies)(installedVersion, catalogVersionSpec, {
+                includePrerelease: true,
+            });
+        }
+        function getCatalogVersionForPackage(packageName) {
+            if (!catalogDefs) {
+                return null;
+            }
+            const matches = [];
+            // Check default catalog — `catalog` takes precedence over `catalogs.default`.
+            // Both existing simultaneously is a pnpm error caught by validateCatalogReference.
+            const defaultEntry = catalogDefs.catalog?.[packageName] ??
+                catalogDefs.catalogs?.default?.[packageName];
+            if (defaultEntry) {
+                matches.push({ catalogRef: 'catalog:', versionSpec: defaultEntry });
+            }
+            // Check named catalogs (skip "default" — handled above)
+            if (catalogDefs.catalogs) {
+                for (const [name, entries] of Object.entries(catalogDefs.catalogs)) {
+                    if (name === 'default' || !entries?.[packageName]) {
+                        continue;
+                    }
+                    matches.push({
+                        catalogRef: `catalog:${name}`,
+                        versionSpec: entries[packageName],
+                    });
+                }
+            }
+            if (!matches.length) {
+                return null;
+            }
+            // Filter by installed version compatibility when available
+            const installedVersion = npmDependencies[packageName];
+            const valid = installedVersion
+                ? matches.filter((m) => catalogEntryMatchesInstalled(m.versionSpec, installedVersion))
+                : matches;
+            if (valid.length !== 1) {
+                return null;
+            }
+            return valid[0].catalogRef;
+        }
+        function getVersionForMissingDependency(packageName) {
+            if (rootPackageJsonDeps[packageName]) {
+                return rootPackageJsonDeps[packageName];
+            }
+            const catalogVersion = getCatalogVersionForPackage(packageName);
+            if (catalogVersion) {
+                return catalogVersion;
+            }
+            return npmDependencies[packageName];
+        }
         function getDependencySection(node) {
             // Check if this node is a dependency section itself
             const directSection = node.key?.value;
@@ -132,8 +193,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                                 projPackageJsonDeps[d] = WORKSPACE_VERSION_WILDCARD;
                             }
                             else {
-                                projPackageJsonDeps[d] =
-                                    rootPackageJsonDeps[d] || npmDependencies[d];
+                                projPackageJsonDeps[d] = getVersionForMissingDependency(d);
                             }
                         });
                         const deps = node.value.properties;
@@ -151,15 +211,14 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             }
         }
         function validateCatalogReferenceForPackage(node, packageName, packageRange) {
-            const manager = (0, catalog_1.getCatalogManager)(devkit_1.workspaceRoot);
-            if (!manager) {
+            if (!catalogManager) {
                 return;
             }
-            if (!manager.isCatalogReference(packageRange)) {
+            if (!catalogManager.isCatalogReference(packageRange)) {
                 return;
             }
             try {
-                manager.validateCatalogReference(devkit_1.workspaceRoot, packageName, packageRange);
+                catalogManager.validateCatalogReference(devkit_1.workspaceRoot, packageName, packageRange);
             }
             catch (error) {
                 context.report({
@@ -189,9 +248,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             }
             // Resolve catalog references before validation
             let resolvedPackageRange = packageRange;
-            const manager = (0, catalog_1.getCatalogManager)(devkit_1.workspaceRoot);
-            if (manager?.isCatalogReference(packageRange)) {
-                const resolved = manager.resolveCatalogReference(devkit_1.workspaceRoot, packageName, packageRange);
+            if (catalogManager?.isCatalogReference(packageRange)) {
+                const resolved = catalogManager.resolveCatalogReference(devkit_1.workspaceRoot, packageName, packageRange);
                 if (!resolved) {
                     // Catalog resolution failed - this shouldn't happen because
                     // validateCatalogReferenceForPackage should have caught it earlier
@@ -274,7 +332,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                     },
                     fix: (fixer) => {
                         expectedDependencyNames.sort().reduce((acc, d) => {
-                            acc[d] = rootPackageJsonDeps[d] || npmDependencies[d];
+                            acc[d] = getVersionForMissingDependency(d);
                             return acc;
                         }, projPackageJsonDeps);
                         const dependencies = Object.keys(projPackageJsonDeps)