@socketsecurity/cli-with-sentry 0.15.19 → 0.15.20

package/dist/cli.js

@@ -4098,13 +4098,16 @@ async function install$1(arb, options) {
     __proto__: null,
     ...options
   };
-  const newArb = new shadowInject.Arborist({
-    path: cwd
-  });
-  newArb.idealTree = await arb.buildIdealTree();
-  const actualTree = await newArb.reify();
-  arb.actualTree = actualTree;
-  return actualTree;
+  try {
+    const newArb = new shadowInject.Arborist({
+      path: cwd
+    });
+    newArb.idealTree = await arb.buildIdealTree();
+    const actualTree = await newArb.reify();
+    arb.actualTree = actualTree;
+    return actualTree;
+  } catch {}
+  return null;
 }
 async function npmFix(pkgEnvDetails, {
   autoMerge,
@@ -4152,7 +4155,7 @@ async function npmFix(pkgEnvDetails, {
   });
   if (!infoByPkgName) {
     spinner?.stop();
-    logger.logger.info('No fixable vulnerabilities found.');
+    logger.logger.info('No fixable vulns found.');
     return;
   }
 
@@ -4164,6 +4167,11 @@ async function npmFix(pkgEnvDetails, {
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
+  const handleInstallFail = () => {
+    logger.logger.error(`Unexpected condition: ${pkgEnvDetails.agent} install failed.\n`);
+    logger.logger.dedent();
+    spinner?.dedent();
+  };
   spinner?.stop();
   let count = 0;
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
@@ -4175,7 +4183,7 @@ async function npmFix(pkgEnvDetails, {
       0: name,
       1: infos
     } = sortedInfoEntries[i];
-    logger.logger.log(`Processing vulnerable package: ${name}`);
+    logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
     if (registry.getManifestData(NPM$a, name)) {
@@ -4240,7 +4248,7 @@ async function npmFix(pkgEnvDetails, {
           const newVersion = shadowInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
           const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
           if (!(newVersion && newVersionPackument)) {
-            warningsForAfter.add(`No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}.`);
+            warningsForAfter.add(`No update applied: ${oldId} requires >=${firstPatchedVersionIdentifier}`);
             continue infosLoop;
           }
           const newVersionRange = utils.applyRange(oldVersion, newVersion, rangeStyle);
@@ -4288,18 +4296,23 @@ async function npmFix(pkgEnvDetails, {
           let errored = false;
           try {
             // eslint-disable-next-line no-await-in-loop
-            actualTree = await install$1(arb, {
+            const maybeActualTree = await install$1(arb, {
               cwd
             });
-            if (test) {
-              spinner?.info(`Testing ${newId} in ${workspaceName}.`);
-              // eslint-disable-next-line no-await-in-loop
-              await npm.runScript(testScript, [], {
-                spinner,
-                stdio: 'ignore'
-              });
+            if (maybeActualTree) {
+              actualTree = maybeActualTree;
+              if (test) {
+                spinner?.info(`Testing ${newId} in ${workspaceName}.`);
+                // eslint-disable-next-line no-await-in-loop
+                await npm.runScript(testScript, [], {
+                  spinner,
+                  stdio: 'ignore'
+                });
+              }
+              spinner?.success(`Fixed ${name} in ${workspaceName}.`);
+            } else {
+              errored = true;
             }
-            spinner?.success(`Fixed ${name} in ${workspaceName}.`);
           } catch (e) {
             errored = true;
             error = e;
@@ -4340,9 +4353,15 @@ async function npmFix(pkgEnvDetails, {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
-                actualTree = await install$1(arb, {
+                const maybeActualTree = await install$1(arb, {
                   cwd
                 });
+                if (!maybeActualTree) {
+                  // Exit early if install fails.
+                  handleInstallFail();
+                  return;
+                }
+                actualTree = maybeActualTree;
                 continue infosLoop;
               }
 
@@ -4386,12 +4405,19 @@ async function npmFix(pkgEnvDetails, {
             }
           }
           if (isCi) {
+            spinner?.start();
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
-            actualTree = await install$1(arb, {
+            const maybeActualTree = await install$1(arb, {
               cwd
             });
+            spinner?.stop();
+            if (maybeActualTree) {
+              actualTree = maybeActualTree;
+            } else {
+              errored = true;
+            }
           }
           if (errored) {
             if (!isCi) {
@@ -4402,10 +4428,16 @@ async function npmFix(pkgEnvDetails, {
                 ignoreWhitespace: true
               })]);
               // eslint-disable-next-line no-await-in-loop
-              actualTree = await install$1(arb, {
+              const maybeActualTree = await install$1(arb, {
                 cwd
               });
               spinner?.stop();
+              if (!maybeActualTree) {
+                // Exit early if install fails.
+                handleInstallFail();
+                return;
+              }
+              actualTree = maybeActualTree;
             }
             logger.logger.fail(`Update failed for ${oldId} in ${workspaceName}.`, error);
           }
@@ -4457,18 +4489,21 @@ async function install(pkgEnvDetails, options) {
     __proto__: null,
     ...options
   };
-  await utils.runAgentInstall(pkgEnvDetails, {
-    args: [...(args ?? []),
-    // Enable pnpm updates to pnpm-lock.yaml in CI environments.
-    // https://pnpm.io/cli/install#--frozen-lockfile
-    '--no-frozen-lockfile',
-    // Enable a non-interactive pnpm install
-    // https://github.com/pnpm/pnpm/issues/6778
-    '--config.confirmModulesPurge=false'],
-    spinner,
-    stdio: debug.isDebug() ? 'inherit' : 'ignore'
-  });
-  return await getActualTree(cwd);
+  try {
+    await utils.runAgentInstall(pkgEnvDetails, {
+      args: [...(args ?? []),
+      // Enable pnpm updates to pnpm-lock.yaml in CI environments.
+      // https://pnpm.io/cli/install#--frozen-lockfile
+      '--no-frozen-lockfile',
+      // Enable a non-interactive pnpm install
+      // https://github.com/pnpm/pnpm/issues/6778
+      '--config.confirmModulesPurge=false'],
+      spinner,
+      stdio: debug.isDebug() ? 'inherit' : 'ignore'
+    });
+    return await getActualTree(cwd);
+  } catch {}
+  return null;
 }
 async function pnpmFix(pkgEnvDetails, {
   autoMerge,
@@ -4498,21 +4533,27 @@ async function pnpmFix(pkgEnvDetails, {
 
   // If pnpm-lock.yaml does NOT exist then install with pnpm to create it.
   if (!lockfile) {
-    actualTree = await install(pkgEnvDetails, {
+    const maybeActualTree = await install(pkgEnvDetails, {
       cwd,
       spinner
     });
-    lockfile = await utils.readPnpmLockfile(lockfilePath);
+    if (maybeActualTree) {
+      actualTree = maybeActualTree;
+      lockfile = await utils.readPnpmLockfile(lockfilePath);
+    }
   }
   // Update pnpm-lock.yaml if its version is older than what the installed pnpm
   // produces.
   if (lockfile && pkgEnvDetails.agentVersion.major >= 10 && utils.parsePnpmLockfileVersion(lockfile.lockfileVersion).major <= 6) {
-    actualTree = await install(pkgEnvDetails, {
+    const maybeActualTree = await install(pkgEnvDetails, {
       args: ['--lockfile-only'],
       cwd,
       spinner
     });
-    lockfile = await utils.readPnpmLockfile(lockfilePath);
+    if (maybeActualTree) {
+      actualTree = maybeActualTree;
+      lockfile = await utils.readPnpmLockfile(lockfilePath);
+    }
   }
 
   // Exit early if pnpm-lock.yaml is not found.
@@ -4538,7 +4579,7 @@ async function pnpmFix(pkgEnvDetails, {
   });
   if (!infoByPkgName) {
     spinner?.stop();
-    logger.logger.info('No fixable vulnerabilities found.');
+    logger.logger.info('No fixable vulns found.');
     return;
   }
 
@@ -4550,6 +4591,11 @@ async function pnpmFix(pkgEnvDetails, {
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
+  const handleInstallFail = () => {
+    logger.logger.error(`Unexpected condition: ${pkgEnvDetails.agent} install failed.\n`);
+    logger.logger.dedent();
+    spinner?.dedent();
+  };
   spinner?.stop();
   let count = 0;
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
@@ -4561,7 +4607,7 @@ async function pnpmFix(pkgEnvDetails, {
       0: name,
       1: infos
     } = sortedInfoEntries[i];
-    logger.logger.log(`Processing vulnerable package: ${name}`);
+    logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
     if (registry.getManifestData(NPM$9, name)) {
@@ -4590,7 +4636,7 @@ async function pnpmFix(pkgEnvDetails, {
 
       // actualTree may not be defined on the first iteration of pkgJsonPathsLoop.
       if (!actualTree) {
-        actualTree = fs$1.existsSync(path.join(rootPath, 'node_modules')) ?
+        const maybeActualTree = fs$1.existsSync(path.join(rootPath, 'node_modules')) ?
         // eslint-disable-next-line no-await-in-loop
         await getActualTree(cwd) :
         // eslint-disable-next-line no-await-in-loop
@@ -4598,6 +4644,14 @@ async function pnpmFix(pkgEnvDetails, {
           cwd,
           spinner
         });
+        if (maybeActualTree) {
+          actualTree = maybeActualTree;
+        }
+      }
+      if (!actualTree) {
+        // Exit early if install fails.
+        handleInstallFail();
+        return;
       }
       const oldVersions = arrays.arrayUnique(shadowInject.findPackageNodes(actualTree, name).map(n => n.version).filter(Boolean));
       if (!oldVersions.length) {
@@ -4641,7 +4695,7 @@ async function pnpmFix(pkgEnvDetails, {
           const newVersion = shadowInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
           const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
           if (!(newVersion && newVersionPackument)) {
-            warningsForAfter.add(`No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}.`);
+            warningsForAfter.add(`No update applied: ${oldId} requires >=${firstPatchedVersionIdentifier}`);
             continue infosLoop;
           }
           const overrideKey = `${name}@${vulnerableVersionRange}`;
@@ -4708,19 +4762,24 @@ async function pnpmFix(pkgEnvDetails, {
           let errored = false;
           try {
             // eslint-disable-next-line no-await-in-loop
-            actualTree = await install(pkgEnvDetails, {
+            const maybeActualTree = await install(pkgEnvDetails, {
               cwd,
               spinner
             });
-            if (test) {
-              spinner?.info(`Testing ${newId} in ${workspaceName}.`);
-              // eslint-disable-next-line no-await-in-loop
-              await npm.runScript(testScript, [], {
-                spinner,
-                stdio: 'ignore'
-              });
+            if (maybeActualTree) {
+              actualTree = maybeActualTree;
+              if (test) {
+                spinner?.info(`Testing ${newId} in ${workspaceName}.`);
+                // eslint-disable-next-line no-await-in-loop
+                await npm.runScript(testScript, [], {
+                  spinner,
+                  stdio: 'ignore'
+                });
+              }
+              spinner?.success(`Fixed ${name} in ${workspaceName}.`);
+            } else {
+              errored = true;
             }
-            spinner?.success(`Fixed ${name} in ${workspaceName}.`);
           } catch (e) {
             error = e;
             errored = true;
@@ -4761,10 +4820,16 @@ async function pnpmFix(pkgEnvDetails, {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
-                actualTree = await install(pkgEnvDetails, {
+                const maybeActualTree = await install(pkgEnvDetails, {
                   cwd,
                   spinner
                 });
+                if (!maybeActualTree) {
+                  // Exit early if install fails.
+                  handleInstallFail();
+                  return;
+                }
+                actualTree = maybeActualTree;
                 continue infosLoop;
               }
 
@@ -4808,13 +4873,20 @@ async function pnpmFix(pkgEnvDetails, {
             }
           }
           if (isCi) {
+            spinner?.start();
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
-            actualTree = await install(pkgEnvDetails, {
+            const maybeActualTree = await install(pkgEnvDetails, {
               cwd,
               spinner
             });
+            spinner?.stop();
+            if (maybeActualTree) {
+              actualTree = maybeActualTree;
+            } else {
+              errored = true;
+            }
           }
           if (errored) {
             if (!isCi) {
@@ -4825,13 +4897,19 @@ async function pnpmFix(pkgEnvDetails, {
                 ignoreWhitespace: true
               })]);
               // eslint-disable-next-line no-await-in-loop
-              actualTree = await install(pkgEnvDetails, {
+              const maybeActualTree = await install(pkgEnvDetails, {
                 cwd,
                 spinner
               });
               spinner?.stop();
+              if (!maybeActualTree) {
+                // Exit early if install fails.
+                handleInstallFail();
+                return;
+              }
+              actualTree = maybeActualTree;
             }
-            logger.logger.fail(`Update failed for ${oldId} in ${workspaceName}.`, error);
+            logger.logger.fail(`Update failed for ${oldId} in ${workspaceName}.`, ...(error ? [error] : []));
           }
           if (++count >= limit) {
             logger.logger.dedent();
@@ -11739,5 +11817,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=5ee308bf-7f52-47e1-b4b2-79a10b530aa3
+//# debugId=ea32bfda-aafa-4d81-bddd-d4a28dbfd4ff
 //# sourceMappingURL=cli.js.map