@flowscripter/dynamic-cli-framework 9.0.0 → 9.0.2

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":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,WAAW,EAEX,kBAAkB,EAClB,aAAa,EAEd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,aAAa,EAGb,QAAQ,EAER,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAwC1E,eAAO,MAAM,uBAAuB,yBAAyB,CAAC;AAY9D,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAaD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAiBpE;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAKlE,SAAgB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzD,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAItE;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA4DM,qBAAqB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAe1D;IAED;;;;OAIG;IACU,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CASnE;IAED;;;OAGG;IACU,2BAA2B,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAWlF;IAED;;;;;OAKG;IACI,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAUjF;IAoBD;;;;;;;OAOG;IACU,OAAO,CAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAQ7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoDpF;IA2CY,eAAe,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsC/F;IAEY,OAAO,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAiDlF;CA2TF"}
+{"version":3,"file":"DefaultUpgradeService.d.ts","sourceRoot":"","sources":["../../../../src/service/upgrade/DefaultUpgradeService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,WAAW,EAEX,kBAAkB,EAClB,aAAa,EAEd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,aAAa,EAGb,QAAQ,EAER,aAAa,EACb,WAAW,EACX,KAAK,cAAc,EACpB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAwC1E,eAAO,MAAM,uBAAuB,yBAAyB,CAAC;AAY9D,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI7E;AAaD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAiBpE;AAQD,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;IAKlE,SAAgB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzD,YAAmB,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,SAAS,EAItE;IAEM,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExC;IA4DM,qBAAqB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAe1D;IAED;;;;OAIG;IACU,wBAAwB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CASnE;IAED;;;OAGG;IACU,2BAA2B,IAAI,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAWlF;IAED;;;;;OAKG;IACI,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAUjF;IAoBD;;;;;;;OAOG;IACU,OAAO,CAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B;IAEM,QAAQ,IAAI,WAAW,GAAG,SAAS,CAWzC;IAEM,UAAU,IAAI,aAAa,GAAG,SAAS,CAQ7C;IAEY,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoDpF;IA2CY,eAAe,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsC/F;IAEY,OAAO,CAAC,qBAAqB,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAiDlF;CAgVF"}

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

@@ -407,7 +407,7 @@ export default class DefaultUpgradeService {
                     await this.#upgradeViaLinuxScript();
                     break;
                 case InstallMethod.HOMEBREW:
-                    await this.#upgradeViaHomebrew();
+                    await this.#upgradeViaHomebrew(checkResult.latestVersion);
                     break;
                 case InstallMethod.WINGET:
                     await this.#upgradeViaWinget();
@@ -586,12 +586,30 @@ export default class DefaultUpgradeService {
             throw new Error(`Install script failed: ${describeSpawnFailure(result)}`);
         }
     }
-    async #upgradeViaHomebrew() {
+    // The latest version is read from the tap's formula on GitHub, but `brew upgrade` only sees the
+    // local tap clone, which is stale until `brew update` runs. A stale tap makes `brew upgrade`
+    // exit 0 with "already installed", so update first and then confirm the installed version.
+    async #upgradeViaHomebrew(expectedVersion) {
         const { tap, formula } = this.#config.homebrew;
+        const updateResult = await this.#spawnQuoted(["brew", "update"]);
+        if (!updateResult.ok) {
+            throw new Error(`brew update failed: ${describeSpawnFailure(updateResult)}`);
+        }
         const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
         if (!result.ok) {
             throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
         }
+        const lines = [];
+        const listResult = await this.#spawnService.spawn(["brew", "list", "--versions", formula], {
+            mode: "wrapped",
+            longRunning: false,
+            onOutput: (line) => lines.push(line),
+        });
+        const installed = lines.join(" ").trim();
+        const installedVersions = installed.split(/\s+/).slice(1);
+        if (!listResult.ok || !installedVersions.includes(expectedVersion)) {
+            throw new Error(`brew upgrade completed but version ${expectedVersion} is not installed (installed: ${installed || "unknown"})`);
+        }
     }
     async #upgradeViaWinget() {
         const { packageId } = this.#config.winget;

