@flowscripter/dynamic-cli-framework 5.0.6 → 5.1.0

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;AAQxE,qBAAa,mBAAoB,YAAW,UAAU;IACpD,QAAQ,CAAC,IAAI,SAAS;IACtB,QAAQ,CAAC,WAAW,6BAA6B;IACjD,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,OAAO,UAAM;IACtB,QAAQ,CAAC,WAAW;;;;QAMlB;IAEI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCvE"}
+{"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;CA6CvE"}

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

@@ -2,6 +2,7 @@ import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, PRINTER_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import { getPluginId } from "./getPluginId.js";
+import { parsePluginSpecifier } from "./parsePluginSpecifier.js";
 export class PluginAddSubCommand {
     name = "add";
     description = "Install a remote plugin";
@@ -10,14 +11,14 @@ export class PluginAddSubCommand {
     positionals = [
         {
             name: "pluginId",
-            description: "Plugin ID to install (e.g. @scope/name)",
+            description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
             type: ValueTypeName.STRING,
         },
     ];
     async execute(context, argumentValues) {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID);
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
-        const pluginId = argumentValues["pluginId"];
+        const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"]);
         await printerService.info(`Searching for plugin: ${pluginId}\n`, Icon.INFORMATION);
         let descriptor;
         for await (const d of pluginService.search({ text: pluginId })) {
@@ -26,6 +27,11 @@ export class PluginAddSubCommand {
                 break;
             }
         }
+        if (descriptor && version) {
+            // search only ever returns the latest version - substitute the explicitly requested
+            // version so install() is asked for the correct one.
+            descriptor = { ...descriptor, version };
+        }
         if (!descriptor) {
             // Search did not find an exact match - attempt direct install by plugin ID.
             // This handles cases where the package exists on the registry but is not
@@ -38,7 +44,7 @@ export class PluginAddSubCommand {
                 pluginId,
                 scope,
                 name,
-                version: "latest",
+                version: version ?? "latest",
                 extensionPoints: [],
             };
         }

package/dist/src/service/plugin/command/parsePluginSpecifier.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export declare function parsePluginSpecifier(specifier: string): {
+    pluginId: string;
+    version?: string;
+};
+//# sourceMappingURL=parsePluginSpecifier.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parsePluginSpecifier.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/parsePluginSpecifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAS9F"}

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

@@ -0,0 +1,22 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export function parsePluginSpecifier(specifier) {
+    const index = specifier.lastIndexOf(":");
+    if (index === -1) {
+        return { pluginId: specifier };
+    }
+    return {
+        pluginId: specifier.slice(0, index),
+        version: specifier.slice(index + 1),
+    };
+}

package/package.json

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

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

@@ -8,6 +8,7 @@ import { PLUGIN_SERVICE_ID } from "@flowscripter/dynamic-cli-framework-api";
 import type { PluginService } from "@flowscripter/dynamic-cli-framework-api";
 import type { VersionedPluginDescriptor } from "@flowscripter/dynamic-plugin-framework";
 import { getPluginId } from "./getPluginId.ts";
+import { parsePluginSpecifier } from "./parsePluginSpecifier.ts";
 
 export class PluginAddSubCommand implements SubCommand {
   readonly name = "add";
@@ -17,7 +18,7 @@ export class PluginAddSubCommand implements SubCommand {
   readonly positionals = [
     {
       name: "pluginId",
-      description: "Plugin ID to install (e.g. @scope/name)",
+      description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
       type: ValueTypeName.STRING,
     },
   ];
@@ -26,7 +27,7 @@ export class PluginAddSubCommand implements SubCommand {
     const printerService = context.getServiceById(PRINTER_SERVICE_ID) as PrinterService;
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 
-    const pluginId = argumentValues["pluginId"] as string;
+    const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"] as string);
     await printerService.info(`Searching for plugin: ${pluginId}\n`, Icon.INFORMATION);
 
     let descriptor: VersionedPluginDescriptor | undefined;
@@ -37,6 +38,12 @@ export class PluginAddSubCommand implements SubCommand {
       }
     }
 
+    if (descriptor && version) {
+      // search only ever returns the latest version - substitute the explicitly requested
+      // version so install() is asked for the correct one.
+      descriptor = { ...descriptor, version };
+    }
+
     if (!descriptor) {
       // Search did not find an exact match - attempt direct install by plugin ID.
       // This handles cases where the package exists on the registry but is not
@@ -52,7 +59,7 @@ export class PluginAddSubCommand implements SubCommand {
         pluginId,
         scope,
         name,
-        version: "latest",
+        version: version ?? "latest",
         extensionPoints: [],
       };
     }

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

@@ -0,0 +1,22 @@
+/**
+ * Splits a plugin specifier into a bare plugin ID and an optional version.
+ *
+ * The specifier is split on the *last* `:` character, if present. Scoped npm package names
+ * (e.g. `@scope/name`) never legitimately contain a literal `:`, so this split cannot collide
+ * with the scope/slash structure of the plugin ID itself.
+ *
+ * Everything after the last `:` is always treated as the requested version, including
+ * non-semver tags such as `latest` or `next` - no validation is performed on the tail.
+ *
+ * @param specifier raw plugin specifier, e.g. `@scope/name`, `@scope/name:3.0.0` or `name:latest`.
+ */
+export function parsePluginSpecifier(specifier: string): { pluginId: string; version?: string } {
+  const index = specifier.lastIndexOf(":");
+  if (index === -1) {
+    return { pluginId: specifier };
+  }
+  return {
+    pluginId: specifier.slice(0, index),
+    version: specifier.slice(index + 1),
+  };
+}