@flowscripter/dynamic-cli-framework 5.2.2 → 5.3.0

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

@@ -11,7 +11,7 @@ export class PluginAddSubCommand {
     positionals = [
         {
             name: "pluginId",
-            description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
+            description: "Plugin ID to install (e.g. @scope/name or @scope/name@version)",
             type: ValueTypeName.STRING,
         },
     ];
@@ -19,7 +19,7 @@ export class PluginAddSubCommand {
         const printerService = context.getServiceById(PRINTER_SERVICE_ID);
         const pluginService = context.getServiceById(PLUGIN_SERVICE_ID);
         const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"]);
-        const searchLabel = version ? `${pluginId}:${version}` : pluginId;
+        const searchLabel = version ? `${pluginId}@${version}` : pluginId;
         await printerService.info(`Searching for plugin: ${searchLabel}\n`, Icon.INFORMATION);
         let descriptor;
         for await (const d of pluginService.search({ text: pluginId })) {

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

@@ -1,14 +1,17 @@
 /**
- * Splits a plugin specifier into a bare plugin ID and an optional version.
+ * Splits a plugin specifier into a bare plugin ID and an optional version, following npm's own
+ * `[@scope/]name[@version]` convention (`:` is not used as a version separator anywhere in the
+ * npm/JS ecosystem, so it is not supported here).
  *
- * 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.
+ * A leading `@scope/` portion (if present) is stripped first, then the *last* `@` in the
+ * remainder - if any - is the version separator. This correctly distinguishes the scope marker
+ * (always the first character) from a version-separating `@` occurring later.
  *
- * Everything after the last `:` is always treated as the requested version, including
+ * Everything after the separator 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`.
+ * @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;

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

@@ -1 +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"}
+{"version":3,"file":"parsePluginSpecifier.d.ts","sourceRoot":"","sources":["../../../../../src/service/plugin/command/parsePluginSpecifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAY9F"}

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

@@ -1,22 +1,28 @@
 /**
- * Splits a plugin specifier into a bare plugin ID and an optional version.
+ * Splits a plugin specifier into a bare plugin ID and an optional version, following npm's own
+ * `[@scope/]name[@version]` convention (`:` is not used as a version separator anywhere in the
+ * npm/JS ecosystem, so it is not supported here).
  *
- * 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.
+ * A leading `@scope/` portion (if present) is stripped first, then the *last* `@` in the
+ * remainder - if any - is the version separator. This correctly distinguishes the scope marker
+ * (always the first character) from a version-separating `@` occurring later.
  *
- * Everything after the last `:` is always treated as the requested version, including
+ * Everything after the separator 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`.
+ * @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) {
+    const isScoped = specifier.startsWith("@");
+    const scopeEnd = isScoped ? specifier.indexOf("/") : -1;
+    const searchFrom = isScoped && scopeEnd !== -1 ? scopeEnd + 1 : 0;
+    const atIndex = specifier.lastIndexOf("@");
+    if (atIndex === -1 || atIndex < searchFrom) {
         return { pluginId: specifier };
     }
     return {
-        pluginId: specifier.slice(0, index),
-        version: specifier.slice(index + 1),
+        pluginId: specifier.slice(0, atIndex),
+        version: specifier.slice(atIndex + 1),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.2.2",
+  "version": "5.3.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

@@ -18,7 +18,7 @@ export class PluginAddSubCommand implements SubCommand {
   readonly positionals = [
     {
       name: "pluginId",
-      description: "Plugin ID to install (e.g. @scope/name or @scope/name:version)",
+      description: "Plugin ID to install (e.g. @scope/name or @scope/name@version)",
       type: ValueTypeName.STRING,
     },
   ];
@@ -28,7 +28,7 @@ export class PluginAddSubCommand implements SubCommand {
     const pluginService = context.getServiceById(PLUGIN_SERVICE_ID) as PluginService;
 
     const { pluginId, version } = parsePluginSpecifier(argumentValues["pluginId"] as string);
-    const searchLabel = version ? `${pluginId}:${version}` : pluginId;
+    const searchLabel = version ? `${pluginId}@${version}` : pluginId;
     await printerService.info(`Searching for plugin: ${searchLabel}\n`, Icon.INFORMATION);
 
     let descriptor: VersionedPluginDescriptor | undefined;

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

@@ -1,22 +1,28 @@
 /**
- * Splits a plugin specifier into a bare plugin ID and an optional version.
+ * Splits a plugin specifier into a bare plugin ID and an optional version, following npm's own
+ * `[@scope/]name[@version]` convention (`:` is not used as a version separator anywhere in the
+ * npm/JS ecosystem, so it is not supported here).
  *
- * 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.
+ * A leading `@scope/` portion (if present) is stripped first, then the *last* `@` in the
+ * remainder - if any - is the version separator. This correctly distinguishes the scope marker
+ * (always the first character) from a version-separating `@` occurring later.
  *
- * Everything after the last `:` is always treated as the requested version, including
+ * Everything after the separator 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`.
+ * @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) {
+  const isScoped = specifier.startsWith("@");
+  const scopeEnd = isScoped ? specifier.indexOf("/") : -1;
+  const searchFrom = isScoped && scopeEnd !== -1 ? scopeEnd + 1 : 0;
+  const atIndex = specifier.lastIndexOf("@");
+  if (atIndex === -1 || atIndex < searchFrom) {
     return { pluginId: specifier };
   }
   return {
-    pluginId: specifier.slice(0, index),
-    version: specifier.slice(index + 1),
+    pluginId: specifier.slice(0, atIndex),
+    version: specifier.slice(atIndex + 1),
   };
 }