fix(@angular-devkit/schematics-cli): correctly parse inline boolean v… · angular/angular-cli@7085a6e · GitHub

1. angular
2. angular-cli

Repository navigation

• Code
• Issues200 (200)
• Pull requests16 (16)
• Actions
• Security and quality8 (8)
• Insights

Commit 7085a6e

Browse filesBrowse the repository at this point in the historyBrowse files

alan-agius4

committed

fix(@angular-devkit/schematics-cli): correctly parse inline boolean values in CLI options (#34201)

When CLI options defined as boolean are provided with inline values like '--debug=false' or '--dry-run=false', 'node:util.parseArgs' in non-strict mode returns string values ('false' / 'true') rather than booleans. This caused false values to be treated as truthy. Normalize string boolean values in CLI options. Closes #34199 PR Close #34201

1 parent 65c105b commit 7085a6e
Copy full SHA for 7085a6e

2 files changed

+36Lines changed: 36 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/angular_devkit/schematics_cli
  • bin
    • schematics.ts
  • test
    • schematics_spec.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/angular_devkit/schematics_cli/bin/schematics.ts‎

Copy file name to clipboardExpand all lines: packages/angular_devkit/schematics_cli/bin/schematics.ts

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -568,6 +568,15 @@ function parseOptions(args: string[]): Options {
568	568	}
569	569	}
570	570
	571	+ for (const key of Object.keys(CLI_OPTION_DEFINITIONS)) {
	572	+ const value = values[key];
	573	+ if (value === 'true') {
	574	+ values[key] = true;
	575	+ } else if (value === 'false') {
	576	+ values[key] = false;
	577	+ }
	578	+ }
	579	+
571	580	return {
572	581	_: positionals,
573	582	schematicOptions,

Collapse file

‎packages/angular_devkit/schematics_cli/test/schematics_spec.ts‎

Copy file name to clipboardExpand all lines: packages/angular_devkit/schematics_cli/test/schematics_spec.ts

+27Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -59,6 +59,33 @@ describe('schematics-cli binary', () => {
59	59	expect(res).toEqual(0);
60	60	});
61	61
	62	+ it('handles boolean CLI options with explicit inline false values', async () => {
	63	+ const args = ['blank', 'foo', '--dry-run', '--debug=false'];
	64	+ const res = await main({ args, stdout, stderr });
	65	+ const output = stripVTControlCharacters(stdout.read()?.toString() || '');
	66	+ expect(output).not.toMatch(/Debug mode enabled/);
	67	+ expect(output).toMatch(/Dry run enabled\./);
	68	+ expect(res).toEqual(0);
	69	+ });
	70	+
	71	+ it('does not display help when --help=false is passed', async () => {
	72	+ const args = ['blank', 'foo', '--dry-run', '--help=false'];
	73	+ const res = await main({ args, stdout, stderr });
	74	+ const output = stripVTControlCharacters(stdout.read()?.toString() || '');
	75	+ expect(output).not.toMatch(/schematics \[collection-name:\]schematic-name/);
	76	+ expect(output).toMatch(/Dry run enabled\./);
	77	+ expect(res).toEqual(0);
	78	+ });
	79	+
	80	+ it('does not list schematics when --list-schematics=false is passed', async () => {
	81	+ const args = ['blank', 'foo', '--dry-run', '--list-schematics=false'];
	82	+ const res = await main({ args, stdout, stderr });
	83	+ const output = stripVTControlCharacters(stdout.read()?.toString() || '');
	84	+ expect(output).not.toMatch(/blank/);
	85	+ expect(output).toMatch(/Dry run enabled\./);
	86	+ expect(res).toEqual(0);
	87	+ });
	88	+
62	89	it('error when no name is provided', async () => {
63	90	const args = ['blank'];
64	91	const res = await main({ args, stdout, stderr });

0 commit comments

Comments

0 (0)