feat(core): use createProjectFileMappings in TargetProjectLocator (#1…

…3268)
nrwl · Nov 21, 2022 · bd4f4a2 · bd4f4a2 · vercel · Nov 21, 2022
1 parent 41c320c
commit bd4f4a2
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 64 deletions.
diff --git a/packages/angular/plugins/component-testing.ts b/packages/angular/plugins/component-testing.ts
@@ -280,7 +280,7 @@ function withSchemaDefaults(options: any): BrowserBuilderSchema {
  */
 function getTempStylesForTailwind(ctExecutorContext: ExecutorContext) {
   const mappedGraphFiles = createProjectFileMappings(
-    ctExecutorContext.projectGraph
+    ctExecutorContext.projectGraph.nodes
   );
   const ctProjectConfig = ctExecutorContext.projectGraph.nodes[
     ctExecutorContext.projectName

diff --git a/packages/cypress/plugins/cypress-preset.ts b/packages/cypress/plugins/cypress-preset.ts
@@ -90,7 +90,7 @@ export function getProjectConfigByPath(
       : configFileFromWorkspaceRoot
   );
 
-  const mappedGraphFiles = createProjectFileMappings(graph);
+  const mappedGraphFiles = createProjectFileMappings(graph.nodes);
   const componentTestingProjectName =
     mappedGraphFiles[normalizedPathFromWorkspaceRoot];
   if (

diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts
@@ -1015,7 +1015,7 @@ Violation detected in:
                 tags: [],
                 implicitDependencies: [],
                 architect: {},
-                files: [createFile(`libs/other/index.ts`)],
+                files: [createFile(`libs/other/src/index.ts`)],
               },
             },
           },
@@ -1033,6 +1033,7 @@ Violation detected in:
       if (importKind === 'type') {
         expect(failures.length).toEqual(0);
       } else {
+        expect(failures.length).toEqual(1);
         expect(failures[0].message).toEqual(
           'Imports of lazy-loaded libraries are forbidden'
         );
@@ -1144,7 +1145,10 @@ Violation detected in:
               tags: [],
               implicitDependencies: [],
               architect: {},
-              files: [createFile(`libs/mylib/src/main.ts`)],
+              files: [
+                createFile(`libs/mylib/src/main.ts`),
+                createFile(`libs/mylib/src/index.ts`),
+              ],
             },
           },
           anotherlibName: {
@@ -1268,7 +1272,10 @@ Violation detected in:
               tags: [],
               implicitDependencies: [],
               architect: {},
-              files: [createFile(`libs/mylib/src/main.ts`, ['anotherlibName'])],
+              files: [
+                createFile(`libs/mylib/src/main.ts`, ['anotherlibName']),
+                createFile(`libs/mylib/src/index.ts`),
+              ],
             },
           },
           anotherlibName: {
@@ -1363,6 +1370,7 @@ Circular file chain:
               architect: {},
               files: [
                 createFile(`libs/badcirclelib/src/main.ts`, ['anotherlibName']),
+                createFile(`libs/badcirclelib/src/index.ts`),
               ],
             },
           },
