socket 1.0.35 → 1.0.37

package/dist/cli.js

@@ -3479,6 +3479,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 +3519,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 +3532,7 @@ async function getSocketPrsWithContext(owner, repo, options) {
           },
           match: {
             ...node,
-            author: login ?? '<unknown>',
-            parsedBranch
+            author: login ?? '<unknown>'
           }
         });
       }
@@ -3563,8 +3563,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 +3587,6 @@ async function getSocketPrsWithContext(owner, repo, options) {
           headRefName,
           mergeStateStatus,
           number: pr.number,
-          parsedBranch,
           state,
           title: pr.title
         }
@@ -3906,7 +3905,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 +3978,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) {
@@ -4037,6 +4033,8 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             continue infosLoop;
           }
 
+          // eslint-disable-next-line no-await-in-loop
+          const pkgJsonSrc = await fs$1.promises.readFile(editablePkgJson.filename, 'utf8');
           // eslint-disable-next-line no-await-in-loop
           const lockSrc = await utils.readLockfile(pkgEnvDetails.lockPath);
           if (!hasAnnouncedWorkspace) {
@@ -4081,9 +4079,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           if (!errored && fixEnv.isCi && fixEnv.repoInfo) {
             // Rewrite files in case the install reverted them.
             // eslint-disable-next-line no-await-in-loop
-            await editablePkgJson.save({
-              ignoreWhitespace: true
-            });
+            await fs$1.promises.writeFile(editablePkgJson.filename, pkgJsonSrc, 'utf8');
             // eslint-disable-next-line no-await-in-loop
             await fs$1.promises.writeFile(pkgEnvDetails.lockPath, lockSrc, 'utf8');
             try {
@@ -4267,17 +4263,16 @@ async function npmFix(pkgEnvDetails, fixConfig) {
     spinner
   } = fixConfig;
   spinner?.start();
-  let arb;
+  const flatConfig = await utils.getNpmConfig({
+    npmVersion: pkgEnvDetails.agentVersion
+  });
   let actualTree;
   let alertsMap;
   try {
     if (purls.length) {
       alertsMap = await utils.getAlertsMapFromPurls(purls, getFixAlertsMapOptions());
     } else {
-      const flatConfig = await utils.getNpmConfig({
-        npmVersion: pkgEnvDetails.agentVersion
-      });
-      arb = new shadowNpmInject.Arborist({
+      const arb = new shadowNpmInject.Arborist({
         path: pkgEnvDetails.pkgPath,
         ...flatConfig
       });
@@ -4318,6 +4313,10 @@ async function npmFix(pkgEnvDetails, fixConfig) {
           }
         })
       };
+      const arb = new shadowNpmInject.Arborist({
+        path: pkgEnvDetails.pkgPath,
+        ...flatConfig
+      });
       const idealTree = await arb.buildIdealTree();
       const node = shadowNpmInject.findPackageNode(idealTree, packument.name, oldVersion);
       if (node) {
@@ -14263,5 +14262,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=4d4efe6d-3f8e-4bd8-b5f9-0987e88a59d4
+//# debugId=66b4f897-caf8-4f1b-ac3a-1f9030377bf2
 //# sourceMappingURL=cli.js.map