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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "19.1.0-beta.1",
+  "version": "19.1.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": {
@@ -13,7 +13,8 @@
     "Web",
     "Lint",
     "ESLint",
-    "CLI"
+    "CLI",
+    "Testing"
   ],
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
@@ -33,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "19.1.0-beta.1",
-    "@nx/js": "19.1.0-beta.1",
+    "@nx/devkit": "19.1.0-beta.3",
+    "@nx/js": "19.1.0-beta.3",
     "@typescript-eslint/type-utils": "^7.3.0",
     "@typescript-eslint/utils": "^7.3.0",
     "chalk": "^4.1.0",
@@ -42,7 +43,7 @@
     "jsonc-eslint-parser": "^2.1.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/eslint-plugin-nx": "19.1.0-beta.1"
+    "@nrwl/eslint-plugin-nx": "19.1.0-beta.3"
   },
   "publishConfig": {
     "access": "public"

package/src/rules/dependency-checks.js

@@ -1,14 +1,14 @@
 "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 utils_1 = require("@typescript-eslint/utils");
+const path_1 = require("path");
+const semver_1 = require("semver");
+const package_json_utils_1 = require("../utils/package-json-utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
-const package_json_utils_1 = require("../utils/package-json-utils");
-const utils_1 = require("@typescript-eslint/utils");
 exports.RULE_NAME = 'dependency-checks';
 exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl/nx/blob/${devkit_1.NX_VERSION}/docs/generated/packages/eslint-plugin/documents/dependency-checks.md`)({
     name: exports.RULE_NAME,
@@ -55,10 +55,10 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
         },
     ],
     create(context, [{ buildTargets, ignoredDependencies, ignoredFiles, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, includeTransitiveDependencies, useLocalPathsForWorkspaceDependencies, },]) {
-        if (!context.parserServices.isJSON) {
+        if (!(0, runtime_lint_utils_1.getParserServices)(context).isJSON) {
             return {};
         }
-        const fileName = (0, devkit_1.normalizePath)(context.getFilename());
+        const fileName = (0, devkit_1.normalizePath)(context.filename ?? context.getFilename());
         // support only package.json
         if (!fileName.endsWith('/package.json')) {
             return {};

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

@@ -130,7 +130,7 @@ exports.default = utils_2.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
          * Globally cached info about workspace
          */
         const projectPath = (0, devkit_1.normalizePath)(global.projectPath || devkit_1.workspaceRoot);
-        const fileName = (0, devkit_1.normalizePath)(context.getFilename());
+        const fileName = (0, devkit_1.normalizePath)(context.filename ?? context.getFilename());
         const { projectGraph, projectRootMappings, projectFileMap, targetProjectLocator, } = (0, project_graph_utils_1.readProjectGraph)(exports.RULE_NAME);
         if (!projectGraph) {
             return {};

package/src/rules/nx-plugin-checks.d.ts

@@ -1,5 +1,5 @@
-import type { AST } from 'jsonc-eslint-parser';
 import type { TSESLint } from '@typescript-eslint/utils';
+import type { AST } from 'jsonc-eslint-parser';
 type Options = [
     {
         generatorsJson?: string;

package/src/rules/nx-plugin-checks.js

@@ -4,13 +4,13 @@ exports.validateVersionJsonExpression = exports.validatePackageGroup = exports.v
 const tslib_1 = require("tslib");
 const utils_1 = require("@typescript-eslint/utils");
 const devkit_1 = require("@nx/devkit");
-const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
-const fs_1 = require("fs");
+const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/src/internal");
+const fs_1 = require("fs");
 const path = tslib_1.__importStar(require("path"));
-const project_graph_utils_1 = require("../utils/project-graph-utils");
 const semver_1 = require("semver");
-const js_1 = require("@nx/js");
+const project_graph_utils_1 = require("../utils/project-graph-utils");
+const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
 const DEFAULT_OPTIONS = {
     generatorsJson: 'generators.json',
     executorsJson: 'executors.json',
@@ -73,11 +73,11 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => ``)({
     defaultOptions: [DEFAULT_OPTIONS],
     create(context) {
         // jsonc-eslint-parser adds this property to parserServices where appropriate
-        if (!context.parserServices.isJSON) {
+        if (!(0, runtime_lint_utils_1.getParserServices)(context).isJSON) {
             return {};
         }
         const { projectGraph, projectRootMappings } = (0, project_graph_utils_1.readProjectGraph)(exports.RULE_NAME);
-        const sourceFilePath = (0, runtime_lint_utils_1.getSourceFilePath)(context.getFilename(), devkit_1.workspaceRoot);
+        const sourceFilePath = (0, runtime_lint_utils_1.getSourceFilePath)(context.filename ?? context.getFilename(), devkit_1.workspaceRoot);
         const sourceProject = (0, runtime_lint_utils_1.findProject)(projectGraph, projectRootMappings, sourceFilePath);
         // If source is not part of an nx workspace, return.
         if (!sourceProject) {
@@ -205,7 +205,7 @@ function validateEntry(baseNode, key, mode, context) {
             });
         }
         else {
-            const schemaFilePath = path.join(path.dirname(context.getFilename()), schemaNode.value.value);
+            const schemaFilePath = path.join(path.dirname(context.filename ?? context.getFilename()), schemaNode.value.value);
             if (!(0, fs_1.existsSync)(schemaFilePath)) {
                 context.report({
                     messageId: 'invalidSchemaPath',
@@ -289,7 +289,7 @@ function validateImplemenationNode(implementationNode, key, context) {
     else {
         const [implementationPath, identifier] = implementationNode.value.value.split('#');
         let resolvedPath;
-        const modulePath = path.join(path.dirname(context.getFilename()), implementationPath);
+        const modulePath = path.join(path.dirname(context.filename ?? context.getFilename()), implementationPath);
         try {
             resolvedPath = require.resolve(modulePath);
         }

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

@@ -1,7 +1,7 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphExternalNode, ProjectGraphProjectNode } from '@nx/devkit';
-import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
 import { TargetProjectLocator } from '@nx/js/src/internal';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESLint, TSESTree } from '@typescript-eslint/utils';
+import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
 export type Deps = {
     [projectName: string]: ProjectGraphDependency[];
 };
@@ -85,4 +85,9 @@ export declare function belongsToDifferentNgEntryPoint(importExpr: string, fileP
  * Returns true if the given project contains MFE config with "exposes:" section
  */
 export declare function appIsMFERemote(project: ProjectGraphProjectNode): boolean;
+/**
+ * parserServices moved from the context object to the nested sourceCode object in v8,
+ * and was removed from its original location in v9.
+ */
+export declare function getParserServices(context: Readonly<TSESLint.RuleContext<any, any>>): any;
 export {};

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

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appIsMFERemote = exports.belongsToDifferentNgEntryPoint = exports.groupImports = exports.isTerminalRun = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.hasStaticImportOfDynamicResource = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findProject = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.isComboDepConstraint = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
+exports.getParserServices = exports.appIsMFERemote = exports.belongsToDifferentNgEntryPoint = exports.groupImports = exports.isTerminalRun = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.hasStaticImportOfDynamicResource = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findProject = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.isComboDepConstraint = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-const graph_utils_1 = require("./graph-utils");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/src/internal");
 const utils_1 = require("@typescript-eslint/utils");
+const path = tslib_1.__importStar(require("node:path"));
+const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
+const fileutils_1 = require("nx/src/utils/fileutils");
+const graph_utils_1 = require("./graph-utils");
 function stringifyTags(tags) {
     return tags.map((t) => `"${t}"`).join(', ');
 }
@@ -246,7 +245,7 @@ function isDirectDependency(source, target) {
 }
 exports.isDirectDependency = isDirectDependency;
 function packageExistsInPackageJson(packageName, projectRoot) {
-    const content = (0, fileutils_1.readFileIfExisting)((0, path_1.join)(devkit_1.workspaceRoot, projectRoot, 'package.json'));
+    const content = (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, projectRoot, 'package.json'));
     if (content) {
         const { dependencies, devDependencies, peerDependencies } = (0, devkit_1.parseJson)(content);
         if (dependencies && dependencies[packageName]) {
@@ -326,7 +325,7 @@ exports.groupImports = groupImports;
  */
 function belongsToDifferentNgEntryPoint(importExpr, filePath, projectRoot) {
     const resolvedImportFile = (0, internal_1.resolveModuleByImport)(importExpr, filePath, // not strictly necessary, but speeds up resolution
-    (0, path_1.join)(devkit_1.workspaceRoot, (0, js_1.getRootTsConfigFileName)()));
+    path.join(devkit_1.workspaceRoot, (0, js_1.getRootTsConfigFileName)()));
     if (!resolvedImportFile) {
         return false;
     }
@@ -363,3 +362,18 @@ function appIsMFERemote(project) {
     return false;
 }
 exports.appIsMFERemote = appIsMFERemote;
+/**
+ * parserServices moved from the context object to the nested sourceCode object in v8,
+ * and was removed from its original location in v9.
+ */
+function getParserServices(context) {
+    if (context.sourceCode && context.sourceCode.parserServices) {
+        return context.sourceCode.parserServices;
+    }
+    const parserServices = context.parserServices;
+    if (!parserServices) {
+        throw new Error('Parser Services are not available, please check your ESLint configuration');
+    }
+    return parserServices;
+}
+exports.getParserServices = getParserServices;