@coana-tech/cli 14.12.86 → 14.12.88

package/cli.mjs

@@ -221274,7 +221274,8 @@ var NpmSocketUpgradeManager = class {
       const oldFileContent = await readFile16(resolve19(this.rootDir, lockfile2), "utf-8");
       let result;
       if (this.packageLockMatcher(lockfile2)) {
-        const command = mode === "LOCKFILE_ONLY" ? cmdt`npm install --package-lock-only` : cmdt`npm install -f --ignore-scripts --no-fund --no-audit --no-progress`;
+        const npmBin = await getNpmBin();
+        const command = mode === "LOCKFILE_ONLY" ? cmdt`${npmBin} install --package-lock-only --loglevel=verbose` : cmdt`${npmBin} install -f --ignore-scripts --no-fund --no-audit --no-progress --loglevel=verbose`;
         result = await execNeverFail(command, lockfileDir);
       } else if (this.pnpmLockMatcher(lockfile2)) {
         const command = mode === "LOCKFILE_ONLY" ? cmdt`pnpm install --lockfile-only` : cmdt`pnpm install --ignore-scripts --fix-lockfile --config.confirmModulesPurge=false`;
@@ -221331,7 +221332,10 @@ var NpmSocketUpgradeManager = class {
         logger.debug("update lockfile error signal", result.error?.signal);
         logger.debug("update lockfile error killed", result.error?.killed);
         logger.debug("update lockfile working directory", lockfileDir);
-        logger.debug("update lockfile command", mode === "LOCKFILE_ONLY" ? "npm install --package-lock-only" : "npm install -f --ignore-scripts --no-fund --no-audit --no-progress");
+        logger.debug(
+          "update lockfile command",
+          mode === "LOCKFILE_ONLY" ? "npm install --package-lock-only" : "npm install -f --ignore-scripts --no-fund --no-audit --no-progress"
+        );
         const errorDetails = [
           `message: ${result.error?.message ?? "Unknown error"}`,
           result.error?.code ? `code: ${result.error.code}` : null,
@@ -221345,7 +221349,6 @@ var NpmSocketUpgradeManager = class {
           artifacts: i3(artifacts),
           message: `Failed to update lockfile: ${errorDetails}`
         });
-        throw new Error(`Failed to update lockfile: ${errorDetails}`);
       }
     });
   }
