Merge pull request #24 from StatelessStudio/v2.0.2

V2.0.2

Author: DrewImm

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "ts-commands",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"description": "ts-commands",
 	"private": "true",
 	"typescript-template": {

package.json

@@ -180,6 +180,14 @@ export class ArgumentParser {
 				`Invalid value for argument: ${option.key} ${displayValue}`
 			);
 		}
+
+		if (!this.validateChoices(option, value)) {
+			const choices = option.choices.join(', ');
+
+			throw new ArgumentError(
+				`Invalid choice for argument: ${option.key} (${value}). Allowed choices are [${choices}]`
+			);
+		}
 	}
 
 	protected isValid(option: CommandOption, value: ArgumentValue): boolean {
@@ -199,4 +207,15 @@ export class ArgumentParser {
 			);
 		}
 	}
+
+	protected validateChoices(
+		option: CommandOption,
+		value: ArgumentValue
+	): boolean {
+		if (option.choices) {
+			return (<string[]>option.choices).includes(<string>value);
+		}
+
+		return true;
+	}
 }

src/argument-parser.ts

@@ -196,4 +196,20 @@ describe('ArgumentParser', () => {
 			'Invalid positional argument: extra.txt'
 		);
 	});
+
+	it('throws an error for invalid choice', () => {
+		command.positional = [];
+		command.options.push({
+			key: 'color',
+			type: OptionType.string,
+			choices: ['red', 'green', 'blue'],
+		});
+		command.init();
+
+		const args = ['--color=yellow'];
+		expect(() => parser.parse(args)).toThrowError(
+			'Invalid choice for argument: color (yellow).' +
+				' Allowed choices are [red, green, blue]'
+		);
+	});
 });