@socketsecurity/cli-with-sentry 0.14.91 → 0.14.92

package/dist/module-sync/cli.js

@@ -420,7 +420,10 @@ ${mdTableStringNumber('Name', 'Counts', data['top_five_alert_types'])}
 }
 function displayAnalyticsScreen(data) {
   const ScreenWidget = _socketInterop(require('blessed/lib/widgets/screen'))
-  const screen = new ScreenWidget({})
+  // Lazily access constants.blessedOptions.
+  const screen = new ScreenWidget({
+    ...constants.blessedOptions
+  })
   const contrib = _socketInterop(require('blessed-contrib'))
   const grid = new contrib.grid({
     rows: 5,
@@ -915,7 +918,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.91:5903afd:941f5dfb:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.92:5d5aa04:eb69c214:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
@@ -3734,40 +3737,19 @@ async function branchExists(branch, cwd = process.cwd()) {
 }
 async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
   try {
-    const currentBranch = (
-      await spawn.spawn('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
-        cwd
-      })
-    ).stdout.trim()
-    if (currentBranch === baseBranch) {
-      logger.logger.info(`Already on ${baseBranch}`)
-      return
-    }
-    logger.logger.info(
-      `Switching branch from ${currentBranch} to ${baseBranch}...`
-    )
     await spawn.spawn('git', ['checkout', baseBranch], {
       cwd
     })
-    logger.logger.info(`Checked out ${baseBranch}`)
+    await spawn.spawn('git', ['reset', '--hard', `origin/${baseBranch}`], {
+      cwd
+    })
+    logger.logger.info(`Checked out and reset to ${baseBranch}`)
   } catch {
     logger.logger.warn(
       `Could not switch to ${baseBranch}. Proceeding with HEAD.`
     )
   }
 }
-function getGitHubRepoInfo() {
-  // Lazily access constants.ENV[GITHUB_REPOSITORY].
-  const ownerSlashRepo = constants.ENV[GITHUB_REPOSITORY]
-  const slashIndex = ownerSlashRepo.indexOf('/')
-  if (slashIndex === -1) {
-    throw new Error('GITHUB_REPOSITORY environment variable not set')
-  }
-  return {
-    owner: ownerSlashRepo.slice(0, slashIndex),
-    repo: ownerSlashRepo.slice(slashIndex + 1)
-  }
-}
 let _octokit
 function getOctokit() {
   if (_octokit === undefined) {
@@ -3778,6 +3760,16 @@ function getOctokit() {
   }
   return _octokit
 }
+async function doesPullRequestExistForBranch(owner, repo, branch) {
+  const octokit = getOctokit()
+  const { data: prs } = await octokit.pulls.list({
+    owner,
+    repo,
+    head: `${owner}:${branch}`,
+    state: 'open'
+  })
+  return prs.length > 0
+}
 async function enableAutoMerge(prResponseData) {
   const octokit = getOctokit()
   const { node_id: prId, number: prNumber } = prResponseData
@@ -3807,7 +3799,29 @@ async function enableAutoMerge(prResponseData) {
     logger.logger.error(`Failed to enable auto-merge for PR #${prNumber}:`, e)
   }
 }
-async function openGitHubPullRequest(name, targetVersion, cwd = process.cwd()) {
+function getGitHubRepoInfo() {
+  // Lazily access constants.ENV[GITHUB_REPOSITORY].
+  const ownerSlashRepo = constants.ENV[GITHUB_REPOSITORY]
+  const slashIndex = ownerSlashRepo.indexOf('/')
+  if (slashIndex === -1) {
+    throw new Error('GITHUB_REPOSITORY environment variable not set')
+  }
+  return {
+    owner: ownerSlashRepo.slice(0, slashIndex),
+    repo: ownerSlashRepo.slice(slashIndex + 1)
+  }
+}
+function getSocketBranchName(name, version) {
+  return `socket-fix-${name}-${version.replace(/\./g, '-')}`
+}
+async function openGitHubPullRequest(
+  owner,
+  repo,
+  branch,
+  name,
+  version,
+  cwd = process.cwd()
+) {
   // Lazily access constants.ENV[GITHUB_ACTIONS].
   if (constants.ENV[GITHUB_ACTIONS]) {
     // Lazily access constants.ENV[SOCKET_SECURITY_GITHUB_PAT].
@@ -3821,9 +3835,7 @@ async function openGitHubPullRequest(name, targetVersion, cwd = process.cwd()) {
       // GitHub defaults to branch name "main"
       // https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch
       'main'
-    const branch = `socket-fix-${name}-${targetVersion.replace(/\./g, '-')}`
-    const commitMsg = `chore: upgrade ${name} to ${targetVersion}`
-    const { owner, repo } = getGitHubRepoInfo()
+    const commitMsg = `chore: upgrade ${name} to ${version}`
     const url = `https://x-access-token:${pat}@github.com/${owner}/${repo}`
     await spawn.spawn('git', ['remote', 'set-url', 'origin', url], {
       cwd
@@ -3854,7 +3866,7 @@ async function openGitHubPullRequest(name, targetVersion, cwd = process.cwd()) {
       title: commitMsg,
       head: branch,
       base: baseBranch,
-      body: `[socket] Upgrade \`${name}\` to ${targetVersion}`
+      body: `[socket] Upgrade \`${name}\` to ${version}`
     })
   } else {
     throw new Error(
@@ -3944,92 +3956,97 @@ async function npmFix(
           continue
         }
         const oldSpec = `${name}@${oldVersion}`
-        let targetVersion
-        let failed = false
-        let installed = false
-        let saved = false
         if (
-          shadowNpmInject.updateNode(node, packument, vulnerableVersionRange)
+          !shadowNpmInject.updateNode(node, packument, vulnerableVersionRange)
         ) {
-          targetVersion = node.package.version
-          const fixSpec = `${name}@^${targetVersion}`
-          const revertData = {
-            ...(editablePkgJson.content.dependencies
-              ? {
-                  dependencies: editablePkgJson.content.dependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.optionalDependencies
-              ? {
-                  optionalDependencies:
-                    editablePkgJson.content.optionalDependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.peerDependencies
-              ? {
-                  peerDependencies: editablePkgJson.content.peerDependencies
-                }
-              : undefined)
+          spinner?.failAndStop(`Could not patch ${oldSpec}`)
+          return
+        }
+        const targetVersion = node.package.version
+        const fixSpec = `${name}@^${targetVersion}`
+        const revertData = {
+          ...(editablePkgJson.content.dependencies
+            ? {
+                dependencies: editablePkgJson.content.dependencies
+              }
+            : undefined),
+          ...(editablePkgJson.content.optionalDependencies
+            ? {
+                optionalDependencies:
+                  editablePkgJson.content.optionalDependencies
+              }
+            : undefined),
+          ...(editablePkgJson.content.peerDependencies
+            ? {
+                peerDependencies: editablePkgJson.content.peerDependencies
+              }
+            : undefined)
+        }
+        spinner?.info(`Installing ${fixSpec}`)
+        let installed = false
+        let saved = false
+        try {
+          shadowNpmInject.updatePackageJsonFromNode(
+            editablePkgJson,
+            arb.idealTree,
+            node,
+            targetVersion,
+            rangeStyle
+          )
+          // eslint-disable-next-line no-await-in-loop
+          await editablePkgJson.save()
+          saved = true
+
+          // eslint-disable-next-line no-await-in-loop
+          await install$1(arb.idealTree, {
+            cwd
+          })
+          installed = true
+          if (test) {
+            spinner?.info(`Testing ${fixSpec}`)
+            // eslint-disable-next-line no-await-in-loop
+            await npm.runScript(testScript, [], {
+              spinner,
+              stdio: 'ignore'
+            })
           }
-          spinner?.info(`Installing ${fixSpec}`)
-          try {
-            shadowNpmInject.updatePackageJsonFromNode(
-              editablePkgJson,
-              arb.idealTree,
-              node,
-              targetVersion,
-              rangeStyle
-            )
+          spinner?.successAndStop(`Fixed ${name}`)
+          spinner?.start()
+        } catch {
+          spinner?.error(`Reverting ${fixSpec}`)
+          if (saved) {
+            editablePkgJson.update(revertData)
             // eslint-disable-next-line no-await-in-loop
             await editablePkgJson.save()
-            saved = true
-
+          }
+          if (installed) {
             // eslint-disable-next-line no-await-in-loop
-            await install$1(arb.idealTree, {
+            await install$1(revertTree, {
               cwd
             })
-            installed = true
-            if (test) {
-              spinner?.info(`Testing ${fixSpec}`)
-              // eslint-disable-next-line no-await-in-loop
-              await npm.runScript(testScript, [], {
-                spinner,
-                stdio: 'ignore'
-              })
-            }
-            spinner?.successAndStop(`Fixed ${name}`)
-            spinner?.start()
-          } catch {
-            failed = true
-            spinner?.error(`Reverting ${fixSpec}`)
-            if (saved) {
-              editablePkgJson.update(revertData)
-              // eslint-disable-next-line no-await-in-loop
-              await editablePkgJson.save()
-            }
-            if (installed) {
-              // eslint-disable-next-line no-await-in-loop
-              await install$1(revertTree, {
-                cwd
-              })
-            }
-            spinner?.failAndStop(`Failed to fix ${oldSpec}`)
           }
-        } else {
-          failed = true
-          spinner?.failAndStop(`Could not patch ${oldSpec}`)
+          spinner?.failAndStop(`Failed to fix ${oldSpec}`)
+          return
         }
+        const { owner, repo } = getGitHubRepoInfo()
+        const branch = getSocketBranchName(name, targetVersion)
         if (
-          !failed &&
-          // Check targetVersion to make TypeScript happy.
-          targetVersion &&
           // Lazily access constants.ENV[CI].
-          constants.ENV[CI$1]
+          constants.ENV[CI$1] &&
+          // eslint-disable-next-line no-await-in-loop
+          !(await doesPullRequestExistForBranch(owner, repo, branch))
         ) {
           let prResponse
           try {
             // eslint-disable-next-line no-await-in-loop
-            prResponse = await openGitHubPullRequest(name, targetVersion, cwd)
+            prResponse = await openGitHubPullRequest(
+              owner,
+              repo,
+              branch,
+              name,
+              targetVersion,
+              cwd
+            )
           } catch (e) {
             logger.logger.error('Failed to open pull request', e)
           }
@@ -4344,122 +4361,128 @@ async function pnpmFix(
         const targetPackument = targetVersion
           ? packument.versions[targetVersion]
           : undefined
-        let failed = false
+        if (!(targetVersion && targetPackument)) {
+          spinner?.failAndStop(`Could not patch ${oldSpec}`)
+          return
+        }
+        const oldPnpm = editablePkgJson.content[PNPM$9]
+        const oldPnpmKeyCount = oldPnpm ? Object.keys(oldPnpm).length : 0
+        const oldOverrides = oldPnpm?.[OVERRIDES$2]
+        const oldOverridesCount = oldOverrides
+          ? Object.keys(oldOverrides).length
+          : 0
+        const overrideKey = `${node.name}@${vulnerableVersionRange}`
+        const overrideRange = shadowNpmInject.applyRange(
+          oldOverrides?.[overrideKey] ?? targetVersion,
+          targetVersion,
+          rangeStyle
+        )
+        const fixSpec = `${name}@${overrideRange}`
+        const updateData = {
+          [PNPM$9]: {
+            ...oldPnpm,
+            [OVERRIDES$2]: {
+              [overrideKey]: overrideRange,
+              ...oldOverrides
+            }
+          }
+        }
+        const revertData = {
+          [PNPM$9]: oldPnpmKeyCount
+            ? {
+                ...oldPnpm,
+                [OVERRIDES$2]:
+                  oldOverridesCount === 1
+                    ? undefined
+                    : {
+                        [overrideKey]: undefined,
+                        ...oldOverrides
+                      }
+              }
+            : undefined,
+          ...(editablePkgJson.content.dependencies
+            ? {
+                dependencies: editablePkgJson.content.dependencies
+              }
+            : undefined),
+          ...(editablePkgJson.content.optionalDependencies
+            ? {
+                optionalDependencies:
+                  editablePkgJson.content.optionalDependencies
+              }
+            : undefined),
+          ...(editablePkgJson.content.peerDependencies
+            ? {
+                peerDependencies: editablePkgJson.content.peerDependencies
+              }
+            : undefined)
+        }
+        spinner?.info(`Installing ${fixSpec}`)
         let installed = false
         let saved = false
-        if (targetVersion && targetPackument) {
-          const oldPnpm = editablePkgJson.content[PNPM$9]
-          const oldPnpmKeyCount = oldPnpm ? Object.keys(oldPnpm).length : 0
-          const oldOverrides = oldPnpm?.[OVERRIDES$2]
-          const oldOverridesCount = oldOverrides
-            ? Object.keys(oldOverrides).length
-            : 0
-          const overrideKey = `${node.name}@${vulnerableVersionRange}`
-          const overrideRange = shadowNpmInject.applyRange(
-            oldOverrides?.[overrideKey] ?? targetVersion,
+        try {
+          editablePkgJson.update(updateData)
+          shadowNpmInject.updatePackageJsonFromNode(
+            editablePkgJson,
+            actualTree,
+            node,
             targetVersion,
             rangeStyle
           )
-          const fixSpec = `${name}@${overrideRange}`
-          const updateData = {
-            [PNPM$9]: {
-              ...oldPnpm,
-              [OVERRIDES$2]: {
-                [overrideKey]: overrideRange,
-                ...oldOverrides
-              }
-            }
-          }
-          const revertData = {
-            [PNPM$9]: oldPnpmKeyCount
-              ? {
-                  ...oldPnpm,
-                  [OVERRIDES$2]:
-                    oldOverridesCount === 1
-                      ? undefined
-                      : {
-                          [overrideKey]: undefined,
-                          ...oldOverrides
-                        }
-                }
-              : undefined,
-            ...(editablePkgJson.content.dependencies
-              ? {
-                  dependencies: editablePkgJson.content.dependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.optionalDependencies
-              ? {
-                  optionalDependencies:
-                    editablePkgJson.content.optionalDependencies
-                }
-              : undefined),
-            ...(editablePkgJson.content.peerDependencies
-              ? {
-                  peerDependencies: editablePkgJson.content.peerDependencies
-                }
-              : undefined)
+          // eslint-disable-next-line no-await-in-loop
+          await editablePkgJson.save()
+          saved = true
+
+          // eslint-disable-next-line no-await-in-loop
+          actualTree = await install(pkgEnvDetails, {
+            spinner
+          })
+          installed = true
+          if (test) {
+            spinner?.info(`Testing ${fixSpec}`)
+            // eslint-disable-next-line no-await-in-loop
+            await npm.runScript(testScript, [], {
+              spinner,
+              stdio: 'ignore'
+            })
           }
-          spinner?.info(`Installing ${fixSpec}`)
-          try {
-            editablePkgJson.update(updateData)
-            shadowNpmInject.updatePackageJsonFromNode(
-              editablePkgJson,
-              actualTree,
-              node,
-              targetVersion,
-              rangeStyle
-            )
+          spinner?.successAndStop(`Fixed ${name}`)
+          spinner?.start()
+        } catch (e) {
+          spinner?.error(`Reverting ${fixSpec}`, e)
+          if (saved) {
+            editablePkgJson.update(revertData)
             // eslint-disable-next-line no-await-in-loop
             await editablePkgJson.save()
-            saved = true
-
+          }
+          if (installed) {
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
             })
-            installed = true
-            if (test) {
-              spinner?.info(`Testing ${fixSpec}`)
-              // eslint-disable-next-line no-await-in-loop
-              await npm.runScript(testScript, [], {
-                spinner,
-                stdio: 'ignore'
-              })
-            }
-            spinner?.successAndStop(`Fixed ${name}`)
-            spinner?.start()
-          } catch (e) {
-            failed = true
-            spinner?.error(`Reverting ${fixSpec}`, e)
-            if (saved) {
-              editablePkgJson.update(revertData)
-              // eslint-disable-next-line no-await-in-loop
-              await editablePkgJson.save()
-            }
-            if (installed) {
-              // eslint-disable-next-line no-await-in-loop
-              actualTree = await install(pkgEnvDetails, {
-                spinner
-              })
-            }
-            spinner?.failAndStop(`Failed to fix ${oldSpec}`)
           }
-        } else {
-          failed = true
-          spinner?.failAndStop(`Could not patch ${oldSpec}`)
+          spinner?.failAndStop(`Failed to fix ${oldSpec}`)
+          return
         }
+        const { owner, repo } = getGitHubRepoInfo()
+        const branch = getSocketBranchName(name, targetVersion)
         if (
-          !failed &&
-          // Check targetVersion to make TypeScript happy.
-          targetVersion &&
           // Lazily access constants.ENV[CI].
-          constants.ENV[CI]
+          constants.ENV[CI] &&
+          // eslint-disable-next-line no-await-in-loop
+          !(await doesPullRequestExistForBranch(owner, repo, branch))
         ) {
           let prResponse
           try {
             // eslint-disable-next-line no-await-in-loop
-            prResponse = await openGitHubPullRequest(name, targetVersion, cwd)
+            prResponse = await openGitHubPullRequest(
+              owner,
+              repo,
+              branch,
+              name,
+              targetVersion,
+              cwd
+            )
           } catch (e) {
             logger.logger.error('Failed to open pull request', e)
           }
@@ -4907,9 +4930,14 @@ const config$z = {
   hidden: true,
   flags: {
     ...commonFlags,
+    autoPilot: {
+      type: 'boolean',
+      default: false,
+      description: `Shorthand for --autoMerge --test`
+    },
     autoMerge: {
       type: 'boolean',
-      default: true,
+      default: false,
       description: `Enable auto-merge for pull requests that Socket opens.\n                        See ${terminalLink('GitHub documentation', 'https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository')} for managing auto-merge for pull requests in your repository.`
     },
     rangeStyle: {
@@ -4928,7 +4956,7 @@ const config$z = {
     },
     test: {
       type: 'boolean',
-      default: true,
+      default: false,
       description: 'Verify the fix by running unit tests'
     },
     testScript: {
@@ -4975,6 +5003,7 @@ async function run$z(argv, importMeta, { parentName }) {
   const { spinner } = constants
   await runFix({
     autoMerge: Boolean(cli.flags['autoMerge']),
+    autoPilot: Boolean(cli.flags['autoPilot']),
     spinner,
     rangeStyle: cli.flags['rangeStyle'] ?? undefined,
     test: Boolean(cli.flags['test']),
@@ -10843,7 +10872,10 @@ async function outputThreatFeed(data, { outputKind }) {
 
   // Note: this temporarily takes over the terminal (just like `man` does).
   const ScreenWidget = _socketInterop(require('blessed/lib/widgets/screen'))
-  const screen = new ScreenWidget()
+  // Lazily access constants.blessedOptions.
+  const screen = new ScreenWidget({
+    ...constants.blessedOptions
+  })
   // Register these keys first so you can always exit, even when it gets stuck
   // If we don't do this and the code crashes, the user must hard-kill the
   // node process just to exit it. That's very bad UX.
@@ -11350,7 +11382,7 @@ void (async () => {
   await updateNotifier({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.91',
+    version: '0.14.92',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -11418,5 +11450,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=510ed266-4b5f-4e30-ba22-1d9d0099690d
+//# debugId=1c9e346c-a188-4a0b-a9d2-98a27621720f
 //# sourceMappingURL=cli.js.map