SocketDev · jdalton · Apr 30, 2025 · Apr 30, 2025
diff --git a/src/commands/analytics/cmd-analytics.mts b/src/commands/analytics/cmd-analytics.mts
@@ -12,7 +12,7 @@ import { getDefaultToken } from '../../utils/sdk.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'analytics',
@@ -211,7 +211,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/audit-log/cmd-audit-log.mts b/src/commands/audit-log/cmd-audit-log.mts
@@ -13,7 +13,7 @@ import { getDefaultToken } from '../../utils/sdk.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'audit-log',
@@ -144,7 +144,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/cdxgen/cmd-cdxgen.mts b/src/commands/cdxgen/cmd-cdxgen.mts
@@ -12,7 +12,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 // TODO: convert yargs to meow. Or convert all the other things to yargs.
 const toLower = (arg: string) => arg.toLowerCase()
@@ -168,7 +168,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/ci/cmd-ci.mts b/src/commands/ci/cmd-ci.mts
@@ -7,7 +7,7 @@ import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'ci',
@@ -48,7 +48,7 @@ async function run(
   })
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/config/cmd-config-auto.mts b/src/commands/config/cmd-config-auto.mts
@@ -12,7 +12,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import type { LocalConfig } from '../../utils/config.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'auto',
@@ -90,7 +90,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/config/cmd-config-get.mts b/src/commands/config/cmd-config-get.mts
@@ -12,7 +12,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import type { LocalConfig } from '../../utils/config.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'get',
@@ -85,7 +85,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/config/cmd-config-list.mts b/src/commands/config/cmd-config-list.mts
@@ -11,7 +11,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'list',
@@ -78,7 +78,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/config/cmd-config-set.mts b/src/commands/config/cmd-config-set.mts
@@ -12,7 +12,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import type { LocalConfig } from '../../utils/config.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'set',
@@ -98,7 +98,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/config/cmd-config-unset.mts b/src/commands/config/cmd-config-unset.mts
@@ -12,7 +12,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import type { LocalConfig } from '../../utils/config.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'unset',
@@ -85,7 +85,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/dependencies/cmd-dependencies.mts b/src/commands/dependencies/cmd-dependencies.mts
@@ -11,7 +11,7 @@ import { getDefaultToken } from '../../utils/sdk.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'dependencies',
@@ -97,7 +97,7 @@ async function run(
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/diff-scan/cmd-diff-scan-get.mts b/src/commands/diff-scan/cmd-diff-scan-get.mts
@@ -12,7 +12,7 @@ import { getDefaultToken } from '../../utils/sdk.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'get',
@@ -152,7 +152,7 @@ async function run(
   )
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/fix/cmd-fix.mts b/src/commands/fix/cmd-fix.mts
@@ -1,10 +1,8 @@
 import terminalLink from 'terminal-link'
 
 import { joinOr } from '@socketsecurity/registry/lib/arrays'
-import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { runFix } from './run-fix.mts'
-import constants from '../../constants.mts'
 import { commonFlags } from '../../flags.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { checkCommandInput } from '../../utils/handle-bad-input.mts'
@@ -15,8 +13,6 @@ import { RangeStyles } from '../../utils/semver.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 import type { RangeStyle } from '../../utils/semver.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
-
 const config: CliCommandConfig = {
   commandName: 'fix',
   description: 'Update dependencies with "fixable" Socket alerts',
@@ -113,11 +109,6 @@ async function run(
     return
   }
 
-  if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
-    return
-  }
-
   await runFix({
     autoMerge: Boolean(cli.flags['autoMerge']),
     autopilot: Boolean(cli.flags['autopilot']),

diff --git a/src/commands/fix/cmd-fix.test.mts b/src/commands/fix/cmd-fix.test.mts
@@ -62,13 +62,18 @@
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(stdout).toMatchInlineSnapshot(`
+        "\\x1b[34mi\\x1b[39m Fixing packages for npm
+        [DryRun]: Not saving"
+      `)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket fix\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket fix\`, cwd: <redacted>
+
+        \\x1b[33m\\u203c\\x1b[39m socket fix: Package package-lock.json found at /Users/jdalton/projects/socket-cli/package-lock.json"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)

diff --git a/src/commands/fix/npm-fix.mts b/src/commands/fix/npm-fix.mts
@@ -53,7 +53,7 @@ import type { SafeNode } from '../../shadow/npm/arborist/lib/node.mts'
 import type { EnvDetails } from '../../utils/package-environment.mts'
 import type { PackageJson } from '@socketsecurity/registry/lib/packages'
 
-const { NPM } = constants
+const { DRY_RUN_NOT_SAVING, NPM } = constants
 
 type InstallOptions = {
   cwd?: string | undefined
@@ -74,8 +74,12 @@ async function install(
 
 export async function npmFix(
   pkgEnvDetails: EnvDetails,
-  { autoMerge, cwd, purls, rangeStyle, test, testScript }: NormalizedFixOptions
+  { autoMerge, cwd, dryRun, purls, rangeStyle, test, testScript }: NormalizedFixOptions
 ) {
+  if (dryRun) {
+    logger.log(DRY_RUN_NOT_SAVING)
+    return
+  }
   // Lazily access constants.spinner.
   const { spinner } = constants
 

diff --git a/src/commands/fix/pnpm-fix.mts b/src/commands/fix/pnpm-fix.mts
@@ -57,7 +57,7 @@ import type { LockfileObject } from '@pnpm/lockfile.fs'
 import type { PackageJson } from '@socketsecurity/registry/lib/packages'
 import type { Spinner } from '@socketsecurity/registry/lib/spinner'
 
-const { NPM, OVERRIDES, PNPM } = constants
+const { DRY_RUN_NOT_SAVING, NPM, OVERRIDES, PNPM } = constants
 
 async function getActualTree(cwd: string = process.cwd()): Promise<SafeNode> {
   const arb = new SafeArborist({
@@ -93,8 +93,12 @@ async function readLockfile(pkgPath: string): Promise<LockfileObject | null> {
 
 export async function pnpmFix(
   pkgEnvDetails: EnvDetails,
-  { autoMerge, cwd, purls, rangeStyle, test, testScript }: NormalizedFixOptions
+  { autoMerge, cwd, dryRun, purls, rangeStyle, test, testScript }: NormalizedFixOptions
 ) {
+  if (dryRun) {
+    logger.log(DRY_RUN_NOT_SAVING)
+    return
+  }
   // Lazily access constants.spinner.
   const { spinner } = constants
 

diff --git a/src/commands/info/cmd-info.mts b/src/commands/info/cmd-info.mts
@@ -11,7 +11,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'info',
@@ -98,7 +98,7 @@ async function run(
     versionSeparator < 1 ? 'latest' : rawPkgName.slice(versionSeparator + 1)
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/login/cmd-login.mts b/src/commands/login/cmd-login.mts
@@ -10,7 +10,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'login',
@@ -67,7 +67,7 @@ async function run(
   const apiProxy = cli.flags['apiProxy'] as string | undefined
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/logout/cmd-logout.mts b/src/commands/logout/cmd-logout.mts
@@ -7,7 +7,7 @@ import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'logout',
@@ -43,7 +43,7 @@ async function run(
   })
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 

diff --git a/src/commands/manifest/cmd-manifest-auto.mts b/src/commands/manifest/cmd-manifest-auto.mts
@@ -15,7 +15,7 @@ import { getFlagListOutput } from '../../utils/output-formatting.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
-const { DRY_RUN_BAIL_TEXT } = constants
+const { DRY_RUN_BAILING_NOW } = constants
 
 const config: CliCommandConfig = {
   commandName: 'auto',
@@ -91,7 +91,7 @@ async function run(
     }
     subArgs.push(dir)
     if (cli.flags['dryRun']) {
-      logger.log(DRY_RUN_BAIL_TEXT)
+      logger.log(DRY_RUN_BAILING_NOW)
       return
     }
     await cmdManifestScala.run(subArgs, importMeta, { parentName })
@@ -105,7 +105,7 @@ async function run(
       subArgs.push(cwd)
     }
     if (cli.flags['dryRun']) {
-      logger.log(DRY_RUN_BAIL_TEXT)
+      logger.log(DRY_RUN_BAILING_NOW)
       return
     }
     await cmdManifestGradle.run(subArgs, importMeta, { parentName })
@@ -123,15 +123,15 @@ async function run(
     // This command takes the TARGET as first arg.
     subArgs.push(hasEnvyml ? envyml : hasEnvyaml ? envyaml : '')
     if (cli.flags['dryRun']) {
-      logger.log(DRY_RUN_BAIL_TEXT)
+      logger.log(DRY_RUN_BAILING_NOW)
       return
     }
     await cmdManifestConda.run(subArgs, importMeta, { parentName })
     return
   }
 
   if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAIL_TEXT)
+    logger.log(DRY_RUN_BAILING_NOW)
     return
   }