feat(core): add support for tags selection in affected and run-many commands

Author: fguitton

docs/generated/cli/affected-apps.md

@@ -81,6 +81,12 @@ Show help
 
 Produces a plain output for affected:apps and affected:libs
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### uncommitted
 
 Type: `boolean`

docs/generated/cli/affected-graph.md

@@ -131,6 +131,12 @@ Type: `number`
 
 Bind the project graph server to a specific port.
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### uncommitted
 
 Type: `boolean`

docs/generated/cli/affected-libs.md

@@ -81,6 +81,12 @@ Show help
 
 Produces a plain output for affected:apps and affected:libs
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### uncommitted
 
 Type: `boolean`

docs/generated/cli/affected.md

@@ -149,6 +149,12 @@ Default: `false`
 
 Rerun the tasks even when the results are available in the cache
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### target
 
 Type: `string`

docs/generated/cli/format-check.md

@@ -67,6 +67,12 @@ Type: `array`
 
 Projects to format (comma delimited)
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### uncommitted
 
 Type: `boolean`

docs/generated/cli/format-write.md

@@ -67,6 +67,12 @@ Type: `array`
 
 Projects to format (comma delimited)
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### uncommitted
 
 Type: `boolean`

docs/generated/cli/print-affected.md

@@ -99,6 +99,12 @@ Type: `string`
 
 Select the subset of the returned json document (e.g., --select=projects)
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### target
 
 Type: `string`

docs/generated/cli/run-many.md

@@ -121,6 +121,12 @@ Default: `false`
 
 Rerun the tasks even when the results are available in the cache
 
+### tags
+
+Type: `string`
+
+Tags to run (comma delimited)
+
 ### target
 
 Type: `string`

docs/generated/packages/nx.json

@@ -12,7 +12,7 @@ import {
 import { performance } from 'perf_hooks';
 import { createProjectGraphAsync } from '../project-graph/project-graph';
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
-import { projectHasTarget } from '../utils/project-graph-utils';
+import { projectHasTarget, filterByTags } from '../utils/project-graph-utils';
 import { filterAffected } from '../project-graph/affected/affected-project-graph';
 import { TargetDependencyConfig } from '../config/workspace-json-project-json';
 import { readNxJson } from '../config/configuration';
@@ -148,6 +148,9 @@ function projectsToRun(
           nxArgs
         )
       );
