Validates short options. Closes #5657

src/cli/Cli.ts

@@ -146,39 +146,42 @@ export class Cli {
       return Promise.resolve();
     }
 
-    const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
+    delete (this.optionsFromArgs.options as any)._;
+    delete (this.optionsFromArgs.options as any)['--'];
 
     try {
       // replace values staring with @ with file contents
-      Cli.loadOptionValuesFromFiles(optionsWithoutShorts);
+      Cli.loadOptionValuesFromFiles(this.optionsFromArgs);
     }
     catch (e) {
-      return this.closeWithError(e, optionsWithoutShorts);
+      return this.closeWithError(e, this.optionsFromArgs);
     }
 
     try {
       // process options before passing them on to validation stage
-      const contextCommandOptions = await this.loadOptionsFromContext(this.commandToExecute.options, optionsWithoutShorts.options.debug);
-      optionsWithoutShorts.options = { ...contextCommandOptions, ...optionsWithoutShorts.options };
-      await this.commandToExecute.command.processOptions(optionsWithoutShorts.options);
+      const contextCommandOptions = await this.loadOptionsFromContext(this.commandToExecute.options, this.optionsFromArgs.options.debug);
+      this.optionsFromArgs.options = { ...contextCommandOptions, ...this.optionsFromArgs.options };
+      await this.commandToExecute.command.processOptions(this.optionsFromArgs.options);
     }
     catch (e: any) {
-      return this.closeWithError(e.message, optionsWithoutShorts, false);
+      return this.closeWithError(e.message, this.optionsFromArgs, false);
     }
 
     // if output not specified, set the configured output value (if any)
-    if (optionsWithoutShorts.options.output === undefined) {
-      optionsWithoutShorts.options.output = this.getSettingWithDefaultValue<string | undefined>(settingsNames.output, 'json');
+    if (this.optionsFromArgs.options.output === undefined) {
+      this.optionsFromArgs.options.output = this.getSettingWithDefaultValue<string | undefined>(settingsNames.output, 'json');
     }
 
-    const validationResult = await this.commandToExecute.command.validate(optionsWithoutShorts, this.commandToExecute);
+    const validationResult = await this.commandToExecute.command.validate(this.optionsFromArgs, this.commandToExecute);
     if (validationResult !== true) {
-      return this.closeWithError(validationResult, optionsWithoutShorts, true);
+      return this.closeWithError(validationResult, this.optionsFromArgs, true);
     }
 
+    this.optionsFromArgs = Cli.removeShortOptions(this.optionsFromArgs);
+
     return Cli
-      .executeCommand(this.commandToExecute.command, optionsWithoutShorts)
-      .then(_ => process.exit(0), err => this.closeWithError(err, optionsWithoutShorts));
+      .executeCommand(this.commandToExecute.command, this.optionsFromArgs)
+      .then(_ => process.exit(0), err => this.closeWithError(err, this.optionsFromArgs!));
   }
 
   public static async executeCommand(command: Command, args: { options: minimist.ParsedArgs }): Promise<void> {
@@ -1040,6 +1043,11 @@ export class Cli {
   private static loadOptionValuesFromFiles(args: { options: minimist.ParsedArgs }): void {
     const optionNames: string[] = Object.getOwnPropertyNames(args.options);
     optionNames.forEach(option => {
+      // skip shorts because we'll be removing them anyway
+      if (option.length === 1) {
+        return;
+      }
+
       const value = args.options[option];
       if (!value ||
         typeof value !== 'string' ||

src/utils/validation.ts

@@ -12,8 +12,11 @@ export const validation = {
 
     const guidRegEx: RegExp = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
 
-    // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
-    return guidRegEx.test(guid) || guid.toLowerCase().trim() === '@meid';
+    // verify if the guid is a valid guid. @meid will be replaced in a later
+    // stage with the actual user id of the logged in user
+    // we also need to make it toString in case the args is resolved as number
+    // or boolean
+    return guidRegEx.test(guid) || guid.toString().toLowerCase().trim() === '@meid';
   },
 
   isValidTeamsChannelId(guid: string): boolean {