socket 1.0.37 → 1.0.39

package/dist/cli.js

@@ -3096,7 +3096,22 @@ async function gitCleanFdx(cwd = process.cwd()) {
   // TODO: propagate CResult?
   await spawn.spawn('git', ['clean', '-fdx'], stdioIgnoreOptions);
 }
+async function gitCheckoutBranch(branch, cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
+  };
+  try {
+    await spawn.spawn('git', ['checkout', branch], stdioIgnoreOptions);
+    return true;
+  } catch {}
+  return false;
+}
 async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
+  if (!filepaths.length) {
+    debug.debugFn('notice', `miss: no filepaths to add`);
+    return false;
+  }
   const {
     cwd = process.cwd(),
     // Lazily access constants.ENV.SOCKET_CLI_GIT_USER_EMAIL.
@@ -3124,9 +3139,17 @@ async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
       error: e
     });
   }
+  return false;
+}
+async function gitDeleteBranch(branch, cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
+  };
   try {
     // Will throw with exit code 1 if branch does not exist.
     await spawn.spawn('git', ['branch', '-D', branch], stdioIgnoreOptions);
+    return true;
   } catch {}
   return false;
 }
@@ -3803,6 +3826,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
     cwd,
     limit,
     minSatisfying,
+    noPrCheck,
     rangeStyle,
     spinner,
     test,
@@ -3890,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);
@@ -3930,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;
       }
 
@@ -3941,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;
@@ -3978,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 {
@@ -4029,6 +4052,8 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             if (fixEnv.isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(fixEnv.baseBranch, cwd);
+              // eslint-disable-next-line no-await-in-loop
+              await gitCheckoutBranch(fixEnv.baseBranch, cwd);
             }
             continue infosLoop;
           }
@@ -4094,6 +4119,10 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(fixEnv.baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
+                await gitCheckoutBranch(fixEnv.baseBranch, cwd);
+                // eslint-disable-next-line no-await-in-loop
+                await gitDeleteBranch(branch, cwd);
+                // eslint-disable-next-line no-await-in-loop
                 const maybeActualTree = await installer(pkgEnvDetails, {
                   cwd,
                   spinner
@@ -4105,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, {
@@ -4150,7 +4180,9 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           if (fixEnv.isCi) {
             spinner?.start();
             // eslint-disable-next-line no-await-in-loop
-            await gitResetAndClean(fixEnv.baseBranch, cwd);
+            await gitResetAndClean(branch, cwd);
+            // eslint-disable-next-line no-await-in-loop
+            await gitCheckoutBranch(fixEnv.baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
             const maybeActualTree = await installer(pkgEnvDetails, {
               cwd,
@@ -4194,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;
           }
         }
@@ -4520,6 +4553,7 @@ async function handleFix({
   ghsas,
   limit,
   minSatisfying,
+  noPrCheck,
   outputKind,
   purls,
   rangeStyle,
@@ -4615,6 +4649,7 @@ async function handleFix({
     cwd,
     limit,
     minSatisfying,
+    noPrCheck,
     purls,
     rangeStyle,
     spinner,
@@ -4664,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: [],
@@ -4769,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({
@@ -4777,6 +4819,7 @@ async function run$H(argv, importMeta, {
     ghsas,
     limit,
     minSatisfying,
+    noPrCheck,
     outputKind,
     purls,
     rangeStyle,
@@ -14262,5 +14305,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=66b4f897-caf8-4f1b-ac3a-1f9030377bf2
+//# debugId=87862000-d157-410a-ab83-7488bd4cfc60
 //# sourceMappingURL=cli.js.map