Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-15 10:11:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): handle case senstive aliases

Browse Source 
Closes #12780
This commit is contained in:
Alan Agius 2018-10-29 18:00:39 +01:00 committed by Hans
parent 282eb52e08
commit d2a29afd48
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/angular/cli/models/parser.ts
View File

@ -29,10 +29,10 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
}
return _coerceType(str, OptionType.Boolean, v) !== undefined
? _coerceType(str, OptionType.Boolean, v)
: _coerceType(str, OptionType.Number, v) !== undefined
? _coerceType(str, OptionType.Number, v)
: _coerceType(str, OptionType.String, v);
? _coerceType(str, OptionType.Boolean, v)
: _coerceType(str, OptionType.Number, v) !== undefined
? _coerceType(str, OptionType.Number, v)
: _coerceType(str, OptionType.String, v);
case OptionType.String:
return str || '';
@ -93,14 +93,16 @@ function _coerce(str: string | undefined, o: Option | null, v?: Value): Value |
function _getOptionFromName(name: string, options: Option[]): Option | undefined {
const cName = strings.camelize(name);
const camelName = /(-|_)/.test(name)
? strings.camelize(name)
: name;
for (const option of options) {
if (option.name == name || option.name == cName) {
if (option.name === name || option.name === camelName) {
return option;
}
if (option.aliases.some(x => x == name || x == cName)) {
if (option.aliases.some(x => x === name || x === camelName)) {
return option;
}
}
@ -108,6 +110,11 @@ function _getOptionFromName(name: string, options: Option[]): Option | undefined
return undefined;
}
function _removeLeadingDashes(key: string): string {
const from = key.startsWith('--') ? 2 : key.startsWith('-') ? 1 : 0;
return key.substr(from);
}
function _assignOption(
arg: string,
@ -130,16 +137,10 @@ function _assignOption(
// If flag is --no-abc AND there's no equal sign.
if (i == -1) {
if (key.startsWith('no-')) {
if (key.startsWith('no')) {
// Only use this key if the option matching the rest is a boolean.
const maybeOption = _getOptionFromName(key.substr(3), options);
if (maybeOption && maybeOption.type == 'boolean') {
value = 'false';
option = maybeOption;
}
} else if (key.startsWith('no')) {
// Only use this key if the option matching the rest is a boolean.
const maybeOption = _getOptionFromName(key.substr(2), options);
const from = key.startsWith('no-') ? 3 : 2;
const maybeOption = _getOptionFromName(strings.camelize(key.substr(from)), options);
if (maybeOption && maybeOption.type == 'boolean') {
value = 'false';
option = maybeOption;
@ -171,7 +172,7 @@ function _assignOption(
}
} else {
key = arg.substring(0, i);
option = _getOptionFromName(key, options) || null;
option = _getOptionFromName(_removeLeadingDashes(key), options) || null;
if (option) {
value = arg.substring(i + 1);
}

2
packages/angular/cli/models/parser_spec.ts
View File

@ -15,6 +15,7 @@ describe('parseArguments', () => {
{ name: 'bool', aliases: [ 'b' ], type: OptionType.Boolean, description: '' },
{ name: 'num', aliases: [ 'n' ], type: OptionType.Number, description: '' },
{ name: 'str', aliases: [ 's' ], type: OptionType.String, description: '' },
{ name: 'strUpper', aliases: [ 'S' ], type: OptionType.String, description: '' },
{ name: 'helloWorld', aliases: [], type: OptionType.String, description: '' },
{ name: 'helloBool', aliases: [], type: OptionType.Boolean, description: '' },
{ name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
@ -35,6 +36,7 @@ describe('parseArguments', () => {
];
const tests: { [test: string]: Partial<Arguments> | ['!!!', Partial<Arguments>, string[]] } = {
'-S=b': { strUpper: 'b' },
'--bool': { bool: true },
'--bool=1': ['!!!', {}, ['--bool=1']],
'--bool ': { bool: true, p1: '' },