@socketsecurity/cli-with-sentry 1.0.38 → 1.0.39

package/dist/cli.js

@@ -3826,6 +3826,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     cwd,
     limit,
     minSatisfying,
+    noPrCheck,
     rangeStyle,
     spinner,
     test,
@@ -3913,6 +3914,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     if (!packument) {
       logger.logger.warn(`Unexpected condition: No packument found for ${name}.\n`);
       cleanupInfoEntriesLoop();
+      // Skip to next package.
       continue infoEntriesLoop;
     }
     const availableVersions = Object.keys(packument.versions);
@@ -3953,8 +3955,8 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
       const oldVersions = arrays.arrayUnique(shadowNpmInject.findPackageNodes(actualTree, name).map(n => n.version).filter(Boolean));
       if (!oldVersions.length) {
         debug.debugFn('notice', `skip: ${name} not found\n`);
-        // Skip to next package.
         cleanupInfoEntriesLoop();
+        // Skip to next package.
         continue infoEntriesLoop;
       }
 
@@ -3964,6 +3966,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
       const editablePkgJson = await packages.readPackageJson(pkgJsonPath, {
         editable: true
       });
+      const seenBranches = new Set();
       const seenVersions = new Set();
       let hasAnnouncedWorkspace = false;
       let workspaceLogCallCount = logger.logger.logCallCount;
@@ -4001,23 +4004,20 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             continue infosLoop;
           }
           const branch = getSocketBranchName(oldPurl, newVersion, workspace);
-          const pr = prs.find(p => p.headRefName === branch);
+          if (seenBranches.has(newVersion)) {
+            continue infosLoop;
+          }
+          const pr = noPrCheck ? undefined : prs.find(p => p.headRefName === branch);
           if (pr) {
             debug.debugFn('notice', `skip: PR #${pr.number} for ${name} exists`);
-            if (++count >= limit) {
-              cleanupInfoEntriesLoop();
-              break infoEntriesLoop;
-            }
+            seenBranches.add(branch);
             continue infosLoop;
           }
           if (fixEnv.isCi && (
           // eslint-disable-next-line no-await-in-loop
           await gitRemoteBranchExists(branch, cwd))) {
             debug.debugFn('notice', `skip: remote branch "${branch}" exists`);
-            if (++count >= limit) {
-              cleanupInfoEntriesLoop();
-              break infoEntriesLoop;
-            }
+            seenBranches.add(branch);
             continue infosLoop;
           }
           const {
@@ -4134,6 +4134,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
                 // Exit early if install fails.
                 return handleInstallFail();
               }
+              seenBranches.add(branch);
 
               // eslint-disable-next-line no-await-in-loop
               await Promise.allSettled([setGitRemoteGithubRepoUrl(fixEnv.repoInfo.owner, fixEnv.repoInfo.repo, fixEnv.githubToken, cwd), cleanupPrs(fixEnv.repoInfo.owner, fixEnv.repoInfo.repo, {
@@ -4225,6 +4226,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           debug.debugFn('notice', 'increment: count', count + 1);
           if (++count >= limit) {
             cleanupInfoEntriesLoop();
+            // Exit main loop.
             break infoEntriesLoop;
           }
         }
@@ -4551,6 +4553,7 @@ async function handleFix({
   ghsas,
   limit,
   minSatisfying,
+  noPrCheck,
   outputKind,
   purls,
   rangeStyle,
@@ -4646,6 +4649,7 @@ async function handleFix({
     cwd,
     limit,
     minSatisfying,
+    noPrCheck,
     purls,
     rangeStyle,
     spinner,
@@ -4695,6 +4699,12 @@ const config$H = {
       default: false,
       description: 'Constrain dependency updates to the minimum satisfying version'
     },
+    noPrCheck: {
+      type: 'boolean',
+      default: false,
+      description: 'Skip PR existence check',
+      hidden: true
+    },
     purl: {
       type: 'string',
       default: [],
@@ -4800,6 +4810,7 @@ async function run$H(argv, importMeta, {
   const limit = (cli.flags['limit'] ? parseInt(String(cli.flags['limit'] || ''), 10) : Infinity) || Infinity;
   const maxSatisfying = Boolean(cli.flags['maxSatisfying']);
   const minSatisfying = Boolean(cli.flags['minSatisfying']) || !maxSatisfying;
+  const noPrCheck = Boolean(cli.flags['noPrCheck']);
   const purls = utils.cmdFlagValueToArray(cli.flags['purl']);
   const testScript = String(cli.flags['testScript'] || 'test');
   await handleFix({
@@ -4808,6 +4819,7 @@ async function run$H(argv, importMeta, {
     ghsas,
     limit,
     minSatisfying,
+    noPrCheck,
     outputKind,
     purls,
     rangeStyle,
@@ -14293,5 +14305,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=cb6e977b-e9db-4f34-bf64-f5a47c14882c
+//# debugId=87862000-d157-410a-ab83-7488bd4cfc60
 //# sourceMappingURL=cli.js.map