@git.zone/cli 2.19.4 → 2.19.6

package/ts/mod_tools/index.ts

@@ -88,7 +88,10 @@ async function runUpdate(argvArg: any, mode: ICliMode): Promise<void> {
   const installedPackages = await pmUtil.getInstalledPackages();
   const packageInfos = await getPackageUpdateInfos(pmUtil, installedPackages);
   const legacyRoots = await pmUtil.getLegacyGlobalRoots();
-  const legacyCleanupNeeded = legacyRoots.length > 0;
+  const legacyCleanupRoots = legacyRoots.filter(
+    (legacyRoot) => legacyRoot.safeToDelete,
+  );
+  const legacyCleanupNeeded = legacyCleanupRoots.length > 0;
 
   if (packageInfos.length === 0) {
     console.log("No managed @git.zone packages found installed globally.");
@@ -131,10 +134,10 @@ async function runUpdate(argvArg: any, mode: ICliMode): Promise<void> {
     console.log("");
   } else if (legacyCleanupNeeded) {
     console.log(
-      `Detected ${legacyRoots.length} legacy pnpm global root(s) for cleanup.`,
+      `Detected ${legacyCleanupRoots.length} legacy pnpm global root(s) for cleanup.`,
     );
     if (verbose) {
-      for (const legacyRoot of legacyRoots) {
+      for (const legacyRoot of legacyCleanupRoots) {
         console.log(`  ${legacyRoot.globalDir}`);
       }
     }
@@ -180,11 +183,12 @@ async function runUpdate(argvArg: any, mode: ICliMode): Promise<void> {
     return;
   }
 
+  let pnpmUpdated = false;
   if (pnpmNeedsUpdate && pnpmInfo.latestVersion) {
     console.log(`Updating pnpm to ${pnpmInfo.latestVersion}...`);
-    const success = await pmUtil.updatePnpm(pnpmInfo.latestVersion);
+    pnpmUpdated = await pmUtil.updatePnpm(pnpmInfo.latestVersion);
     console.log(
-      success
+      pnpmUpdated
         ? "pnpm updated successfully.\n"
         : "pnpm update failed. Continuing with package updates.\n",
     );
@@ -205,8 +209,11 @@ async function runUpdate(argvArg: any, mode: ICliMode): Promise<void> {
         )
       : { successCount: 0, failCount: 0 };
 
-  if (packagesToUpdate.length > 0 || legacyCleanupNeeded) {
+  if (packagesToUpdate.length > 0 || legacyCleanupNeeded || pnpmUpdated) {
     await syncCurrentGlobalShims(pmUtil);
+  }
+
+  if (packagesToUpdate.length > 0 || legacyCleanupNeeded) {
     await cleanupLegacyInstalls(pmUtil);
   }
 }
@@ -256,7 +263,7 @@ async function runInstall(argvArg: any, mode: ICliMode): Promise<void> {
   if (!mode.yes) {
     const choicesWithVersions: Array<{ name: string; value: string }> = [];
     for (const packageName of missingPackages) {
-      const latest = await pmUtil.getLatestVersion(packageName);
+      const latest = await pmUtil.getLatestMatureVersion(packageName);
       choicesWithVersions.push({
         name: `${packageName}${latest ? `@${latest}` : ""}`,
         value: packageName,
@@ -288,7 +295,7 @@ async function handleSelfUpdate(
 ): Promise<boolean> {
   console.log("Checking for gitzone self-update...\n");
   const currentVersion = commitinfo.version;
-  const latestVersion = await pmUtil.getLatestVersion("@git.zone/cli");
+  const latestVersion = await pmUtil.getLatestMatureVersion("@git.zone/cli");
 
   if (!latestVersion || !pmUtil.isNewerVersion(currentVersion, latestVersion)) {
     console.log(`  @git.zone/cli  ${currentVersion}  Up to date\n`);
@@ -321,7 +328,7 @@ async function handleSelfUpdate(
     return false;
   }
 
-  const success = await pmUtil.installLatest("@git.zone/cli");
+  const success = await pmUtil.installLatest("@git.zone/cli", latestVersion);
   if (!success) {
     console.log(
       "\ngitzone self-update failed. Continuing with the current version.\n",
@@ -329,8 +336,10 @@ async function handleSelfUpdate(
     return false;
   }
 
+  await syncCurrentGlobalShims(pmUtil);
+  await cleanupLegacyInstalls(pmUtil);
   console.log(
-    "\ngitzone has been updated. Re-run gitzone tools update to check remaining packages.",
+    "\ngitzone has been updated and command shims have been refreshed. Re-run gitzone tools update to check remaining packages.",
   );
   return true;
 }
@@ -344,7 +353,9 @@ async function getPackageUpdateInfos(
     if (!GITZONE_PACKAGES.includes(installedPackage.name)) {
       continue;
     }
-    const latestVersion = await pmUtil.getLatestVersion(installedPackage.name);
+    const latestVersion = await pmUtil.getLatestMatureVersion(
+      installedPackage.name,
+    );
     packageInfos.push({
       name: installedPackage.name,
       currentVersion: installedPackage.version,
@@ -401,7 +412,7 @@ async function printPackageListWithLatest(
   console.log("  Package                      Latest");
   console.log("  ----------------------------------------");
   for (const packageName of packageNames) {
-    const latest = await pmUtil.getLatestVersion(packageName);
+    const latest = await pmUtil.getLatestMatureVersion(packageName);
     console.log(`  ${packageName.padEnd(28)}  ${latest || "unknown"}`);
   }
   console.log("");
@@ -420,7 +431,14 @@ async function installPackages(
       typeof packageSpec === "string" ? packageSpec : packageSpec.name;
     const packageVersion =
       typeof packageSpec === "string" ? undefined : packageSpec.version;
-    const success = await pmUtil.installLatest(packageName, packageVersion);
+    const effectivePackageVersion =
+      packageVersion ||
+      (await pmUtil.getLatestMatureVersion(packageName)) ||
+      undefined;
+    const success = await pmUtil.installLatest(
+      packageName,
+      effectivePackageVersion,
+    );
     if (success) {
       console.log(`  ${packageName} ${action} successfully`);
       successCount++;