@socketsecurity/cli-with-sentry 1.0.36 → 1.0.38

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;
 }
@@ -3479,6 +3502,7 @@ async function getSocketPrsWithContext(owner, repo, options) {
     __proto__: null,
     ...options
   };
+  const branchPattern = getSocketBranchPattern(options);
   const checkAuthor = strings.isNonEmptyString(author);
   const octokit = getOctokit();
   const octokitGraphql = getOctokitGraphql();
@@ -3518,8 +3542,8 @@ async function getSocketPrsWithContext(owner, repo, options) {
       const node = nodes[i];
       const login = node.author?.login;
       const matchesAuthor = checkAuthor ? login === author : true;
-      const parsedBranch = genericSocketBranchParser(node.headRefName);
-      if (matchesAuthor && parsedBranch) {
+      const matchesBranch = branchPattern.test(node.headRefName);
+      if (matchesAuthor && matchesBranch) {
         contextualMatches.push({
           context: {
             apiType: 'graphql',
@@ -3531,8 +3555,7 @@ async function getSocketPrsWithContext(owner, repo, options) {
           },
           match: {
             ...node,
-            author: login ?? '<unknown>',
-            parsedBranch
+            author: login ?? '<unknown>'
           }
         });
       }
@@ -3563,8 +3586,8 @@ async function getSocketPrsWithContext(owner, repo, options) {
     const login = pr.user?.login;
     const headRefName = pr.head.ref;
     const matchesAuthor = checkAuthor ? login === author : true;
-    const parsedBranch = genericSocketBranchParser(headRefName);
-    if (matchesAuthor && parsedBranch) {
+    const matchesBranch = branchPattern.test(headRefName);
+    if (matchesAuthor && matchesBranch) {
       // Upper cased mergeable_state is equivalent to mergeStateStatus.
       // https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#get-a-pull-request
       const mergeStateStatus = pr.mergeable_state?.toUpperCase?.() ?? 'UNKNOWN';
@@ -3587,7 +3610,6 @@ async function getSocketPrsWithContext(owner, repo, options) {
           headRefName,
           mergeStateStatus,
           number: pr.number,
-          parsedBranch,
           state,
           title: pr.title
         }
@@ -3906,7 +3928,6 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
       const pkgPath = path.dirname(pkgJsonPath);
       const isWorkspaceRoot = pkgJsonPath === pkgEnvDetails.editablePkgJson.filename;
       const workspace = isWorkspaceRoot ? 'root' : path.relative(rootPath, pkgPath);
-      const branchWorkspace = fixEnv.isCi ? getSocketBranchWorkspaceComponent(workspace) : '';
       // actualTree may not be defined on the first iteration of pkgJsonPathsLoop.
       if (!actualTree) {
         if (!fixEnv.isCi) {
@@ -3980,9 +4001,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             continue infosLoop;
           }
           const branch = getSocketBranchName(oldPurl, newVersion, workspace);
-          const pr = prs.find(({
-            parsedBranch: b
-          }) => b.workspace === branchWorkspace && b.newVersion === newVersion);
+          const pr = prs.find(p => p.headRefName === branch);
           if (pr) {
             debug.debugFn('notice', `skip: PR #${pr.number} for ${name} exists`);
             if (++count >= limit) {
@@ -4033,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;
           }
@@ -4098,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
@@ -4154,7 +4179,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,
@@ -14266,5 +14293,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=de722ff7-23df-4530-81e3-f05cc7c7a02e
+//# debugId=cb6e977b-e9db-4f34-bf64-f5a47c14882c
 //# sourceMappingURL=cli.js.map