@flowscripter/dynamic-cli-framework 1.7.4 → 2.0.0

package/dist/src/service/treePrinter/TreePrinterServiceProvider.js

@@ -1,6 +1,6 @@
 import DefaultTreePrinterService from "./DefaultTreePrinterService.js";
-import { TREE_PRINTER_SERVICE_ID } from "../../api/service/core/TreePrinterService.js";
-import { PRINTER_SERVICE_ID } from "../../api/service/core/PrinterService.js";
+import { TREE_PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import { PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 export default class TreePrinterServiceProvider {
     servicePriority;
     serviceId = TREE_PRINTER_SERVICE_ID;

package/dist/src/terminal/ImageRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImageRenderer.d.ts","sourceRoot":"","sources":["../../../src/terminal/ImageRenderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAG1C,MAAM,CAAC,OAAO,OAAO,aAAa;;gBAGpB,QAAQ,EAAE,QAAQ;IAI9B,WAAW,CACT,WAAW,EAAE,UAAU,EACvB,eAAe,GAAE,MAAY,EAC7B,2BAA2B,CAAC,EAAE,MAAM,GACnC,OAAO,CAAC,MAAM,CAAC;CA4JnB"}
+{"version":3,"file":"ImageRenderer.d.ts","sourceRoot":"","sources":["../../../src/terminal/ImageRenderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAG1C,MAAM,CAAC,OAAO,OAAO,aAAa;;gBAGpB,QAAQ,EAAE,QAAQ;IAI9B,WAAW,CACT,WAAW,EAAE,UAAU,EACvB,eAAe,GAAE,MAAY,EAC7B,2BAA2B,CAAC,EAAE,MAAM,GACnC,OAAO,CAAC,MAAM,CAAC;CA8JnB"}

package/dist/src/terminal/ImageRenderer.js

@@ -10,12 +10,14 @@ export default class ImageRenderer {
     }
     renderImage(imageBuffer, widthPercentage = 100, hexFormattedBackgroundColor) {
         if (!this.#isMultiplexer()) {
-            if (supportsTerminalGraphics.stdout.kitty) {
-                return this.#renderKitty(imageBuffer, widthPercentage);
-            }
+            // iTerm2 only supports its own proprietary image protocol, not Kitty's, despite
+            // supports-terminal-graphics incorrectly reporting kitty:true for iTerm2 3.6+.
             if (supportsTerminalGraphics.stdout.iterm2) {
                 return this.#renderITerm2(imageBuffer, widthPercentage);
             }
+            if (supportsTerminalGraphics.stdout.kitty) {
+                return this.#renderKitty(imageBuffer, widthPercentage);
+            }
         }
         return this.#renderAnsiBlocks(imageBuffer, widthPercentage, hexFormattedBackgroundColor);
     }
@@ -40,10 +42,10 @@ export default class ImageRenderer {
         for (let i = 0; i < chunks.length; i++) {
             const isLast = i === chunks.length - 1;
             if (i === 0) {
-                result += `\x1b_Gf=100,a=T,c=${columns},m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
+                result += `\x1b_Gf=100,a=T,c=${columns},q=2,m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
             }
             else {
-                result += `\x1b_Gm=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
+                result += `\x1b_Gq=2,m=${isLast ? 0 : 1};${chunks[i]}\x1b\\`;
             }
         }
         return result;

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

@@ -1,7 +1,7 @@
-import type Command from "../api/command/Command.ts";
-import type CLIConfig from "../api/CLIConfig.ts";
-import type SubCommandArgument from "../api/argument/SubCommandArgument.ts";
-import type GlobalCommandArgument from "../api/argument/GlobalCommandArgument.ts";
+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";
+import type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
 /**
  * Determine the configuration key for the specified {@link SubCommandArgument}.
  *

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,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,kBAAkB,MAAM,uCAAuC,CAAC;AAC5E,OAAO,KAAK,qBAAqB,MAAM,0CAA0C,CAAC;AAgBlF;;;;;;;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,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"}

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

@@ -1,7 +1,7 @@
-import type CLIConfig from "../api/CLIConfig.ts";
-import { type PopulatedArgumentSingleValueType, type PopulatedArgumentValues } from "../api/argument/ArgumentValueTypes.ts";
-import type GlobalCommand from "../api/command/GlobalCommand.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import { type PopulatedArgumentSingleValueType, type PopulatedArgumentValues } from "@flowscripter/dynamic-cli-framework-api";
+import type { GlobalCommand } 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.
  *

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,SAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAGL,KAAK,gCAAgC,EACrC,KAAK,uBAAuB,EAC7B,MAAM,uCAAuC,CAAC;AAO/C,OAAO,KAAK,aAAa,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAmC3D;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,gCAAgC,CAalC;AA0ID;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,GAClB,uBAAuB,GAAG,SAAS,CA6ErC"}
+{"version":3,"file":"envVarHelper.d.ts","sourceRoot":"","sources":["../../../src/util/envVarHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAGL,KAAK,gCAAgC,EACrC,KAAK,uBAAuB,EAC7B,MAAM,yCAAyC,CAAC;AAOjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAmC1E;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,GACrB,gCAAgC,CAalC;AA0ID;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,GAClB,uBAAuB,GAAG,SAAS,CA6ErC"}

package/dist/src/util/envVarHelper.js

@@ -1,6 +1,6 @@
 import process from "node:process";
-import { ArgumentValueTypeName, ComplexValueTypeName, } from "../api/argument/ArgumentValueTypes.js";
-import { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "../api/argument/SubCommandArgument.js";
+import { ArgumentValueTypeName, ComplexValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
+import { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "@flowscripter/dynamic-cli-framework-api";
 function getKeySegment(segment) {
     let keySegment = segment.replace("-", "_").toUpperCase();
     if (keySegment[0].match(/[0-9]/)) {

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

@@ -1,11 +1,11 @@
-import type GlobalCommand from "../api/command/GlobalCommand.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
-import type Context from "../api/Context.ts";
-import type GlobalModifierCommand from "../api/command/GlobalModifierCommand.ts";
-import type GroupCommand from "../api/command/GroupCommand.ts";
-import type CLIConfig from "../api/CLIConfig.ts";
-import type PrinterService from "../api/service/core/PrinterService.ts";
-import type TableGeneratorService from "../api/service/core/TableGeneratorService.ts";
+import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { Context } from "@flowscripter/dynamic-cli-framework-api";
+import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
+import type { TableGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
 export interface HelpEntry {
     readonly syntax: string;
     readonly description?: 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,aAAa,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAI7C,OAAO,KAAK,qBAAqB,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAM/D,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,cAAc,MAAM,uCAAuC,CAAC;AAGxE,OAAO,KAAK,qBAAqB,MAAM,8CAA8C,CAAC;AAMtF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA8BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CAgJR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}
+{"version":3,"file":"helpHelper.d.ts","sourceRoot":"","sources":["../../../src/util/helpHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAM7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAM5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxC;AAsDD,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AA8BD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,aAAa,EAAE,aAAa,GAC3B,SAAS,CA6DX;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CA+C3E;AAkLD,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,WAAW,CAAC,CAoBpB;AACD,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,KAAK,CAAC,WAAW,CAAC,CAgCpB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,aAAa,CAAC,qBAAqB,CAAC,EAC5D,cAAc,EAAE,aAAa,CAAC,aAAa,CAAC,EAC5C,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,CAgJR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,GACrC,MAAM,EAAE,CAkBV"}

package/dist/src/util/helpHelper.js

@@ -1,5 +1,5 @@
 import { distance } from "fastest-levenshtein";
-import { ArgumentValueTypeName, ComplexValueTypeName } from "../api/argument/ArgumentValueTypes.js";
+import { ArgumentValueTypeName, ComplexValueTypeName, } from "@flowscripter/dynamic-cli-framework-api";
 import { getGlobalCommandArgumentConfigurationKey, getSubCommandArgumentConfigurationKey, } from "./configHelper.js";
 const SYNTAX_INDENT_WIDTH = 2;
 const MINIMUM_SYNTAX_COLUMN_WIDTH = 15;

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

@@ -1,6 +1,6 @@
 import type { ParseResult } from "../runtime/parser.ts";
-import type Context from "../api/Context.ts";
-import type CommandRegistry from "../runtime/registry/CommandRegistry.ts";
+import type { Context } from "@flowscripter/dynamic-cli-framework-api";
+import type { CommandRegistry } from "@flowscripter/dynamic-cli-framework-api";
 export declare function printParseResultError(context: Context, parseResult: ParseResult, isDefaultCommand?: boolean): Promise<void>;
 export declare function printCommandExecutionError(context: Context, parseResult: ParseResult, err: Error, isDefaultCommand?: boolean): Promise<void>;
 export declare function printRuntimeError(context: Context, err: Error): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"runnerHelper.d.ts","sourceRoot":"","sources":["../../../src/util/runnerHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAE7C,OAAO,KAAK,eAAe,MAAM,wCAAwC,CAAC;AAY1E,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,UAAQ,iBAiBzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,gBAAgB,UAAQ,iBAiBzB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAMnE;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,OAAO,iBAGlE;AAED,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,iBAgCrC;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,iBAQzC"}
+{"version":3,"file":"runnerHelper.d.ts","sourceRoot":"","sources":["../../../src/util/runnerHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAY/E,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,UAAQ,iBAiBzB;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,gBAAgB,UAAQ,iBAiBzB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAMnE;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,OAAO,iBAGlE;AAED,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,iBAgCrC;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,iBAQzC"}

package/dist/src/util/runnerHelper.js

@@ -1,4 +1,4 @@
-import { Icon, PRINTER_SERVICE_ID } from "../api/service/core/PrinterService.js";
+import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { isGlobalCommand, isGlobalModifierCommand } from "../runtime/command/CommandTypeGuards.js";
 import { getInvalidArgumentString } from "../runtime/values/argumentValueValidation.js";
 import { findPossibleCommandNames } from "./helpHelper.js";

package/index.ts

@@ -1,5 +1,5 @@
 // Argument API
-export type { default as Argument } from "./src/api/argument/Argument.ts";
+export type { Argument } from "@flowscripter/dynamic-cli-framework-api";
 export type {
   ArgumentSingleValueType,
   ArgumentValues,
@@ -7,37 +7,37 @@ export type {
   PopulatedArgumentSingleValueType,
   PopulatedArgumentValues,
   PopulatedArgumentValueType,
-} from "./src/api/argument/ArgumentValueTypes.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
 export {
   ArgumentValueTypeName,
   ComplexValueTypeName,
-} from "./src/api/argument/ArgumentValueTypes.ts";
-export type { default as ComplexOption } from "./src/api/argument/ComplexOption.ts";
-export { MAXIMUM_COMPLEX_OPTION_NESTING_DEPTH } from "./src/api/argument/ComplexOption.ts";
-export type { default as SubCommandArgument } from "./src/api/argument/SubCommandArgument.ts";
-export { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "./src/api/argument/SubCommandArgument.ts";
-export type { default as GlobalCommandArgument } from "./src/api/argument/GlobalCommandArgument.ts";
-export type { default as Option } from "./src/api/argument/Option.ts";
-export type { default as Positional } from "./src/api/argument/Positional.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
+export type { ComplexOption } from "@flowscripter/dynamic-cli-framework-api";
+export { MAXIMUM_COMPLEX_OPTION_NESTING_DEPTH } from "@flowscripter/dynamic-cli-framework-api";
+export type { SubCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
+export { MAXIMUM_ARGUMENT_ARRAY_SIZE } from "@flowscripter/dynamic-cli-framework-api";
+export type { GlobalCommandArgument } from "@flowscripter/dynamic-cli-framework-api";
+export type { Option } from "@flowscripter/dynamic-cli-framework-api";
+export type { Positional } from "@flowscripter/dynamic-cli-framework-api";
 
 // Command API
-export type { default as Command } from "./src/api/command/Command.ts";
-export type { default as GlobalCommand } from "./src/api/command/GlobalCommand.ts";
-export type { default as GlobalModifierCommand } from "./src/api/command/GlobalModifierCommand.ts";
-export type { default as GroupCommand } from "./src/api/command/GroupCommand.ts";
-export type { default as SubCommand } from "./src/api/command/SubCommand.ts";
-export type { default as UsageExample } from "./src/api/command/UsageExample.ts";
+export type { Command } from "@flowscripter/dynamic-cli-framework-api";
+export type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
+export type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
+export type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
+export type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
+export type { UsageExample } from "@flowscripter/dynamic-cli-framework-api";
 
 // Service API
-export type { ServiceInfo, ServiceProvider } from "./src/api/service/ServiceProvider.ts";
+export type { ServiceInfo, ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
 
 // Registry API
-export type { default as CommandRegistry } from "./src/runtime/registry/CommandRegistry.ts";
-export type { default as ServiceProviderRegistry } from "./src/runtime/registry/ServiceProviderRegistry.ts";
+export type { CommandRegistry } from "@flowscripter/dynamic-cli-framework-api";
+export type { ServiceProviderRegistry } from "@flowscripter/dynamic-cli-framework-api";
 
 // Core Services
-export { ASCII_BANNER_GENERATOR_SERVICE_ID } from "./src/api/service/core/AsciiBannerGeneratorService.ts";
-export type { default as AsciiBannerGeneratorService } from "./src/api/service/core/AsciiBannerGeneratorService.ts";
+export { ASCII_BANNER_GENERATOR_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { AsciiBannerGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
 export type {
   BannerColorEffects,
   BannerGenerateOptions,
@@ -46,7 +46,7 @@ export type {
   FixedColorEffect,
   GradientColorEffect,
   RainbowColorEffect,
-} from "./src/api/service/core/AsciiBannerGeneratorService.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultAsciiBannerGeneratorService } from "./src/service/asciiBannerGenerator/DefaultAsciiBannerGeneratorService.ts";
 export { default as AsciiBannerGeneratorServiceProvider } from "./src/service/asciiBannerGenerator/AsciiBannerGeneratorServiceProvider.ts";
 export { default as ChiselFontAsciiBannerGeneratorService } from "./src/service/chiselAsciiBannerGenerator/ChiselFontAsciiBannerGeneratorService.ts";
@@ -57,86 +57,86 @@ export type {
 
 export { default as BannerServiceProvider } from "./src/service/banner/BannerServiceProvider.ts";
 
-export { KEY_VALUE_SERVICE_ID } from "./src/api/service/core/KeyValueService.ts";
-export { SECRET_SENTINEL_PREFIX } from "./src/api/service/core/KeyValueService.ts";
-export type { default as KeyValueService } from "./src/api/service/core/KeyValueService.ts";
-export type { default as SecretService } from "./src/api/service/core/SecretService.ts";
+export { KEY_VALUE_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export { SECRET_SENTINEL_PREFIX } from "@flowscripter/dynamic-cli-framework-api";
+export type { KeyValueService } from "@flowscripter/dynamic-cli-framework-api";
+export type { SecretService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultKeyValueService } from "./src/service/configuration/DefaultKeyValueService.ts";
 export { default as DefaultSecretService } from "./src/service/configuration/DefaultSecretService.ts";
 export type { SecretsApi } from "./src/service/configuration/DefaultSecretService.ts";
 export { default as ConfigCommand } from "./src/service/configuration/command/ConfigCommand.ts";
 export { default as ConfigurationServiceProvider } from "./src/service/configuration/ConfigurationServiceProvider.ts";
 
-export { PRINTER_SERVICE_ID } from "./src/api/service/core/PrinterService.ts";
-export type { default as PrinterService } from "./src/api/service/core/PrinterService.ts";
-export { Icon, Level, ProgressStyle, SpinnerStyle } from "./src/api/service/core/PrinterService.ts";
+export { PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
+export { Icon, Level, ProgressStyle, SpinnerStyle } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultPrinterService } from "./src/service/printer/DefaultPrinterService.ts";
 export { default as PrinterServiceProvider } from "./src/service/printer/PrinterServiceProvider.ts";
 
-export { SHUTDOWN_SERVICE_ID } from "./src/api/service/core/ShutdownService.ts";
-export type { default as ShutdownService } from "./src/api/service/core/ShutdownService.ts";
+export { SHUTDOWN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { ShutdownService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultShutdownService } from "./src/service/shutdown/DefaultShutdownService.ts";
 export { default as ShutdownServiceProvider } from "./src/service/shutdown/ShutdownServiceProvider.ts";
 
-export { SYNTAX_HIGHLIGHTER_SERVICE_ID } from "./src/api/service/core/SyntaxHighlighterService.ts";
-export type { default as SyntaxHighlighterService } from "./src/api/service/core/SyntaxHighlighterService.ts";
-export type { ColorScheme } from "./src/api/service/core/SyntaxHighlighterService.ts";
+export { SYNTAX_HIGHLIGHTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { SyntaxHighlighterService } from "@flowscripter/dynamic-cli-framework-api";
+export type { ColorScheme } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultSyntaxHighlighterService } from "./src/service/syntaxHighlighter/DefaultSyntaxHighlighterService.ts";
 export { default as SyntaxHighlighterServiceProvider } from "./src/service/syntaxHighlighter/SyntaxHighlighterServiceProvider.ts";
 
-export { PRETTY_PRINTER_SERVICE_ID } from "./src/api/service/core/PrettyPrinterService.ts";
-export type { default as PrettyPrinterService } from "./src/api/service/core/PrettyPrinterService.ts";
+export { PRETTY_PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { PrettyPrinterService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultPrettyPrinterService } from "./src/service/prettyPrinter/DefaultPrettyPrinterService.ts";
 export { default as PrettyPrinterServiceProvider } from "./src/service/prettyPrinter/PrettyPrinterServiceProvider.ts";
 
-export { IMAGE_PRINTER_SERVICE_ID } from "./src/api/service/core/ImagePrinterService.ts";
-export type { default as ImagePrinterService } from "./src/api/service/core/ImagePrinterService.ts";
+export { IMAGE_PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { ImagePrinterService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultImagePrinterService } from "./src/service/imagePrinter/DefaultImagePrinterService.ts";
 export { default as ImagePrinterServiceProvider } from "./src/service/imagePrinter/ImagePrinterServiceProvider.ts";
 
-export { TREE_PRINTER_SERVICE_ID } from "./src/api/service/core/TreePrinterService.ts";
-export type { default as TreePrinterService } from "./src/api/service/core/TreePrinterService.ts";
-export type { TreeNode } from "./src/api/service/core/TreePrinterService.ts";
+export { TREE_PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { TreePrinterService } from "@flowscripter/dynamic-cli-framework-api";
+export type { TreeNode } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultTreePrinterService } from "./src/service/treePrinter/DefaultTreePrinterService.ts";
 export { default as TreePrinterServiceProvider } from "./src/service/treePrinter/TreePrinterServiceProvider.ts";
 
-export { TABLE_GENERATOR_SERVICE_ID } from "./src/api/service/core/TableGeneratorService.ts";
-export type { default as TableGeneratorService } from "./src/api/service/core/TableGeneratorService.ts";
+export { TABLE_GENERATOR_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { TableGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
 export {
   Align,
   type CellOptions,
   type ColumnOptions,
   type RowOptions,
   type TableOptions,
-} from "./src/api/service/core/TableGeneratorService.ts";
-export { default as Table } from "./src/api/service/core/Table.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
+export { Table } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultTableGeneratorService } from "./src/service/tableGenerator/DefaultTableGeneratorService.ts";
 export { default as TableGeneratorServiceProvider } from "./src/service/tableGenerator/TableGeneratorServiceProvider.ts";
 
-export { DATA_DUMP_GENERATOR_SERVICE_ID } from "./src/api/service/core/DataDumpGeneratorService.ts";
-export type { default as DataDumpGeneratorService } from "./src/api/service/core/DataDumpGeneratorService.ts";
+export { DATA_DUMP_GENERATOR_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { DataDumpGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
 export {
   type ByteRangeColor,
   DumpFormat,
   type HexDumpGenerateOptions,
-} from "./src/api/service/core/DataDumpGeneratorService.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultDataDumpGeneratorService } from "./src/service/dataDumpGenerator/DefaultDataDumpGeneratorService.ts";
 export { default as DataDumpGeneratorServiceProvider } from "./src/service/dataDumpGenerator/DataDumpGeneratorServiceProvider.ts";
 
-export { COMPLETION_SERVICE_ID } from "./src/api/service/core/CompletionService.ts";
-export type { default as CompletionService } from "./src/api/service/core/CompletionService.ts";
-export { type CompletionItem, ShellType } from "./src/api/service/core/CompletionService.ts";
+export { COMPLETION_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { CompletionService } from "@flowscripter/dynamic-cli-framework-api";
+export { type CompletionItem, ShellType } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultCompletionService } from "./src/service/completion/DefaultCompletionService.ts";
 export { default as CompletionServiceProvider } from "./src/service/completion/CompletionServiceProvider.ts";
 
-export { PROMPTER_SERVICE_ID } from "./src/api/service/core/PrompterService.ts";
-export type { default as PrompterService } from "./src/api/service/core/PrompterService.ts";
+export { PROMPTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { PrompterService } from "@flowscripter/dynamic-cli-framework-api";
 export {
   type Prompt,
   type PromptOption,
   type PromptResult,
   PromptType,
-} from "./src/api/service/core/PrompterService.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultPrompterService } from "./src/service/prompter/DefaultPrompterService.ts";
 export {
   DEFAULT_PROMPTER_CONFIG,
@@ -144,19 +144,20 @@ export {
 } from "./src/service/prompter/DefaultPrompterService.ts";
 export { default as PrompterServiceProvider } from "./src/service/prompter/PrompterServiceProvider.ts";
 
-export { ARGUMENT_PROMPTER_SERVICE_ID } from "./src/api/service/core/ArgumentPrompterService.ts";
-export type { default as ArgumentPrompterService } from "./src/api/service/core/ArgumentPrompterService.ts";
-export type { ParseResult } from "./src/runtime/parser.ts";
+export { ARGUMENT_PROMPTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { ArgumentPrompterService } from "@flowscripter/dynamic-cli-framework-api";
+export type { ParseResult } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultArgumentPrompterService } from "./src/service/argumentPrompter/DefaultArgumentPrompterService.ts";
 export { default as ArgumentPrompterServiceProvider } from "./src/service/argumentPrompter/ArgumentPrompterServiceProvider.ts";
 
 // CLI API
-export type { InvalidArgument } from "./src/api/RunResult.ts";
-export type { default as Context } from "./src/api/Context.ts";
-export type { default as RunResult, InvalidArgumentReason, RunState } from "./src/api/RunResult.ts";
-export type { default as BaseCLIFeatureOptions } from "./src/api/BaseCLIFeatureOptions.ts";
-export type { default as CLIConfig } from "./src/api/CLIConfig.ts";
-export type { default as CLI } from "./src/api/CLI.ts";
+export type { InvalidArgument } from "@flowscripter/dynamic-cli-framework-api";
+export type { Context } from "@flowscripter/dynamic-cli-framework-api";
+export type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
+export { InvalidArgumentReason, RunState } from "@flowscripter/dynamic-cli-framework-api";
+export type { default as BaseCLIFeatureOptions } from "./src/cli/BaseCLIFeatureOptions.ts";
+export type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+export type { CLI } from "@flowscripter/dynamic-cli-framework-api";
 
 // Help Commands
 export {
@@ -169,12 +170,12 @@ export {
 } from "./src/command/MultiCommandCliHelpCommand.ts";
 
 // Plugin API
-export type { default as CommandFactory } from "./src/api/plugin/CommandFactory.ts";
-export { DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT } from "./src/api/plugin/CommandFactory.ts";
-export type { default as ServiceProviderFactory } from "./src/api/plugin/ServiceProviderFactory.ts";
-export { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "./src/api/plugin/ServiceProviderFactory.ts";
-export { PLUGIN_SERVICE_ID } from "./src/api/service/core/PluginService.ts";
-export type { default as PluginService } from "./src/api/service/core/PluginService.ts";
+export type { CommandFactory } from "@flowscripter/dynamic-cli-framework-api";
+export { DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+export type { ServiceProviderFactory } from "@flowscripter/dynamic-cli-framework-api";
+export { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+export { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+export type { PluginService } from "@flowscripter/dynamic-cli-framework-api";
 export { default as DefaultPluginServiceProvider } from "./src/service/plugin/DefaultPluginServiceProvider.ts";
 
 // Core CLI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "1.7.4",
+  "version": "2.0.0",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -48,6 +48,7 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
+    "@flowscripter/dynamic-cli-framework-api": "^1.0.1",
     "@flowscripter/dynamic-plugin-framework": "1.10.1",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",

package/src/cli/BaseCLI.ts

@@ -1,15 +1,15 @@
-import type CLI from "../api/CLI.ts";
-import type RunResult from "../api/RunResult.ts";
-import { RunState } from "../api/RunResult.ts";
+import type { CLI } from "@flowscripter/dynamic-cli-framework-api";
+import type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
+import { RunState } from "@flowscripter/dynamic-cli-framework-api";
 import getLogger from "../util/logger.ts";
 import DefaultCommandRegistry from "../runtime/registry/DefaultCommandRegistry.ts";
-import type Command from "../api/command/Command.ts";
+import type { Command } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultServiceProviderRegistry from "../runtime/registry/DefaultServiceProviderRegistry.ts";
 import DefaultContext from "../runtime/DefaultContext.ts";
-import type { ServiceProvider } from "../api/service/ServiceProvider.ts";
-import type CLIConfig from "../api/CLIConfig.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
-import type GlobalCommand from "../api/command/GlobalCommand.ts";
+import type { ServiceProvider } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
 import {
   SingleCommandCliHelpGlobalCommand,
   SingleCommandCliHelpSubCommand,
@@ -37,11 +37,11 @@ import { printRuntimeError } from "../util/runnerHelper.ts";
 
 import { WritableStream } from "node:stream/web";
 import type Terminal from "../terminal/Terminal.ts";
-import type PrinterService from "../api/service/core/PrinterService.ts";
+import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultPrinterService from "../service/printer/DefaultPrinterService.ts";
 import type Styler from "../terminal/Styler.ts";
 import type KeyReader from "../terminal/KeyReader.ts";
-import type BaseCLIFeatureOptions from "../api/BaseCLIFeatureOptions.ts";
+import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
 import DefaultPrompterService, {
   DEFAULT_PROMPTER_CONFIG,
 } from "../service/prompter/DefaultPrompterService.ts";
@@ -331,7 +331,6 @@ export default class BaseCLI implements CLI {
       if (shutdownState.shutdownRequested || (error as Error).message === "Interrupted") {
         return { runState: RunState.INTERRUPTED };
       }
-      logger.error("Runtime error: %s", (error as Error).message);
       await printRuntimeError(this.#context, error as Error);
       return {
         runState: RunState.RUNTIME_ERROR,

package/src/cli/DefaultRuntimeCLI.ts

@@ -1,8 +1,8 @@
 import process from "node:process";
 import BaseCLI from "./BaseCLI.ts";
-import type RunResult from "../api/RunResult.ts";
-import type CLIConfig from "../api/CLIConfig.ts";
-import type BaseCLIFeatureOptions from "../api/BaseCLIFeatureOptions.ts";
+import type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
 import { Writable } from "node:stream";
 import TtyTerminal from "../terminal/TtyTerminal.ts";
 import TtyKeyReader from "../terminal/TtyKeyReader.ts";

package/src/cli/DynamicPluginRuntimeCLI.ts

@@ -1,14 +1,14 @@
 import type { MarketplacePluginManager } from "@flowscripter/dynamic-plugin-framework";
-import type CLIConfig from "../api/CLIConfig.ts";
-import type BaseCLIFeatureOptions from "../api/BaseCLIFeatureOptions.ts";
-import type RunResult from "../api/RunResult.ts";
-import { RunState } from "../api/RunResult.ts";
+import type { CLIConfig } from "@flowscripter/dynamic-cli-framework-api";
+import type BaseCLIFeatureOptions from "./BaseCLIFeatureOptions.ts";
+import type { RunResult } from "@flowscripter/dynamic-cli-framework-api";
+import { RunState } from "@flowscripter/dynamic-cli-framework-api";
 import DefaultRuntimeCLI from "./DefaultRuntimeCLI.ts";
 import DefaultPluginServiceProvider from "../service/plugin/DefaultPluginServiceProvider.ts";
-import { DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT } from "../api/plugin/CommandFactory.ts";
-import { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "../api/plugin/ServiceProviderFactory.ts";
-import type CommandFactory from "../api/plugin/CommandFactory.ts";
-import type ServiceProviderFactory from "../api/plugin/ServiceProviderFactory.ts";
+import { DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+import { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "@flowscripter/dynamic-cli-framework-api";
+import type { CommandFactory } from "@flowscripter/dynamic-cli-framework-api";
+import type { ServiceProviderFactory } from "@flowscripter/dynamic-cli-framework-api";
 import process from "node:process";
 
 /**

package/src/command/MultiCommandCliHelpCommand.ts

@@ -1,14 +1,14 @@
-import type Positional from "../api/argument/Positional.ts";
-import type Option from "../api/argument/Option.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
-import type GlobalCommand from "../api/command/GlobalCommand.ts";
-import type GroupCommand from "../api/command/GroupCommand.ts";
+import type { Positional } from "@flowscripter/dynamic-cli-framework-api";
+import type { Option } from "@flowscripter/dynamic-cli-framework-api";
+import type { SubCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
 import {
   type ArgumentSingleValueType,
   type ArgumentValues,
   ArgumentValueTypeName,
-} from "../api/argument/ArgumentValueTypes.ts";
-import type Context from "../api/Context.ts";
+} from "@flowscripter/dynamic-cli-framework-api";
+import type { Context } from "@flowscripter/dynamic-cli-framework-api";
 import type { HelpSection } from "../util/helpHelper.ts";
 import {
   findPossibleCommandNames,
@@ -19,12 +19,12 @@ import {
   getSubCommandArgumentsSyntax,
   printHelpSections,
 } from "../util/helpHelper.ts";
-import type GlobalModifierCommand from "../api/command/GlobalModifierCommand.ts";
-import type CommandRegistry from "../runtime/registry/CommandRegistry.ts";
-import type PrinterService from "../api/service/core/PrinterService.ts";
-import { Icon, PRINTER_SERVICE_ID } from "../api/service/core/PrinterService.ts";
-import type TableGeneratorService from "../api/service/core/TableGeneratorService.ts";
-import { TABLE_GENERATOR_SERVICE_ID } from "../api/service/core/TableGeneratorService.ts";
+import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { CommandRegistry } from "@flowscripter/dynamic-cli-framework-api";
+import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
+import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import type { TableGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
+import { TABLE_GENERATOR_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 
 /**
  * Provides common implementation for both {@link MultiCommandCliHelpGlobalCommand} and {@link MultiCommandCliHelpSubCommand}.

package/src/command/SingleCommandCliHelpCommand.ts

@@ -1,8 +1,8 @@
-import type GlobalCommand from "../api/command/GlobalCommand.ts";
-import type SubCommand from "../api/command/SubCommand.ts";
-import type Option from "../api/argument/Option.ts";
-import type Positional from "../api/argument/Positional.ts";
-import type Context from "../api/Context.ts";
+import type { GlobalCommand } from "@flowscripter/dynamic-cli-framework-api";
+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 {
   getCommandArgsHelpSections,
   getCommandExamplesHelpSections,
@@ -12,13 +12,13 @@ import {
   type HelpSection,
   printHelpSections,
 } from "../util/helpHelper.ts";
-import type GlobalModifierCommand from "../api/command/GlobalModifierCommand.ts";
-import type GroupCommand from "../api/command/GroupCommand.ts";
-import type CommandRegistry from "../runtime/registry/CommandRegistry.ts";
-import type PrinterService from "../api/service/core/PrinterService.ts";
-import { PRINTER_SERVICE_ID } from "../api/service/core/PrinterService.ts";
-import type TableGeneratorService from "../api/service/core/TableGeneratorService.ts";
-import { TABLE_GENERATOR_SERVICE_ID } from "../api/service/core/TableGeneratorService.ts";
+import type { GlobalModifierCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { GroupCommand } from "@flowscripter/dynamic-cli-framework-api";
+import type { CommandRegistry } from "@flowscripter/dynamic-cli-framework-api";
+import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
+import { PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
+import type { TableGeneratorService } from "@flowscripter/dynamic-cli-framework-api";
+import { TABLE_GENERATOR_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 
 /**
  * Provides common implementation for both {@link SingleCommandCliHelpGlobalCommand} and {@link SingleCommandCliHelpSubCommand}.