@nx/eslint-plugin 21.2.3 → 21.3.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "21.2.3",
+  "version": "21.3.0-beta.0",
   "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,9 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.2.3",
-    "@nx/js": "21.2.3",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@nx/devkit": "21.3.0-beta.0",
+    "@nx/js": "21.3.0-beta.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
     "chalk": "^4.1.0",

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

@@ -24,4 +24,3 @@ export declare function validateEntry(baseNode: AST.JSONObjectExpression, key: s
 export declare function validateImplementationNode(implementationNode: AST.JSONProperty, key: string, context: TSESLint.RuleContext<MessageIds, Options>, options: NormalizedOptions): void;
 export declare function validatePackageGroup(baseNode: AST.JSONObjectExpression, context: TSESLint.RuleContext<MessageIds, Options>): void;
 export declare function validateVersionJsonExpression(node: AST.JSONExpression, context: TSESLint.RuleContext<MessageIds, Options>): string | boolean;
-export declare function checkIfIdentifierIsFunction(filePath: string, identifier: string): boolean;

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

@@ -7,11 +7,8 @@ exports.validateEntry = validateEntry;
 exports.validateImplementationNode = validateImplementationNode;
 exports.validatePackageGroup = validatePackageGroup;
 exports.validateVersionJsonExpression = validateVersionJsonExpression;
-exports.checkIfIdentifierIsFunction = checkIfIdentifierIsFunction;
 const tslib_1 = require("tslib");
 const utils_1 = require("@typescript-eslint/utils");
-const fs_1 = require("fs");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/src/internal");
@@ -349,7 +346,8 @@ function validateImplementationNode(implementationNode, key, context, options) {
         }
         if (identifier) {
             try {
-                if (!checkIfIdentifierIsFunction(resolvedPath, identifier)) {
+                const m = require(resolvedPath);
+                if (!(identifier in m && typeof m[identifier] === 'function')) {
                     context.report({
                         messageId: 'invalidImplementationModule',
                         node: implementationNode.value,
@@ -361,7 +359,6 @@ function validateImplementationNode(implementationNode, key, context, options) {
                 }
             }
             catch {
-                // require can throw if the module is not found
                 context.report({
                     messageId: 'unableToReadImplementationExports',
                     node: implementationNode.value,
@@ -432,26 +429,3 @@ function validateVersionJsonExpression(node, context) {
         ((0, semver_1.valid)(node.value) ||
             context.options[0]?.allowedVersionStrings.includes(node.value)));
 }
-function checkIfIdentifierIsFunction(filePath, identifier) {
-    try {
-        const ts = require('typescript');
-        const sourceCode = (0, fs_1.readFileSync)(filePath, 'utf-8');
-        const sourceFile = ts.createSourceFile(filePath, sourceCode, ts.ScriptTarget.Latest, true);
-        const exportedFunctions = (0, tsquery_1.tsquery)(sourceFile, `
-      FunctionDeclaration[name.text="${identifier}"][modifiers],
-      ExportDeclaration > FunctionDeclaration[name.text="${identifier}"],
-      VariableStatement[modifiers] VariableDeclaration[name.text="${identifier}"] ArrowFunction,
-      VariableStatement[modifiers] VariableDeclaration[name.text="${identifier}"] FunctionExpression,
-      ExportDeclaration > VariableStatement VariableDeclaration[name.text="${identifier}"] ArrowFunction,
-      ExportDeclaration > VariableStatement VariableDeclaration[name.text="${identifier}"] FunctionExpression,
-      ExportDeclaration ExportSpecifier[name.text="${identifier}"]
-    `);
-        return exportedFunctions.length > 0;
-    }
-    catch {
-        // ignore
-    }
-    // Fallback to require()
-    const m = require(filePath);
-    return identifier in m && typeof m[identifier] === 'function';
-}

package/src/utils/ast-utils.js

@@ -5,7 +5,6 @@ exports.getBarrelEntryPointProjectNode = getBarrelEntryPointProjectNode;
 exports.getRelativeImportPath = getRelativeImportPath;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const type_utils_1 = require("@typescript-eslint/type-utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -60,9 +59,8 @@ function getBarrelEntryPointProjectNode(projectNode) {
             .filter((entry) => {
             const sourceFolderPaths = tsConfigBase.compilerOptions.paths[entry];
             return sourceFolderPaths.some((sourceFolderPath) => {
-                const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
-                return (sourceFolderPath === sourceRoot ||
-                    sourceFolderPath.indexOf(`${sourceRoot}/`) === 0);
+                return (sourceFolderPath === projectNode.data.sourceRoot ||
+                    sourceFolderPath.indexOf(`${projectNode.data.sourceRoot}/`) === 0);
             });
         })
             .map((entry) => tsConfigBase.compilerOptions.paths[entry].map((x) => ({