Minor code shuffle in run-cdxgen (#551)

Author: jdalton

src/commands/cdxgen/cmd-cdxgen.mts

@@ -4,7 +4,7 @@ import yargsParse from 'yargs-parser'
 import { logger } from '@socketsecurity/registry/lib/logger'
 import { pluralize } from '@socketsecurity/registry/lib/words'
 
-import { runCycloneDX } from './run-cyclonedx.mts'
+import { runCdxgen } from './run-cdxgen.mts'
 import constants from '../../constants.mts'
 import { isHelpFlag } from '../../utils/cmd.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -289,5 +289,5 @@ async function run(
     }
   }
 
-  await runCycloneDX(yargv)
+  await runCdxgen(yargv)
 }

src/commands/cdxgen/run-cyclonedx.mts src/commands/cdxgen/run-cdxgen.mtssrc/commands/cdxgen/run-cyclonedx.mts renamed to src/commands/cdxgen/run-cdxgen.mts

@@ -21,7 +21,36 @@ const nodejsPlatformTypes = new Set([
   'typescript'
 ])
 
-export async function runCycloneDX(yargvWithYes: any) {
+function argvToArray(argv: {
+  [key: string]: boolean | null | number | string | Array<string | number>
+}): string[] {
+  if (argv['help']) {
+    return ['--help']
+  }
+  const result = []
+  for (const { 0: key, 1: value } of Object.entries(argv)) {
+    if (key === '_' || key === '--') {
+      continue
+    }
+    if (key === 'babel' || key === 'install-deps' || key === 'validate') {
+      // cdxgen documents no-babel, no-install-deps, and no-validate flags so
+      // use them when relevant.
+      result.push(`--${value ? key : `no-${key}`}`)
+    } else if (value === true) {
+      result.push(`--${key}`)
+    } else if (typeof value === 'string') {
+      result.push(`--${key}`, String(value))
+    } else if (Array.isArray(value)) {
+      result.push(`--${key}`, ...value.map(String))
+    }
+  }
+  if (argv['--']) {
+    result.push('--', ...(argv as any)['--'])
+  }
+  return result
+}
+
+export async function runCdxgen(yargvWithYes: any) {
   let cleanupPackageLock = false
   const { yes, ...yargv } = { __proto__: null, ...yargvWithYes } as any
   const yesArgs = yes ? ['--yes'] : []
@@ -64,32 +93,3 @@ export async function runCycloneDX(yargvWithYes: any) {
     logger.log(colors.cyanBright(`${yargv.output} created!`))
   }
 }
-
-function argvToArray(argv: {
-  [key: string]: boolean | null | number | string | Array<string | number>
-}): string[] {
-  if (argv['help']) {
-    return ['--help']
-  }
-  const result = []
-  for (const { 0: key, 1: value } of Object.entries(argv)) {
-    if (key === '_' || key === '--') {
-      continue
-    }
-    if (key === 'babel' || key === 'install-deps' || key === 'validate') {
-      // cdxgen documents no-babel, no-install-deps, and no-validate flags so
-      // use them when relevant.
-      result.push(`--${value ? key : `no-${key}`}`)
-    } else if (value === true) {
-      result.push(`--${key}`)
-    } else if (typeof value === 'string') {
-      result.push(`--${key}`, String(value))
-    } else if (Array.isArray(value)) {
-      result.push(`--${key}`, ...value.map(String))
-    }
-  }
-  if (argv['--']) {
-    result.push('--', ...(argv as any)['--'])
-  }
-  return result
-}