package/dist/src/service/upgrade/command/UpgradeSubCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAUrF,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAQrC;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD5E;CACF"}
+{"version":3,"file":"UpgradeSubCommand.d.ts","sourceRoot":"","sources":["../../../../../src/service/upgrade/command/UpgradeSubCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,yCAAyC,CAAC;AAuBrF,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,mBAAmB,SAAS;IACrC,QAAQ,CAAC,WAAW,UAAM;IAE1B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAQrC;IAEW,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD5E;CACF"}

package/dist/src/service/upgrade/command/UpgradeSubCommand.js

@@ -1,5 +1,17 @@
 import { ValueTypeName } from "@flowscripter/dynamic-cli-framework-api";
 import { Icon, InstallMethod, PRINTER_SERVICE_ID, UPGRADE_SERVICE_ID, } from "@flowscripter/dynamic-cli-framework-api";
+function installMethodsForPlatform() {
+    if (process.platform === "darwin") {
+        return [InstallMethod.HOMEBREW, InstallMethod.GITHUB_RELEASE];
+    }
+    if (process.platform === "linux") {
+        return [InstallMethod.LINUX_SCRIPT, InstallMethod.GITHUB_RELEASE];
+    }
+    if (process.platform === "win32") {
+        return [InstallMethod.WINGET, InstallMethod.GITHUB_RELEASE];
+    }
+    return [InstallMethod.GITHUB_RELEASE];
+}
 export class UpgradeSubCommand {
     name = "upgrade";
     description = "Upgrade to the latest available version";
@@ -10,7 +22,7 @@ export class UpgradeSubCommand {
             name: "install-method",
             type: ValueTypeName.STRING,
             isOptional: true,
-            allowableValues: Object.values(InstallMethod),
+            allowableValues: installMethodsForPlatform(),
             description: "Override the detected install method",
         },
     ];

package/package.json

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

package/src/service/upgrade/DefaultUpgradeService.ts

@@ -512,7 +512,7 @@ export default class DefaultUpgradeService implements UpgradeService {
           await this.#upgradeViaLinuxScript();
           break;
         case InstallMethod.HOMEBREW:
-          await this.#upgradeViaHomebrew();
+          await this.#upgradeViaHomebrew(checkResult.latestVersion);
           break;
         case InstallMethod.WINGET:
           await this.#upgradeViaWinget();
@@ -725,12 +725,33 @@ export default class DefaultUpgradeService implements UpgradeService {
     }
   }
 
-  async #upgradeViaHomebrew(): Promise<void> {
+  // The latest version is read from the tap's formula on GitHub, but `brew upgrade` only sees the
+  // local tap clone, which is stale until `brew update` runs. A stale tap makes `brew upgrade`
+  // exit 0 with "already installed", so update first and then confirm the installed version.
+  async #upgradeViaHomebrew(expectedVersion: string): Promise<void> {
     const { tap, formula } = this.#config.homebrew!;
+    const updateResult = await this.#spawnQuoted(["brew", "update"]);
+    if (!updateResult.ok) {
+      throw new Error(`brew update failed: ${describeSpawnFailure(updateResult)}`);
+    }
     const result = await this.#spawnQuoted(["brew", "upgrade", `${tap}/${formula}`]);
     if (!result.ok) {
       throw new Error(`brew upgrade failed: ${describeSpawnFailure(result)}`);
     }
+
+    const lines: string[] = [];
+    const listResult = await this.#spawnService!.spawn(["brew", "list", "--versions", formula], {
+      mode: "wrapped",
+      longRunning: false,
+      onOutput: (line) => lines.push(line),
+    });
+    const installed = lines.join(" ").trim();
+    const installedVersions = installed.split(/\s+/).slice(1);
+    if (!listResult.ok || !installedVersions.includes(expectedVersion)) {
+      throw new Error(
+        `brew upgrade completed but version ${expectedVersion} is not installed (installed: ${installed || "unknown"})`,
+      );
+    }
   }
 
   async #upgradeViaWinget(): Promise<void> {

package/src/service/upgrade/command/UpgradeSubCommand.ts

@@ -11,6 +11,19 @@ import {
 import type { PrinterService } from "@flowscripter/dynamic-cli-framework-api";
 import type { UpgradeService } from "@flowscripter/dynamic-cli-framework-api";
 
+function installMethodsForPlatform(): InstallMethod[] {
+  if (process.platform === "darwin") {
+    return [InstallMethod.HOMEBREW, InstallMethod.GITHUB_RELEASE];
+  }
+  if (process.platform === "linux") {
+    return [InstallMethod.LINUX_SCRIPT, InstallMethod.GITHUB_RELEASE];
+  }
+  if (process.platform === "win32") {
+    return [InstallMethod.WINGET, InstallMethod.GITHUB_RELEASE];
+  }
+  return [InstallMethod.GITHUB_RELEASE];
+}
+
 export class UpgradeSubCommand implements SubCommand {
   readonly name = "upgrade";
   readonly description = "Upgrade to the latest available version";
@@ -22,7 +35,7 @@ export class UpgradeSubCommand implements SubCommand {
       name: "install-method",
       type: ValueTypeName.STRING,
       isOptional: true,
-      allowableValues: Object.values(InstallMethod),
+      allowableValues: installMethodsForPlatform(),
       description: "Override the detected install method",
     },
   ];