+  if (nxArgs.tags.length > 0) {
+    affectedGraph = affectedProjectsWithTags(affectedGraph, nxArgs);
+  }
 
   if (nxArgs.exclude) {
     const excludedProjects = new Set(nxArgs.exclude);
@@ -159,6 +162,27 @@ function projectsToRun(
   return Object.values(affectedGraph.nodes) as ProjectGraphProjectNode[];
 }
 
+function affectedProjectsWithTags(
+  affectedGraph: ProjectGraph,
+  nxArgs: NxArgs
+): ProjectGraph {
+  const matchedProjectNames = filterByTags(affectedGraph, nxArgs.tags);
+  const filteredProjects = matchedProjectNames.map(
+    (projectName) => affectedGraph.nodes[projectName]
+  );
+  const res = {
+    nodes: filteredProjects.reduce(
+      (nodes, project) => ({
+        ...nodes,
+        [project.name]: project,
+      }),
+      {}
+    ),
+    dependencies: affectedGraph.dependencies,
+  } as ProjectGraph;
+  return res;
+}
+
 function allProjectsWithTarget(
   projects: ProjectGraphProjectNode[],
   nxArgs: NxArgs

packages/nx/src/command-line/affected.ts

@@ -512,6 +512,11 @@ function withAffectedOptions(yargs: yargs.Argv): yargs.Argv {
       type: 'boolean',
       default: undefined,
     })
+    .option('tags', {
+      describe: 'Tags to run (comma delimited)',
+      type: 'string',
+      default: undefined,
+    })
     .option('all', {
       describe: 'All projects',
       type: 'boolean',
@@ -538,10 +543,11 @@ function withAffectedOptions(yargs: yargs.Argv): yargs.Argv {
     .group(['files', 'uncommitted', 'untracked'], 'or using:')
     .implies('head', 'base')
     .conflicts({
-      files: ['uncommitted', 'untracked', 'base', 'head', 'all'],
-      untracked: ['uncommitted', 'files', 'base', 'head', 'all'],
-      uncommitted: ['files', 'untracked', 'base', 'head', 'all'],
-      all: ['files', 'untracked', 'uncommitted', 'base', 'head'],
+      files: ['uncommitted', 'untracked', 'base', 'head', 'all', 'tags'],
+      untracked: ['uncommitted', 'files', 'base', 'head', 'all', 'tags'],
+      uncommitted: ['files', 'untracked', 'base', 'head', 'all', 'tags'],
+      all: ['files', 'untracked', 'uncommitted', 'base', 'head', 'tags'],
+      tags: ['files', 'untracked', 'uncommitted', 'base', 'head', 'all'],
     });
 }
 
@@ -556,11 +562,21 @@ function withRunManyOptions(yargs: yargs.Argv): yargs.Argv {
       describe:
         'Projects to run. (comma delimited project names and/or patterns)',
       type: 'string',
+      default: undefined,
+    })
+    .option('tags', {
+      describe: 'Tags to run (comma delimited)',
+      type: 'string',
+      default: undefined,
     })
     .option('all', {
       describe: '[deprecated] Run the target on all projects in the workspace',
       type: 'boolean',
       default: true,
+    })
+    .conflicts({
+      projects: ['tags'],
+      tags: ['projects'],
     });
 }
 

packages/nx/src/command-line/nx-commands.ts

@@ -13,6 +13,7 @@ describe('run-many', () => {
             type: 'lib',
             data: {
               root: 'proj1',
+              tags: ['api', 'theme1'],
               targets: {
                 build: {},
                 test: {},
@@ -24,6 +25,7 @@ describe('run-many', () => {
             type: 'lib',
             data: {
               root: 'proj2',
+              tags: ['ui', 'theme2'],
               targets: {
                 test: {},
               },
@@ -40,6 +42,7 @@ describe('run-many', () => {
           all: true,
           target: 'test',
           projects: [],
+          tags: [],
         },
         projectGraph
       ).map(({ name }) => name);
@@ -52,6 +55,7 @@ describe('run-many', () => {
         {
           target: 'test',
           projects: ['proj1'],
+          tags: [],
         },
         projectGraph
       ).map(({ name }) => name);
@@ -64,19 +68,73 @@ describe('run-many', () => {
         {
           target: 'test',
           projects: ['proj*'],
+          tags: [],
         },
         projectGraph
       ).map(({ name }) => name);
       expect(projects).toContain('proj1');
       expect(projects).toContain('proj2');
     });
 
+    it('should filter projects by tag', () => {
+      const projects = projectsToRun(
+        {
+          target: 'test',
+          projects: [],
+          tags: ['api'],
+        },
+        projectGraph
+      ).map(({ name }) => name);
+      expect(projects).toContain('proj1');
+      expect(projects).not.toContain('proj2');
+    });
+
+    it('should filter projects by tag pattern', () => {
+      const projects = projectsToRun(
+        {
+          target: 'test',
+          projects: [],
+          tags: ['theme*'],
+        },
+        projectGraph
+      ).map(({ name }) => name);
+      expect(projects).toContain('proj1');
+      expect(projects).toContain('proj2');
+    });
+
+    it('should filter projects by tag only', () => {
+      const projects = projectsToRun(
+        {
+          target: 'test',
+          projects: ['proj1'],
+          tags: ['ui'],
+        },
+        projectGraph
+      ).map(({ name }) => name);
+      expect(projects).not.toContain('proj1');
+      expect(projects).toContain('proj2');
+    });
+
     it('should throw for invalid patterns', () => {
       expect(() => {
         projectsToRun(
           {
             target: 'test',
             projects: ['nomatch*'],
+            tags: [],
+          },
+          projectGraph
+        ).map(({ name }) => name);
+      }).toThrowError('nomatch*');
+    });
+
+    it('should throw for invalid tag patterns', () => {
+      expect(() => {
+        projectsToRun(
+          {
+            target: 'test',
+            projects: [],
+            tags: ['nomatch*'],
           },
           projectGraph
         ).map(({ name }) => name);
@@ -89,6 +147,7 @@ describe('run-many', () => {
           all: true,
           target: 'test',
           projects: [],
+          tags: [],
           exclude: ['proj1'],
         },
         projectGraph
@@ -103,6 +162,7 @@ describe('run-many', () => {
           all: true,
           target: 'test',
           projects: [],
+          tags: [],
           exclude: ['proj*'],
         },
         projectGraph
@@ -133,6 +193,7 @@ describe('run-many', () => {
           {
             target: 'test',
             projects: ['proj1*'],
+            tags: [],
             exclude: ['proj12*'],
           },
           projectGraph