fix(@angular/cli): ng get: return whole config root when no path prov… · feicc/angular-cli@a5d8bc1 · GitHub

feicc / angular-cli Public

forked from angular/angular-cli

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests 92
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit a5d8bc1

Browse filesBrowse the repository at this point in the historyBrowse files

prestonvanloon

authored and

hansl

committed

fix(@angular/cli): ng get: return whole config root when no path provided.

Close angular#5887

1 parent 382ba8d commit a5d8bc1
Copy full SHA for a5d8bc1

4 files changed

+11-7Lines changed: 11 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/@angular/cli
  • commands
    • get.ts
  • models/config
    • config.spec.ts
    • config.ts
• tests/e2e/tests/commands/get
  • get.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/@angular/cli/commands/get.ts‎

Copy file name to clipboardExpand all lines: packages/@angular/cli/commands/get.ts

+1-5Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -32,16 +32,12 @@ const GetCommand = Command.extend({
32	32	+ 'you need the --global argument.');
33	33	}
34	34
35		- if (!rawArgs[0]) {
36		- throw new SilentError('No key specified. Run "ng help get" for usage.');
37		- }
38		-
39	35	const value = config.get(rawArgs[0]);
40	36
41	37	if (value === null || value === undefined) {
42	38	throw new SilentError('Value cannot be found.');
43	39	} else if (typeof value == 'object') {
44		- console.log(JSON.stringify(value));
	40	+ console.log(JSON.stringify(value, null, 2));
45	41	} else {
46	42	console.log(value);
47	43	}

Collapse file

‎packages/@angular/cli/models/config/config.spec.ts‎

Copy file name to clipboardExpand all lines: packages/@angular/cli/models/config/config.spec.ts

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -34,6 +34,11 @@ describe('Config', () => {
34	34	stringKey: 'stringValue'
35	35	});
36	36
	37	+ expect(JSON.parse(JSON.stringify(config.get()))).toEqual({
	38	+ requiredKey: 1,
	39	+ stringKeyDefault: 'defaultValue',
	40	+ stringKey: 'stringValue'
	41	+ });
37	42	expect(config.get('requiredKey')).toEqual(1);
38	43	expect(config.get('stringKey')).toEqual('stringValue');
39	44	expect(config.get('booleanKey')).toEqual(undefined);

Collapse file

‎packages/@angular/cli/models/config/config.ts‎

Copy file name to clipboardExpand all lines: packages/@angular/cli/models/config/config.ts

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -39,7 +39,10 @@ export class CliConfig<JsonType> {
39	39	return this._config.$$alias(path, newPath);
40	40	}
41	41
42		- get(jsonPath: string) {
	42	+ get(jsonPath?: string) {
	43	+ if (!jsonPath) {
	44	+ return this._config.$$root();
	45	+ }
43	46	return this._config.$$get(jsonPath);
44	47	}
45	48

Collapse file

‎tests/e2e/tests/commands/get/get.ts‎

Copy file name to clipboardExpand all lines: tests/e2e/tests/commands/get/get.ts

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ import {expectToFail} from '../../../utils/utils';
4	4	export default function() {
5	5	return Promise.resolve()
6	6	.then(() => expectToFail(() => ng('get', 'apps.zzz.prefix')))
7		- .then(() => expectToFail(() => ng('get')))
	7	+ .then(() => ng('get'))
8	8	.then(() => ng('get', 'apps.0.prefix'))
9	9	.then(({ stdout }) => {
10	10	if (!stdout.match(/app/)) {

0 commit comments

Comments

0 (0)