@flowscripter/dynamic-cli-framework 5.1.6 → 5.1.7

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

@@ -1,11 +1,17 @@
 import type { PluginService } from "@flowscripter/dynamic-cli-framework-api";
 import type { KeyValueService } from "@flowscripter/dynamic-cli-framework-api";
-import type { MarketplacePluginManager, SearchQuery, VersionedPluginDescriptor, NpmjsPluginRepositoryConfig, NpmPluginRepositoryConfig } from "@flowscripter/dynamic-plugin-framework";
+import type { MarketplacePluginManager, SearchQuery, VersionedPluginDescriptor, NpmjsPluginRepositoryConfig, NpmPluginRepositoryConfig, FetchInterface } from "@flowscripter/dynamic-plugin-framework";
 export default class DefaultPluginService implements PluginService {
     #private;
     constructor(remoteConfig: NpmjsPluginRepositoryConfig, localConfig: NpmPluginRepositoryConfig);
     get pluginManager(): MarketplacePluginManager;
     applyKeyValueOverrides(keyValueService: KeyValueService): Promise<void>;
+    /**
+     * Supply the {@link FetchInterface} for the underlying `pluginManager` to delegate fetch calls
+     * to, so it respects the host CLI's shutdown handling and default timeout.
+     */
+    setFetch(fetchInterface: FetchInterface): void;
+    checkAvailable(pluginId: string, version?: string): Promise<boolean>;
     search(query: Readonly<SearchQuery>): AsyncIterable<Readonly<VersionedPluginDescriptor>>;
     install(descriptor: Readonly<VersionedPluginDescriptor>): Promise<void>;
     uninstall(pluginId: string): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"DefaultPluginService.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EACzB,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAOhD,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,aAAa;;gBAKpD,YAAY,EAAE,2BAA2B,EAAE,WAAW,EAAE,yBAAyB;IAS7F,IAAI,aAAa,IAAI,wBAAwB,CAE5C;IAEK,sBAAsB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAIlF,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAInE,eAAe,IAAI,aAAa,CAAC;QAC/B,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAChD,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;CAGH"}
+{"version":3,"file":"DefaultPluginService.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/DefaultPluginService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EACzB,2BAA2B,EAC3B,yBAAyB,EAEzB,cAAc,EACf,MAAM,wCAAwC,CAAC;AAWhD,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,aAAa;;gBAKpD,YAAY,EAAE,2BAA2B,EAAE,WAAW,EAAE,yBAAyB;IAS7F,IAAI,aAAa,IAAI,wBAAwB,CAE5C;IAEK,sBAAsB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7E;;;OAGG;IACH,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI;IAMxC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAIlF,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IAInE,eAAe,IAAI,aAAa,CAAC;QAC/B,UAAU,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAChD,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;CAGH"}

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

@@ -1,4 +1,7 @@
 import { NpmPluginManager, NpmjsPluginRepository, NpmPluginRepository, } from "@flowscripter/dynamic-plugin-framework";
+function isFetchCapable(value) {
+    return typeof value === "object" && value !== null && "setFetch" in value;
+}
 export default class DefaultPluginService {
     #defaultRemoteConfig;
     #defaultLocalConfig;
@@ -22,6 +25,18 @@ export default class DefaultPluginService {
         }
         this.#pluginManager = new NpmPluginManager(remotesConfig.map((config) => new NpmjsPluginRepository(config)), new NpmPluginRepository(localConfig));
     }
