@flowscripter/dynamic-cli-framework 5.2.2 → 5.3.1

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/dist/src/service/upgrade/DefaultUpgradeService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAM1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BzE,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAsU1B"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EAEZ,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAS1E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAkB5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAO/C,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS;IAKhE,eAAe,CACpB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,YAAY,EAAE,YAAY,GAAG,SAAS,GACrC,IAAI;IAKA,qBAAqB,CAAC,aAAa,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA4BzE,QAAQ,IAAI,WAAW,GAAG,SAAS;IAanC,UAAU,IAAI,aAAa,GAAG,SAAS;IAWjC,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgBxE,eAAe,CAC1B,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,kBAAkB,CAAC;IAwCjB,OAAO,CAClB,UAAU,CAAC,EAAE,WAAW,EACxB,YAAY,CAAC,EAAE,aAAa,EAC5B,qBAAqB,CAAC,EAAE,aAAa,GACpC,OAAO,CAAC,aAAa,CAAC;CAsU1B"}

package/dist/src/service/upgrade/DefaultUpgradeService.js

@@ -4,6 +4,8 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { InstallMethod, SupportedArch, SupportedOs, } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
+import getLogger from "../../util/logger.js";
+const logger = getLogger("DefaultUpgradeService");
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
 // so that opportunistic call is raced against this timeout so it never stalls CLI startup.
 // A deliberate caller (waitForResult=true, e.g. the `upgrade` command) awaits checkForUpgrade()
@@ -35,6 +37,7 @@ export default class DefaultUpgradeService {
     }
     getUpgradeCheckResult(waitForResult = false) {
         if (!this.#upgradeCheckPromise) {
+            logger.debug(() => "Starting upgrade check");
             // Only cache a non-"failed" result. A "failed" result can come from a transient issue
             // (e.g. a network blip, or the opportunistic startup check racing past
             // VERSION_CHECK_TIMEOUT_MS before checkForUpgrade() itself resolves) - caching that would
@@ -42,6 +45,7 @@ export default class DefaultUpgradeService {
             // waiting via waitForResult=true) any chance of a fresh attempt for the rest of this
             // process's lifetime.
             this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
+                logger.debug(() => `Upgrade check result: ${JSON.stringify(result)}`);
                 if (result.status === "failed") {
                     this.#upgradeCheckPromise = undefined;
                 }

package/package.json

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

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -18,6 +18,9 @@ import {
 } from "@flowscripter/dynamic-cli-framework-api";
 import semver from "semver";
 import type { UpgradeLocationsConfig } from "./UpgradeLocationsConfig.ts";
+import getLogger from "../../util/logger.ts";
+
+const logger = getLogger("DefaultUpgradeService");
 
 // checkForUpgrade() runs opportunistically on every CLI invocation (via BannerServiceProvider),
 // so that opportunistic call is raced against this timeout so it never stalls CLI startup.
@@ -63,6 +66,7 @@ export default class DefaultUpgradeService implements UpgradeService {
 
   public getUpgradeCheckResult(waitForResult = false): Promise<UpgradeCheckResult> {
     if (!this.#upgradeCheckPromise) {
+      logger.debug(() => "Starting upgrade check");
       // Only cache a non-"failed" result. A "failed" result can come from a transient issue
       // (e.g. a network blip, or the opportunistic startup check racing past
       // VERSION_CHECK_TIMEOUT_MS before checkForUpgrade() itself resolves) - caching that would
@@ -70,6 +74,7 @@ export default class DefaultUpgradeService implements UpgradeService {
       // waiting via waitForResult=true) any chance of a fresh attempt for the rest of this
       // process's lifetime.
       this.#upgradeCheckPromise = this.checkForUpgrade().then((result) => {
+        logger.debug(() => `Upgrade check result: ${JSON.stringify(result)}`);
         if (result.status === "failed") {
           this.#upgradeCheckPromise = undefined;
         }