refactor: quote properties used for meta-programming

Co-authored-by: Benjamin E. Coe <bencoe@google.com>
yargs · Jun 20, 2021 · 2cfab05 · 2cfab05
1 parent 2617303
commit 2cfab05
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/lib/yargs-parser-types.ts b/lib/yargs-parser-types.ts
@@ -186,11 +186,16 @@ export type FlagsKey = KeyOf<Omit<Flags, 'keys'>>;
 
 export type ArrayFlagsKey = Extract<FlagsKey, 'bools' | 'strings' | 'numbers'>;
 
-export interface DefaultValuesForType {
-  boolean: boolean;
-  string: string;
-  number: undefined;
-  array: any[];
+export enum DefaultValuesForTypeKey {
+  BOOLEAN = 'boolean',
+  STRING = 'string',
+  NUMBER = 'number',
+  ARRAY = 'array',
 }
 
-export type DefaultValuesForTypeKey = KeyOf<DefaultValuesForType>;
+export interface DefaultValuesForType {
+  [DefaultValuesForTypeKey.BOOLEAN]: boolean;
+  [DefaultValuesForTypeKey.STRING]: string;
+  [DefaultValuesForTypeKey.NUMBER]: undefined;
+  [DefaultValuesForTypeKey.ARRAY]: any[];
+}
diff --git a/lib/yargs-parser.ts b/lib/yargs-parser.ts
@@ -13,7 +13,6 @@ import type {
   CoerceCallback,
   Configuration,
   DefaultValuesForType,
-  DefaultValuesForTypeKey,
   DetailedArguments,
   Dictionary,
   Flag,
@@ -29,6 +28,7 @@ import type {
   ValueOf,
   YargsParserMixin
 } from './yargs-parser-types.js'
+import { DefaultValuesForTypeKey } from './yargs-parser-types.js'
 import { camelCase, decamelize, looksLikeNumber } from './string-utils.js'
 
 let mixin: YargsParserMixin
@@ -1002,22 +1002,22 @@ export class YargsParser {
     // return a default value, given the type of a flag.,
     function defaultForType<K extends DefaultValuesForTypeKey> (type: K): DefaultValuesForType[K] {
       const def: DefaultValuesForType = {
-        boolean: true,
-        string: '',
-        number: undefined,
-        array: []
+        [DefaultValuesForTypeKey.BOOLEAN]: true,
+        [DefaultValuesForTypeKey.STRING]: '',
+        [DefaultValuesForTypeKey.NUMBER]: undefined,
+        [DefaultValuesForTypeKey.ARRAY]: []
       }
 
       return def[type]
     }
 
     // given a flag, enforce a default type.
     function guessType (key: string): DefaultValuesForTypeKey {
-      let type: DefaultValuesForTypeKey = 'boolean'
-      if (checkAllAliases(key, flags.strings)) type = 'string'
-      else if (checkAllAliases(key, flags.numbers)) type = 'number'
-      else if (checkAllAliases(key, flags.bools)) type = 'boolean'
-      else if (checkAllAliases(key, flags.arrays)) type = 'array'
+      let type: DefaultValuesForTypeKey = DefaultValuesForTypeKey.BOOLEAN
+      if (checkAllAliases(key, flags.strings)) type = DefaultValuesForTypeKey.STRING
+      else if (checkAllAliases(key, flags.numbers)) type = DefaultValuesForTypeKey.NUMBER
+      else if (checkAllAliases(key, flags.bools)) type = DefaultValuesForTypeKey.BOOLEAN
+      else if (checkAllAliases(key, flags.arrays)) type = DefaultValuesForTypeKey.ARRAY
       return type
     }