+    /**
+     * Supply the {@link FetchInterface} for the underlying `pluginManager` to delegate fetch calls
+     * to, so it respects the host CLI's shutdown handling and default timeout.
+     */
+    setFetch(fetchInterface) {
+        if (isFetchCapable(this.#pluginManager)) {
+            this.#pluginManager.setFetch(fetchInterface);
+        }
+    }
+    async checkAvailable(pluginId, version) {
+        return this.#pluginManager.checkAvailable(pluginId, version);
+    }
     search(query) {
         return this.#pluginManager.search(query);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"PluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/PluginServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAWzE,OAAO,KAAK,EAEV,2BAA2B,EAC3B,yBAAyB,EAE1B,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,sBAAsB,MAAM,kDAAkD,CAAC;AACtF,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AAMtG,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,eAAe;;IACnE,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAW/B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,2BAA2B,EACzC,WAAW,EAAE,yBAAyB,EACtC,eAAe,EAAE,sBAAsB,EACvC,uBAAuB,EAAE,8BAA8B,EACvD,4BAA4B,GAAE,4BAAiC,EAC/D,4BAA4B,GAAE,4BAAiC;IAW3D,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAS1D,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAmEnD"}
+{"version":3,"file":"PluginServiceProvider.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/PluginServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAWzE,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAE1B,MAAM,wCAAwC,CAAC;AAIhD,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAA8B,EAC5B,KAAK,4BAA4B,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,sBAAsB,MAAM,kDAAkD,CAAC;AACtF,OAAO,8BAA8B,MAAM,0DAA0D,CAAC;AAMtG,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,eAAe;;IACnE,QAAQ,CAAC,SAAS,oBAAqB;IACvC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;gBAW/B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,2BAA2B,EACzC,WAAW,EAAE,yBAAyB,EACtC,eAAe,EAAE,sBAAsB,EACvC,uBAAuB,EAAE,8BAA8B,EACvD,4BAA4B,GAAE,4BAAiC,EAC/D,4BAA4B,GAAE,4BAAiC;IAW3D,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAS1D,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAiEnD"}

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

@@ -60,15 +60,12 @@ export default class PluginServiceProvider {
             pluginManager.setSpawn(adapter);
         }
         if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
-            logger.debug("FetchService not available, plugin manager will fetch directly");
-        }
-        else if (!("setFetch" in pluginManager)) {
-            logger.debug("Plugin manager does not support FetchCapable, skipping fetch injection");
+            logger.debug("FetchService not available, plugin service will fetch directly");
         }
         else {
             const fetchService = context.getServiceById(FETCH_SERVICE_ID);
             const adapter = new FetchInterfaceAdapter(fetchService, this.#fetchInterfaceAdapterOptions);
-            pluginManager.setFetch(adapter);
+            pluginService.setFetch(adapter);
         }
         await pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);
         await pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT);

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

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

package/dist/src/service/plugin/command/PluginAddSubCommand.js