@@ -229596,7 +229599,7 @@ function assertDefined(value2) {
 
 // dist/cli-upgrade-purl.js
 var ECOSYSTEMS_WITH_SOCKET_UPGRADES = ["NPM", "MAVEN", "NUGET", "GO", "RUST", "PIP", "RUBYGEMS"];
-async function upgradePurl(rootDir, upgrades, artifacts, options, logFile, cliFixRunId) {
+async function upgradePurl(rootDir, upgrades, artifacts, options, cliFixRunId) {
   if (options.rangeStyle && options.rangeStyle !== "pin") {
     throw new Error('Range style must be "pin"');
   }
@@ -229625,79 +229628,71 @@ ${Array.from(upgrades).map(([idx, upgradeVersion]) => `	${prettyPrintPurlUpgrade
       if (supportedUpgrades.size === 0) {
         return "fixed-none";
       }
-      try {
-        const manifestFiles = await fetchManifestFilesFromManifestsTarHash(options.manifestsTarHash);
-        const ecosystemToSocketArtifactUpgrades = /* @__PURE__ */ new Map();
-        for (const [idx, upgradeVersion] of supportedUpgrades) {
-          const artifact = artifacts[idx];
-          if (!artifact.name)
-            continue;
-          if (!artifact.version)
-            continue;
-          const ecosystem = getAdvisoryEcosystemFromPurlType(artifact.type);
-          if (!ecosystem) {
-            throw new Error(`CLI Assertion error: Attempting to upgrade a purl from an unsupported ecosystem: ${purlToString(artifact)}.`);
-          }
-          if (!ecosystemToSocketArtifactUpgrades.has(ecosystem)) {
-            ecosystemToSocketArtifactUpgrades.set(ecosystem, /* @__PURE__ */ new Map());
-          }
-          ecosystemToSocketArtifactUpgrades.get(ecosystem).set(idx, upgradeVersion);
-        }
-        let anyErrors = false;
-        for (const [ecosystem, upgrades2] of ecosystemToSocketArtifactUpgrades) {
-          if (options.rangeStyle && !["NPM", "MAVEN", "NUGET", "GO", "RUST", "PIP", "RUBYGEMS"].includes(ecosystem)) {
-            logger.warn(`Range style is not supported for ${ecosystem}, skipping upgrades`);
-            continue;
-          }
-          const statusUpdater = (update2) => {
-            const statusIcons = {
-              success: "\u2705",
-              skipped: "\u26AA",
-              warn: "\u26A0\uFE0F",
-              error: "\u274C"
-            };
-            logger.info(`${statusIcons[update2.status]} ${update2.message} \u2500 ${relative18(rootDir, resolve40(rootDir, update2.file))}`);
-            update2.artifacts.forEach((idx, i7) => {
-              logger.info(`${" ".repeat(3)}${i7 === update2.artifacts.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} ${prettyPrintSocketFactArtifactUpgrade(artifacts[idx], upgrades2.get(idx))}`);
-            });
-            for (const detail of update2.details ?? []) {
-              logger.debug(detail);
-            }
-            if (update2.patch)
-              logger.debug(update2.patch);
-            if (update2.status === "error")
-              anyErrors = true;
-          };
-          const ctxt = {
-            manifestFiles,
-            upgrades: upgrades2,
-            artifacts,
-            rangeStyle: options.rangeStyle,
-            // Note! picomatch
-            wsFilter: (0, import_picomatch10.default)(options.include?.map((s6) => s6 || ".") ?? [".", "**"], {
-              ignore: options.exclude?.map((s6) => s6 || ".")
-            }),
-            statusUpdater
-          };
-          await applySocketUpgrades(ecosystem, rootDir, ctxt);
+      const manifestFiles = await fetchManifestFilesFromManifestsTarHash(options.manifestsTarHash);
+      const ecosystemToSocketArtifactUpgrades = /* @__PURE__ */ new Map();
+      for (const [idx, upgradeVersion] of supportedUpgrades) {
+        const artifact = artifacts[idx];
+        if (!artifact.name)
+          continue;
+        if (!artifact.version)
+          continue;
+        const ecosystem = getAdvisoryEcosystemFromPurlType(artifact.type);
+        if (!ecosystem) {
+          throw new Error(`CLI Assertion error: Attempting to upgrade a purl from an unsupported ecosystem: ${purlToString(artifact)}.`);
         }
-        if (upgradePurlRunId) {
-          await getSocketAPI().finalizeUpgradePurlRun(upgradePurlRunId, "succeeded");
+        if (!ecosystemToSocketArtifactUpgrades.has(ecosystem)) {
+          ecosystemToSocketArtifactUpgrades.set(ecosystem, /* @__PURE__ */ new Map());
         }
-        return unsupportedUpgrades.size === 0 && !anyErrors ? "fixed-all" : "fixed-some";
-      } catch (error) {
-        logger.debug(`Error stack: ${error.stack}`);
-        if (upgradePurlRunId) {
-          await getSocketAPI().finalizeUpgradePurlRun(
-            upgradePurlRunId,
-            "error",
-            !cliFixRunId ? error.stack : void 0,
-            // do not send stack trace and logContent for computeFixes runs, as that will be handled by that command.
-            !cliFixRunId && logFile ? await logger.getLogContent(logFile) : void 0
-          );
+        ecosystemToSocketArtifactUpgrades.get(ecosystem).set(idx, upgradeVersion);
+      }
+      let anyErrors = false;
+      let anySkipped = false;
+      for (const [ecosystem, upgrades2] of ecosystemToSocketArtifactUpgrades) {
+        if (options.rangeStyle && !["NPM", "MAVEN", "NUGET", "GO", "RUST", "PIP", "RUBYGEMS"].includes(ecosystem)) {
+          logger.warn(`Range style is not supported for ${ecosystem}, skipping upgrades`);
+          continue;
         }
-        throw error;
+        const statusUpdater = (update2) => {
+          const statusIcons = {
+            success: "\u2705",
+            skipped: "\u26AA",
+            warn: "\u26A0\uFE0F",
+            error: "\u274C"
+          };
+          logger.info(`${statusIcons[update2.status]} ${update2.message} \u2500 ${relative18(rootDir, resolve40(rootDir, update2.file))}`);
+          update2.artifacts.forEach((idx, i7) => {
+            logger.info(`${" ".repeat(3)}${i7 === update2.artifacts.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} ${prettyPrintSocketFactArtifactUpgrade(artifacts[idx], upgrades2.get(idx))}`);
+          });
+          for (const detail of update2.details ?? []) {
+            logger.debug(detail);
+          }
+          if (update2.patch)
+            logger.debug(update2.patch);
+          if (update2.status === "error")
+            anyErrors = true;
+          if (update2.status === "skipped")
+            anySkipped = true;
+        };
+        const ctxt = {
+          manifestFiles,
+          upgrades: upgrades2,
+          artifacts,
+          rangeStyle: options.rangeStyle,
+          // Note! picomatch
+          wsFilter: (0, import_picomatch10.default)(options.include?.map((s6) => s6 || ".") ?? [".", "**"], {
+            ignore: options.exclude?.map((s6) => s6 || ".")
+          }),
+          statusUpdater
+        };
+        await applySocketUpgrades(ecosystem, rootDir, ctxt);
+      }
+      if (upgradePurlRunId) {
+        await getSocketAPI().finalizeUpgradePurlRun(upgradePurlRunId, "succeeded");
+      }
+      if (anyErrors) {
+        throw new Error("Failed to upgrade purls - consult logs for more details");
       }
+      return unsupportedUpgrades.size === 0 && !anySkipped ? "fixed-all" : "fixed-some";
     }
     const otherModulesCommunicator = new OtherModulesCommunicator(rootDir, options, {
       type: "missing"
@@ -230176,7 +230171,7 @@ async function computeFixesAndUpgradePurls(path2, options, logFile) {
       include: options.include,
       exclude: options.exclude,
       rangeStyle: options.rangeStyle
-    }, logFile, autofixRunId) ?? "fixed-all";
+    }, autofixRunId) ?? "fixed-all";
     if (autofixRunId) {
       await getSocketAPI().finalizeAutofixRun(autofixRunId, ghsasFailedToFix.length === 0 && applyFixesStatus === "fixed-all" ? "fixed-all" : ghsasFailedToFix.length === Object.keys(ghsaToVulnerableArtifactIdsToApply).length || applyFixesStatus === "fixed-none" ? "fixed-none" : "fixed-some");
     }
@@ -245922,7 +245917,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version2 = "14.12.86";
+var version2 = "14.12.88";
 
 // dist/cli-core.js
 var { mapValues, omit, partition, pick } = import_lodash15.default;
@@ -246754,6 +246749,7 @@ computeFixesAndUpgradePurlsCmd.name("compute-fixes-and-upgrade-purls").argument(
     await rm2(tmpDir, { recursive: true, force: true });
   } catch (error) {
     console.error(`Failed with error: ${error instanceof Error ? error.message : String(error)}`);
+    console.error(`Notice, the updates may have partially succeeded so check your manifest files for changes`);
     console.error(`More details available in log file: ${logFile}`);
     process.exit(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coana-tech/cli",
-  "version": "14.12.86",
+  "version": "14.12.88",
   "description": "Coana CLI",
   "type": "module",
   "bin": {