@flowscripter/dynamic-cli-framework 2.5.0 → 3.0.1

package/src/service/plugin/command/PluginRemoveSubCommand.ts

@@ -1,7 +1,7 @@
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentValues } from "@flowscripter/dynamic-cli-framework-api";
-import { ArgumentValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
+import type { Values } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
@@ -16,11 +16,11 @@ export class PluginRemoveSubCommand implements SubCommand {
     {
       name: "pluginId",
       description: "Plugin ID to remove (e.g. @scope/name)",
-      type: ArgumentValueTypeName.STRING,
+      type: ValueTypeName.STRING,
     },
   ];
 
-  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+  async execute(context: Context, argumentValues: Values): Promise<void> {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 

package/src/service/plugin/command/PluginSearchSubCommand.ts

@@ -1,7 +1,7 @@
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentValues } from "@flowscripter/dynamic-cli-framework-api";
-import { ArgumentValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
+import type { Values } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import { PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
@@ -17,12 +17,12 @@ export class PluginSearchSubCommand implements SubCommand {
     {
       name: "query",
       description: "Search query",
-      type: ArgumentValueTypeName.STRING,
+      type: ValueTypeName.STRING,
       isVarargOptional: true,
     },
   ];
 
-  async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+  async execute(context: Context, argumentValues: Values): Promise<void> {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 

package/src/service/plugin/command/PluginUpgradeSubCommand.ts

@@ -1,6 +1,6 @@
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentValues } from "@flowscripter/dynamic-cli-framework-api";
+import type { Values } from "@flowscripter/dynamic-cli-framework-api";
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
@@ -14,7 +14,7 @@ export class PluginUpgradeSubCommand implements SubCommand {
   readonly options = [];
   readonly positionals = [];
 
-  async execute(context: Context, _argumentValues: ArgumentValues): Promise<void> {
+  async execute(context: Context, _argumentValues: Values): Promise<void> {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 

package/src/service/printer/command/DarkModeCommand.ts

@@ -1,9 +1,6 @@
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentSingleValueType,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type SingleValueType, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type PrinterServiceProvider from "../PrinterServiceProvider.ts";
 
@@ -15,7 +12,7 @@ export default class DarkModeCommand implements GlobalModifierCommand {
   readonly description = "Enable dark mode for output";
   readonly enableConfiguration = true;
   readonly argument: GlobalCommandArgument = {
-    type: ArgumentValueTypeName.BOOLEAN,
+    type: ValueTypeName.BOOLEAN,
     defaultValue: false,
     configurationKey: "DARK_MODE",
   };
@@ -28,7 +25,7 @@ export default class DarkModeCommand implements GlobalModifierCommand {
     this.executePriority = executePriority;
   }
 
-  public execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void> {
+  public execute(_context: Context, argumentValue: SingleValueType): Promise<void> {
     this.#printerServiceProvider.printerService!.darkMode = argumentValue as boolean;
 
     return Promise.resolve();

package/src/service/printer/command/LogLevelCommand.ts

@@ -1,8 +1,5 @@
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentSingleValueType,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type SingleValueType, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type PrinterServiceProvider from "../PrinterServiceProvider.ts";
@@ -16,7 +13,7 @@ export default class LogLevelCommand implements GlobalModifierCommand {
   readonly description = "Set the logging threshold";
   readonly enableConfiguration = true;
   readonly argument: GlobalCommandArgument = {
-    type: ArgumentValueTypeName.STRING,
+    type: ValueTypeName.STRING,
     allowableValues: ["DEBUG", "INFO", "WARN", "ERROR"],
     isCaseInsensitive: true,
     defaultValue: "INFO",
@@ -31,7 +28,7 @@ export default class LogLevelCommand implements GlobalModifierCommand {
     this.executePriority = executePriority;
   }
 
-  public execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void> {
+  public execute(_context: Context, argumentValue: SingleValueType): Promise<void> {
     const logLevel = argumentValue as string;
 
     switch (logLevel.toUpperCase()) {

package/src/service/printer/command/NoColorCommand.ts

@@ -1,9 +1,6 @@
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentSingleValueType,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type SingleValueType, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type PrinterServiceProvider from "../PrinterServiceProvider.ts";
 
@@ -15,7 +12,7 @@ export default class NoColorCommand implements GlobalModifierCommand {
   readonly description = "Disable color for output";
   readonly enableConfiguration = true;
   readonly argument: GlobalCommandArgument = {
-    type: ArgumentValueTypeName.BOOLEAN,
+    type: ValueTypeName.BOOLEAN,
     defaultValue: false,
     configurationKey: "NO_COLOR",
   };
@@ -28,7 +25,7 @@ export default class NoColorCommand implements GlobalModifierCommand {
     this.executePriority = executePriority;
   }
 
-  public execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void> {
+  public execute(_context: Context, argumentValue: SingleValueType): Promise<void> {
     this.#printerServiceProvider.printerService!.colorEnabled = !argumentValue as boolean;
 
     return Promise.resolve();

package/src/service/printer/command/NoHyperlinksCommand.ts

@@ -1,9 +1,6 @@
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentSingleValueType,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type SingleValueType, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type PrinterServiceProvider from "../PrinterServiceProvider.ts";
 
@@ -12,7 +9,7 @@ export default class NoHyperlinksCommand implements GlobalModifierCommand {
   readonly description = "Disable hyperlinks for output";
   readonly enableConfiguration = true;
   readonly argument: GlobalCommandArgument = {
-    type: ArgumentValueTypeName.BOOLEAN,
+    type: ValueTypeName.BOOLEAN,
     defaultValue: false,
     configurationKey: "NO_HYPERLINKS",
   };
@@ -25,7 +22,7 @@ export default class NoHyperlinksCommand implements GlobalModifierCommand {
     this.executePriority = executePriority;
   }
 
-  public execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void> {
+  public execute(_context: Context, argumentValue: SingleValueType): Promise<void> {
     this.#printerServiceProvider.printerService!.hyperlinksEnabled = !argumentValue as boolean;
 
     return Promise.resolve();

package/src/service/prompter/command/NoPromptCommand.ts

@@ -1,9 +1,6 @@
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentSingleValueType,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type SingleValueType, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type PrompterServiceProvider from "../PrompterServiceProvider.ts";
 
@@ -12,7 +9,7 @@ export default class NoPromptCommand implements GlobalModifierCommand {
   readonly description = "Disable interactive prompting";
   readonly enableConfiguration = true;
   readonly argument: GlobalCommandArgument = {
-    type: ArgumentValueTypeName.BOOLEAN,
+    type: ValueTypeName.BOOLEAN,
     defaultValue: false,
     configurationKey: "NO_PROMPT",
   };
@@ -25,7 +22,7 @@ export default class NoPromptCommand implements GlobalModifierCommand {
     this.executePriority = executePriority;
   }
 
-  public execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void> {
+  public execute(_context: Context, argumentValue: SingleValueType): Promise<void> {
     this.#prompterServiceProvider.prompterService.promptEnabled = !(argumentValue as boolean);
 
     return Promise.resolve();

package/src/service/prompter/prompt/promptText.ts

@@ -1,5 +1,5 @@
 import type { Prompt, PromptResult } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentSingleValueType } from "@flowscripter/dynamic-cli-framework-api";
+import type { SingleValueType } from "@flowscripter/dynamic-cli-framework-api";
 import { SpecialKey } from "../../../terminal/KeyReader.ts";
 import ShutdownServiceProvider from "../../shutdown/ShutdownServiceProvider.ts";
 import { renderPromptHeader } from "./PromptContext.ts";
@@ -52,7 +52,7 @@ export default async function promptText(
         continue;
       }
 
-      const value: ArgumentSingleValueType = buffer;
+      const value: SingleValueType = buffer;
 
       const validationOption = promptDef.options.length > 0 ? promptDef.options[0] : undefined;
       if (validationOption?.validate) {

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -60,7 +60,17 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult | undefined> {
     if (!this.#upgradeCheckPromise) {
-      this.#upgradeCheckPromise = this.checkForUpgrade();
+      // Only cache a successful result. An `undefined` result can come from a transient
+      // failure (e.g. the opportunistic startup check's fetch exceeding
+      // VERSION_CHECK_TIMEOUT_MS) - caching that would permanently deny a later, deliberate
+      // caller (e.g. the `upgrade` command explicitly waiting via waitForResult=true) any
+      // chance of a fresh attempt for the rest of this process's lifetime.
+      this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
+        if (result === undefined) {
+          this.#upgradeCheckPromise = undefined;
+        }
+        return result;
+      });
     }
     if (waitForResult) {
       return this.#upgradeCheckPromise;

package/src/service/upgrade/command/UpgradeSubCommand.ts

@@ -1,10 +1,7 @@
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  type ArgumentValues,
-  ArgumentValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { type Values, ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import {
   Icon,
   InstallMethod,
@@ -24,14 +21,14 @@ export class UpgradeSubCommand implements SubCommand {
   readonly options: ReadonlyArray<Option> = [
     {
       name: "os",
-      type: ArgumentValueTypeName.STRING,
+      type: ValueTypeName.STRING,
       isOptional: true,
       allowableValues: Object.values(SupportedOs),
       description: "Override the detected operating system",
     },
     {
       name: "install-method",
-      type: ArgumentValueTypeName.STRING,
+      type: ValueTypeName.STRING,
       isOptional: true,
       allowableValues: Object.values(InstallMethod),
       description: "Override the detected install method",
@@ -44,7 +41,7 @@ export class UpgradeSubCommand implements SubCommand {
     this.#upgradeService = upgradeService;
   }
 
-  public async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+  public async execute(context: Context, argumentValues: Values): Promise<void> {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const cliName = context.cliConfig.name;
 

package/src/util/envVarHelper.ts

@@ -2,10 +2,10 @@ import process from "node:process";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
 import {
-  ArgumentValueTypeName,
+  ValueTypeName,
   ComplexValueTypeName,
-  type PopulatedArgumentSingleValueType,
-  type PopulatedArgumentValues,
+  type PopulatedSingleValueType,
+  type PopulatedValues,
 } from "@flowscripter/dynamic-cli-framework-api";
 type ProcessEnv = NodeJS.ProcessEnv;
 
@@ -59,7 +59,7 @@ function getGlobalArgumentKeyPrefix(
 export function getGlobalCommandValueFromEnvVars(
   cliConfig: CLIConfig,
   command: GlobalCommand,
-): PopulatedArgumentSingleValueType {
+): PopulatedSingleValueType {
   const { argument } = command;
   if (argument === undefined) {
     return undefined;
@@ -67,7 +67,7 @@ export function getGlobalCommandValueFromEnvVars(
 
   // simple check for a specific env var name
   let envVarValue = process.env[getGlobalArgumentKeyPrefix(cliConfig, command, argument)];
-  if (envVarValue != undefined && argument.type === ArgumentValueTypeName.BOOLEAN) {
+  if (envVarValue != undefined && argument.type === ValueTypeName.BOOLEAN) {
     envVarValue = envVarValue.length > 0 ? "true" : "false";
   }
 
@@ -75,7 +75,7 @@ export function getGlobalCommandValueFromEnvVars(
 }
 
 function getOptionValuesFromEnvVars(
-  envVarValues: PopulatedArgumentValues,
+  envVarValues: PopulatedValues,
   potentialEnvVarNames: Array<string>,
   env: ProcessEnv,
   option: Option | ComplexOption,
@@ -126,17 +126,16 @@ function getOptionValuesFromEnvVars(
         if (suffix.length > 0) {
           if (option.type === ComplexValueTypeName.COMPLEX) {
             if (
-              (envVarValues[option.name] as Array<PopulatedArgumentSingleValueType>)[index] ===
-              undefined
+              (envVarValues[option.name] as Array<PopulatedSingleValueType>)[index] === undefined
             ) {
-              (envVarValues[option.name] as Array<PopulatedArgumentValues>)[index] = Object.create(
+              (envVarValues[option.name] as Array<PopulatedValues>)[index] = Object.create(
                 null,
-              ) as PopulatedArgumentValues;
+              ) as PopulatedValues;
             }
             (option as ComplexOption).properties.forEach((property) => {
               const propertySegment = property.configurationKey || getKeySegment(property.name);
               getOptionValuesFromEnvVars(
-                (envVarValues[option.name] as Array<PopulatedArgumentValues>)[index]!,
+                (envVarValues[option.name] as Array<PopulatedValues>)[index]!,
                 matches,
                 env,
                 property,
@@ -145,13 +144,13 @@ function getOptionValuesFromEnvVars(
             });
             if (
               Object.keys(
-                (envVarValues[option.name] as Array<PopulatedArgumentValues>)[index] as Record<
+                (envVarValues[option.name] as Array<PopulatedValues>)[index] as Record<
                   string,
                   string
                 >,
               ).length === 0
             ) {
-              delete (envVarValues[option.name] as Array<PopulatedArgumentValues>)[index];
+              delete (envVarValues[option.name] as Array<PopulatedValues>)[index];
             }
           } else {
             throw new Error(`Unidentified suffix ${suffix} in env var: ${match}`);
@@ -161,14 +160,13 @@ function getOptionValuesFromEnvVars(
         } else {
           // set primitive value
           let envVarValue = env[match];
-          if (envVarValue != undefined && option.type === ArgumentValueTypeName.BOOLEAN) {
+          if (envVarValue != undefined && option.type === ValueTypeName.BOOLEAN) {
             envVarValue = envVarValue.length > 1 ? "true" : "false";
           }
-          (envVarValues[option.name] as Array<PopulatedArgumentSingleValueType>)[index] =
-            envVarValue;
+          (envVarValues[option.name] as Array<PopulatedSingleValueType>)[index] = envVarValue;
         }
 
-        const elements = envVarValues[option.name] as Array<PopulatedArgumentSingleValueType>;
+        const elements = envVarValues[option.name] as Array<PopulatedSingleValueType>;
         for (let i = elements.length - 1; i > -1; i--) {
           if (elements[i] === undefined) {
             elements.length = i;
@@ -182,11 +180,11 @@ function getOptionValuesFromEnvVars(
   } else if (option.type === ComplexValueTypeName.COMPLEX) {
     (option as ComplexOption).properties.forEach((property) => {
       if (envVarValues[option.name] === undefined) {
-        envVarValues[option.name] = Object.create(null) as PopulatedArgumentValues;
+        envVarValues[option.name] = Object.create(null) as PopulatedValues;
       }
       const propertySegment = property.configurationKey || getKeySegment(property.name);
       getOptionValuesFromEnvVars(
-        envVarValues[option.name] as PopulatedArgumentValues,
+        envVarValues[option.name] as PopulatedValues,
         potentialEnvVarNames,
         env,
         property,
@@ -202,7 +200,7 @@ function getOptionValuesFromEnvVars(
     if (value === undefined) {
       return undefined;
     }
-    if (option.type === ArgumentValueTypeName.BOOLEAN) {
+    if (option.type === ValueTypeName.BOOLEAN) {
       value = value.length > 1 ? "true" : "false";
     }
     // set primitive value
@@ -220,8 +218,8 @@ function getOptionValuesFromEnvVars(
 export function getSubCommandValuesFromEnvVars(
   cliConfig: CLIConfig,
   command: SubCommand,
-): PopulatedArgumentValues | undefined {
-  const envVarValues = Object.create(null) as PopulatedArgumentValues;
+): PopulatedValues | undefined {
+  const envVarValues = Object.create(null) as PopulatedValues;
   if (command.options) {
     for (const option of command.options) {
       const potentialEnvVarNames = Object.keys(process.env);
@@ -270,11 +268,10 @@ export function getSubCommandValuesFromEnvVars(
             }
             // set primitive value
             let envVarValue = process.env[match];
-            if (envVarValue != undefined && positional.type === ArgumentValueTypeName.BOOLEAN) {
+            if (envVarValue != undefined && positional.type === ValueTypeName.BOOLEAN) {
               envVarValue = envVarValue.length > 1 ? "true" : "false";
             }
-            (envVarValues[positional.name] as Array<PopulatedArgumentSingleValueType>)[index] =
-              envVarValue;
+            (envVarValues[positional.name] as Array<PopulatedSingleValueType>)[index] = envVarValue;
           }
         });
       } else {
@@ -283,7 +280,7 @@ export function getSubCommandValuesFromEnvVars(
         if (value === undefined) {
           return undefined;
         }
-        if (positional.type === ArgumentValueTypeName.BOOLEAN) {
+        if (positional.type === ValueTypeName.BOOLEAN) {
           value = value.length > 1 ? "true" : "false";
         }
         // set primitive value

package/src/util/helpHelper.ts

@@ -1,10 +1,7 @@
 import { distance } from "fastest-levenshtein";
 import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  ArgumentValueTypeName,
-  ComplexValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName, ComplexValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { UsageExample } from "@flowscripter/dynamic-cli-framework-api";
@@ -144,24 +141,21 @@ function getGlobalCommandArgumentForm(globalCommandArgument: GlobalCommandArgume
   let argumentSyntax = "";
 
   switch (globalCommandArgument.type) {
-    case ArgumentValueTypeName.BOOLEAN:
+    case ValueTypeName.BOOLEAN:
       argumentSyntax = "true|false";
       break;
-    case ArgumentValueTypeName.INTEGER:
+    case ValueTypeName.INTEGER:
       argumentSyntax = "<integer_value>";
       break;
-    case ArgumentValueTypeName.NUMBER:
+    case ValueTypeName.NUMBER:
       argumentSyntax = "<number_value>";
       break;
-    case ArgumentValueTypeName.STRING:
+    case ValueTypeName.STRING:
       argumentSyntax = "<string_value>";
       break;
   }
 
-  if (
-    globalCommandArgument.isOptional ||
-    globalCommandArgument.type === ArgumentValueTypeName.BOOLEAN
-  ) {
+  if (globalCommandArgument.isOptional || globalCommandArgument.type === ValueTypeName.BOOLEAN) {
     argumentSyntax = `[${argumentSyntax}]`;
   }
 
@@ -187,13 +181,13 @@ export function getGlobalArgumentHelpEntry(
     notesItems.push(`valid values: ${argument.allowableValues.join("|")}`);
   } else {
     switch (argument.type) {
-      case ArgumentValueTypeName.STRING:
+      case ValueTypeName.STRING:
         notesItems.push("string value");
         break;
-      case ArgumentValueTypeName.INTEGER:
+      case ValueTypeName.INTEGER:
         notesItems.push("integer value");
         break;
-      case ArgumentValueTypeName.NUMBER:
+      case ValueTypeName.NUMBER:
         notesItems.push("number value");
         break;
     }
@@ -240,17 +234,17 @@ export function getSubCommandArgumentsSyntax(subCommand: SubCommand): string {
 
   subCommand.options.forEach((option) => {
     let optionSyntax = `--${option.name}`;
-    switch (option.type as ArgumentValueTypeName | ComplexValueTypeName) {
-      case ArgumentValueTypeName.BOOLEAN:
+    switch (option.type as ValueTypeName | ComplexValueTypeName) {
+      case ValueTypeName.BOOLEAN:
         optionSyntax = `${optionSyntax} [true|false]`;
         break;
-      case ArgumentValueTypeName.INTEGER:
+      case ValueTypeName.INTEGER:
         optionSyntax = `${optionSyntax} <integer_value>`;
         break;
-      case ArgumentValueTypeName.NUMBER:
+      case ValueTypeName.NUMBER:
         optionSyntax = `${optionSyntax} <number_value>`;
         break;
-      case ArgumentValueTypeName.STRING:
+      case ValueTypeName.STRING:
         optionSyntax = `${optionSyntax} <string_value>`;
         break;
       case ComplexValueTypeName.COMPLEX:
@@ -318,16 +312,16 @@ function getOptionHelpEntry(
       notesItems.push(`valid values: ${option.allowableValues.join("|")}`);
     } else {
       switch (option.type) {
-        case ArgumentValueTypeName.STRING:
+        case ValueTypeName.STRING:
           notesItems.push(`string value`);
           break;
-        case ArgumentValueTypeName.INTEGER:
+        case ValueTypeName.INTEGER:
           notesItems.push(`integer value`);
           break;
-        case ArgumentValueTypeName.NUMBER:
+        case ValueTypeName.NUMBER:
           notesItems.push(`number value`);
           break;
-        case ArgumentValueTypeName.BOOLEAN:
+        case ValueTypeName.BOOLEAN:
           notesItems.push(`boolean value`);
           break;
       }
@@ -403,16 +397,16 @@ function getPositionalHelpEntry(
     notesItems.push(`valid values: ${positional.allowableValues.join("|")}`);
   } else {
     switch (positional.type) {
-      case ArgumentValueTypeName.STRING:
+      case ValueTypeName.STRING:
         notesItems.push(`string value`);
         break;
-      case ArgumentValueTypeName.INTEGER:
+      case ValueTypeName.INTEGER:
         notesItems.push(`integer value`);
         break;
-      case ArgumentValueTypeName.NUMBER:
+      case ValueTypeName.NUMBER:
         notesItems.push(`number value`);
         break;
-      case ArgumentValueTypeName.BOOLEAN:
+      case ValueTypeName.BOOLEAN:
         notesItems.push(`boolean value`);
         break;
     }
@@ -544,7 +538,7 @@ export function getMultiCommandAppSyntax(
           modifier.argument !== undefined &&
           !modifier.argument.isOptional &&
           modifier.argument.defaultValue === undefined &&
-          modifier.argument.type !== ArgumentValueTypeName.BOOLEAN,
+          modifier.argument.type !== ValueTypeName.BOOLEAN,
       );
       syntax += optionArgMandatory ? " <value>" : " [<value>]";
     }
@@ -571,7 +565,7 @@ export function getMultiCommandAppSyntax(
       argValueOptional = globalCommands.some(
         (globalCommand) =>
           globalCommand.argument !== undefined &&
-          globalCommand.argument.type === ArgumentValueTypeName.BOOLEAN,
+          globalCommand.argument.type === ValueTypeName.BOOLEAN,
       );
     }
   }
@@ -623,19 +617,17 @@ export function getMultiCommandAppSyntax(
           groupCommand.memberSubCommands.some((memberCommand) =>
             memberCommand.options.some(
               (option) =>
-                option.type === ArgumentValueTypeName.BOOLEAN ||
+                option.type === ValueTypeName.BOOLEAN ||
                 memberCommand.positionals.some(
-                  (positional) => positional.type === ArgumentValueTypeName.BOOLEAN,
+                  (positional) => positional.type === ValueTypeName.BOOLEAN,
                 ),
             ),
           ),
         ) ||
         subCommands.some(
           (subCommand) =>
-            subCommand.options.some((option) => option.type === ArgumentValueTypeName.BOOLEAN) ||
-            subCommand.positionals.some(
-              (positional) => positional.type === ArgumentValueTypeName.BOOLEAN,
-            ),
+            subCommand.options.some((option) => option.type === ValueTypeName.BOOLEAN) ||
+            subCommand.positionals.some((positional) => positional.type === ValueTypeName.BOOLEAN),
         );
       multipleArg =
         multipleArg ||