@socketsecurity/cli-with-sentry 0.15.9 → 0.15.11

package/dist/cli.js

@@ -4059,7 +4059,9 @@ async function install$1(arb, options) {
     path: cwd
   })
   newArb.idealTree = await arb.buildIdealTree()
-  return await newArb.reify()
+  const actualTree = await newArb.reify()
+  arb.actualTree = actualTree
+  return actualTree
 }
 async function npmFix(
   pkgEnvDetails,
@@ -4119,7 +4121,13 @@ async function npmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     sorts.naturalCompare(a[0], b[0])
   )
-  infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (
+    let i = 0, { length } = sortedInfoEntries;
+    i < length;
+    i += 1
+  ) {
+    const { 0: name, 1: infos } = sortedInfoEntries[i]
+    const isLastInfoEntry = i === length - 1
     logger.logger.log(`Processing vulnerable package: ${name}`)
     logger.logger.indent()
     spinner?.indent()
@@ -4134,11 +4142,11 @@ async function npmFix(
       )
       logger.logger.dedent()
       spinner?.dedent()
-      continue
+      continue infoEntriesLoop
     }
     const availableVersions = Object.keys(packument.versions)
     const warningsForAfter = new Set()
-    for (const pkgJsonPath of pkgJsonPaths) {
+    pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {
       const pkgPath = path.dirname(pkgJsonPath)
       const isWorkspaceRoot =
         pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
@@ -4146,6 +4154,7 @@ async function npmFix(
         ? 'root'
         : path.relative(rootPath, pkgPath)
       logger.logger.log(`Checking workspace: ${workspaceName}`)
+      const workspaceLogCallCount = logger.logger.logCallCount
 
       // eslint-disable-next-line no-await-in-loop
       actualTree = await install$1(arb, {
@@ -4161,7 +4170,7 @@ async function npmFix(
         logger.logger.warn(
           `Unexpected condition: Lockfile entries not found for ${name}.\n`
         )
-        continue
+        continue pkgJsonPathsLoop
       }
 
       // Always re-read the editable package.json to avoid stale mutations
@@ -4170,7 +4179,7 @@ async function npmFix(
       const editablePkgJson = await packages.readPackageJson(pkgJsonPath, {
         editable: true
       })
-      for (const oldVersion of oldVersions) {
+      oldVersionsLoop: for (const oldVersion of oldVersions) {
         const oldId = `${name}@${oldVersion}`
         const oldPurl = utils.idToPurl(oldId)
         const node = shadowInject.findPackageNode(actualTree, name, oldVersion)
@@ -4178,9 +4187,9 @@ async function npmFix(
           logger.logger.warn(
             `Unexpected condition: Arborist node not found, skipping ${oldId}`
           )
-          continue
+          continue oldVersionsLoop
         }
-        for (const {
+        infosLoop: for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos.values()) {
@@ -4196,7 +4205,7 @@ async function npmFix(
             warningsForAfter.add(
               `No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
             )
-            continue
+            continue infosLoop
           }
           const newVersionRange = utils.applyRange(
             oldVersion,
@@ -4243,8 +4252,12 @@ async function npmFix(
             if (isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(baseBranch, cwd)
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install$1(arb, {
+                cwd
+              })
             }
-            continue
+            continue infosLoop
           }
           spinner?.start()
           spinner?.info(`Installing ${newId} in ${workspaceName}`)
@@ -4281,14 +4294,14 @@ async function npmFix(
                 debug.debugLog(
                   `Branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               if (await gitRemoteBranchExists(branch, cwd)) {
                 debug.debugLog(
                   `Remote branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
               const moddedFilepaths =
                 // eslint-disable-next-line no-await-in-loop
@@ -4303,7 +4316,7 @@ async function npmFix(
                 logger.logger.warn(
                   'Unexpected condition: Nothing to commit, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               if (
                 // eslint-disable-next-line no-await-in-loop
@@ -4317,7 +4330,7 @@ async function npmFix(
                 logger.logger.warn(
                   'Unexpected condition: Push failed, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
@@ -4352,6 +4365,10 @@ async function npmFix(
           if (isCi) {
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd)
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install$1(arb, {
+              cwd
+            })
           }
           if (errored) {
             if (!isCi) {
@@ -4363,6 +4380,10 @@ async function npmFix(
                   ignoreWhitespace: true
                 })
               ])
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install$1(arb, {
+                cwd
+              })
             }
             spinner?.failAndStop(
               `Update failed for ${oldId} in ${workspaceName}`,
@@ -4370,16 +4391,18 @@ async function npmFix(
             )
           }
           if (++count >= limit) {
-            break infoByPkgNameLoop
+            break infoEntriesLoop
           }
         }
       }
-      logger.logger.log('')
+      if (logger.logger.logCallCount > workspaceLogCallCount) {
+        logger.logger.log('')
+      }
     }
     for (const warningText of warningsForAfter) {
       logger.logger.warn(warningText)
     }
-    if (warningsForAfter.size) {
+    if (!isLastInfoEntry) {
       logger.logger.log('')
     }
     logger.logger.dedent()
@@ -4511,7 +4534,13 @@ async function pnpmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     sorts.naturalCompare(a[0], b[0])
   )
-  infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (
+    let i = 0, { length } = sortedInfoEntries;
+    i < length;
+    i += 1
+  ) {
+    const { 0: name, 1: infos } = sortedInfoEntries[i]
+    const isLastInfoEntry = i === length - 1
     logger.logger.log(`Processing vulnerable package: ${name}`)
     logger.logger.indent()
     spinner?.indent()
@@ -4526,11 +4555,11 @@ async function pnpmFix(
       )
       logger.logger.dedent()
       spinner?.dedent()
-      continue
+      continue infoEntriesLoop
     }
     const availableVersions = Object.keys(packument.versions)
     const warningsForAfter = new Set()
-    for (const pkgJsonPath of pkgJsonPaths) {
+    pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {
       const pkgPath = path.dirname(pkgJsonPath)
       const isWorkspaceRoot =
         pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
@@ -4538,6 +4567,7 @@ async function pnpmFix(
         ? 'root'
         : path.relative(rootPath, pkgPath)
       logger.logger.log(`Checking workspace: ${workspaceName}`)
+      const workspaceLogCallCount = logger.logger.logCallCount
 
       // eslint-disable-next-line no-await-in-loop
       actualTree = await install(pkgEnvDetails, {
@@ -4554,7 +4584,7 @@ async function pnpmFix(
         logger.logger.warn(
           `Unexpected condition: Lockfile entries not found for ${name}.\n`
         )
-        continue
+        continue pkgJsonPathsLoop
       }
 
       // Always re-read the editable package.json to avoid stale mutations
@@ -4566,7 +4596,7 @@ async function pnpmFix(
       // Get current overrides for revert logic
       const oldPnpmSection = editablePkgJson.content[PNPM$7]
       const oldOverrides = oldPnpmSection?.[OVERRIDES$2]
-      for (const oldVersion of oldVersions) {
+      oldVersionsLoop: for (const oldVersion of oldVersions) {
         const oldId = `${name}@${oldVersion}`
         const oldPurl = utils.idToPurl(oldId)
         const node = shadowInject.findPackageNode(actualTree, name, oldVersion)
@@ -4574,9 +4604,9 @@ async function pnpmFix(
           logger.logger.warn(
             `Unexpected condition: Arborist node not found, skipping ${oldId}`
           )
-          continue
+          continue oldVersionsLoop
         }
-        for (const {
+        infosLoop: for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos.values()) {
@@ -4592,7 +4622,7 @@ async function pnpmFix(
             warningsForAfter.add(
               `No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
             )
-            continue
+            continue infosLoop
           }
           const overrideKey = `${name}@${vulnerableVersionRange}`
           const newVersionRange = utils.applyRange(
@@ -4666,8 +4696,13 @@ async function pnpmFix(
             if (isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(baseBranch, cwd)
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(pkgEnvDetails, {
+                cwd,
+                spinner
+              })
             }
-            continue
+            continue infosLoop
           }
           spinner?.start()
           spinner?.info(`Installing ${newId} in ${workspaceName}`)
@@ -4706,14 +4741,14 @@ async function pnpmFix(
                 debug.debugLog(
                   `Branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               if (await gitRemoteBranchExists(branch, cwd)) {
                 debug.debugLog(
                   `Remote branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
               const moddedFilepaths =
                 // eslint-disable-next-line no-await-in-loop
@@ -4727,7 +4762,7 @@ async function pnpmFix(
                 logger.logger.warn(
                   'Unexpected condition: Nothing to commit, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               if (
                 // eslint-disable-next-line no-await-in-loop
@@ -4741,7 +4776,7 @@ async function pnpmFix(
                 logger.logger.warn(
                   'Unexpected condition: Push failed, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
@@ -4776,6 +4811,11 @@ async function pnpmFix(
           if (isCi) {
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd)
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, {
+              cwd,
+              spinner
+            })
           }
           if (errored) {
             if (!isCi) {
@@ -4787,6 +4827,11 @@ async function pnpmFix(
                   ignoreWhitespace: true
                 })
               ])
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(pkgEnvDetails, {
+                cwd,
+                spinner
+              })
             }
             spinner?.failAndStop(
               `Update failed for ${oldId} in ${workspaceName}`,
@@ -4794,16 +4839,18 @@ async function pnpmFix(
             )
           }
           if (++count >= limit) {
-            break infoByPkgNameLoop
+            break infoEntriesLoop
           }
         }
       }
-      logger.logger.log('')
+      if (logger.logger.logCallCount > workspaceLogCallCount) {
+        logger.logger.log('')
+      }
     }
     for (const warningText of warningsForAfter) {
       logger.logger.warn(warningText)
     }
-    if (warningsForAfter.size) {
+    if (!isLastInfoEntry) {
       logger.logger.log('')
     }
     logger.logger.dedent()
@@ -12356,5 +12403,5 @@ void (async () => {
     await utils.captureException(e)
   }
 })()
-//# debugId=dea4f491-8a2b-49bf-8e18-2cf5743e0432
+//# debugId=55747463-2478-4bf7-b270-e981f6a95bd1
 //# sourceMappingURL=cli.js.map