socket 0.14.106 → 0.14.108

package/dist/module-sync/cli.js

@@ -917,9 +917,11 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.106:968fc98:d2acc868:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.108:342eeb0:75e98336:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
+  const defaultOrg = shadowNpmInject.getConfigValue('defaultOrg')
+  const readOnlyConfig = shadowNpmInject.isReadOnlyConfig() ? '*' : '.'
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
   const relCwd = path.normalizePath(
     process$1
@@ -935,7 +937,7 @@ function getAsciiHeader(command) {
   const body = `
    _____         _       _        /---------------
   |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver ${cliVersion}
-  |__   | . |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}
+  |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, default org: ${defaultOrg}` : ''}
   |_____|___|___|_,_|___|_|.dev   | Command: \`${command}\`, cwd: ${relCwd}`.trimStart()
   return `   ${body}\n`
 }
@@ -2301,7 +2303,7 @@ async function handleScanReport({
   })
 }
 
-async function outputCreateNewScan(data, outputKind) {
+async function outputCreateNewScan(data, outputKind, interactive) {
   if (!data.id) {
     logger.logger.fail('Did not receive a scan ID from the API...')
     process.exitCode = 1
@@ -2341,10 +2343,11 @@ async function outputCreateNewScan(data, outputKind) {
   )
   logger.logger.log(`Available at: ${link}`)
   if (
-    await prompts.confirm({
+    interactive &&
+    (await prompts.confirm({
       message: 'Would you like to open it in your browser?',
       default: false
-    })
+    }))
   ) {
     await vendor.open(`${data.html_report_url}`)
   }
@@ -2357,6 +2360,7 @@ async function handleCreateNewScan({
   committers,
   cwd,
   defaultBranch,
+  interactive,
   orgSlug,
   outputKind,
   pendingHead,
@@ -2428,7 +2432,7 @@ async function handleCreateNewScan({
       process.exitCode = 1
     }
   } else {
-    await outputCreateNewScan(data, outputKind)
+    await outputCreateNewScan(data, outputKind, interactive)
   }
 }
 
@@ -2451,6 +2455,7 @@ async function handleCI() {
     committers: '',
     cwd: process.cwd(),
     defaultBranch: false,
+    interactive: false,
     orgSlug,
     outputKind: 'json',
     pendingHead: true,
@@ -3815,14 +3820,16 @@ async function gitCreateAndPushBranchIfNeeded(
   await spawn.spawn('git', ['checkout', '-b', branch], {
     cwd
   })
-  const relFilepaths = await vendor.distExports.glob(
-    '**/{package.json,package-lock.json,pnpm-lock.yaml}',
-    {
-      cwd
-    }
-  )
-  if (relFilepaths.length) {
-    await spawn.spawn('git', ['add', ...relFilepaths], {
+  const moddedFilepaths = (await gitUnstagedModifiedFiles(cwd)).filter(p => {
+    const basename = path$1.basename(p)
+    return (
+      basename === 'package.json' ||
+      basename === 'package-lock.json' ||
+      basename === 'pnpm-lock.yaml'
+    )
+  })
+  if (moddedFilepaths.length) {
+    await spawn.spawn('git', ['add', ...moddedFilepaths], {
       cwd
     })
   }
@@ -3839,6 +3846,13 @@ async function gitHardReset(cwd = process.cwd()) {
     cwd
   })
 }
+async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
+  const { stdout } = await spawn.spawn('git', ['diff', '--name-only'], {
+    cwd
+  })
+  const rawFiles = stdout?.trim().split('\n') ?? []
+  return rawFiles.map(relPath => path.normalizePath(relPath))
+}
 async function isInGitRepo(cwd = process.cwd()) {
   try {
     await spawn.spawn('git', ['rev-parse', '--is-inside-work-tree'], {
@@ -3876,13 +3890,17 @@ function getOctokitGraphql() {
 }
 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
+  try {
+    const { data: prs } = await octokit.pulls.list({
+      owner,
+      repo,
+      head: `${owner}:${branch}`,
+      state: 'open'
+    })
+    debug.debugLog('doesPullRequestExistForBranch > prs', prs)
+    return prs.length > 0
+  } catch {}
+  return false
 }
 async function enableAutoMerge({ node_id: prId, number: prNumber }) {
   const octokitGraphql = getOctokitGraphql()
@@ -4455,6 +4473,7 @@ async function pnpmFix(
     pkgEnvDetails.editablePkgJson.filename,
     ...workspacePkgJsonPaths
   ]
+  debug.debugLog('workspacePkgJsonPaths', workspacePkgJsonPaths)
   let actualTree = initialTree
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
@@ -4509,6 +4528,7 @@ async function pnpmFix(
           }
           continue
         }
+        debug.debugLog('pkgJsonPaths', pkgJsonPaths)
         for (const pkgJsonPath of pkgJsonPaths) {
           const isWorkspaceRoot =
             pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
@@ -10259,6 +10279,12 @@ const config$8 = {
       description:
         'Set the default branch of the repository to the branch of this full-scan. Should only need to be done once, for example for the "main" or "master" branch.'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
     pendingHead: {
       type: 'boolean',
       default: true,
@@ -10355,6 +10381,7 @@ async function run$8(argv, importMeta, { parentName }) {
     cwd: cwdOverride,
     defaultBranch,
     dryRun,
+    interactive = true,
     json,
     markdown,
     pendingHead,
@@ -10380,7 +10407,7 @@ async function run$8(argv, importMeta, { parentName }) {
   // If we updated any inputs then we should print the command line to repeat
   // the command without requiring user input, as a suggestion.
   let updatedInput = false
-  if (!targets.length && !dryRun) {
+  if (!targets.length && !dryRun && interactive) {
     const received = await suggestTarget()
     targets = received ?? []
     updatedInput = true
@@ -10389,7 +10416,7 @@ async function run$8(argv, importMeta, { parentName }) {
   // If the current cwd is unknown and is used as a repo slug anyways, we will
   // first need to register the slug before we can use it.
   // Only do suggestions with an apiToken and when not in dryRun mode
-  if (apiToken && !dryRun) {
+  if (apiToken && !dryRun && interactive) {
     if (!orgSlug) {
       const suggestion = await suggestOrgSlug()
       if (suggestion) {
@@ -10477,6 +10504,7 @@ async function run$8(argv, importMeta, { parentName }) {
     committers: (committers && String(committers)) || '',
     cwd,
     defaultBranch: Boolean(defaultBranch),
+    interactive: Boolean(interactive),
     orgSlug,
     outputKind: json ? 'json' : markdown ? 'markdown' : 'text',
     pendingHead: Boolean(pendingHead),
@@ -12263,7 +12291,7 @@ void (async () => {
   await vendor.updater({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.106',
+    version: '0.14.108',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12331,5 +12359,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=b25de489-8925-4012-8959-2813dc2dbb5c
+//# debugId=d0709b7a-bb78-4292-adb6-17ec75cd13e9
 //# sourceMappingURL=cli.js.map