socket 0.14.146 → 0.14.148

package/bin/cli.js

@@ -3,8 +3,8 @@
 
 const process = require('node:process')
 
-const { spawn } = require('../dist/@socketsecurity/registry/lib/spawn')
-const constants = require('../dist/constants')
+const constants = require('../dist/constants.js')
+const { spawn } = require('../external/@socketsecurity/registry/lib/spawn.js')
 
 const { INLINED_SOCKET_CLI_SENTRY_BUILD } = constants
 

package/bin/npm-cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 'use strict'
 
-const constants = require('../dist/constants')
+const constants = require('../dist/constants.js')
 const shadowBin = require(constants.distShadowNpmBinPath)
 shadowBin(constants.NPM)

package/bin/npx-cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 'use strict'
 
-const constants = require('../dist/constants')
+const constants = require('../dist/constants.js')
 const shadowBin = require(constants.distShadowNpmBinPath)
 shadowBin(constants.NPX)

package/dist/cli.js

@@ -3,31 +3,31 @@
 const process$1 = require('node:process')
 const require$$0 = require('node:url')
 const vendor = require('./vendor.js')
-const debug = require('./@socketsecurity/registry/lib/debug')
-const logger = require('./@socketsecurity/registry/lib/logger')
+const debug = require('../external/@socketsecurity/registry/lib/debug')
+const logger = require('../external/@socketsecurity/registry/lib/logger')
 const assert = require('node:assert')
 const fs = require('node:fs/promises')
-const strings = require('./@socketsecurity/registry/lib/strings')
+const strings = require('../external/@socketsecurity/registry/lib/strings')
 const shadowNpmInject = require('./shadow-npm-inject.js')
 const constants = require('./constants.js')
 const path$1 = require('node:path')
-const objects = require('./@socketsecurity/registry/lib/objects')
-const path = require('./@socketsecurity/registry/lib/path')
-const regexps = require('./@socketsecurity/registry/lib/regexps')
-const words = require('./@socketsecurity/registry/lib/words')
+const objects = require('../external/@socketsecurity/registry/lib/objects')
+const path = require('../external/@socketsecurity/registry/lib/path')
+const regexps = require('../external/@socketsecurity/registry/lib/regexps')
+const words = require('../external/@socketsecurity/registry/lib/words')
 const fs$1 = require('node:fs')
 const shadowBin = require('./shadow-bin.js')
-const prompts = require('./@socketsecurity/registry/lib/prompts')
+const prompts = require('../external/@socketsecurity/registry/lib/prompts')
 const shadowNpmPaths = require('./shadow-npm-paths.js')
 const util = require('node:util')
