@flowscripter/dynamic-cli-framework 9.1.3 → 10.0.0

package/dist/src/command/MultiCommandCliHelpCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiCommandCliHelpCommand.d.ts","sourceRoot":"","sources":["../../../src/command/MultiCommandCliHelpCommand.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,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAYvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAM/E;;GAEG;AACH,uBAAe,kCAAkC;;IAC/C,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,8BAA8B;IAIlD,YAAY,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAGpE;IA8HD,UAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ChE;IAED,UAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFnF;CACF;AAED;;GAEG;AACH,qBAAa,gCACX,SAAQ,kCACR,YAAW,aAAa;IAExB,QAAQ,CAAC,UAAU,OAAO;IAE1B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAOrF;CACF;AAED;;GAEG;AACH,qBAAa,6BACX,SAAQ,kCACR,YAAW,UAAU;IAErB,SAAgB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAEpD,SAAgB,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAOpD;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5E;CACF"}
+{"version":3,"file":"MultiCommandCliHelpCommand.d.ts","sourceRoot":"","sources":["../../../src/command/MultiCommandCliHelpCommand.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,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAYvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAM/E;;GAEG;AACH,uBAAe,kCAAkC;;IAC/C,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,WAAW,8BAA8B;IAIlD,YAAY,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAGpE;IA8HD,UAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ChE;IAED,UAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyFnF;CACF;AAED;;GAEG;AACH,qBAAa,gCACX,SAAQ,kCACR,YAAW,aAAa;IAExB,QAAQ,CAAC,UAAU,OAAO;IAE1B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAOrF;CACF;AAED;;GAEG;AACH,qBAAa,6BACX,SAAQ,kCACR,YAAW,UAAU;IAErB,SAAgB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAM;IAEpD,SAAgB,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAOpD;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO5E;CACF"}

package/dist/src/command/MultiCommandCliHelpCommand.js

@@ -188,7 +188,7 @@ class MultiCommandCliAbstractHelpCommand {
                 },
             ],
         });
