Skip to content

Commit

Permalink
fix(core): fix output text for multiple targets (#28043)
Browse files Browse the repository at this point in the history 
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #

(cherry picked from commit 05f16cf)
  • Loading branch information
@xiongemi @FrozenPandaz
xiongemi authored and FrozenPandaz committed Sep 25, 2024
1 parent 08ade26 commit 03e43a0
Show file tree
Hide file tree
Showing 2 changed files with 372 additions and 22 deletions.
339 changes: 338 additions & 1 deletion packages/nx/src/tasks-runner/life-cycles/formatting-utils.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { formatFlags } from './formatting-utils';
import { output } from '../../utils/output';
import { formatFlags, formatTargetsAndProjects } from './formatting-utils';

describe('formatFlags', () => {
it('should properly show string values', () => {
Expand Down Expand Up @@ -42,3 +43,339 @@ describe('formatFlags', () => {
);
});
});

describe('formatTargetsAndProjects', () => {
it('should handle single project and target', () => {
expect(
formatTargetsAndProjects(
['myproject'],
['lint', 'build', 'test'],
[
{
id: 'myproject:build',
target: {
project: 'myproject',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('build')} for project myproject`);

expect(
formatTargetsAndProjects(
['myproject'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('lint')} for project myproject`);
});

it('should handle single project and multiple targets', () => {
expect(
formatTargetsAndProjects(
['myproject'],
['lint', 'build', 'test'],
[
{
id: 'myproject:build',
target: {
project: 'myproject',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject:test',
target: {
project: 'myproject',
target: 'test',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(
`targets ${output.bold('build')}, ${output.bold(
'test'
)} for project myproject`
);
expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('lint')} for project myproject`);

expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject2:lint',
target: {
project: 'myproject2',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('lint')} for project myproject2`);
});

it('should handle multiple projects and targets', () => {
expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:build',
target: {
project: 'myproject',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject2:build',
target: {
project: 'myproject2',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('build')} for 2 projects`);

expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject2:lint',
target: {
project: 'myproject2',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(`target ${output.bold('lint')} for 2 projects`);

expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject2:build',
target: {
project: 'myproject2',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(
`targets ${output.bold('lint')}, ${output.bold('build')} for 2 projects`
);
});

it('should handle dependent tasks', () => {
expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:build',
target: {
project: 'myproject',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject3:build',
target: {
project: 'myproject3',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(
`target ${output.bold('build')} for project myproject and ${output.bold(
1
)} task it depends on`
);

expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject2:lint',
target: {
project: 'myproject2',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject3:lint',
target: {
project: 'myproject3',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(
`target ${output.bold('lint')} for 2 projects and ${output.bold(
1
)} task they depend on`
);

expect(
formatTargetsAndProjects(
['myproject', 'myproject2'],
['lint', 'build', 'test'],
[
{
id: 'myproject:lint',
target: {
project: 'myproject',
target: 'lint',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject2:build',
target: {
project: 'myproject2',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject3:build',
target: {
project: 'myproject3',
target: 'build',
},
overrides: {},
parallelism: false,
outputs: [],
},
{
id: 'myproject3:bundle',
target: {
project: 'myproject3',
target: 'bundle',
},
overrides: {},
parallelism: false,
outputs: [],
},
]
)
).toEqual(
`targets ${output.bold('lint')}, ${output.bold(
'build'
)} for 2 projects and ${output.bold(2)} tasks they depend on`
);
});
});
Loading

0 comments on commit 03e43a0

Please sign in to comment.