@socketsecurity/cli-with-sentry 0.15.47 → 0.15.49

package/dist/cli.js

@@ -4875,16 +4875,16 @@ async function pnpmFix(pkgEnvDetails, {
     const infoEntry = sortedInfoEntries[i];
     const partialPurlObj = utils.getPurlObject(infoEntry[0]);
     const name = packages.resolvePackageName(partialPurlObj);
-    let infos = [...infoEntry[1].values()];
+    const infos = [...infoEntry[1].values()];
+    if (!infos.length) {
+      continue infoEntriesLoop;
+    }
+    const activeBranches = [];
     if (isCi) {
       const branchFullName = getSocketBranchFullNameComponent(partialPurlObj);
       const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj);
-      const activeBranches = [];
       for (const pr of openPrs) {
         const parsedBranch = branchParser(pr.headRefName);
-        debug.debugFn(`parse: ${pr.headRefName}\n`, parsedBranch);
-        debug.debugFn(`check: branchPurlType ${branchPurlType} === ${parsedBranch?.type}`);
-        debug.debugFn(`check: branchFullName ${branchFullName} === ${parsedBranch?.fullName}`);
         if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
           activeBranches.push(parsedBranch);
         }
@@ -4894,10 +4894,6 @@ async function pnpmFix(pkgEnvDetails, {
       } else if (openPrs.length) {
         debug.debugFn('miss: 0 active branches found');
       }
-      infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
-    }
-    if (!infos.length) {
-      continue infoEntriesLoop;
     }
     logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
@@ -4988,12 +4984,16 @@ async function pnpmFix(pkgEnvDetails, {
         infosLoop: for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
-        } of infos.values()) {
+        } of infos) {
           if (vendor.semverExports.gte(oldVersion, firstPatchedVersionIdentifier)) {
             debug.debugFn(`skip: ${oldId} is >= ${firstPatchedVersionIdentifier}`);
             continue infosLoop;
           }
           const newVersion = shadowInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
+          if (activeBranches.find(b => b.newVersion === newVersion)) {
+            debug.debugFn(`skip: open PR found for ${name}@${newVersion}`);
+            continue infosLoop;
+          }
           const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
           if (!(newVersion && newVersionPackument)) {
             warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
@@ -14275,5 +14275,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=7ed4fffc-f660-40e2-8f0b-b1981857752e
+//# debugId=5e90f708-2e66-4276-baa6-9beceb5ddf65
 //# sourceMappingURL=cli.js.map