@@ -1886,8 +1894,9 @@ function runRule(
 ): TSESLint.Linter.LintMessage[] {
   (global as any).projectPath = `${process.cwd()}/proj`;
   (global as any).projectGraph = projectGraph;
-  (global as any).projectGraphFileMappings =
-    createProjectFileMappings(projectGraph);
+  (global as any).projectGraphFileMappings = createProjectFileMappings(
+    projectGraph.nodes
+  );
   (global as any).targetProjectLocator = new TargetProjectLocator(
     projectGraph.nodes,
     projectGraph.externalNodes

diff --git a/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts b/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts
@@ -23,7 +23,7 @@ export function ensureGlobalProjectGraph(ruleName: string) {
     try {
       (global as any).projectGraph = readCachedProjectGraph();
       (global as any).projectGraphFileMappings = createProjectFileMappings(
-        (global as any).projectGraph
+        (global as any).projectGraph.nodes
       );
     } catch {
       const WARNING_PREFIX = `${chalk.reset.keyword('orange')('warning')}`;

diff --git a/packages/nx/src/project-graph/affected/locators/workspace-projects.spec.ts b/packages/nx/src/project-graph/affected/locators/workspace-projects.spec.ts
@@ -22,9 +22,9 @@ describe('getTouchedProjects', () => {
   it('should return a list of projects for the given changes', () => {
     const fileChanges = getFileChanges(['libs/a/index.ts', 'libs/b/index.ts']);
     const projects = {
-      a: { root: 'libs/a' },
-      b: { root: 'libs/b' },
-      c: { root: 'libs/c' },
+      a: { root: 'libs/a', files: [{ file: 'libs/a/index.ts' }] },
+      b: { root: 'libs/b', files: [{ file: 'libs/b/index.ts' }] },
+      c: { root: 'libs/c', files: [{ file: 'libs/c/index.ts' }] },
     };
     expect(
       getTouchedProjects(fileChanges, buildProjectGraphNodes(projects))
@@ -34,9 +34,9 @@ describe('getTouchedProjects', () => {
   it('should return projects with the root matching a whole directory name in the file path', () => {
     const fileChanges = getFileChanges(['libs/a-b/index.ts']);
     const projects = {
-      a: { root: 'libs/a' },
-      abc: { root: 'libs/a-b-c' },
-      ab: { root: 'libs/a-b' },
+      a: { root: 'libs/a', files: [{ file: 'libs/a/index.ts' }] },
+      abc: { root: 'libs/a-b-c', files: [{ file: 'libs/a-b-c/index.ts' }] },
+      ab: { root: 'libs/a-b', files: [{ file: 'libs/a-b/index.ts' }] },
     };
     expect(
       getTouchedProjects(fileChanges, buildProjectGraphNodes(projects))
@@ -46,9 +46,9 @@ describe('getTouchedProjects', () => {
   it('should return projects with the root matching a whole directory name in the file path', () => {
     const fileChanges = getFileChanges(['libs/a-b/index.ts']);
     const projects = {
-      aaaaa: { root: 'libs/a' },
-      abc: { root: 'libs/a-b-c' },
-      ab: { root: 'libs/a-b' },
+      aaaaa: { root: 'libs/a', files: [{ file: 'libs/a/index.ts' }] },
+      abc: { root: 'libs/a-b-c', files: [{ file: 'libs/a-b-c/index.ts' }] },
+      ab: { root: 'libs/a-b', files: [{ file: 'libs/a-b/index.ts' }] },
     };
     expect(
       getTouchedProjects(fileChanges, buildProjectGraphNodes(projects))
@@ -58,8 +58,8 @@ describe('getTouchedProjects', () => {
   it('should return the most qualifying match with the file path', () => {
     const fileChanges = getFileChanges(['libs/a/b/index.ts']);
     const projects = {
-      aaaaa: { root: 'libs/a' },
-      ab: { root: 'libs/a/b' },
+      aaaaa: { root: 'libs/a', files: [{ file: 'libs/a/index.ts' }] },
+      ab: { root: 'libs/a/b', files: [{ file: 'libs/a/b/index.ts' }] },
     };
     expect(
       getTouchedProjects(fileChanges, buildProjectGraphNodes(projects))
@@ -69,8 +69,8 @@ describe('getTouchedProjects', () => {
   it('should not return parent project if nested project is touched', () => {
     const fileChanges = getFileChanges(['libs/a/b/index.ts']);
     const projects = {
-      a: { root: 'libs/a' },
-      b: { root: 'libs/a/b' },
+      a: { root: 'libs/a', files: [{ file: 'libs/a/index.ts' }] },
+      b: { root: 'libs/a/b', files: [{ file: 'libs/a/b/index.ts' }] },
     };
     expect(
       getTouchedProjects(fileChanges, buildProjectGraphNodes(projects))

diff --git a/packages/nx/src/project-graph/affected/locators/workspace-projects.ts b/packages/nx/src/project-graph/affected/locators/workspace-projects.ts
@@ -2,24 +2,23 @@ import * as minimatch from 'minimatch';
 import { TouchedProjectLocator } from '../affected-project-graph-models';
 import { NxJsonConfiguration } from '../../../config/nx-json';
 import { ProjectGraphProjectNode } from '../../../config/project-graph';
-import {
-  createProjectRootMappings,
-  findMatchingProjectForPath,
-} from '../../../utils/target-project-locator';
+import { createProjectFileMappings } from '../../../utils/target-project-locator';
 
 export const getTouchedProjects: TouchedProjectLocator = (
   touchedFiles,
   projectGraphNodes
 ): string[] => {
-  const projectRootMap = createProjectRootMappings(projectGraphNodes);
+  const allProjectFiles = createProjectFileMappings(projectGraphNodes);
+  const affected = [];
 
-  return touchedFiles.reduce((affected, f) => {
-    const matchingProject = findMatchingProjectForPath(f.file, projectRootMap);
+  touchedFiles.forEach((f) => {
+    const matchingProject = allProjectFiles[f.file];
     if (matchingProject) {
       affected.push(matchingProject);
     }
-    return affected;
-  }, []);
+  });
+
+  return affected;
 };
 
 export const getImplicitlyTouchedProjects: TouchedProjectLocator = (

diff --git a/packages/nx/src/utils/nx-plugin.ts b/packages/nx/src/utils/nx-plugin.ts
@@ -8,7 +8,6 @@ import { workspaceRoot } from './workspace-root';
 import { readJsonFile } from '../utils/fileutils';
 import {
   PackageJson,
-  readModulePackageJson,
   readModulePackageJsonWithoutFallbacks,
 } from './package-json';
 import { registerTsProject } from './register';

diff --git a/packages/nx/src/utils/target-project-locator.spec.ts b/packages/nx/src/utils/target-project-locator.spec.ts
@@ -80,6 +80,10 @@ describe('findTargetProjectWithImport', () => {
             file: 'libs/proj/index.ts',
             hash: 'some-hash',
           },
+          {
+            file: 'libs/proj/class.ts',
+            hash: 'some-hash',
+          },
         ],
         proj2: [
           {
@@ -152,79 +156,79 @@ describe('findTargetProjectWithImport', () => {
         type: 'lib',
         data: {
           root: 'libs/proj3a',
-          files: [],
+          files: ctx.fileMap['proj3a'],
         },
       },
       proj2: {
         name: 'proj2',
         type: 'lib',
         data: {
           root: 'libs/proj2',
-          files: [],
+          files: ctx.fileMap['proj2'],
         },
       },
       proj: {
         name: 'proj',
         type: 'lib',
         data: {
           root: 'libs/proj',
-          files: [],
+          files: ctx.fileMap['proj'],
         },
       },
       proj1234: {
         name: 'proj1234',
         type: 'lib',
         data: {
           root: 'libs/proj1234',
-          files: [],
+          files: ctx.fileMap['proj1234'],
         },
       },
       proj123: {
         name: 'proj123',
         type: 'lib',
         data: {
           root: 'libs/proj123',
-          files: [],
+          files: ctx.fileMap['proj123'],
         },
       },
       proj4ab: {
         name: 'proj4ab',
         type: 'lib',
         data: {
           root: 'libs/proj4ab',
-          files: [],
+          files: ctx.fileMap['proj4ab'],
         },
       },
       proj5: {
         name: 'proj5',
         type: 'lib',
         data: {
           root: 'libs/proj5',
-          files: [],
+          files: ctx.fileMap['proj5'],
         },
       },
       proj6: {
         name: 'proj6',
         type: 'lib',
         data: {
           root: 'libs/proj6',
-          files: [],
+          files: ctx.fileMap['proj6'],
         },
       },
       proj7: {
         name: 'proj7',
         type: 'lib',
         data: {
           root: 'libs/proj7',
-          files: [],
+          files: ctx.fileMap['proj7'],
         },
       },
       'proj1234-child': {
         name: 'proj1234-child',
         type: 'lib',
         data: {
           root: 'libs/proj1234-child',
-          files: [],
+          files: ctx.fileMap['proj1234-child'],
         },
       },
     };
@@ -508,6 +512,10 @@ describe('findTargetProjectWithImport (without tsconfig.json)', () => {
             file: 'libs/proj/index.ts',
             hash: 'some-hash',
           },
+          {
+            file: 'libs/proj/class.ts',
+            hash: 'some-hash',
+          },
         ],
         proj2: [
           {
@@ -580,79 +588,79 @@ describe('findTargetProjectWithImport (without tsconfig.json)', () => {
         type: 'lib',
         data: {
           root: 'libs/proj3a',
-          files: [],
+          files: ctx.fileMap.proj3a,
         },
       },
       proj2: {
         name: 'proj2',
         type: 'lib',
         data: {
           root: 'libs/proj2',
-          files: [],
+          files: ctx.fileMap.proj2,
         },
       },
       proj: {
         name: 'proj',
         type: 'lib',
         data: {
           root: 'libs/proj',
-          files: [],
+          files: ctx.fileMap.proj,
         },
       },
       proj1234: {
         name: 'proj1234',
         type: 'lib',
         data: {
           root: 'libs/proj1234',
-          files: [],
+          files: ctx.fileMap.proj1234,
         },
       },
       proj123: {
         name: 'proj123',
         type: 'lib',
         data: {
           root: 'libs/proj123',
-          files: [],
+          files: ctx.fileMap.proj123,
         },
       },
       proj4ab: {
         name: 'proj4ab',
         type: 'lib',
         data: {
           root: 'libs/proj4ab',
-          files: [],
+          files: ctx.fileMap.proj4ab,
         },
       },
       proj5: {
         name: 'proj5',
         type: 'lib',
         data: {
           root: 'libs/proj5',
-          files: [],
+          files: ctx.fileMap.proj5,
         },
       },
       proj6: {
         name: 'proj6',
         type: 'lib',
         data: {
           root: 'libs/proj6',
-          files: [],
+          files: ctx.fileMap.proj6,
         },
       },
       proj7: {
         name: 'proj7',
         type: 'lib',
         data: {
           root: 'libs/proj7',
-          files: [],
+          files: ctx.fileMap.proj7,
         },
       },
       'proj1234-child': {
         name: 'proj1234-child',
         type: 'lib',
         data: {
           root: 'libs/proj1234-child',
-          files: [],
+          files: ctx.fileMap['proj1234-child'],
         },
       },
     };