@flowscripter/dynamic-cli-framework 2.4.0 → 3.0.0

package/dist/src/service/upgrade/UpgradeServiceProvider.js

@@ -2,7 +2,7 @@ import { UPGRADE_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PROMPTER_SERVICE_ID, PromptType } from "@flowscripter/dynamic-cli-framework-api";
 import { KEY_VALUE_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
-import { SHUTDOWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { FETCH_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultUpgradeService from "./DefaultUpgradeService.js";
 import { UpgradeSubCommand } from "./command/UpgradeSubCommand.js";
@@ -29,16 +29,19 @@ export default class UpgradeServiceProvider {
     async initService(context) {
         const upgradeService = this.#upgradeService;
         const cliConfig = this.#cliConfig;
-        if (context.doesServiceExist(SPAWN_SERVICE_ID)) {
-            const spawnService = context.getServiceById(SPAWN_SERVICE_ID);
-            const shutdownService = context.doesServiceExist(SHUTDOWN_SERVICE_ID)
-                ? context.getServiceById(SHUTDOWN_SERVICE_ID)
-                : undefined;
-            upgradeService.setDependencies(spawnService, shutdownService);
-        }
-        else {
+        const spawnService = context.doesServiceExist(SPAWN_SERVICE_ID)
+            ? context.getServiceById(SPAWN_SERVICE_ID)
+            : undefined;
+        const fetchService = context.doesServiceExist(FETCH_SERVICE_ID)
+            ? context.getServiceById(FETCH_SERVICE_ID)
+            : undefined;
+        if (spawnService === undefined) {
             logger.debug(() => "SpawnService not available, upgrade install methods will be unavailable");
         }
+        if (fetchService === undefined) {
+            logger.debug(() => "FetchService not available, upgrade version checks will be unavailable");
+        }
+        upgradeService.setDependencies(spawnService, fetchService);
         void upgradeService.getUpgradeCheckResult();
         if (!context.doesServiceExist(PROMPTER_SERVICE_ID)) {
             logger.debug(() => "PrompterService not available, skipping auto-upgrade");

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

@@ -1,7 +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 } from "@flowscripter/dynamic-cli-framework-api";
+import { type Values } from "@flowscripter/dynamic-cli-framework-api";
 import type DefaultUpgradeService from "../DefaultUpgradeService.ts";
 export declare class UpgradeSubCommand implements SubCommand {
     #private;
@@ -11,6 +11,6 @@ export declare class UpgradeSubCommand implements SubCommand {
     readonly positionals: never[];
     readonly options: ReadonlyArray<Option>;
     constructor(upgradeService: DefaultUpgradeService);
-    execute(context: Context, argumentValues: ArgumentValues): Promise<void>;
+    execute(context: Context, argumentValues: Values): Promise<void>;
 }
 //# sourceMappingURL=UpgradeSubCommand.d.ts.map

package/dist/src/service/upgrade/command/UpgradeSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yCAAyC,CAAC;AASjD,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE,qBAAa,iBAAkB,YAAW,UAAU;;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAerC;gBAIiB,cAAc,EAAE,qBAAqB;IAI3C,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAyCtF"}
+{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AASrF,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE,qBAAa,iBAAkB,YAAW,UAAU;;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAerC;gBAIiB,cAAc,EAAE,qBAAqB;IAI3C,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyC9E"}

package/dist/src/service/upgrade/command/UpgradeSubCommand.js

@@ -1,4 +1,4 @@
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, InstallMethod, PRINTER_SERVICE_ID, SupportedArch, SupportedOs, } from "@flowscripter/dynamic-cli-framework-api";
 export class UpgradeSubCommand {
     name = "upgrade";
@@ -8,14 +8,14 @@ export class UpgradeSubCommand {
     options = [
         {
             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",

package/dist/src/util/envVarHelper.d.ts

@@ -1,5 +1,5 @@
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
-import { type PopulatedArgumentSingleValueType, type PopulatedArgumentValues } from "@flowscripter/dynamic-cli-framework-api";
+import { type PopulatedSingleValueType, type PopulatedValues } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 /**
@@ -9,7 +9,7 @@ import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
  * @param command the {@link GlobalCommand} to use for determining the default configuration key and containing a
  * {@link GlobalCommandArgument} instance to populate a value for.
  */
-export declare function getGlobalCommandValueFromEnvVars(cliConfig: CLIConfig, command: GlobalCommand): PopulatedArgumentSingleValueType;
+export declare function getGlobalCommandValueFromEnvVars(cliConfig: CLIConfig, command: GlobalCommand): PopulatedSingleValueType;
 /**
  * Get configured argument values for the specified {@link Option} from environment variables.
  *
@@ -17,5 +17,5 @@ export declare function getGlobalCommandValueFromEnvVars(cliConfig: CLIConfig, c
  * @param command the {@link SubCommand} to use for determining the default configuration key and containing
  * {@link Positional} and {@link Option} instances to populate values for.
  */
-export declare function getSubCommandValuesFromEnvVars(cliConfig: CLIConfig, command: SubCommand): PopulatedArgumentValues | undefined;
+export declare function getSubCommandValuesFromEnvVars(cliConfig: CLIConfig, command: SubCommand): PopulatedValues | undefined;
 //# sourceMappingURL=envVarHelper.d.ts.map

package/dist/src/util/envVarHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"envVarHelper.d.ts","sourceRoot":"","sources":["../../../src/util/envVarHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAGL,KAAK,gCAAgC,EACrC,KAAK,uBAAuB,EAC7B,MAAM,yCAAyC,CAAC;AAOjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAmC1E;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,gCAAgC,CAalC;AA0ID;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,GAClB,uBAAuB,GAAG,SAAS,CA6ErC"}
+{"version":3,"file":"envVarHelper.d.ts","sourceRoot":"","sources":["../../../src/util/envVarHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,yCAAyC,CAAC;AAOjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAmC1E;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,wBAAwB,CAa1B;AAwID;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,GAClB,eAAe,GAAG,SAAS,CA4E7B"}

package/dist/src/util/envVarHelper.js

@@ -1,5 +1,5 @@
 import process from "node:process";
-import { ArgumentValueTypeName, ComplexValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName, ComplexValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
 import { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "@flowscripter/dynamic-cli-framework-api";
 function getKeySegment(segment) {
     let keySegment = segment.replace("-", "_").toUpperCase();
@@ -34,7 +34,7 @@ export function getGlobalCommandValueFromEnvVars(cliConfig, command) {
     }
     // 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";
     }
     return envVarValue;
@@ -77,8 +77,7 @@ function getOptionValuesFromEnvVars(envVarValues, potentialEnvVarNames, env, opt
                 }
                 if (suffix.length > 0) {
                     if (option.type === ComplexValueTypeName.COMPLEX) {
-                        if (envVarValues[option.name][index] ===
-                            undefined) {
+                        if (envVarValues[option.name][index] === undefined) {
                             envVarValues[option.name][index] = Object.create(null);
                         }
                         option.properties.forEach((property) => {
@@ -99,11 +98,10 @@ function getOptionValuesFromEnvVars(envVarValues, potentialEnvVarNames, env, opt
                 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][index] =
-                        envVarValue;
+                    envVarValues[option.name][index] = envVarValue;
                 }
                 const elements = envVarValues[option.name];
                 for (let i = elements.length - 1; i > -1; i--) {
@@ -135,7 +133,7 @@ function getOptionValuesFromEnvVars(envVarValues, potentialEnvVarNames, env, opt
         if (value === undefined) {
             return undefined;
         }
-        if (option.type === ArgumentValueTypeName.BOOLEAN) {
+        if (option.type === ValueTypeName.BOOLEAN) {
             value = value.length > 1 ? "true" : "false";
         }
         // set primitive value
@@ -186,11 +184,10 @@ export function getSubCommandValuesFromEnvVars(cliConfig, command) {
                         }
                         // 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][index] =
-                            envVarValue;
+                        envVarValues[positional.name][index] = envVarValue;
                     }
                 });
             }
@@ -200,7 +197,7 @@ export function getSubCommandValuesFromEnvVars(cliConfig, command) {
                 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/dist/src/util/helpHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpHelper.d.ts","sourceRoot":"","sources":["../../../src/util/helpHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAM7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAM5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA8BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CAgJR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}
+{"version":3,"file":"helpHelper.d.ts","sourceRoot":"","sources":["../../../src/util/helpHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAG7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAM5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA2BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CA8IR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}

package/dist/src/util/helpHelper.js

@@ -1,5 +1,5 @@
 import { distance } from "fastest-levenshtein";
-import { ArgumentValueTypeName, ComplexValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName, ComplexValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { getGlobalCommandArgumentConfigurationKey, getSubCommandArgumentConfigurationKey, } from "./configHelper.js";
 const SYNTAX_INDENT_WIDTH = 2;
 const MINIMUM_SYNTAX_COLUMN_WIDTH = 15;
@@ -74,21 +74,20 @@ export async function printHelpSections(printerService, tableGeneratorService, s
 function getGlobalCommandArgumentForm(globalCommandArgument) {
     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}]`;
     }
     return argumentSyntax;
@@ -106,13 +105,13 @@ export function getGlobalArgumentHelpEntry(cliConfig, includeEnvVars, globalComm
     }
     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;
         }
@@ -151,16 +150,16 @@ export function getSubCommandArgumentsSyntax(subCommand) {
     subCommand.options.forEach((option) => {
         let optionSyntax = `--${option.name}`;
         switch (option.type) {
-            case ArgumentValueTypeName.BOOLEAN:
+            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:
@@ -219,16 +218,16 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
         }
         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;
             }
@@ -287,16 +286,16 @@ function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional)
     }
     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;
         }
@@ -401,7 +400,7 @@ export function getMultiCommandAppSyntax(context, globalModifierCommands, global
             const optionArgMandatory = globalModifierCommands.every((modifier) => modifier.argument !== undefined &&
                 !modifier.argument.isOptional &&
                 modifier.argument.defaultValue === undefined &&
-                modifier.argument.type !== ArgumentValueTypeName.BOOLEAN);
+                modifier.argument.type !== ValueTypeName.BOOLEAN);
             syntax += optionArgMandatory ? " <value>" : " [<value>]";
         }
         syntax += "]";
@@ -422,7 +421,7 @@ export function getMultiCommandAppSyntax(context, globalModifierCommands, global
                 ((globalCommand.argument.isOptional !== undefined && globalCommand.argument.isOptional) ||
                     globalCommand.argument.defaultValue !== undefined));
             argValueOptional = globalCommands.some((globalCommand) => globalCommand.argument !== undefined &&
-                globalCommand.argument.type === ArgumentValueTypeName.BOOLEAN);
+                globalCommand.argument.type === ValueTypeName.BOOLEAN);
         }
     }
     if (groupCommands.length > 0 || subCommands.length > 0) {
@@ -442,10 +441,10 @@ export function getMultiCommandAppSyntax(context, globalModifierCommands, global
                         subCommand.positionals.some((positional) => positional.isVarargOptional !== undefined && positional.isVarargOptional));
             argValueOptional =
                 argValueOptional ||
-                    groupCommands.some((groupCommand) => groupCommand.memberSubCommands.some((memberCommand) => memberCommand.options.some((option) => option.type === ArgumentValueTypeName.BOOLEAN ||
-                        memberCommand.positionals.some((positional) => positional.type === ArgumentValueTypeName.BOOLEAN)))) ||
-                    subCommands.some((subCommand) => subCommand.options.some((option) => option.type === ArgumentValueTypeName.BOOLEAN) ||
-                        subCommand.positionals.some((positional) => positional.type === ArgumentValueTypeName.BOOLEAN));
+                    groupCommands.some((groupCommand) => groupCommand.memberSubCommands.some((memberCommand) => memberCommand.options.some((option) => option.type === ValueTypeName.BOOLEAN ||
+                        memberCommand.positionals.some((positional) => positional.type === ValueTypeName.BOOLEAN)))) ||
+                    subCommands.some((subCommand) => subCommand.options.some((option) => option.type === ValueTypeName.BOOLEAN) ||
+                        subCommand.positionals.some((positional) => positional.type === ValueTypeName.BOOLEAN));
             multipleArg =
                 multipleArg ||
                     groupCommands.some((groupCommand) => groupCommand.memberSubCommands.some((memberCommand) => memberCommand.options.some((option) => option.isArray) ||

package/index.ts

@@ -1,17 +1,14 @@
 // Argument API
 export type { Argument } from "@flowscripter/dynamic-cli-framework-api";
 export type {
-  ArgumentSingleValueType,
-  ArgumentValues,
-  ArgumentValueType,
-  PopulatedArgumentSingleValueType,
-  PopulatedArgumentValues,
-  PopulatedArgumentValueType,
-} from "@flowscripter/dynamic-cli-framework-api";
-export {
-  ArgumentValueTypeName,
-  ComplexValueTypeName,
+  SingleValueType,
+  Values,
+  ValueType,
+  PopulatedSingleValueType,
+  PopulatedValues,
+  PopulatedValueType,
 } from "@flowscripter/dynamic-cli-framework-api";
+export { ValueTypeName, ComplexValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 export type { ComplexOption } from "@flowscripter/dynamic-cli-framework-api";
 export { MAXIMUM_COMPLEX_OPTION_NESTING_DEPTH } from "@flowscripter/dynamic-cli-framework-api";
 export type { SubCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
@@ -78,6 +75,11 @@ export type { ShutdownService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultShutdownService } from "./src/service/shutdown/DefaultShutdownService.ts";
 export { default as ShutdownServiceProvider } from "./src/service/shutdown/ShutdownServiceProvider.ts";
 
+export { FETCH_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { FetchOptions, FetchService } from "@flowscripter/dynamic-cli-framework-api";
+export { default as DefaultFetchService } from "./src/service/fetch/DefaultFetchService.ts";
+export { default as FetchServiceProvider } from "./src/service/fetch/FetchServiceProvider.ts";
+
 export { SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 export type {
   SpawnOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "2.4.0",
+  "version": "3.0.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -48,8 +48,8 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@flowscripter/dynamic-cli-framework-api": "^1.3.0",
-    "@flowscripter/dynamic-plugin-framework": "1.11.1",
+    "@flowscripter/dynamic-cli-framework-api": "^1.4.1",
+    "@flowscripter/dynamic-plugin-framework": "1.12.0",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",
     "figlet": "^1.11.0",

package/src/cli/BaseCLI.ts

@@ -52,6 +52,7 @@ import DefaultCompletionService from "../service/completion/DefaultCompletionSer
 import CompletionServiceProvider from "../service/completion/CompletionServiceProvider.ts";
 import ImagePrinterServiceProvider from "../service/imagePrinter/ImagePrinterServiceProvider.ts";
 import SpawnServiceProvider from "../service/spawn/SpawnServiceProvider.ts";
+import FetchServiceProvider from "../service/fetch/FetchServiceProvider.ts";
 import UpgradeServiceProvider from "../service/upgrade/UpgradeServiceProvider.ts";
 const logger = getLogger("BaseCLI");
 
@@ -72,6 +73,7 @@ const logger = getLogger("BaseCLI");
  *
  * * {@link ImagePrinterServiceProvider}
  * * {@link SpawnServiceProvider}
+ * * {@link FetchServiceProvider}
  * * {@link CompletionServiceProvider}
  * * {@link UpgradeServiceProvider}
  *
@@ -136,6 +138,7 @@ export default class BaseCLI implements CLI {
       completionServiceEnabled: false,
       imagePrinterServiceEnabled: false,
       spawnServiceEnabled: false,
+      fetchServiceEnabled: false,
       upgradeServiceEnabled: false,
       upgradeLocationsConfig: { supportedPlatforms: [] },
       validateAllCommands: false,
@@ -274,6 +277,10 @@ export default class BaseCLI implements CLI {
       this.addServiceProvider(new SpawnServiceProvider(58));
     }
 
+    if (this.#options.fetchServiceEnabled) {
+      this.addServiceProvider(new FetchServiceProvider(57));
+    }
+
     if (this.#options.completionServiceEnabled) {
       const completionService = new DefaultCompletionService();
       this.addServiceProvider(

package/src/cli/BaseCLIFeatureOptions.ts

@@ -9,6 +9,7 @@ export default interface BaseCLIFeatureOptions {
   readonly completionServiceEnabled?: boolean;
   readonly imagePrinterServiceEnabled?: boolean;
   readonly spawnServiceEnabled?: boolean;
+  readonly fetchServiceEnabled?: boolean;
   readonly upgradeServiceEnabled?: boolean;
   readonly upgradeLocationsConfig?: UpgradeLocationsConfig;
   readonly validateAllCommands?: boolean;

package/src/command/MultiCommandCliHelpCommand.ts

@@ -4,9 +4,9 @@ import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import {
-  type ArgumentSingleValueType,
-  type ArgumentValues,
-  ArgumentValueTypeName,
+  type SingleValueType,
+  type Values,
+  ValueTypeName,
 } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { HelpSection } from "../util/helpHelper.ts";
@@ -308,11 +308,11 @@ export class MultiCommandCliHelpGlobalCommand
 
   readonly argument = {
     name: "command",
-    type: ArgumentValueTypeName.STRING,
+    type: ValueTypeName.STRING,
     isOptional: true,
   };
 
-  public async execute(context: Context, argumentValue?: ArgumentSingleValueType): Promise<void> {
+  public async execute(context: Context, argumentValue?: SingleValueType): Promise<void> {
     const commandName = argumentValue as string | undefined;
     if (commandName !== undefined) {
       await this.printUsageHelp(context, commandName);
@@ -334,13 +334,13 @@ export class MultiCommandCliHelpSubCommand
   public readonly positionals: ReadonlyArray<Positional> = [
     {
       name: "command",
-      type: ArgumentValueTypeName.STRING,
+      type: ValueTypeName.STRING,
       isVarargOptional: true,
       description: "Display help for the specific <command>",
     },
   ];
 
-  public async execute(context: Context, argumentValues: ArgumentValues): Promise<void> {
+  public async execute(context: Context, argumentValues: Values): Promise<void> {
     const commandName = argumentValues["command"] as string | undefined;
     if (commandName !== undefined) {
       await this.printUsageHelp(context, commandName);

package/src/runtime/command/CommandValidator.ts

@@ -4,11 +4,8 @@ import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Argument } from "@flowscripter/dynamic-cli-framework-api";
 import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentSingleValueType } from "@flowscripter/dynamic-cli-framework-api";
-import {
-  ArgumentValueTypeName,
-  ComplexValueTypeName,
-} from "@flowscripter/dynamic-cli-framework-api";
+import type { SingleValueType } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName, ComplexValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
 import type { ComplexOption } from "@flowscripter/dynamic-cli-framework-api";
 import { isComplexOption } from "../argument/ArgumentTypeGuards.ts";
@@ -30,14 +27,14 @@ import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-
 const logger = getLogger("commandValidation");
 
 function validateValueType(
-  type: ArgumentValueTypeName,
-  value: ArgumentSingleValueType,
+  type: ValueTypeName,
+  value: SingleValueType,
   argumentName: string,
   isDefaultValue: boolean,
   isRangeValue: boolean,
 ): void {
   switch (type) {
-    case ArgumentValueTypeName.BOOLEAN:
+    case ValueTypeName.BOOLEAN:
       if (typeof value !== "boolean") {
         throw new Error(
           `Specified ${
@@ -46,7 +43,7 @@ function validateValueType(
         );
       }
       break;
-    case ArgumentValueTypeName.NUMBER:
+    case ValueTypeName.NUMBER:
       if (typeof value !== "number" || !Number.isFinite(value)) {
         throw new Error(
           `Specified ${
@@ -55,7 +52,7 @@ function validateValueType(
         );
       }
       break;
-    case ArgumentValueTypeName.INTEGER:
+    case ValueTypeName.INTEGER:
       if (typeof value !== "number" || !Number.isInteger(value)) {
         throw new Error(
           `Specified ${
@@ -64,7 +61,7 @@ function validateValueType(
         );
       }
       break;
-    case ArgumentValueTypeName.STRING:
+    case ValueTypeName.STRING:
       if (typeof value !== "string") {
         throw new Error(
           `Specified ${
@@ -102,15 +99,15 @@ function isConfigurationKeyLegal(configurationKey: string): boolean {
 
 function validateArgument(argument: Argument, name: string): void {
   if (
-    argument.type !== ArgumentValueTypeName.NUMBER &&
-    argument.type !== ArgumentValueTypeName.INTEGER &&
-    argument.type !== ArgumentValueTypeName.STRING &&
-    argument.type !== ArgumentValueTypeName.BOOLEAN
+    argument.type !== ValueTypeName.NUMBER &&
+    argument.type !== ValueTypeName.INTEGER &&
+    argument.type !== ValueTypeName.STRING &&
+    argument.type !== ValueTypeName.BOOLEAN
   ) {
     throw new Error(`Illegal type: '${argument.type}' for argument: '${name}'`);
   }
   if (argument.allowableValues) {
-    if (argument.type === ArgumentValueTypeName.BOOLEAN) {
+    if (argument.type === ValueTypeName.BOOLEAN) {
       throw new Error(
         `Illegal type: '${argument.type}' for argument: '${name}' with allowable values specified`,
       );
@@ -120,21 +117,18 @@ function validateArgument(argument: Argument, name: string): void {
     });
   }
   if (argument.isCaseInsensitive !== undefined) {
-    if (argument.type === ArgumentValueTypeName.BOOLEAN && argument.isCaseInsensitive === false) {
+    if (argument.type === ValueTypeName.BOOLEAN && argument.isCaseInsensitive === false) {
       throw new Error(
         `Illegal type: '${argument.type}' for argument: '${name}' must always be case insensitive`,
       );
-    } else if (argument.type !== ArgumentValueTypeName.STRING) {
+    } else if (argument.type !== ValueTypeName.STRING) {
       throw new Error(
         `Illegal type: '${argument.type}' for argument: '${name}' with case insensitive specified`,
       );
     }
   }
   if (argument.minValueInclusive !== undefined) {
-    if (
-      argument.type !== ArgumentValueTypeName.NUMBER &&
-      argument.type !== ArgumentValueTypeName.INTEGER
-    ) {
+    if (argument.type !== ValueTypeName.NUMBER && argument.type !== ValueTypeName.INTEGER) {
       throw new Error(
         `Illegal type: '${argument.type}' for argument: '${name}' with min value specified`,
       );
@@ -147,10 +141,7 @@ function validateArgument(argument: Argument, name: string): void {
     validateValueType(argument.type, argument.minValueInclusive, name, false, true);
   }
   if (argument.maxValueInclusive !== undefined) {
-    if (
-      argument.type !== ArgumentValueTypeName.NUMBER &&
-      argument.type !== ArgumentValueTypeName.INTEGER
-    ) {
+    if (argument.type !== ValueTypeName.NUMBER && argument.type !== ValueTypeName.INTEGER) {
       throw new Error(
         `Illegal type: '${argument.type}' for argument: '${name}' with max value specified`,
       );