-const arrays = require('./@socketsecurity/registry/lib/arrays')
-const registry = require('./@socketsecurity/registry')
-const npm = require('./@socketsecurity/registry/lib/npm')
-const packages = require('./@socketsecurity/registry/lib/packages')
-const spawn = require('./@socketsecurity/registry/lib/spawn')
-const sorts = require('./@socketsecurity/registry/lib/sorts')
-const registryConstants = require('./@socketsecurity/registry/lib/constants')
-const promises = require('./@socketsecurity/registry/lib/promises')
+const arrays = require('../external/@socketsecurity/registry/lib/arrays')
+const registry = require('../external/@socketsecurity/registry')
+const npm = require('../external/@socketsecurity/registry/lib/npm')
+const packages = require('../external/@socketsecurity/registry/lib/packages')
+const spawn = require('../external/@socketsecurity/registry/lib/spawn')
+const sorts = require('../external/@socketsecurity/registry/lib/sorts')
+const registryConstants = require('../external/@socketsecurity/registry/lib/constants')
+const promises = require('../external/@socketsecurity/registry/lib/promises')
 
 function failMsgWithBadge(badge, msg) {
   return `${vendor.yoctocolorsCjsExports.bgRed(vendor.yoctocolorsCjsExports.bold(vendor.yoctocolorsCjsExports.white(` ${badge}: `)))} ${vendor.yoctocolorsCjsExports.bold(msg)}`
@@ -387,12 +387,12 @@ ${mdTableStringNumber('Name', 'Counts', data['top_five_alert_types'])}
 `
 }
 function displayAnalyticsScreen(data) {
-  const ScreenWidget = require('./blessed/lib/widgets/screen')
+  const ScreenWidget = require('../external/blessed/lib/widgets/screen.js')
   // Lazily access constants.blessedOptions.
   const screen = new ScreenWidget({
     ...constants.blessedOptions
   })
-  const GridLayout = require('./blessed-contrib/lib/layout/grid')
+  const GridLayout = require('../external/blessed-contrib/lib/layout/grid.js')
   const grid = new GridLayout({
     rows: 5,
     cols: 4,
@@ -454,7 +454,7 @@ function displayAnalyticsScreen(data) {
     [3, 2, 1, 2],
     data['total_low_prevented']
   )
-  const BarChart = require('./blessed-contrib/lib/widget/charts/bar')
+  const BarChart = require('../external/blessed-contrib/lib/widget/charts/bar.js')
   const bar = grid.set(4, 0, 1, 2, BarChart, {
     label: 'Top 5 alert types',
     barWidth: 10,
@@ -551,7 +551,7 @@ function formatDate(date) {
   return `${Months[new Date(date).getMonth()]} ${new Date(date).getDate()}`
 }
 function renderLineCharts(grid, screen, title, coords, data) {
-  const LineChart = require('./blessed-contrib/lib/widget/charts/line')
+  const LineChart = require('../external/blessed-contrib/lib/widget/charts/line.js')
   const line = grid.set(...coords, LineChart, {
     style: {
       line: 'cyan',
@@ -904,7 +904,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.146:6152991:91bfab73:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.148:b04f898:6146c5b2: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')
@@ -3741,7 +3741,7 @@ function getSocketBranchName(purl, newVersion, workspaceName) {
     ? `${formatBranchName(purlObj.namespace)}-`
     : ''
   const fullName = `${maybeWorkspaceName}${maybeNamespace}${formatBranchName(purlObj.name)}`
-  return `socket-fix-${fullName}-${formatBranchName(newVersion)}`
+  return `socket/${fullName}-${formatBranchName(newVersion)}`
 }
 function getSocketPullRequestTitle(purl, newVersion, workspaceName) {
   const purlObj = vendor.packageurlJsExports.PackageURL.fromString(purl)
@@ -3761,32 +3761,15 @@ function getSocketCommitMessage(purl, newVersion, workspaceName) {
   const workspaceDetails = workspaceName ? ` in ${workspaceName}` : ''
   return `socket: Bump ${pkgName} from ${purlObj.version} to ${newVersion}${workspaceDetails}`
 }
-async function gitBranchExists(branch, cwd = process.cwd()) {
-  try {
-    await spawn.spawn(
-      'git',
-      ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`],
-      {
-        cwd,
-        stdio: 'ignore'
-      }
-    )
-    return true
-  } catch {}
-  return false
-}
-async function gitCleanFdx(cwd = process.cwd()) {
-  await spawn.spawn('git', ['clean', '-fdx'], {
-    cwd
-  })
-}
 async function gitCreateAndPushBranchIfNeeded(
   branch,
   commitMsg,
   cwd = process.cwd()
 ) {
-  if (await gitBranchExists(branch, cwd)) {
-    logger.logger.warn(`Branch "${branch}" already exists, skipping creation.`)
+  if (await gitRemoteBranchExists(branch, cwd)) {
+    logger.logger.warn(
+      `Branch "${branch}" already exists remotely, skipping push.`
+    )
     return true
   }
   const moddedFilepaths = (await gitUnstagedModifiedFiles(cwd)).filter(p => {
@@ -3810,16 +3793,50 @@ async function gitCreateAndPushBranchIfNeeded(
   await spawn.spawn('git', ['commit', '-m', commitMsg], {
     cwd
   })
-  await spawn.spawn('git', ['push', '--set-upstream', 'origin', branch], {
-    cwd
-  })
-  return true
+  try {
+    await spawn.spawn('git', ['push', '--set-upstream', 'origin', branch], {
+      cwd
+    })
+    return true
+  } catch {}
+  logger.logger.warn(`Push failed for "${branch}", trying force-push`)
+  try {
+    await spawn.spawn(
+      'git',
+      ['push', '--force', '--set-upstream', 'origin', branch],
+      {
+        cwd
+      }
+    )
+    return true
+  } catch {}
+  logger.logger.warn(`Force-push failed for "${branch}"`)
+  return false
 }
 async function gitHardReset(branch = 'HEAD', cwd = process.cwd()) {
   await spawn.spawn('git', ['reset', '--hard', branch], {
     cwd
   })
 }
+async function gitCleanFdx(cwd = process.cwd()) {
+  await spawn.spawn('git', ['clean', '-fdx'], {
+    cwd
+  })
+}
+async function gitRemoteBranchExists(branch, cwd = process.cwd()) {
+  try {
+    const { stdout } = await spawn.spawn(
+      'git',
+      ['ls-remote', '--heads', 'origin', branch],
+      {
+        cwd
+      }
+    )
+    return stdout.trim().length > 0
+  } catch {
+    return false
+  }
+}
 async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
   const { stdout } = await spawn.spawn('git', ['diff', '--name-only'], {
     cwd
@@ -3984,11 +4001,11 @@ function normalizeFixOptions(options_) {
     __proto__: null,
     ...options_
   }
-  if (typeof options.autoPilot !== 'boolean') {
-    options.autoPilot = false
+  if (typeof options.autopilot !== 'boolean') {
+    options.autopilot = false
   }
   if (typeof options.autoMerge !== 'boolean') {
-    options.autoMerge = !!options.autoPilot
+    options.autoMerge = !!options.autopilot
   }
   if (typeof options.cwd !== 'string') {
     options.cwd = process.cwd()
@@ -4000,7 +4017,7 @@ function normalizeFixOptions(options_) {
     options.rangeStyle = 'preserve'
   }
   if (typeof options.test !== 'boolean') {
-    options.test = !!options.autoPilot || !!options.testScript
+    options.test = !!options.autopilot || !!options.testScript
   }
   if (typeof options.testScript !== 'string') {
     options.testScript = 'test'
@@ -5147,7 +5164,7 @@ const config$B = {
   hidden: false,
   flags: {
     ...commonFlags,
-    autoPilot: {
+    autopilot: {
       type: 'boolean',
       default: false,
       description: `Shorthand for --autoMerge --test`
@@ -5160,25 +5177,25 @@ const config$B = {
     purl: {
       type: 'string',
       default: [],
-      description: `Provide a list of ${vendor.terminalLinkExports('package URLs (PURLs)', 'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl')} to fix, as either a comma separated value or as multiple flags, instead of querying the Socket API`,
+      description: `Provide a list of ${vendor.terminalLinkExports('package URLs', 'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl')} (PURLs) to fix, as either a comma separated value or as multiple flags,\n                        instead of querying the Socket API`,
       isMultiple: true,
       shortFlag: 'p'
     },
     rangeStyle: {
       type: 'string',
       default: 'preserve',
-      description: vendor.html`
-      Define how updated dependency versions should be written in package.json.
-      Available styles:
-        *	caret - Use ^ range for compatible updates (e.g. ^1.2.3)
-        *	gt - Use > to allow any newer version (e.g. >1.2.3)
-        *	gte - Use >= to allow any newer version (e.g. >=1.2.3)
-        *	lt - Use < to allow only lower versions (e.g. <1.2.3)
-        *	lte - Use <= to allow only lower versions (e.g. <=1.2.3)
-        *	pin - Use the exact version (e.g. 1.2.3)
-        *	preserve - Retain the existing version range style as-is
-        *	tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
-      `
+      description: `
+                        Define how updated dependency versions should be written in package.json.
+                        Available styles:
+                          * caret - Use ^ range for compatible updates (e.g. ^1.2.3)
+                          * gt - Use > to allow any newer version (e.g. >1.2.3)
+                          * gte - Use >= to allow any newer version (e.g. >=1.2.3)
+                          * lt - Use < to allow only lower versions (e.g. <1.2.3)
+                          * lte - Use <= to allow only lower versions (e.g. <=1.2.3)
+                          * pin - Use the exact version (e.g. 1.2.3)
+                          * preserve - Retain the existing version range style as-is
+                          * tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
+      `.trim()
     },
     test: {
       type: 'boolean',
@@ -5229,7 +5246,7 @@ async function run$B(argv, importMeta, { parentName }) {
   const { spinner } = constants
   await runFix({
     autoMerge: Boolean(cli.flags['autoMerge']),
-    autoPilot: Boolean(cli.flags['autoPilot']),
+    autopilot: Boolean(cli.flags['autopilot']),
     purls: Array.isArray(cli.flags['purl']) ? cli.flags['purl'] : [],
     spinner,
     rangeStyle: cli.flags['rangeStyle'] ?? undefined,
@@ -6032,7 +6049,7 @@ async function convertGradleToMaven(target, bin, cwd, verbose, gradleOpts) {
     // I'd prefer something plain-text if it is to be committed.
 
     // Note: init.gradle will be exported by .config/rollup.dist.config.mjs
-    const initLocation = path$1.join(constants.rootDistPath, 'init.gradle')
+    const initLocation = path$1.join(constants.distPath, 'init.gradle')
     const commandArgs = ['--init-script', initLocation, ...gradleOpts, 'pom']
     if (verbose) {
       logger.logger.log('[VERBOSE] Executing:', [bin], ', args:', commandArgs)
@@ -11748,7 +11765,7 @@ async function outputThreatFeed(data, { outputKind }) {
   const descriptions = data.results.map(d => d.description)
 
   // Note: this temporarily takes over the terminal (just like `man` does).
-  const ScreenWidget = require('./blessed/lib/widgets/screen')
+  const ScreenWidget = require('../external/blessed/lib/widgets/screen.js')
   // Lazily access constants.blessedOptions.
   const screen = new ScreenWidget({
     ...constants.blessedOptions
@@ -11758,7 +11775,7 @@ async function outputThreatFeed(data, { outputKind }) {
   // node process just to exit it. That's very bad UX.
   // eslint-disable-next-line n/no-process-exit
   screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
-  const TableWidget = require('./blessed-contrib/lib/widget/table')
+  const TableWidget = require('../external/blessed-contrib/lib/widget/table.js')
   const table = new TableWidget({
     keys: 'true',
     fg: 'white',
@@ -11781,7 +11798,7 @@ async function outputThreatFeed(data, { outputKind }) {
   })
 
   // Create details box at the bottom
-  const BoxWidget = require('./blessed/lib/widgets/box')
+  const BoxWidget = require('../external/blessed/lib/widgets/box.js')
   const detailsBox = new BoxWidget({
     bottom: 0,
     height: '30%',
@@ -12257,7 +12274,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.146',
+    version: '0.14.148',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12325,5 +12342,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=34e47639-9572-462a-a1a9-831502ee124f
+//# debugId=574124cd-9782-42bb-ba9e-f71cc52dd4c3
 //# sourceMappingURL=cli.js.map