fix(flags): standalone option could be combined with options whose va…

…lue is optional and has a default value
c4spar · May 21, 2020 · 5cd8287 · 5cd8287
1 parent cb91b85
commit 5cd8287
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/flags/lib/flags.ts b/packages/flags/lib/flags.ts
@@ -29,7 +29,6 @@ export function parseFlags<O = any>( args: string[], opts: IParseOptions = {} ):
     let negate = false;
 
     const flags: IFlags = {};
-    const defaultValues: IGenericObject<boolean> = {};
     const literal: string[] = [];
     const unknown: string[] = [];
 
@@ -112,7 +111,6 @@ export function parseFlags<O = any>( args: string[], opts: IParseOptions = {} ):
 
                 if ( typeof option.default !== 'undefined' ) {
                     flags[ friendlyName ] = typeof option.default === 'function' ? option.default() : option.default;
-                    defaultValues[ friendlyName ] = true;
                 } else if ( option.args && option.args[ 0 ].optionalValue ) {
                     flags[ friendlyName ] = true;
                 } else {
@@ -241,7 +239,7 @@ export function parseFlags<O = any>( args: string[], opts: IParseOptions = {} ):
     }
 
     if ( opts.flags && opts.flags.length ) {
-        validateFlags( opts.flags, flags, defaultValues, opts.knownFlaks, opts.allowEmpty );
+        validateFlags( opts.flags, flags, opts.knownFlaks, opts.allowEmpty );
     }
 
     return { flags: flags as any as O, unknown, literal };

diff --git a/packages/flags/lib/validate-flags.ts b/packages/flags/lib/validate-flags.ts
@@ -19,8 +19,9 @@ interface IFlagOptionsMap {
  * @param knownFlaks    Don't throw an error if a missing flag is defined in knownFlags (currently not implemented).
  * @param allowEmpty    Don't throw an error if values is empty.
  */
-export function validateFlags( flags: IFlagOptions[], values: IFlags, defaultValues: IGenericObject<boolean> = {}, knownFlaks?: IFlags, allowEmpty?: boolean ): void {
+export function validateFlags( flags: IFlagOptions[], values: IFlags, knownFlaks?: IFlags, allowEmpty?: boolean ): void {
 
+    const defaultValues: IGenericObject<boolean> = {};
     // Set default value's
     for ( const option of flags ) {
         const name: string = camelCase( option.name );