@nx/eslint-plugin 22.0.0-beta.5 → 22.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "22.0.0-beta.5",
+  "version": "22.0.0-beta.6",
   "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.0.0-beta.5",
-    "@nx/js": "22.0.0-beta.5",
+    "@nx/devkit": "22.0.0-beta.6",
+    "@nx/js": "22.0.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",

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

@@ -12,7 +12,7 @@ export type Options = [
         runtimeHelpers?: string[];
     }
 ];
-export type MessageIds = 'missingDependency' | 'obsoleteDependency' | 'versionMismatch' | 'missingDependencySection';
+export type MessageIds = 'missingDependency' | 'obsoleteDependency' | 'versionMismatch' | 'missingDependencySection' | 'invalidCatalogReference';
 export declare const RULE_NAME = "dependency-checks";
 declare const _default: ESLintUtils.RuleModule<MessageIds, Options, unknown, ESLintUtils.RuleListener>;
 export default _default;

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":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAiBvD,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;KAC3B;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,CAAC;AAE/B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;AAE7C,wBA6UG"}
+{"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;AAiBvD,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;KAC3B;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;AAE7C,wBAgYG"}

package/src/rules/dependency-checks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULE_NAME = void 0;
 const devkit_1 = require("@nx/devkit");
+const catalog_1 = require("@nx/devkit/src/utils/catalog");
 const find_npm_dependencies_1 = require("@nx/js/src/utils/find-npm-dependencies");
 const utils_1 = require("@typescript-eslint/utils");
 const path_1 = require("path");
@@ -40,6 +41,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             obsoleteDependency: `The "{{packageName}}" package is not used by "{{projectName}}" project.`,
             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}}`,
+            invalidCatalogReference: `Invalid catalog reference for "{{packageName}}": {{error}}`,
         },
     },
     defaultOptions: [
@@ -124,22 +126,51 @@ 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) {
+                return;
+            }
+            if (!manager.isCatalogReference(packageRange)) {
+                return;
+            }
+            try {
+                manager.validateCatalogReference(devkit_1.workspaceRoot, packageName, packageRange);
+            }
+            catch (error) {
+                context.report({
+                    node: node,
+                    messageId: 'invalidCatalogReference',
+                    data: {
+                        packageName: packageName,
+                        error: error.message,
+                    },
+                });
+            }
+        }
         function validateVersionMatchesInstalled(node, packageName, packageRange) {
             if (!checkVersionMismatches) {
                 return;
             }
+            // 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 (!resolved) {
+                    // Catalog resolution failed - this shouldn't happen because
+                    // validateCatalogReferenceForPackage should have caught it earlier
+                    // But if it does, skip validation gracefully
+                    return;
+                }
+                resolvedPackageRange = resolved;
+            }
             if (npmDependencies[packageName].startsWith('file:') ||
-                packageRange.startsWith('file:') ||
+                resolvedPackageRange.startsWith('file:') ||
                 npmDependencies[packageName] === '*' ||
-                packageRange === '*' ||
-                packageRange.startsWith('workspace:') ||
-                /**
-                 * Catalogs can be named, or left unnamed
-                 * So just checking up until the : will catch both cases
-                 * e.g. catalog:some-catalog or catalog:
-                 */
-                packageRange.startsWith('catalog:') ||
-                (0, semver_1.satisfies)(npmDependencies[packageName], packageRange, {
+                resolvedPackageRange === '*' ||
+                resolvedPackageRange.startsWith('workspace:') ||
+                (0, semver_1.satisfies)(npmDependencies[packageName], resolvedPackageRange, {
                     includePrerelease: true,
                 })) {
                 return;
@@ -234,6 +265,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 if (ignoredDependencies.includes(packageName)) {
                     return;
                 }
+                validateCatalogReferenceForPackage(node, packageName, packageRange);
                 if (expectedDependencyNames.includes(packageName)) {
                     validateVersionMatchesInstalled(node, packageName, packageRange);
                 }