-        helpSections.push(...getCommandArgsHelpSections(context.cliConfig, this.#includeEnvVars, subCommand, false));
+        helpSections.push(...getCommandArgsHelpSections(context.cliConfig, this.#includeEnvVars, subCommand, false, groupCommand));
         helpSections.push(...getCommandExamplesHelpSections(printerService, context, subCommand));
         await printHelpSections(printerService, tableGeneratorService, helpSections);
     }

package/dist/src/runtime/command/CommandValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandValidator.d.ts","sourceRoot":"","sources":["../../../../src/runtime/command/CommandValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAiBvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAmJzE,MAAM,CAAC,OAAO,OAAO,gBAAgB;;IAInC,YAAmB,SAAS,EAAE,SAAS,EAEtC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAUtC;CAgWF"}
+{"version":3,"file":"CommandValidator.d.ts","sourceRoot":"","sources":["../../../../src/runtime/command/CommandValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAiBvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAmJzE,MAAM,CAAC,OAAO,OAAO,gBAAgB;;IAKnC,YAAmB,SAAS,EAAE,SAAS,EAEtC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAUtC;CAsWF"}

package/dist/src/runtime/command/CommandValidator.js

@@ -97,6 +97,7 @@ function validateSubCommandArgument(subCommandArgument) {
 export default class CommandValidator {
     #cliConfig;
     #configurationKeys = [];
+    #currentGroupCommand;
     constructor(cliConfig) {
         this.#cliConfig = cliConfig;
     }
@@ -184,7 +185,13 @@ export default class CommandValidator {
                 throw new Error(`Group command: '${groupCommand.name}' contains member sub-command with the same name`);
             }
             subCommandNames.push(subCommand.name);
-            this.#validateSubCommand(subCommand);
+            this.#currentGroupCommand = groupCommand;
+            try {
+                this.#validateSubCommand(subCommand);
+            }
+            finally {
+                this.#currentGroupCommand = undefined;
+            }
         });
     }
     /**
@@ -254,7 +261,7 @@ export default class CommandValidator {
                 !isConfigurationKeyLegal(argument.configurationKey)) {
                 throw new Error(`Illegal configuration key: '${argument.configurationKey}'`);
             }
-            const configurationKey = getSubCommandArgumentConfigurationKey(this.#cliConfig, command, argumentAncestry);
+            const configurationKey = getSubCommandArgumentConfigurationKey(this.#cliConfig, command, argumentAncestry, this.#currentGroupCommand);
             if (configurationKey !== undefined) {
                 if (this.#configurationKeys.includes(configurationKey)) {
                     throw new Error(`Command: '${command.name}' contains arguments with the same configuration key: '${configurationKey}'`);

package/dist/src/runtime/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAiB/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEvF,OAAO,KAAK,4BAA4B,MAAM,0DAA0D,CAAC;AACzG,OAAO,KAAK,uBAAuB,MAAM,qDAAqD,CAAC;AAK/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAKvE,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAMhF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAkfzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EG;AACH,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,eAAe,EAAE,eAAe,EAChC,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,GAAG,SAAS,EACtE,uBAAuB,EAAE,uBAAuB,GAAG,SAAS,EAC5D,OAAO,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,OAAO,EACxB,cAAc,CAAC,EAAE,qBAAqB,GACrC,OAAO,CAAC,YAAY,CAAC,CAkKvB"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAiB/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEvF,OAAO,KAAK,4BAA4B,MAAM,0DAA0D,CAAC;AACzG,OAAO,KAAK,uBAAuB,MAAM,qDAAqD,CAAC;AAK/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAKvE,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAMhF;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAmfzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EG;AACH,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,EAC3B,eAAe,EAAE,eAAe,EAChC,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,GAAG,SAAS,EACtE,uBAAuB,EAAE,uBAAuB,GAAG,SAAS,EAC5D,OAAO,EAAE,OAAO,EAChB,cAAc,CAAC,EAAE,OAAO,EACxB,cAAc,CAAC,EAAE,qBAAqB,GACrC,OAAO,CAAC,YAAY,CAAC,CAkKvB"}

package/dist/src/runtime/runner.js

@@ -186,7 +186,7 @@ async function findAndExecuteNonModifierCommand(availableArgs, unusedArgs, nonMo
     unusedArgs.push(...scanResult.unusedArgSequences);
     if (scanResult.nonModifierCommandClause) {
         const defaultArgumentValues = configurationServiceProvider
-            ? await configurationServiceProvider.getDefaultArgumentValues(context.cliConfig, scanResult.nonModifierCommandClause.command)
+            ? await configurationServiceProvider.getDefaultArgumentValues(context.cliConfig, scanResult.nonModifierCommandClause.command, scanResult.nonModifierCommandClause.groupCommand)
             : undefined;
         if (isGlobalCommand(scanResult.nonModifierCommandClause.command)) {
             parseResult = parseGlobalCommandClause(scanResult.nonModifierCommandClause, defaultArgumentValues);

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

@@ -1,6 +1,7 @@
 import type { ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
 import type { SingleValueType, Values, ValueNode, PopulatedValues, PopulatedValueType } from "@flowscripter/dynamic-cli-framework-api";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
 export type KeyValueServiceScopeType = "command" | "service";
@@ -27,7 +28,8 @@ export type KeyValueServiceScopeType = "command" | "service";
  *
  * 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 Values}. As an example:
+ * (or `<group name>:<member name>` for a member of a {@link GroupCommand}) and the contained values are treated as
+ * command {@link Values}. As an example:
  *
  * ```
  * {
@@ -44,6 +46,9 @@ export type KeyValueServiceScopeType = "command" | "service";
  *         "command2": {
  *             "arg4": true
  *         },
+ *         "group1:member1": {
+ *             "arg5": "bar"
+ *         },
  *         "globalCommand": "globalArgumentValue"
  *     },
  *     "key-values": {
@@ -74,13 +79,15 @@ export type KeyValueServiceScopeType = "command" | "service";
  * Argument configuration keys are concatenated with a `_` separator.
  * Any arguments which support array values must by suffixed with `_` and an explicit array index.
  * If the root argument in the path does not use a custom {@link Argument.configurationKey} then the key path
- * is additionally suffixed with the {@link CLIConfig.name} and the {@link Command.name} with `_` separators.
+ * is additionally prefixed with the {@link CLIConfig.name}, the {@link GroupCommand.name} (if the command is a group
+ * member) and the {@link Command.name} with `_` separators.
  * This is best explained with examples...
  *
  * No custom configuration key examples:
  *
  * * executable: `MyCLI`, command: `globalCommand1`, global command argument => environment variable: `MYCLI_GLOBALCOMMAND1`
  * * executable: `MyCLI`, command: `command1`, simple root argument: `arg1` => environment variable: `MYCLI_COMMAND1_ARG1`
+ * * executable: `MyCLI`, group: `group1`, member command: `member1`, simple root argument: `arg1` => environment variable: `MYCLI_GROUP1_MEMBER1_ARG1`
  * * executable: `MyCLI`, command: `command1`, array root argument, 1st element: `arg2[0]` => environment variable: `MYCLI_COMMAND1_ARG2_0`
  * * executable: `MyCLI`, command: `command1`, argument is a digit so it is by default suffixed with `_`: `3` => environment variable: `MYCLI_COMMAND1__3`
  * * executable: `MyCLI`, command: `command1`, nested sub-argument: `arg1.arg2` => environment variable: `MYCLI_COMMAND1_ARG1_ARG2`
@@ -127,8 +134,10 @@ 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.
+     * @param groupCommand the {@link GroupCommand} if the command is a group member. The configuration file key
+     * is then `<group name>:<command name>` and the env var names include the group name.
      */
-    getDefaultArgumentValues(cliConfig: CLIConfig, command: Command): Promise<PopulatedValues | PopulatedValueType | undefined>;
+    getDefaultArgumentValues(cliConfig: CLIConfig, command: Command, groupCommand?: GroupCommand): Promise<PopulatedValues | PopulatedValueType | undefined>;
     /**
      * Get-or-create the underlying, raw {@link ValueNode} `Map` for the given scope - for
      * {@link KeyValueServiceProvider}'s exclusive use, via its direct reference to this provider.

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,eAAe,EACf,MAAM,EACN,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AASvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAOvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAQzE,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,SAAS,CAAC;AAkB7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8FG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAA4B;IACtD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,aAAa,EAAE,OAAO,CAAC;IACvC,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAGvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAKnC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAa;IAqBvE;;;;;;;;OAQG;IACH,YACE,eAAe,EAAE,MAAM,EACvB,cAAc,UAAQ,EACtB,aAAa,UAAQ,EACrB,oBAAoB,UAAQ,EAW7B;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAehE;IAEM,iBAAiB,CAAC,cAAc,EAAE,MAAM,QAE9C;IAED;;;;;;;OAOG;IACU,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,eAAe,GAAG,kBAAkB,GAAG,SAAS,CAAC,CAoD3D;IAED;;;;;;OAMG;IACI,eAAe,CACpB,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAOxB;IAED;;;;;;OAMG;IACU,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzD;IAEY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CxD;IA4DM,eAAe,IAAI,MAAM,CAgC/B;CACF"}
+{"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,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAS5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAOvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAQzE,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,SAAS,CAAC;AAkB7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoGG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,YAAW,eAAe;;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAA4B;IACtD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,aAAa,EAAE,OAAO,CAAC;IACvC,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAGvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAKnC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAa;IAqBvE;;;;;;;;OAQG;IACH,YACE,eAAe,EAAE,MAAM,EACvB,cAAc,UAAQ,EACtB,aAAa,UAAQ,EACrB,oBAAoB,UAAQ,EAW7B;IAEM,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAehE;IAEM,iBAAiB,CAAC,cAAc,EAAE,MAAM,QAE9C;IAED;;;;;;;;;OASG;IACU,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,GAAG,kBAAkB,GAAG,SAAS,CAAC,CAsD3D;IAED;;;;;;OAMG;IACI,eAAe,CACpB,SAAS,EAAE,wBAAwB,EACnC,QAAQ,EAAE,MAAM,GACf,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAOxB;IAED;;;;;;OAMG;IACU,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzD;IAEY,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CxD;IA4DM,eAAe,IAAI,MAAM,CAgC/B;CACF"}

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

@@ -47,7 +47,8 @@ class ConfigurationServiceImpl {
  *
  * 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 Values}. As an example:
+ * (or `<group name>:<member name>` for a member of a {@link GroupCommand}) and the contained values are treated as
+ * command {@link Values}. As an example:
  *
  * ```
  * {
@@ -64,6 +65,9 @@ class ConfigurationServiceImpl {
  *         "command2": {
  *             "arg4": true
  *         },
+ *         "group1:member1": {
+ *             "arg5": "bar"
+ *         },
  *         "globalCommand": "globalArgumentValue"
  *     },
  *     "key-values": {
@@ -94,13 +98,15 @@ class ConfigurationServiceImpl {
  * Argument configuration keys are concatenated with a `_` separator.
  * Any arguments which support array values must by suffixed with `_` and an explicit array index.
  * If the root argument in the path does not use a custom {@link Argument.configurationKey} then the key path
- * is additionally suffixed with the {@link CLIConfig.name} and the {@link Command.name} with `_` separators.
+ * is additionally prefixed with the {@link CLIConfig.name}, the {@link GroupCommand.name} (if the command is a group
+ * member) and the {@link Command.name} with `_` separators.
  * This is best explained with examples...
  *
  * No custom configuration key examples:
  *
  * * executable: `MyCLI`, command: `globalCommand1`, global command argument => environment variable: `MYCLI_GLOBALCOMMAND1`
  * * executable: `MyCLI`, command: `command1`, simple root argument: `arg1` => environment variable: `MYCLI_COMMAND1_ARG1`
+ * * executable: `MyCLI`, group: `group1`, member command: `member1`, simple root argument: `arg1` => environment variable: `MYCLI_GROUP1_MEMBER1_ARG1`
  * * executable: `MyCLI`, command: `command1`, array root argument, 1st element: `arg2[0]` => environment variable: `MYCLI_COMMAND1_ARG2_0`
  * * executable: `MyCLI`, command: `command1`, argument is a digit so it is by default suffixed with `_`: `3` => environment variable: `MYCLI_COMMAND1__3`
  * * executable: `MyCLI`, command: `command1`, nested sub-argument: `arg1.arg2` => environment variable: `MYCLI_COMMAND1_ARG1_ARG2`
@@ -191,20 +197,23 @@ export default class ConfigurationServiceProvider {
      *
      * @param cliConfig the {@link CLIConfig} to use for retrieving configuration keys.
      * @param command the {@link Command} instance to retrieve default argument values for.
+     * @param groupCommand the {@link GroupCommand} if the command is a group member. The configuration file key
+     * is then `<group name>:<command name>` and the env var names include the group name.
      */
-    async getDefaultArgumentValues(cliConfig, command) {
+    async getDefaultArgumentValues(cliConfig, command, groupCommand) {
         if (!this.configEnabled) {
             logger.debug("configuration of default values is not enabled");
             return undefined;
         }
-        logger.debug("getting default argument values for command: %s", command.name);
+        const commandKey = groupCommand ? `${groupCommand.name}:${command.name}` : command.name;
+        logger.debug("getting default argument values for command: %s", commandKey);
         if (command.enableConfiguration === undefined || command.enableConfiguration !== true) {
             logger.debug("enableConfiguration for command: %s is not true", command.name);
             return undefined;
         }
         let result;
         if (isGlobalModifierCommand(command) || isGlobalCommand(command)) {
-            const configuredValue = this.defaultsData.get(command.name);
+            const configuredValue = this.defaultsData.get(commandKey);
             const envVarValue = this.envVarsEnabled
                 ? getGlobalCommandValueFromEnvVars(cliConfig, command)
                 : undefined;
@@ -212,9 +221,9 @@ export default class ConfigurationServiceProvider {
             result = envVarValue !== undefined ? envVarValue : configuredValue;
         }
         else if (isSubCommand(command)) {
-            const configuredValues = this.defaultsData.get(command.name);
+            const configuredValues = this.defaultsData.get(commandKey);
             const envVarValues = this.envVarsEnabled
-                ? getSubCommandValuesFromEnvVars(cliConfig, command)
+                ? getSubCommandValuesFromEnvVars(cliConfig, command, groupCommand)
                 : undefined;
             if (envVarValues === undefined) {
                 result = configuredValues;

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

@@ -1,3 +1,4 @@
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
 import type { SubCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
@@ -9,8 +10,10 @@ import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-
  * @param command the {@link Command} to use for determining the default configuration key.
  * @param argumentAncestry a list of {@link SubCommandArgument} instances from the root command arguments to a leaf argument.
  * Apart from {@link ComplexOption} instances this will always only have a single entry.
+ * @param groupCommand the {@link GroupCommand} if the command is a member of a group, in which case the group name
+ * is an additional key segment.
  */
-export declare function getSubCommandArgumentConfigurationKey(cliConfig: CLIConfig, command: Command, argumentAncestry: Array<SubCommandArgument>): string | undefined;
+export declare function getSubCommandArgumentConfigurationKey(cliConfig: CLIConfig, command: Command, argumentAncestry: Array<SubCommandArgument>, groupCommand?: GroupCommand): string | undefined;
 /**
  * Determine the configuration key for the specified {@link GlobalCommandArgument}.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"configHelper.d.ts","sourceRoot":"","sources":["../../../src/util/configHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAgBrF;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,CAAC,GAC1C,MAAM,GAAG,SAAS,CA2BpB;AAED;;;;;;GAMG;AACH,wBAAgB,wCAAwC,CACtD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,GAC3C,MAAM,GAAG,SAAS,CAcpB"}
+{"version":3,"file":"configHelper.d.ts","sourceRoot":"","sources":["../../../src/util/configHelper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAgBrF;;;;;;;;;GASG;AACH,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,CAAC,EAC3C,YAAY,CAAC,EAAE,YAAY,GAC1B,MAAM,GAAG,SAAS,CA8BpB;AAED;;;;;;GAMG;AACH,wBAAgB,wCAAwC,CACtD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,GAC3C,MAAM,GAAG,SAAS,CAcpB"}

package/dist/src/util/configHelper.js

@@ -18,8 +18,10 @@ function getKeySegment(segment, isCustom = false, isArray = false) {
  * @param command the {@link Command} to use for determining the default configuration key.
  * @param argumentAncestry a list of {@link SubCommandArgument} instances from the root command arguments to a leaf argument.
  * Apart from {@link ComplexOption} instances this will always only have a single entry.
+ * @param groupCommand the {@link GroupCommand} if the command is a member of a group, in which case the group name
+ * is an additional key segment.
  */
-export function getSubCommandArgumentConfigurationKey(cliConfig, command, argumentAncestry) {
+export function getSubCommandArgumentConfigurationKey(cliConfig, command, argumentAncestry, groupCommand) {
     if (command.enableConfiguration === undefined || command.enableConfiguration !== true) {
         return undefined;
     }
@@ -30,6 +32,9 @@ export function getSubCommandArgumentConfigurationKey(cliConfig, command, argume
     const firstArgument = argumentAncestry[0];
     if (firstArgument.configurationKey === undefined) {
         keySegments.push(getKeySegment(cliConfig.name));
+        if (groupCommand) {
+            keySegments.push(getKeySegment(groupCommand.name));
+        }
         keySegments.push(getKeySegment(command.name));
     }
     argumentAncestry.forEach((argument) => {

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

@@ -1,6 +1,7 @@
 import type { CLIConfig } 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 { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 /**
  * Get configured argument value for the specified {@link GlobalCommandArgument} from environment variables.
@@ -16,6 +17,8 @@ export declare function getGlobalCommandValueFromEnvVars(cliConfig: CLIConfig, c
  * @param cliConfig the {@link CLIConfig} to use for determining the default configuration key.
  * @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.
+ * @param groupCommand the {@link GroupCommand} if the command is a group member, in which case the group name
+ * is an additional env var name segment.
  */
-export declare function getSubCommandValuesFromEnvVars(cliConfig: CLIConfig, command: SubCommand): PopulatedValues | undefined;
+export declare function getSubCommandValuesFromEnvVars(cliConfig: CLIConfig, command: SubCommand, groupCommand?: GroupCommand): 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,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"}
+{"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,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAqC1E;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,wBAAwB,CAa1B;AAwID;;;;;;;;GAQG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,YAAY,CAAC,EAAE,YAAY,GAC1B,eAAe,GAAG,SAAS,CAsF7B"}

package/dist/src/util/envVarHelper.js

@@ -8,11 +8,12 @@ function getKeySegment(segment) {
     }
     return keySegment;
 }
-function getSubCommandArgumentKeyPrefix(cliConfig, command, subCommandArgument) {
+function getSubCommandArgumentKeyPrefix(cliConfig, command, subCommandArgument, groupCommand) {
     if (subCommandArgument.configurationKey) {
         return subCommandArgument.configurationKey;
     }
-    return `${getKeySegment(cliConfig.name)}_${getKeySegment(command.name)}_${getKeySegment(subCommandArgument.name)}`;
+    const groupSegment = groupCommand ? `${getKeySegment(groupCommand.name)}_` : "";
+    return `${getKeySegment(cliConfig.name)}_${groupSegment}${getKeySegment(command.name)}_${getKeySegment(subCommandArgument.name)}`;
 }
 function getGlobalArgumentKeyPrefix(cliConfig, command, globalCommandArgument) {
     if (globalCommandArgument.configurationKey) {
@@ -146,13 +147,15 @@ function getOptionValuesFromEnvVars(envVarValues, potentialEnvVarNames, env, opt
  * @param cliConfig the {@link CLIConfig} to use for determining the default configuration key.
  * @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.
+ * @param groupCommand the {@link GroupCommand} if the command is a group member, in which case the group name
+ * is an additional env var name segment.
  */
-export function getSubCommandValuesFromEnvVars(cliConfig, command) {
+export function getSubCommandValuesFromEnvVars(cliConfig, command, groupCommand) {
     const envVarValues = Object.create(null);
     if (command.options) {
         for (const option of command.options) {
             const potentialEnvVarNames = Object.keys(process.env);
-            const optionPrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, option);
+            const optionPrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, option, groupCommand);
             getOptionValuesFromEnvVars(envVarValues, potentialEnvVarNames, process.env ?? {}, option, optionPrefix);
         }
     }
@@ -163,7 +166,7 @@ export function getSubCommandValuesFromEnvVars(cliConfig, command) {
                 positional.name === "prototype") {
                 throw new Error(`Unsafe key name in use: ${positional.name}, CodeQL Rule ID: js/prototype-polluting-assignment`);
             }
-            let envVarNamePrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, positional);
+            let envVarNamePrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, positional, groupCommand);
             if (positional.isVarargMultiple) {
                 envVarNamePrefix = `${envVarNamePrefix}_`;
                 const matches = Object.keys(process.env).filter((envVarName) => envVarName.startsWith(envVarNamePrefix));

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

@@ -19,7 +19,7 @@ export interface HelpSection {
 export declare function printHelpSections(printerService: PrinterService, tableGeneratorService: TableGeneratorService, sections: Array<HelpSection>): Promise<void>;
 export declare function getGlobalArgumentHelpEntry(cliConfig: CLIConfig, includeEnvVars: boolean, globalCommand: GlobalCommand): HelpEntry;
 export declare function getSubCommandArgumentsSyntax(subCommand: SubCommand): string;
-export declare function getCommandArgsHelpSections(cliConfig: CLIConfig, includeEnvVars: boolean, subCommand: SubCommand, isSingleCommandApp: boolean): Array<HelpSection>;
+export declare function getCommandArgsHelpSections(cliConfig: CLIConfig, includeEnvVars: boolean, subCommand: SubCommand, isSingleCommandApp: boolean, groupCommand?: GroupCommand): Array<HelpSection>;
 export declare function getCommandExamplesHelpSections(printerService: PrinterService, context: Context, subCommand: SubCommand): Array<HelpSection>;
 export declare function getMultiCommandAppSyntax(context: Context, globalModifierCommands: ReadonlyArray<GlobalModifierCommand>, globalCommands: ReadonlyArray<GlobalCommand>, groupCommands: ReadonlyArray<GroupCommand>, subCommands: ReadonlyArray<SubCommand>): string;
 export declare function findPossibleCommandNames(commandName: string, groupCommands: ReadonlyArray<GroupCommand>, subCommands: ReadonlyArray<SubCommand>): string[];

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;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;AAiCrF,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"}
+{"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;AAiCrF,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;AA8LD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,CAAC,EAAE,YAAY,GAC1B,KAAK,CAAC,WAAW,CAAC,CA4BpB;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

@@ -216,7 +216,7 @@ export function getSubCommandArgumentsSyntax(subCommand) {
     });
     return syntax;
 }
-function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntryIndent = 0, optionAncestry = []) {
+function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntryIndent = 0, optionAncestry = [], groupCommand) {
     let subEntries;
     let optionCharacters = "--";
     let aliasCharacter = "-";
@@ -230,10 +230,7 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
     if (option.type === ComplexValueTypeName.COMPLEX) {
         subEntries = [];
         option.properties.forEach((property) => {
-            subEntries.push(getOptionHelpEntry(cliConfig, includeEnvVars, command, property, newSubEntryIndent, [
-                ...optionAncestry,
-                option,
-            ]));
+            subEntries.push(getOptionHelpEntry(cliConfig, includeEnvVars, command, property, newSubEntryIndent, [...optionAncestry, option], groupCommand));
         });
     }
     else {
@@ -279,10 +276,7 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
         notesItems.push("array");
     }
     if (includeEnvVars && option.type !== ComplexValueTypeName.COMPLEX) {
-        const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [
-            ...optionAncestry,
-            option,
-        ]);
+        const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [...optionAncestry, option], groupCommand);
         if (configurationKey !== undefined) {
             notesItems.push(`env var: ${configurationKey}`);
         }
@@ -303,7 +297,7 @@ function getOptionHelpEntry(cliConfig, includeEnvVars, command, option, subEntry
         helpSubEntries: subEntries,
     };
 }
-function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional) {
+function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional, groupCommand) {
     const notesItems = [];
     if (positional.allowableValues !== undefined && positional.allowableValues.length > 0) {
         notesItems.push(`valid values: ${userInputList(positional.allowableValues, "|")}`);
@@ -341,9 +335,7 @@ function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional)
         notesItems.push("array");
     }
     if (includeEnvVars) {
-        const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [
-            positional,
-        ]);
+        const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [positional], groupCommand);
         if (configurationKey !== undefined) {
             notesItems.push(`env var: ${configurationKey}`);
         }
@@ -362,7 +354,7 @@ function getPositionalHelpEntry(cliConfig, includeEnvVars, command, positional)
         description,
     };
 }
-export function getCommandArgsHelpSections(cliConfig, includeEnvVars, subCommand, isSingleCommandApp) {
+export function getCommandArgsHelpSections(cliConfig, includeEnvVars, subCommand, isSingleCommandApp, groupCommand) {
     const helpSections = [];
     if (subCommand.options.length > 0 || subCommand.positionals.length > 0) {
         const argumentsSection = {
@@ -370,10 +362,10 @@ export function getCommandArgsHelpSections(cliConfig, includeEnvVars, subCommand
             helpEntries: [],
         };
         subCommand.options.forEach((option) => {
-            argumentsSection.helpEntries.push(getOptionHelpEntry(cliConfig, includeEnvVars, subCommand, option));
+            argumentsSection.helpEntries.push(getOptionHelpEntry(cliConfig, includeEnvVars, subCommand, option, 0, [], groupCommand));
         });
         subCommand.positionals.forEach((positional) => {
-            argumentsSection.helpEntries.push(getPositionalHelpEntry(cliConfig, includeEnvVars, subCommand, positional));
+            argumentsSection.helpEntries.push(getPositionalHelpEntry(cliConfig, includeEnvVars, subCommand, positional, groupCommand));
         });
         helpSections.push(argumentsSection);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "9.1.3",
+  "version": "10.0.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",

package/src/command/MultiCommandCliHelpCommand.ts

@@ -288,7 +288,13 @@ abstract class MultiCommandCliAbstractHelpCommand {
     });
 
     helpSections.push(
-      ...getCommandArgsHelpSections(context.cliConfig, this.#includeEnvVars, subCommand, false),
+      ...getCommandArgsHelpSections(
+        context.cliConfig,
+        this.#includeEnvVars,
+        subCommand,
+        false,
+        groupCommand,
+      ),
     );
 
     helpSections.push(...getCommandExamplesHelpSections(printerService, context, subCommand));

package/src/runtime/command/CommandValidator.ts

@@ -165,6 +165,7 @@ function validateSubCommandArgument(subCommandArgument: SubCommandArgument): voi
 export default class CommandValidator {
   readonly #cliConfig: CLIConfig;
   readonly #configurationKeys: Array<string> = [];
+  #currentGroupCommand: GroupCommand | undefined;
 
   public constructor(cliConfig: CLIConfig) {
     this.#cliConfig = cliConfig;
@@ -265,7 +266,12 @@ export default class CommandValidator {
         );
       }
       subCommandNames.push(subCommand.name);
-      this.#validateSubCommand(subCommand);
+      this.#currentGroupCommand = groupCommand;
+      try {
+        this.#validateSubCommand(subCommand);
+      } finally {
+        this.#currentGroupCommand = undefined;
+      }
     });
   }
 
@@ -365,6 +371,7 @@ export default class CommandValidator {
         this.#cliConfig,
         command,
         argumentAncestry,
+        this.#currentGroupCommand,
       );
 
       if (configurationKey !== undefined) {

package/src/runtime/runner.ts

@@ -314,6 +314,7 @@ async function findAndExecuteNonModifierCommand(
       ? await configurationServiceProvider.getDefaultArgumentValues(
           context.cliConfig,
           scanResult.nonModifierCommandClause.command,
+          scanResult.nonModifierCommandClause.groupCommand,
         )
       : undefined;
 

package/src/service/configuration/ConfigurationServiceProvider.ts

@@ -13,6 +13,7 @@ import type {
 } from "@flowscripter/dynamic-cli-framework-api";
 import getLogger from "../../util/logger.ts";
 import type { Context } from "@flowscripter/dynamic-cli-framework-api";
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import DumpConfigCommand from "./command/DumpConfigCommand.ts";
 import {
   CONFIGURATION_SERVICE_ID,
@@ -77,7 +78,8 @@ class ConfigurationServiceImpl implements ConfigurationService {
  *
  * 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 Values}. As an example:
+ * (or `<group name>:<member name>` for a member of a {@link GroupCommand}) and the contained values are treated as
+ * command {@link Values}. As an example:
  *
  * ```
  * {
@@ -94,6 +96,9 @@ class ConfigurationServiceImpl implements ConfigurationService {
  *         "command2": {
  *             "arg4": true
  *         },
+ *         "group1:member1": {
+ *             "arg5": "bar"
+ *         },
  *         "globalCommand": "globalArgumentValue"
  *     },
  *     "key-values": {
@@ -124,13 +129,15 @@ class ConfigurationServiceImpl implements ConfigurationService {
  * Argument configuration keys are concatenated with a `_` separator.
  * Any arguments which support array values must by suffixed with `_` and an explicit array index.
  * If the root argument in the path does not use a custom {@link Argument.configurationKey} then the key path
- * is additionally suffixed with the {@link CLIConfig.name} and the {@link Command.name} with `_` separators.
+ * is additionally prefixed with the {@link CLIConfig.name}, the {@link GroupCommand.name} (if the command is a group
+ * member) and the {@link Command.name} with `_` separators.
  * This is best explained with examples...
  *
  * No custom configuration key examples:
  *
  * * executable: `MyCLI`, command: `globalCommand1`, global command argument => environment variable: `MYCLI_GLOBALCOMMAND1`
  * * executable: `MyCLI`, command: `command1`, simple root argument: `arg1` => environment variable: `MYCLI_COMMAND1_ARG1`
+ * * executable: `MyCLI`, group: `group1`, member command: `member1`, simple root argument: `arg1` => environment variable: `MYCLI_GROUP1_MEMBER1_ARG1`
  * * executable: `MyCLI`, command: `command1`, array root argument, 1st element: `arg2[0]` => environment variable: `MYCLI_COMMAND1_ARG2_0`
  * * executable: `MyCLI`, command: `command1`, argument is a digit so it is by default suffixed with `_`: `3` => environment variable: `MYCLI_COMMAND1__3`
  * * executable: `MyCLI`, command: `command1`, nested sub-argument: `arg1.arg2` => environment variable: `MYCLI_COMMAND1_ARG1_ARG2`
@@ -238,17 +245,22 @@ 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.
+   * @param groupCommand the {@link GroupCommand} if the command is a group member. The configuration file key
+   * is then `<group name>:<command name>` and the env var names include the group name.
    */
   public async getDefaultArgumentValues(
     cliConfig: CLIConfig,
     command: Command,
+    groupCommand?: GroupCommand,
   ): Promise<PopulatedValues | PopulatedValueType | undefined> {
     if (!this.configEnabled) {
       logger.debug("configuration of default values is not enabled");
       return undefined;
     }
 
-    logger.debug("getting default argument values for command: %s", command.name);
+    const commandKey = groupCommand ? `${groupCommand.name}:${command.name}` : command.name;
+
+    logger.debug("getting default argument values for command: %s", commandKey);
 
     if (command.enableConfiguration === undefined || command.enableConfiguration !== true) {
       logger.debug("enableConfiguration for command: %s is not true", command.name);
@@ -258,16 +270,16 @@ export default class ConfigurationServiceProvider implements ServiceProvider {
     let result: PopulatedValues | PopulatedValueType | undefined;
 
     if (isGlobalModifierCommand(command) || isGlobalCommand(command)) {
-      const configuredValue = this.defaultsData.get(command.name) as SingleValueType;
+      const configuredValue = this.defaultsData.get(commandKey) as SingleValueType;
       const envVarValue = this.envVarsEnabled
         ? getGlobalCommandValueFromEnvVars(cliConfig, command)
         : undefined;
       // default to environment variable value
       result = envVarValue !== undefined ? envVarValue : configuredValue;
     } else if (isSubCommand(command)) {
-      const configuredValues = this.defaultsData.get(command.name) as Values;
+      const configuredValues = this.defaultsData.get(commandKey) as Values;
       const envVarValues = this.envVarsEnabled
-        ? getSubCommandValuesFromEnvVars(cliConfig, command)
+        ? getSubCommandValuesFromEnvVars(cliConfig, command, groupCommand)
         : undefined;
       if (envVarValues === undefined) {
         result = configuredValues;

package/src/util/configHelper.ts

@@ -1,3 +1,4 @@
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
@@ -26,11 +27,14 @@ function getKeySegment(segment: string, isCustom = false, isArray = false) {
  * @param command the {@link Command} to use for determining the default configuration key.
  * @param argumentAncestry a list of {@link SubCommandArgument} instances from the root command arguments to a leaf argument.
  * Apart from {@link ComplexOption} instances this will always only have a single entry.
+ * @param groupCommand the {@link GroupCommand} if the command is a member of a group, in which case the group name
+ * is an additional key segment.
  */
 export function getSubCommandArgumentConfigurationKey(
   cliConfig: CLIConfig,
   command: Command,
   argumentAncestry: Array<SubCommandArgument>,
+  groupCommand?: GroupCommand,
 ): string | undefined {
   if (command.enableConfiguration === undefined || command.enableConfiguration !== true) {
     return undefined;
@@ -43,6 +47,9 @@ export function getSubCommandArgumentConfigurationKey(
   const firstArgument = argumentAncestry[0]!;
   if (firstArgument.configurationKey === undefined) {
     keySegments.push(getKeySegment(cliConfig.name));
+    if (groupCommand) {
+      keySegments.push(getKeySegment(groupCommand.name));
+    }
     keySegments.push(getKeySegment(command.name));
   }
 

package/src/util/envVarHelper.ts

@@ -14,6 +14,7 @@ import { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "@flowscripter/dynamic-cli-framework
 import type { Option } from "@flowscripter/dynamic-cli-framework-api";
 import type { GlobalCommandArgument } 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 { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
 import type { ComplexOption } from "@flowscripter/dynamic-cli-framework-api";
 
@@ -29,11 +30,13 @@ function getSubCommandArgumentKeyPrefix(
   cliConfig: CLIConfig,
   command: Command,
   subCommandArgument: SubCommandArgument,
+  groupCommand?: GroupCommand,
 ) {
   if (subCommandArgument.configurationKey) {
     return subCommandArgument.configurationKey;
   }
-  return `${getKeySegment(cliConfig.name)}_${getKeySegment(command.name)}_${getKeySegment(
+  const groupSegment = groupCommand ? `${getKeySegment(groupCommand.name)}_` : "";
+  return `${getKeySegment(cliConfig.name)}_${groupSegment}${getKeySegment(command.name)}_${getKeySegment(
     subCommandArgument.name,
   )}`;
 }
@@ -214,16 +217,24 @@ function getOptionValuesFromEnvVars(
  * @param cliConfig the {@link CLIConfig} to use for determining the default configuration key.
  * @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.
+ * @param groupCommand the {@link GroupCommand} if the command is a group member, in which case the group name
+ * is an additional env var name segment.
  */
 export function getSubCommandValuesFromEnvVars(
   cliConfig: CLIConfig,
   command: SubCommand,
+  groupCommand?: GroupCommand,
 ): PopulatedValues | undefined {
   const envVarValues = Object.create(null) as PopulatedValues;
   if (command.options) {
     for (const option of command.options) {
       const potentialEnvVarNames = Object.keys(process.env);
-      const optionPrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, option as Option);
+      const optionPrefix = getSubCommandArgumentKeyPrefix(
+        cliConfig,
+        command,
+        option as Option,
+        groupCommand,
+      );
       getOptionValuesFromEnvVars(
         envVarValues,
         potentialEnvVarNames,
@@ -244,7 +255,12 @@ export function getSubCommandValuesFromEnvVars(
           `Unsafe key name in use: ${positional.name}, CodeQL Rule ID: js/prototype-polluting-assignment`,
         );
       }
-      let envVarNamePrefix = getSubCommandArgumentKeyPrefix(cliConfig, command, positional);
+      let envVarNamePrefix = getSubCommandArgumentKeyPrefix(
+        cliConfig,
+        command,
+        positional,
+        groupCommand,
+      );
 
       if (positional.isVarargMultiple) {
         envVarNamePrefix = `${envVarNamePrefix}_`;

package/src/util/helpHelper.ts

@@ -312,6 +312,7 @@ function getOptionHelpEntry(
   option: Option | ComplexOption,
   subEntryIndent = 0,
   optionAncestry: Array<Option | ComplexOption> = [],
+  groupCommand?: GroupCommand,
 ): HelpEntry {
   let subEntries: Array<HelpEntry> | undefined;
   let optionCharacters = "--";
@@ -328,10 +329,15 @@ function getOptionHelpEntry(
     subEntries = [];
     option.properties.forEach((property) => {
       subEntries!.push(
-        getOptionHelpEntry(cliConfig, includeEnvVars, command, property, newSubEntryIndent, [
-          ...optionAncestry,
-          option,
-        ]),
+        getOptionHelpEntry(
+          cliConfig,
+          includeEnvVars,
+          command,
+          property,
+          newSubEntryIndent,
+          [...optionAncestry, option],
+          groupCommand,
+        ),
       );
     });
   } else {
@@ -384,10 +390,12 @@ function getOptionHelpEntry(
   }
 
   if (includeEnvVars && option.type !== ComplexValueTypeName.COMPLEX) {
-    const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [
-      ...(optionAncestry as Array<SubCommandArgument>),
-      option as unknown as SubCommandArgument,
-    ]);
+    const configurationKey = getSubCommandArgumentConfigurationKey(
+      cliConfig,
+      command,
+      [...(optionAncestry as Array<SubCommandArgument>), option as unknown as SubCommandArgument],
+      groupCommand,
+    );
     if (configurationKey !== undefined) {
       notesItems.push(`env var: ${configurationKey}`);
     }
@@ -418,6 +426,7 @@ function getPositionalHelpEntry(
   includeEnvVars: boolean,
   command: Command,
   positional: Positional,
+  groupCommand?: GroupCommand,
 ): HelpEntry {
   const notesItems: Array<string> = [];
   if (positional.allowableValues !== undefined && positional.allowableValues.length > 0) {
@@ -458,9 +467,12 @@ function getPositionalHelpEntry(
   }
 
   if (includeEnvVars) {
-    const configurationKey = getSubCommandArgumentConfigurationKey(cliConfig, command, [
-      positional,
-    ]);
+    const configurationKey = getSubCommandArgumentConfigurationKey(
+      cliConfig,
+      command,
+      [positional],
+      groupCommand,
+    );
     if (configurationKey !== undefined) {
       notesItems.push(`env var: ${configurationKey}`);
     }
@@ -486,6 +498,7 @@ export function getCommandArgsHelpSections(
   includeEnvVars: boolean,
   subCommand: SubCommand,
   isSingleCommandApp: boolean,
+  groupCommand?: GroupCommand,
 ): Array<HelpSection> {
   const helpSections: Array<HelpSection> = [];
   if (subCommand.options.length > 0 || subCommand.positionals.length > 0) {
@@ -495,12 +508,20 @@ export function getCommandArgsHelpSections(
     };
     subCommand.options.forEach((option) => {
       argumentsSection.helpEntries.push(
-        getOptionHelpEntry(cliConfig, includeEnvVars, subCommand, option as Option),
+        getOptionHelpEntry(
+          cliConfig,
+          includeEnvVars,
+          subCommand,
+          option as Option,
+          0,
+          [],
+          groupCommand,
+        ),
       );
     });
     subCommand.positionals.forEach((positional) => {
       argumentsSection.helpEntries.push(
-        getPositionalHelpEntry(cliConfig, includeEnvVars, subCommand, positional),
+        getPositionalHelpEntry(cliConfig, includeEnvVars, subCommand, positional, groupCommand),
       );
     });
     helpSections.push(argumentsSection);