fix(command): infer option default value as const (#660)

c4spar · Sep 13, 2023 · c91ddb6 · c91ddb6
1 parent 5118a1c
commit c91ddb6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/command/command.ts b/command/command.ts
@@ -1237,7 +1237,7 @@ export class Command<
     TRequired extends OptionOptions["required"] = undefined,
     TCollect extends OptionOptions["collect"] = undefined,
     TConflicts extends OptionOptions["conflicts"] = undefined,
-    TDefaultValue = undefined,
+    const TDefaultValue = undefined,
     TMappedValue = undefined,
   >(
     flags: TFlags,
@@ -1304,7 +1304,7 @@ export class Command<
       TCommandOptions,
       Merge<TParentCommandTypes, Merge<TCommandGlobalTypes, TCommandTypes>>,
       undefined extends TConflicts ? TRequired : false,
-      TDefault
+      TDefaultValue
     >,
     TMappedGlobalOptions extends MapValue<
       TGlobalOptions,
@@ -1314,7 +1314,7 @@ export class Command<
     TRequired extends OptionOptions["required"] = undefined,
     TCollect extends OptionOptions["collect"] = undefined,
     TConflicts extends OptionOptions["conflicts"] = undefined,
-    TDefault = undefined,
+    const TDefaultValue = undefined,
     TMappedValue = undefined,
   >(
     flags: TFlags,
@@ -1335,7 +1335,7 @@ export class Command<
       >
         & {
           global: true;
-          default?: DefaultValue<TDefault>;
+          default?: DefaultValue<TDefaultValue>;
           required?: TRequired;
           collect?: TCollect;
           value?: OptionValueHandler<
@@ -1375,7 +1375,7 @@ export class Command<
     TRequired extends OptionOptions["required"] = undefined,
     TCollect extends OptionOptions["collect"] = undefined,
     TConflicts extends OptionOptions["conflicts"] = undefined,
-    TDefaultValue = undefined,
+    const TDefaultValue = undefined,
     TMappedValue = undefined,
   >(
     flags: TFlags,

diff --git a/command/test/command/generic_types_test.ts b/command/test/command/generic_types_test.ts
@@ -757,7 +757,7 @@ import {
         .type("color", colorType)
         .option("--foo [val:string]", "...")
         .option("--bar [val:string]", "...", { default: 4 })
-        .option("--baz <val:color>", "...", { default: "red" as const })
+        .option("--baz <val:color>", "...", { default: "red" })
         .option("--beep <val:string> [val:string]", "...", {
           default: new Date(),
           global: true,
@@ -771,11 +771,11 @@ import {
           assert<
             IsExact<typeof options, {
               foo?: string | true;
-              bar: string | number | true;
+              bar: string | true | 4;
               baz: "red" | "blue";
               beep: Date | [string, string?];
               boop: Date | [string, number?];
-              one: { two: string | number };
+              one: { two: string | 4 };
             }>
           >(true);
         });
@@ -809,7 +809,7 @@ import {
         .option("--one.foo <val:string>", "...", {
           default: 4,
           value: (value) => {
-            assert<IsExact<typeof value, number | string>>(true);
+            assert<IsExact<typeof value, string | 4>>(true);
             return new Date();
           },
         })
@@ -849,8 +849,8 @@ import {
               beep: Map<string, number>;
               boop: Array<Date>;
               foo?: string | true;
-              bar: string | number | true;
-              baz: string | number;
+              bar: string | true | 4;
+              baz: string | 4;
               one: { foo: Date; bar?: RegExp };
               three?: { four?: number };
               envVar: Date;
@@ -944,7 +944,7 @@ import {
               color: string | false;
               check: boolean;
               remote?: string | false;
-              defaultValue: number | false;
+              defaultValue: false | 5;
             }>
           >(true);
         });