@nx/eslint-plugin 17.1.0-beta.2 → 17.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "17.1.0-beta.2",
+  "version": "17.1.0-beta.4",
   "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,8 +33,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.1.0-beta.2",
-    "@nx/js": "17.1.0-beta.2",
+    "@nx/devkit": "17.1.0-beta.4",
+    "@nx/js": "17.1.0-beta.4",
     "@typescript-eslint/type-utils": "^6.9.1",
     "@typescript-eslint/utils": "^6.9.1",
     "chalk": "^4.1.0",
@@ -42,7 +42,7 @@
     "jsonc-eslint-parser": "^2.1.0",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/eslint-plugin-nx": "17.1.0-beta.2"
+    "@nrwl/eslint-plugin-nx": "17.1.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,4 +1,3 @@
-import type { RuleModule } from '@typescript-eslint/utils/ts-eslint';
 import { ESLintUtils } from '@typescript-eslint/utils';
 export type Options = [
     {
@@ -13,5 +12,5 @@ export type Options = [
 ];
 export type MessageIds = 'missingDependency' | 'obsoleteDependency' | 'versionMismatch' | 'missingDependencySection';
 export declare const RULE_NAME = "dependency-checks";
-declare const _default: RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
+declare const _default: ESLintUtils.RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
 export default _default;

package/src/rules/enforce-module-boundaries.d.ts

@@ -1,5 +1,4 @@
 import { DepConstraint } from '../utils/runtime-lint-utils';
-import type { RuleModule } from '@typescript-eslint/utils/ts-eslint';
 import { ESLintUtils } from '@typescript-eslint/utils';
 type Options = [
     {
@@ -15,5 +14,5 @@ type Options = [
 ];
 export type MessageIds = 'noRelativeOrAbsoluteImportsAcrossLibraries' | 'noSelfCircularDependencies' | 'noCircularDependencies' | 'noImportsOfApps' | 'noImportsOfE2e' | 'noImportOfNonBuildableLibraries' | 'noImportsOfLazyLoadedLibraries' | 'projectWithoutTagsCannotHaveDependencies' | 'bannedExternalImportsViolation' | 'nestedBannedExternalImportsViolation' | 'noTransitiveDependencies' | 'onlyTagsConstraintViolation' | 'emptyOnlyTagsConstraintViolation' | 'notTagsConstraintViolation';
 export declare const RULE_NAME = "enforce-module-boundaries";
-declare const _default: RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
+declare const _default: ESLintUtils.RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
 export default _default;

package/src/utils/ast-utils.js

@@ -79,7 +79,17 @@ function hasMemberExport(exportedMember, filePath) {
     return ((0, js_1.findNodes)(sourceFile, ts.SyntaxKind.Identifier).filter((identifier) => identifier.text === exportedMember).length > 0);
 }
 function getRelativeImportPath(exportedMember, filePath, basePath) {
-    if ((0, fs_1.lstatSync)(filePath).isDirectory()) {
+    const status = (0, fs_1.lstatSync)(filePath, {
+        throwIfNoEntry: false,
+    });
+    if (!status /*not existed, but probably not full file with an extension*/) {
+        // try to find an extension that exists
+        const ext = ['.ts', '.tsx', '.js', '.jsx'].find((ext) => (0, fs_1.lstatSync)(filePath + ext, { throwIfNoEntry: false }));
+        if (ext) {
+            filePath += ext;
+        }
+    }
+    else if (status.isDirectory()) {
         const file = (0, fs_1.readdirSync)(filePath).find((file) => /^index\.[jt]sx?$/.exec(file));
         if (file) {
             filePath = (0, devkit_1.joinPathFragments)(filePath, file);
@@ -88,15 +98,6 @@ function getRelativeImportPath(exportedMember, filePath, basePath) {
             return;
         }
     }
-    else if (!(0, fs_1.lstatSync)(filePath, {
-        throwIfNoEntry: false,
-    }) /*not folder, but probably not full file with an extension either*/) {
-        // try to find an extension that exists
-        const ext = ['.ts', '.tsx', '.js', '.jsx'].find((ext) => (0, fs_1.lstatSync)(filePath + ext, { throwIfNoEntry: false }));
-        if (ext) {
-            filePath += ext;
-        }
-    }
     const fileContent = (0, fs_1.readFileSync)(filePath, 'utf8');
     // use the TypeScript AST to find the path to the file where exportedMember is defined
     const sourceFile = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, true);