refactor(command): refactor possible values

c4spar · May 26, 2021 · 045c56e · 045c56e
1 parent 37dc946
commit 045c56e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/command/command.ts b/command/command.ts
@@ -589,8 +589,7 @@ export class Command<
       const completeHandler: ICompleteHandler = (
         cmd: Command,
         parent?: Command,
-      ) =>
-        handler.complete?.(cmd, parent) || handler.values?.(cmd, parent) || [];
+      ) => handler.complete?.(cmd, parent) || [];
       this.complete(name, completeHandler, options);
     }
 

diff --git a/command/help/_help_generator.ts b/command/help/_help_generator.ts
@@ -240,25 +240,17 @@ export class HelpGenerator {
         italic(option.conflicts.map(getFlag).join(", ")),
     );
 
-    let possibleValues: Array<string | number | RegExp> | undefined;
-    if (option.value instanceof RegExp) {
-      possibleValues = [option.value];
-    } else if (Array.isArray(option.value)) {
-      possibleValues = option.value;
-    } else {
-      const type = this.cmd.getType(option.args[0]?.type)?.handler;
-      if (type instanceof Type) {
-        possibleValues = type.values?.(this.cmd, this.cmd.getParent());
+    const type = this.cmd.getType(option.args[0]?.type)?.handler;
+    if (type instanceof Type) {
+      const possibleValues = type.values?.(this.cmd, this.cmd.getParent());
+      if (possibleValues?.length) {
+        hints.push(
+          bold(`Values: `) +
+            possibleValues.map((value: unknown) => inspect(value)).join(", "),
+        );
       }
     }
 
-    if (possibleValues) {
-      hints.push(
-        bold(`Values: `) +
-          possibleValues.map((value: unknown) => inspect(value)).join(", "),
-      );
-    }
-
     if (hints.length) {
       return `(${hints.join(", ")})`;
     }

diff --git a/command/types/enum.ts b/command/types/enum.ts
@@ -24,6 +24,10 @@ export class EnumType<T extends string | number> extends Type<T> {
   public values(): T[] {
     return this.allowedValues.slice();
   }
+
+  public complete(): T[] {
+    return this.values();
+  }
 }
 
 export type TypeValue<T extends Type<unknown>> = T extends Type<infer V> ? V