@flowscripter/dynamic-cli-framework 2.4.0 → 3.0.0

package/dist/src/runtime/values/subCommandValuePopulation.js

@@ -1,4 +1,4 @@
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
 import getLogger from "../../util/logger.js";
 import argumentValueMerge from "./argumentValueMerge.js";
 import { MAXIMUM_COMPLEX_OPTION_NESTING_DEPTH } from "@flowscripter/dynamic-cli-framework-api";
@@ -333,7 +333,8 @@ class ParseContext {
                 }
                 else {
                     // set the new value on the array
-                    optionValue[pathElement] = value;
+                    optionValue[pathElement] =
+                        value;
                 }
             } // otherwise continue to navigate the path
             else {
@@ -410,7 +411,7 @@ class ParseContext {
             // the potential arg as a following option arg or positional value
             if (potentialArg !== "true" &&
                 potentialArg !== "false" &&
-                this.currentOption.type === ArgumentValueTypeName.BOOLEAN) {
+                this.currentOption.type === ValueTypeName.BOOLEAN) {
                 // Set the value to implicit value of true and return ony error.
                 if (!this.setOptionValue("true")) {
                     return;
@@ -483,11 +484,11 @@ class ParseContext {
     }
 }
 /**
- * Populate {@link PopulatedArgumentValues} for the provided {@link SubCommand} using the provided potential args.
+ * Populate {@link PopulatedValues} for the provided {@link SubCommand} using the provided potential args.
  *
- * @param subCommand the {@link SubCommand} for which {@link PopulatedArgumentValues} values should be populated.
+ * @param subCommand the {@link SubCommand} for which {@link PopulatedValues} values should be populated.
  * @param potentialArgs the potential args to use for population.
- * @param defaultValues optional default {@link ArgumentValues} to use for population before parsing the provided arguments.
+ * @param defaultValues optional default {@link Values} to use for population before parsing the provided arguments.
  */
 export default function populateSubCommandValues(subCommand, potentialArgs, defaultValues) {
     logger.debug(() => {
@@ -519,7 +520,7 @@ export default function populateSubCommandValues(subCommand, potentialArgs, defa
     // Check if the last arg specified an option but no value
     if (parseContext.state === ParseState.OPTION_VALUE_EXPECTED) {
         // special case if the last arg was for a boolean option where the value was implicitly `true`
-        if (parseContext.currentOption.type === ArgumentValueTypeName.BOOLEAN) {
+        if (parseContext.currentOption.type === ValueTypeName.BOOLEAN) {
             parseContext.setOptionValue("true");
         }
         else {

package/dist/src/service/argumentPrompter/DefaultArgumentPrompterService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultArgumentPrompterService.d.ts","sourceRoot":"","sources":["../../../../src/service/argumentPrompter/DefaultArgumentPrompterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAuB/E,MAAM,CAAC,OAAO,OAAO,8BAA+B,YAAW,uBAAuB;;gBAGjE,eAAe,EAAE,eAAe;IAI7C,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAoQhF"}
+{"version":3,"file":"DefaultArgumentPrompterService.d.ts","sourceRoot":"","sources":["../../../../src/service/argumentPrompter/DefaultArgumentPrompterService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAuB/E,MAAM,CAAC,OAAO,OAAO,8BAA+B,YAAW,uBAAuB;;gBAGjE,eAAe,EAAE,eAAe;IAI7C,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAiQhF"}

package/dist/src/service/argumentPrompter/DefaultArgumentPrompterService.js

@@ -1,6 +1,6 @@
 import { PromptType, } from "@flowscripter/dynamic-cli-framework-api";
 import { InvalidArgumentReason } 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 { isGlobalCommand, isSubCommand } from "../../runtime/command/CommandTypeGuards.js";
 export default class DefaultArgumentPrompterService {
     #prompterService;
@@ -127,7 +127,7 @@ export default class DefaultArgumentPrompterService {
         return values;
     }
     static #argumentToPrompt(name, description, arg) {
-        if (arg.type === ArgumentValueTypeName.BOOLEAN) {
+        if (arg.type === ValueTypeName.BOOLEAN) {
             return {
                 name,
                 promptText: description,
@@ -148,7 +148,7 @@ export default class DefaultArgumentPrompterService {
             };
         }
         const validationOption = {
-            displayValue: arg.type === ArgumentValueTypeName.SECRET ? "__SECRET__" : name,
+            displayValue: arg.type === ValueTypeName.SECRET ? "__SECRET__" : name,
             returnedValue: "",
             min: arg.minValueInclusive,
             max: arg.maxValueInclusive,
@@ -164,11 +164,11 @@ export default class DefaultArgumentPrompterService {
     static #coerceValue(value, type) {
         if (typeof value === "string") {
             switch (type) {
-                case ArgumentValueTypeName.INTEGER:
+                case ValueTypeName.INTEGER:
                     return parseInt(value, 10);
-                case ArgumentValueTypeName.NUMBER:
+                case ValueTypeName.NUMBER:
                     return parseFloat(value);
-                case ArgumentValueTypeName.BOOLEAN:
+                case ValueTypeName.BOOLEAN:
                     return value.toLowerCase() === "true";
             }
         }

package/dist/src/service/banner/command/NoBannerCommand.d.ts

@@ -1,5 +1,5 @@
 import type { GlobalModifierCommand } 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 type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
 import type BannerServiceProvider from "../BannerServiceProvider.ts";
@@ -14,6 +14,6 @@ export default class NoBannerCommand implements GlobalModifierCommand {
     readonly argument: GlobalCommandArgument;
     readonly executePriority: number;
     constructor(bannerServiceProvider: BannerServiceProvider, executePriority: number);
-    execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void>;
+    execute(_context: Context, argumentValue: SingleValueType): Promise<void>;
 }
 //# sourceMappingURL=NoBannerCommand.d.ts.map

package/dist/src/service/banner/command/NoBannerCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoBannerCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/banner/command/NoBannerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,qBAAqB;;IACnE,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,8BAA8B;IAClD,QAAQ,CAAC,mBAAmB,QAAQ;IACpC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAItC;IACF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAId,qBAAqB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM;IAKjF,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAKzF"}
+{"version":3,"file":"NoBannerCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/banner/command/NoBannerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,yCAAyC,CAAC;AAC9F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,qBAAqB,MAAM,6BAA6B,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,qBAAqB;;IACnE,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,WAAW,8BAA8B;IAClD,QAAQ,CAAC,mBAAmB,QAAQ;IACpC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAItC;IACF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAId,qBAAqB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM;IAKjF,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAKjF"}

package/dist/src/service/banner/command/NoBannerCommand.js

@@ -1,4 +1,4 @@
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 /**
  * Command to disable banner output for the CLI application.
  */
@@ -7,7 +7,7 @@ export default class NoBannerCommand {
     description = "Disable output of banner";
     enableConfiguration = true;
     argument = {
-        type: ArgumentValueTypeName.BOOLEAN,
+        type: ValueTypeName.BOOLEAN,
         defaultValue: true,
         configurationKey: "NO_BANNER",
     };

package/dist/src/service/completion/command/CompletionCompleteSubCommand.d.ts

@@ -2,7 +2,7 @@ import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
 import type { Positional } 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";
 export declare class CompletionCompleteSubCommand implements SubCommand {
     readonly name = "complete";
     readonly description = "Generate completions for shell integration";
@@ -10,6 +10,6 @@ export declare class CompletionCompleteSubCommand implements SubCommand {
     readonly disableGenericHelpDisplay = true;
     readonly options: ReadonlyArray<Option>;
     readonly positionals: ReadonlyArray<Positional>;
-    execute(context: Context, argumentValues: ArgumentValues): Promise<void>;
+    execute(context: Context, argumentValues: Values): Promise<void>;
 }
 //# sourceMappingURL=CompletionCompleteSubCommand.d.ts.map

package/dist/src/service/completion/command/CompletionCompleteSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompletionCompleteSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionCompleteSubCommand.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,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yCAAyC,CAAC;AAMjD,qBAAa,4BAA6B,YAAW,UAAU;IAC7D,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,gDAAgD;IACpE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,yBAAyB,QAAQ;IAE1C,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAE7C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAc7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqB/E"}
+{"version":3,"file":"CompletionCompleteSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionCompleteSubCommand.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,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,4BAA6B,YAAW,UAAU;IAC7D,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,gDAAgD;IACpE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,yBAAyB,QAAQ;IAE1C,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAE7C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAc7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBvE"}

package/dist/src/service/completion/command/CompletionCompleteSubCommand.js

@@ -1,4 +1,4 @@
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { COMPLETION_SERVICE_ID, ShellType } from "@flowscripter/dynamic-cli-framework-api";
 import { PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 export class CompletionCompleteSubCommand {
@@ -10,13 +10,13 @@ export class CompletionCompleteSubCommand {
     positionals = [
         {
             name: "shell",
-            type: ArgumentValueTypeName.STRING,
+            type: ValueTypeName.STRING,
             allowableValues: Object.values(ShellType),
             description: "Shell type",
         },
         {
             name: "args",
-            type: ArgumentValueTypeName.STRING,
+            type: ValueTypeName.STRING,
             isVarargMultiple: true,
             isVarargOptional: true,
             description: "Shell-specific completion context arguments",

package/dist/src/service/completion/command/CompletionIntegrationSubCommand.d.ts

@@ -2,13 +2,13 @@ import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
 import type { Positional } 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";
 export declare class CompletionIntegrationSubCommand implements SubCommand {
     readonly name = "integration";
     readonly description = "Install shell completion integration";
     readonly enableConfiguration = false;
     readonly options: ReadonlyArray<Option>;
     readonly positionals: ReadonlyArray<Positional>;
-    execute(context: Context, argumentValues: ArgumentValues): Promise<void>;
+    execute(context: Context, argumentValues: Values): Promise<void>;
 }
 //# sourceMappingURL=CompletionIntegrationSubCommand.d.ts.map

package/dist/src/service/completion/command/CompletionIntegrationSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompletionIntegrationSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionIntegrationSubCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yCAAyC,CAAC;AAMjD,qBAAa,+BAAgC,YAAW,UAAU;IAChE,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,WAAW,0CAA0C;IAC9D,QAAQ,CAAC,mBAAmB,SAAS;IAErC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAOrC;IAEF,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAO7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA4D/E"}
+{"version":3,"file":"CompletionIntegrationSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/completion/command/CompletionIntegrationSubCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAMrF,qBAAa,+BAAgC,YAAW,UAAU;IAChE,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,WAAW,0CAA0C;IAC9D,QAAQ,CAAC,mBAAmB,SAAS;IAErC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAOrC;IAEF,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAO7C;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA4DvE"}

package/dist/src/service/completion/command/CompletionIntegrationSubCommand.js

@@ -1,5 +1,5 @@
 import process from "node:process";
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { COMPLETION_SERVICE_ID, ShellType } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 export class CompletionIntegrationSubCommand {
@@ -9,7 +9,7 @@ export class CompletionIntegrationSubCommand {
     options = [
         {
             name: "config-path",
-            type: ArgumentValueTypeName.STRING,
+            type: ValueTypeName.STRING,
             isOptional: true,
             description: "Path to shell configuration file",
         },
@@ -17,7 +17,7 @@ export class CompletionIntegrationSubCommand {
     positionals = [
         {
             name: "shell",
-            type: ArgumentValueTypeName.STRING,
+            type: ValueTypeName.STRING,
             allowableValues: Object.values(ShellType),
             description: "Shell type to configure",
         },

package/dist/src/service/configuration/ConfigurationServiceProvider.d.ts

@@ -1,5 +1,5 @@
 import type { ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
-import type { ArgumentSingleValueType, ArgumentValues, PopulatedArgumentValues, PopulatedArgumentValueType } from "@flowscripter/dynamic-cli-framework-api";
+import type { SingleValueType, Values, PopulatedValues, PopulatedValueType } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
@@ -11,16 +11,16 @@ import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
  *
  * **Default Command Arguments**
  *
- * Configuration of default {@link ArgumentValues} for {@link Command} instances is supported if they
+ * Configuration of default {@link Values} for {@link Command} instances is supported if they
  * have defined {@link Command.enableConfiguration} as `true`.
  *
  * Two sources of configuration are supported and both are expected to be manually managed by the user of the CLI.
  *
  * *Configuration File*
  *
- * A JSON file where the structure matches {@link ArgumentValues} and the defaults are stored
+ * A JSON file where the structure matches {@link Values} and the defaults are stored
  * under a top level `defaults` property. The second level of properties is used to refer to {@link Command.name}
- * and the contained values are treated as command {@link ArgumentValues}. As an example:
+ * and the contained values are treated as command {@link Values}. As an example:
  *
  * ```
  * {
@@ -143,7 +143,7 @@ export default class ConfigurationServiceProvider implements ServiceProvider {
     readonly keyValueServiceEnabled: boolean;
     readonly secretServiceEnabled: boolean;
     configLocation: string | undefined;
-    defaultsData: Map<string, ArgumentValues | ArgumentSingleValueType>;
+    defaultsData: Map<string, Values | SingleValueType>;
     /**
      * Create an instance of the service provider with the specified details.
      *
@@ -164,7 +164,7 @@ export default class ConfigurationServiceProvider implements ServiceProvider {
      * @param cliConfig the {@link CLIConfig} to use for retrieving configuration keys.
      * @param command the {@link Command} instance to retrieve default argument values for.
      */
-    getDefaultArgumentValues(cliConfig: CLIConfig, command: Command): Promise<PopulatedArgumentValues | PopulatedArgumentValueType | undefined>;
+    getDefaultArgumentValues(cliConfig: CLIConfig, command: Command): Promise<PopulatedValues | PopulatedValueType | undefined>;
     /**
      * Indicate that the contained {@link DefaultKeyValueService} should be set to have a scope of the provided
      * command name.

package/dist/src/service/configuration/ConfigurationServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/ConfigurationServiceProvider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE5F,OAAO,KAAK,EACV,uBAAuB,EACvB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAQvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAOvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAQzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkIG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAwB;IAClD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,aAAa,EAAE,OAAO,CAAC;IACvC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAGvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAKnC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,uBAAuB,CAAC,CAAa;IAmBvF;;;;;;;;OAQG;gBAED,eAAe,EAAE,MAAM,EACvB,cAAc,UAAQ,EACtB,aAAa,UAAQ,EACrB,sBAAsB,UAAQ,EAC9B,oBAAoB,UAAQ;IAevB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAqB1D,iBAAiB,CAAC,cAAc,EAAE,MAAM;IAI/C;;;;;;;OAOG;IACU,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,uBAAuB,GAAG,0BAA0B,GAAG,SAAS,CAAC;IAuE5E;;;;;;;OAOG;IACI,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IA6BzD;;;;;;;OAOG;IACI,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IA6BvD;;;;;OAKG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsGlD,eAAe,IAAI,MAAM;CAiCjC"}
+{"version":3,"file":"ConfigurationServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/configuration/ConfigurationServiceProvider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE5F,OAAO,KAAK,EACV,eAAe,EACf,MAAM,EACN,eAAe,EACf,kBAAkB,EACnB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAQvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAOvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAQzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkIG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAwB;IAClD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,aAAa,EAAE,OAAO,CAAC;IACvC,SAAgB,sBAAsB,EAAE,OAAO,CAAC;IAChD,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAGvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAKnC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAa;IAmBvE;;;;;;;;OAQG;gBAED,eAAe,EAAE,MAAM,EACvB,cAAc,UAAQ,EACtB,aAAa,UAAQ,EACrB,sBAAsB,UAAQ,EAC9B,oBAAoB,UAAQ;IAevB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAqB1D,iBAAiB,CAAC,cAAc,EAAE,MAAM;IAI/C;;;;;;;OAOG;IACU,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,eAAe,GAAG,kBAAkB,GAAG,SAAS,CAAC;IAuE5D;;;;;;;OAOG;IACI,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IA6BzD;;;;;;;OAOG;IACI,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IA6BvD;;;;;OAKG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsGlD,eAAe,IAAI,MAAM;CAiCjC"}

package/dist/src/service/configuration/ConfigurationServiceProvider.js

@@ -20,16 +20,16 @@ const logger = getLogger("ConfigurationServiceProvider");
  *
  * **Default Command Arguments**
  *
- * Configuration of default {@link ArgumentValues} for {@link Command} instances is supported if they
+ * Configuration of default {@link Values} for {@link Command} instances is supported if they
  * have defined {@link Command.enableConfiguration} as `true`.
  *
  * Two sources of configuration are supported and both are expected to be manually managed by the user of the CLI.
  *
  * *Configuration File*
  *
- * A JSON file where the structure matches {@link ArgumentValues} and the defaults are stored
+ * A JSON file where the structure matches {@link Values} and the defaults are stored
  * under a top level `defaults` property. The second level of properties is used to refer to {@link Command.name}
- * and the contained values are treated as command {@link ArgumentValues}. As an example:
+ * and the contained values are treated as command {@link Values}. As an example:
  *
  * ```
  * {
@@ -153,7 +153,7 @@ export default class ConfigurationServiceProvider {
     // the location of the currently managed configuration data
     configLocation;
     // the configuration data to be used by the CLI runner implementation when setting command defaults.
-    // ArgumentSingleValueType is for GlobalCommandArgument values, ArgumentValues is for
+    // SingleValueType is for GlobalCommandArgument values, Values is for
     // SubCommandArgument values.
     defaultsData = new Map();
     // the configuration data to be used by the CLI runner implementation

package/dist/src/service/configuration/command/ConfigCommand.d.ts

@@ -1,6 +1,6 @@
 import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } 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 type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type ConfigurationServiceProvider from "../ConfigurationServiceProvider.ts";
 /**
@@ -14,6 +14,6 @@ export default class ConfigCommand implements GlobalModifierCommand {
     readonly argument: GlobalCommandArgument;
     readonly executePriority: number;
     constructor(configurationServiceProvider: ConfigurationServiceProvider, executePriority: number);
-    execute(_context: Context, argumentValue: ArgumentSingleValueType): Promise<void>;
+    execute(_context: Context, argumentValue: SingleValueType): Promise<void>;
 }
 //# sourceMappingURL=ConfigCommand.d.ts.map

package/dist/src/service/configuration/command/ConfigCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/configuration/command/ConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,4BAA4B,MAAM,oCAAoC,CAAC;AAEnF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,qBAAqB;;IACjE,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,yCAAyC;IAC7D,QAAQ,CAAC,mBAAmB,QAAQ;IACpC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAGtC;IACF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAK/B,4BAA4B,EAAE,4BAA4B,EAC1D,eAAe,EAAE,MAAM;IAMlB,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAOzF"}
+{"version":3,"file":"ConfigCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/configuration/command/ConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,yCAAyC,CAAC;AAC9F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,4BAA4B,MAAM,oCAAoC,CAAC;AAEnF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,YAAW,qBAAqB;;IACjE,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,WAAW,yCAAyC;IAC7D,QAAQ,CAAC,mBAAmB,QAAQ;IACpC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAGtC;IACF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAK/B,4BAA4B,EAAE,4BAA4B,EAC1D,eAAe,EAAE,MAAM;IAMlB,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjF"}

package/dist/src/service/configuration/command/ConfigCommand.js

@@ -1,4 +1,4 @@
-import { ArgumentValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 /**
  * Command allowing the specification of the configuration file location used by the {@link ConfigurationServiceProvider}.
  */
@@ -7,7 +7,7 @@ export default class ConfigCommand {
     description = "Set the configuration file location";
     enableConfiguration = true;
     argument = {
-        type: ArgumentValueTypeName.STRING,
+        type: ValueTypeName.STRING,
         configurationKey: "CONFIG",
     };
     executePriority;

package/dist/src/service/fetch/DefaultFetchService.d.ts

@@ -0,0 +1,7 @@
+import type { FetchOptions, FetchService, ShutdownService } from "@flowscripter/dynamic-cli-framework-api";
+export default class DefaultFetchService implements FetchService {
+    #private;
+    setDependencies(shutdownService: ShutdownService): void;
+    fetch(input: string | URL, options?: FetchOptions): Promise<Response>;
+}
+//# sourceMappingURL=DefaultFetchService.d.ts.map

package/dist/src/service/fetch/DefaultFetchService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DefaultFetchService.d.ts","sourceRoot":"","sources":["../../../../src/service/fetch/DefaultFetchService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EAChB,MAAM,yCAAyC,CAAC;AAKjD,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,YAAY;;IAGvD,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IAIjD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC;CAsCvF"}

package/dist/src/service/fetch/DefaultFetchService.js

@@ -0,0 +1,44 @@
+import getLogger from "../../util/logger.js";
+const logger = getLogger("DefaultFetchService");
+export default class DefaultFetchService {
+    #shutdownService;
+    setDependencies(shutdownService) {
+        this.#shutdownService = shutdownService;
+    }
+    async fetch(input, options = {}) {
+        if (this.#shutdownService === undefined) {
+            throw new Error("DefaultFetchService.fetch() called before setDependencies()");
+        }
+        const shutdownService = this.#shutdownService;
+        const { timeoutMs, longRunning = false, signal: callerSignal, ...requestInit } = options;
+        const controller = new AbortController();
+        const signals = [controller.signal];
+        if (callerSignal) {
+            signals.push(callerSignal);
+        }
+        if (timeoutMs !== undefined) {
+            signals.push(AbortSignal.timeout(timeoutMs));
+        }
+        const signal = signals.length === 1 ? signals[0] : AbortSignal.any(signals);
+        let settled = false;
+        if (longRunning) {
+            shutdownService.enterLongRunningMode();
+            shutdownService.addShutdownListener(async () => {
+                if (settled) {
+                    return;
+                }
+                logger.debug(() => `Aborting fetch of '${input.toString()}' due to shutdown`);
+                controller.abort();
+            });
+        }
+        try {
+            return await fetch(input, { ...requestInit, signal });
+        }
+        finally {
+            settled = true;
+            if (longRunning) {
+                shutdownService.leaveLongRunningMode();
+            }
+        }
+    }
+}

package/dist/src/service/fetch/FetchServiceProvider.d.ts

@@ -0,0 +1,10 @@
+import type { CLIConfig, Context, ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
+export default class FetchServiceProvider implements ServiceProvider {
+    #private;
+    readonly serviceId: string;
+    readonly servicePriority: number;
+    constructor(servicePriority: number);
+    getServiceInfo(_cliConfig: CLIConfig): Promise<ServiceInfo>;
+    initService(context: Context): Promise<void>;
+}
+//# sourceMappingURL=FetchServiceProvider.d.ts.map

package/dist/src/service/fetch/FetchServiceProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FetchServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/fetch/FetchServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EACP,WAAW,EACX,eAAe,EAEhB,MAAM,yCAAyC,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,eAAe;;IAClE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAoB;IAC9C,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAGd,eAAe,EAAE,MAAM;IAInC,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAQ3D,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAKpD"}

package/dist/src/service/fetch/FetchServiceProvider.js

@@ -0,0 +1,22 @@
+import { FETCH_SERVICE_ID, SHUTDOWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import DefaultFetchService from "./DefaultFetchService.js";
+export default class FetchServiceProvider {
+    serviceId = FETCH_SERVICE_ID;
+    servicePriority;
+    #fetchService;
+    constructor(servicePriority) {
+        this.servicePriority = servicePriority;
+    }
+    getServiceInfo(_cliConfig) {
+        this.#fetchService = new DefaultFetchService();
+        return Promise.resolve({
+            service: this.#fetchService,
+            commands: [],
+        });
+    }
+    initService(context) {
+        const shutdownService = context.getServiceById(SHUTDOWN_SERVICE_ID);
+        this.#fetchService.setDependencies(shutdownService);
+        return Promise.resolve();
+    }
+}

package/dist/src/service/plugin/DefaultPluginServiceProvider.d.ts

@@ -3,11 +3,12 @@ import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
 import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
 import { type SpawnInterfaceAdapterOptions } from "./SpawnInterfaceAdapter.ts";
+import { type FetchInterfaceAdapterOptions } from "./FetchInterfaceAdapter.ts";
 export default class DefaultPluginServiceProvider implements ServiceProvider {
     #private;
     readonly serviceId = "PLUGIN_SERVICE";
     readonly servicePriority: number;
-    constructor(pluginManager: MarketplacePluginManager, servicePriority?: number, spawnInterfaceAdapterOptions?: SpawnInterfaceAdapterOptions);
+    constructor(pluginManager: MarketplacePluginManager, servicePriority?: number, spawnInterfaceAdapterOptions?: SpawnInterfaceAdapterOptions, fetchInterfaceAdapterOptions?: FetchInterfaceAdapterOptions);
     getServiceInfo(_cliConfig: CLIConfig): Promise<ServiceInfo>;
     initService(context: Context): Promise<void>;
 }

package/dist/src/service/plugin/DefaultPluginServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultPluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AAKpC,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAM/B,aAAa,EAAE,wBAAwB,EACvC,eAAe,SAAK,EACpB,4BAA4B,GAAE,4BAAiC;IAO3D,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAQjE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB7C"}
+{"version":3,"file":"DefaultPluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAKzE,OAAO,KAAK,EAEV,wBAAwB,EAEzB,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AAKpC,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAO/B,aAAa,EAAE,wBAAwB,EACvC,eAAe,SAAK,EACpB,4BAA4B,GAAE,4BAAiC,EAC/D,4BAA4B,GAAE,4BAAiC;IAQ3D,cAAc,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAQjE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA4B7C"}

package/dist/src/service/plugin/DefaultPluginServiceProvider.js

@@ -1,8 +1,10 @@
 import { PRINTER_SERVICE_ID, SPAWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { FETCH_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultPluginService from "./DefaultPluginService.js";
 import { PluginGroupCommand } from "./command/PluginGroupCommand.js";
 import SpawnInterfaceAdapter, {} from "./SpawnInterfaceAdapter.js";
+import FetchInterfaceAdapter, {} from "./FetchInterfaceAdapter.js";
 import getLogger from "../../util/logger.js";
 const logger = getLogger("DefaultPluginServiceProvider");
 export default class DefaultPluginServiceProvider {
@@ -10,11 +12,13 @@ export default class DefaultPluginServiceProvider {
     servicePriority;
     #pluginManager;
     #spawnInterfaceAdapterOptions;
+    #fetchInterfaceAdapterOptions;
     #pluginService;
-    constructor(pluginManager, servicePriority = 50, spawnInterfaceAdapterOptions = {}) {
+    constructor(pluginManager, servicePriority = 50, spawnInterfaceAdapterOptions = {}, fetchInterfaceAdapterOptions = {}) {
         this.#pluginManager = pluginManager;
         this.servicePriority = servicePriority;
         this.#spawnInterfaceAdapterOptions = spawnInterfaceAdapterOptions;
+        this.#fetchInterfaceAdapterOptions = fetchInterfaceAdapterOptions;
     }
     async getServiceInfo(_cliConfig) {
         this.#pluginService = new DefaultPluginService(this.#pluginManager);
@@ -26,16 +30,27 @@ export default class DefaultPluginServiceProvider {
     initService(context) {
         if (!context.doesServiceExist(SPAWN_SERVICE_ID)) {
             logger.debug("SpawnService not available, plugin manager will spawn processes directly");
-            return Promise.resolve();
         }
-        if (!("setSpawn" in this.#pluginManager)) {
+        else if (!("setSpawn" in this.#pluginManager)) {
             logger.debug("Plugin manager does not support SpawnCapable, skipping spawn injection");
-            return Promise.resolve();
         }
-        const spawnService = context.getServiceById(SPAWN_SERVICE_ID);
-        const printerService = context.getServiceById(PRINTER_SERVICE_ID);
-        const adapter = new SpawnInterfaceAdapter(spawnService, printerService, this.#spawnInterfaceAdapterOptions);
-        this.#pluginManager.setSpawn(adapter);
+        else {
+            const spawnService = context.getServiceById(SPAWN_SERVICE_ID);
+            const printerService = context.getServiceById(PRINTER_SERVICE_ID);
+            const adapter = new SpawnInterfaceAdapter(spawnService, printerService, this.#spawnInterfaceAdapterOptions);
+            this.#pluginManager.setSpawn(adapter);
+        }
+        if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
+            logger.debug("FetchService not available, plugin manager will fetch directly");
+        }
+        else if (!("setFetch" in this.#pluginManager)) {
+            logger.debug("Plugin manager does not support FetchCapable, skipping fetch injection");
+        }
+        else {
+            const fetchService = context.getServiceById(FETCH_SERVICE_ID);
+            const adapter = new FetchInterfaceAdapter(fetchService, this.#fetchInterfaceAdapterOptions);
+            this.#pluginManager.setFetch(adapter);
+        }
         return Promise.resolve();
     }
 }

package/dist/src/service/plugin/FetchInterfaceAdapter.d.ts

@@ -0,0 +1,17 @@
+import type { FetchService } from "@flowscripter/dynamic-cli-framework-api";
+import type { FetchInterface } from "@flowscripter/dynamic-plugin-framework";
+export interface FetchInterfaceAdapterOptions {
+    timeoutMs?: number;
+}
+/**
+ * Adapts a {@link FetchService} to dynamic-plugin-framework's {@link FetchInterface}, so plugin
+ * manager/repository fetches respect the host CLI's shutdown handling and default timeout.
+ */
+export default class FetchInterfaceAdapter implements FetchInterface {
+    #private;
+    constructor(fetchService: FetchService, options?: FetchInterfaceAdapterOptions);
+    fetch(input: string, init?: RequestInit & {
+        timeoutMs?: number;
+    }): Promise<Response>;
+}
+//# sourceMappingURL=FetchInterfaceAdapter.d.ts.map

package/dist/src/service/plugin/FetchInterfaceAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FetchInterfaceAdapter.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/FetchInterfaceAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAE7E,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAI/C,YAAY,EAAE,YAAY,EAAE,OAAO,GAAE,4BAAiC;IAK5E,KAAK,CAChB,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1C,OAAO,CAAC,QAAQ,CAAC;CAIrB"}

package/dist/src/service/plugin/FetchInterfaceAdapter.js

@@ -0,0 +1,16 @@
+/**
+ * Adapts a {@link FetchService} to dynamic-plugin-framework's {@link FetchInterface}, so plugin
+ * manager/repository fetches respect the host CLI's shutdown handling and default timeout.
+ */
+export default class FetchInterfaceAdapter {
+    #fetchService;
+    #timeoutMs;
+    constructor(fetchService, options = {}) {
+        this.#fetchService = fetchService;
+        this.#timeoutMs = options.timeoutMs;
+    }
+    async fetch(input, init) {
+        const { timeoutMs = this.#timeoutMs, ...requestInit } = init ?? {};
+        return this.#fetchService.fetch(input, { ...requestInit, timeoutMs });
+    }
+}

package/dist/src/service/plugin/SpawnInterfaceAdapter.js

@@ -26,7 +26,7 @@ export default class SpawnInterfaceAdapter {
         };
         const result = await this.#spawnService.spawn(command, {
             cwd: options.cwd,
-            stdio: "wrapped",
+            mode: "wrapped",
             onOutput,
         });
         await writeQueue;

package/dist/src/service/plugin/command/PluginAddSubCommand.d.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";
 export declare class PluginAddSubCommand implements SubCommand {
     readonly name = "add";
     readonly description = "Install a remote plugin";
@@ -10,8 +10,8 @@ export declare class PluginAddSubCommand implements SubCommand {
     readonly positionals: {
         name: string;
         description: string;
-        type: ArgumentValueTypeName;
+        type: ValueTypeName;
     }[];
-    execute(context: Context, argumentValues: ArgumentValues): Promise<void>;
+    execute(context: Context, argumentValues: Values): Promise<void>;
 }
 //# sourceMappingURL=PluginAddSubCommand.d.ts.map

package/dist/src/service/plugin/command/PluginAddSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAQhF,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuC/E"}
+{"version":3,"file":"PluginAddSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/PluginAddSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAQxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCvE"}