@@ -52,6 +52,16 @@ export class PluginAddSubCommand {
         const installLabel = descriptor.version && descriptor.version !== "latest"
             ? `${descriptor.pluginId}@${descriptor.version}`
             : descriptor.pluginId;
+        // Confirm the package (and specific version/tag, if requested) actually exists on the
+        // remote marketplace before invoking the package manager - so a non-existent plugin or
+        // version is reported clearly instead of failing later (and less clearly) inside
+        // `bun add`/`npm install`.
+        const versionToCheck = descriptor.version === "latest" ? undefined : descriptor.version;
+        if (!(await pluginService.checkAvailable(descriptor.pluginId, versionToCheck))) {
+            throw new Error(versionToCheck
+                ? `Version ${versionToCheck} of plugin ${descriptor.pluginId} was not found in the configured plugin registry`
+                : `Plugin ${descriptor.pluginId} was not found in the configured plugin registry`);
+        }
         await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
         await pluginService.install(descriptor);
         await printerService.print(`Plugin ${descriptor.pluginId} installed.\n`, Icon.SUCCESS);

package/package.json

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

package/src/service/plugin/DefaultPluginService.ts

@@ -6,6 +6,8 @@ import type {
   VersionedPluginDescriptor,
   NpmjsPluginRepositoryConfig,
   NpmPluginRepositoryConfig,
+  FetchCapable,
+  FetchInterface,
 } from "@flowscripter/dynamic-plugin-framework";
 import {
   NpmPluginManager,
@@ -13,6 +15,10 @@ import {
   NpmPluginRepository,
 } from "@flowscripter/dynamic-plugin-framework";
 
+function isFetchCapable(value: unknown): value is FetchCapable {
+  return typeof value === "object" && value !== null && "setFetch" in value;
+}
+
 export default class DefaultPluginService implements PluginService {
   readonly #defaultRemoteConfig: NpmjsPluginRepositoryConfig;
   readonly #defaultLocalConfig: NpmPluginRepositoryConfig;
@@ -50,6 +56,20 @@ export default class DefaultPluginService implements PluginService {
     );
   }
 
+  /**
+   * Supply the {@link FetchInterface} for the underlying `pluginManager` to delegate fetch calls
+   * to, so it respects the host CLI's shutdown handling and default timeout.
+   */
+  setFetch(fetchInterface: FetchInterface): void {
+    if (isFetchCapable(this.#pluginManager)) {
+      this.#pluginManager.setFetch(fetchInterface);
+    }
+  }
+
+  async checkAvailable(pluginId: string, version?: string): Promise<boolean> {
+    return this.#pluginManager.checkAvailable(pluginId, version);
+  }
+
   search(query: Readonly<SearchQuery>): AsyncIterable<Readonly<VersionedPluginDescriptor>> {
     return this.#pluginManager.search(query);
   }

package/src/service/plugin/PluginServiceProvider.ts

@@ -12,7 +12,6 @@ import { DYNAMIC_CLI_FRAMEWORK_SERVICE_PROVIDER_FACTORY_EXTENSION_POINT } from "
 import type { CommandFactory } from "@flowscripter/dynamic-cli-framework-api";
 import type { ServiceProviderFactory } from "@flowscripter/dynamic-cli-framework-api";
 import type {
-  FetchCapable,
   NpmjsPluginRepositoryConfig,
   NpmPluginRepositoryConfig,
   SpawnCapable,
@@ -98,13 +97,11 @@ export default class PluginServiceProvider implements ServiceProvider {
     }
 
     if (!context.doesServiceExist(FETCH_SERVICE_ID)) {
-      logger.debug("FetchService not available, plugin manager will fetch directly");
-    } else if (!("setFetch" in pluginManager)) {
-      logger.debug("Plugin manager does not support FetchCapable, skipping fetch injection");
+      logger.debug("FetchService not available, plugin service will fetch directly");
     } else {
       const fetchService = context.getServiceById(FETCH_SERVICE_ID) as FetchService;
       const adapter = new FetchInterfaceAdapter(fetchService, this.#fetchInterfaceAdapterOptions);
-      (pluginManager as unknown as FetchCapable).setFetch(adapter);
+      pluginService.setFetch(adapter);
     }
 
     await pluginManager.registerExtensions(DYNAMIC_CLI_FRAMEWORK_COMMAND_FACTORY_EXTENSION_POINT);

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

@@ -69,6 +69,20 @@ export class PluginAddSubCommand implements SubCommand {
       descriptor.version && descriptor.version !== "latest"
         ? `${descriptor.pluginId}@${descriptor.version}`
         : descriptor.pluginId;
+
+    // Confirm the package (and specific version/tag, if requested) actually exists on the
+    // remote marketplace before invoking the package manager - so a non-existent plugin or
+    // version is reported clearly instead of failing later (and less clearly) inside
+    // `bun add`/`npm install`.
+    const versionToCheck = descriptor.version === "latest" ? undefined : descriptor.version;
+    if (!(await pluginService.checkAvailable(descriptor.pluginId, versionToCheck))) {
+      throw new Error(
+        versionToCheck
+          ? `Version ${versionToCheck} of plugin ${descriptor.pluginId} was not found in the configured plugin registry`
+          : `Plugin ${descriptor.pluginId} was not found in the configured plugin registry`,
+      );
+    }
+
     await printerService.info(`Installing ${installLabel}...\n`, Icon.INFORMATION);
     await pluginService.install(descriptor);
     await printerService.print(`Plugin ${descriptor.pluginId} installed.\n`, Icon.SUCCESS);