fix(linter): correctly fix absolute imports across package boundaries

bautistaaa · Jul 22, 2022 · 8e6a66c · 8e6a66c
1 parent 2fa7578
commit 8e6a66c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/e2e/linter/src/linter.test.ts b/e2e/linter/src/linter.test.ts
@@ -256,6 +256,10 @@ describe('Linter', () => {
       createFile(
         `libs/${libA}/src/lib/tslib-a.ts`,
         `
+      export function libASayHi(): string {
+        return 'hi there';
+      }
+
       export function libASayHello(): string {
         return 'Hi from tslib-a';
       }
@@ -297,13 +301,15 @@ describe('Linter', () => {
       createFile(
         `libs/${libB}/src/lib/tslib-b.ts`,
         `
+        import { libASayHi } from 'libs/${libA}/src/lib/tslib-a';
         import { libASayHello } from '../../../${libA}/src/lib/tslib-a';
         // import { someNonPublicLibFunction } from '../../../${libA}/src/lib/some-non-exported-function';
         import { someSelectivelyExportedFn } from '../../../${libA}/src/lib/some-non-exported-function';
 
         export function tslibB(): string {
           // someNonPublicLibFunction();
           someSelectivelyExportedFn();
+          libASayHi();
           libASayHello();
           return 'hi there';
         }
@@ -410,6 +416,9 @@ export function tslibC(): string {
       expect(fileContent).toContain(
         `import { libASayHello } from '@${projScope}/${libA}';`
       );
+      expect(fileContent).toContain(
+        `import { libASayHi } from '@${projScope}/${libA}';`
+      );
       expect(fileContent).toContain(
         `import { someSelectivelyExportedFn } from '@${projScope}/${libA}';`
       );

diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
@@ -17,6 +17,7 @@ import {
   findProjectUsingImport,
   findSourceProject,
   findTransitiveExternalDependencies,
+  findTargetProject,
   getSourceFilePath,
   getTargetProjectBasedOnRelativeImport,
   groupImports,
@@ -203,16 +204,24 @@ export default createESLintRule<Options, MessageIds>({
       }
 
       // check for relative and absolute imports
-      let targetProject: ProjectGraphProjectNode | ProjectGraphExternalNode =
-        getTargetProjectBasedOnRelativeImport(
+      const isAbsoluteImportIntoAnotherProj =
+        isAbsoluteImportIntoAnotherProject(imp, workspaceLayout);
+      let targetProject: ProjectGraphProjectNode | ProjectGraphExternalNode;
+
+      if (isAbsoluteImportIntoAnotherProj) {
+        targetProject = findTargetProject(projectGraph, imp);
+      } else {
+        targetProject = getTargetProjectBasedOnRelativeImport(
           imp,
           projectPath,
           projectGraph,
           sourceFilePath
         );
+      }
+
       if (
         (targetProject && sourceProject !== targetProject) ||
-        isAbsoluteImportIntoAnotherProject(imp, workspaceLayout)
+        isAbsoluteImportIntoAnotherProj
       ) {
         context.report({
           node,