socket 0.15.62 → 0.15.63

package/dist/cli.js

@@ -3918,8 +3918,8 @@ function getActiveBranchesForPackage(ciEnv, partialPurl, openPrs) {
   if (!ciEnv) {
     return [];
   }
-  const partialPurlObj = utils.getPurlObject(partialPurl);
   const activeBranches = [];
+  const partialPurlObj = utils.getPurlObject(partialPurl);
   const branchFullName = getSocketBranchFullNameComponent(partialPurlObj);
   const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj);
   for (const pr of openPrs) {
@@ -3928,10 +3928,13 @@ function getActiveBranchesForPackage(ciEnv, partialPurl, openPrs) {
       activeBranches.push(parsedBranch);
     }
   }
-  if (activeBranches.length) {
-    debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
-  } else if (openPrs.length) {
-    debug.debugFn('miss: 0 active branches found');
+  if (debug.isDebug()) {
+    const fullName = packages.resolvePackageName(partialPurlObj);
+    if (activeBranches.length) {
+      debug.debugFn(`found: ${activeBranches.length} active branches for ${fullName}\n`, activeBranches);
+    } else if (openPrs.length) {
+      debug.debugFn(`miss: 0 active branches found for ${fullName}`);
+    }
   }
   return activeBranches;
 }
@@ -4081,7 +4084,7 @@ async function cleanupOpenPrs(owner, repo, options) {
     return match;
   }));
   if (cachesToSave.size) {
-    await Promise.allSettled([...cachesToSave].map(({
+    await Promise.allSettled(Array.from(cachesToSave).map(({
       0: key,
       1: data
     }) => writeCache(key, data)));
@@ -4455,7 +4458,7 @@ async function npmFix(pkgEnvDetails, {
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
-  const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
+  const sortedInfoEntries = Array.from(infoByPartialPurl.entries()).sort((a, b) => sorts.naturalCompare(a[0], b[0]));
   const cleanupInfoEntriesLoop = () => {
     logger.logger.dedent();
     spinner?.dedent();
@@ -4477,11 +4480,10 @@ async function npmFix(pkgEnvDetails, {
     const infoEntry = sortedInfoEntries[i];
     const partialPurlObj = utils.getPurlObject(infoEntry[0]);
     const name = packages.resolvePackageName(partialPurlObj);
-    const infos = [...infoEntry[1].values()];
+    const infos = Array.from(infoEntry[1].values());
     if (!infos.length) {
       continue infoEntriesLoop;
     }
-    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
@@ -4495,6 +4497,7 @@ async function npmFix(pkgEnvDetails, {
       cleanupInfoEntriesLoop();
       continue infoEntriesLoop;
     }
+    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     const availableVersions = Object.keys(packument.versions);
     const warningsForAfter = new Set();
 
@@ -4926,6 +4929,9 @@ async function pnpmFix(pkgEnvDetails, {
       }
     };
   }
+  if (debug.isDebug()) {
+    debug.debugFn('found: cves for', Array.from(infoByPartialPurl.keys()));
+  }
 
   // Lazily access constants.packumentCache.
   const {
@@ -4935,7 +4941,7 @@ async function pnpmFix(pkgEnvDetails, {
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
-  const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
+  const sortedInfoEntries = Array.from(infoByPartialPurl.entries()).sort((a, b) => sorts.naturalCompare(a[0], b[0]));
   const cleanupInfoEntriesLoop = () => {
     logger.logger.dedent();
     spinner?.dedent();
@@ -4957,11 +4963,10 @@ async function pnpmFix(pkgEnvDetails, {
     const infoEntry = sortedInfoEntries[i];
     const partialPurlObj = utils.getPurlObject(infoEntry[0]);
     const name = packages.resolvePackageName(partialPurlObj);
-    const infos = [...infoEntry[1].values()];
+    const infos = Array.from(infoEntry[1].values());
     if (!infos.length) {
       continue infoEntriesLoop;
     }
-    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
@@ -4975,6 +4980,7 @@ async function pnpmFix(pkgEnvDetails, {
       cleanupInfoEntriesLoop();
       continue infoEntriesLoop;
     }
+    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     const availableVersions = Object.keys(packument.versions);
     const warningsForAfter = new Set();
 
@@ -7878,7 +7884,7 @@ function cleanupQueryStdout(stdout) {
       names.add(resolvedName);
     }
   }
-  return JSON.stringify([...names], null, 2);
+  return JSON.stringify(Array.from(names), null, 2);
 }
 function parsableToQueryStdout(stdout) {
   if (stdout === '') {
@@ -7888,7 +7894,7 @@ function parsableToQueryStdout(stdout) {
   // The matchAll regexp looks for a forward (posix) or backward (win32) slash
   // and matches one or more non-slashes until the newline.
   const names = new Set(stdout.matchAll(/(?<=[/\\])[^/\\]+(?=\n)/g));
-  return JSON.stringify([...names], null, 2);
+  return JSON.stringify(Array.from(names), null, 2);
 }
 async function npmQuery(npmExecPath, cwd) {
   let stdout = '';
@@ -14712,5 +14718,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=ff4cb15e-6c8d-4702-a71b-9fdebd5e1b1
+//# debugId=dab0d87c-3238-422d-976b-390f87d2120a
 //# sourceMappingURL=cli.js.map