Minor cleanup

Author: jdalton

src/commands/action/core/github.ts

@@ -30,23 +30,23 @@ export class GitHub {
     switch (process.env['GITHUB_EVENT_NAME']) {
       case 'push':
         return this.prNumber ? 'diff' : 'main'
-      case 'pull_request':
+      case 'pull_request': {
         // This env variable needs to be set in the GitHub action.
         // Add this code below to GitHub action:
         // - steps:
         //   - name: Get PR State
         //     if: github.event_name == 'pull_request'
         //     run: echo "EVENT_ACTION=${{ github.event.action }}" >> $GITHUB_ENV
         const eventAction = process.env['EVENT_ACTION']
+        if (eventAction === 'opened' || eventAction === 'synchronize') {
+          return 'diff'
+        }
         if (!eventAction) {
           throw new Error('Missing event action')
         }
-        if (['opened', 'synchronize'].includes(eventAction)) {
-          return 'diff'
-        } else {
-          logger.log(`Pull request action: ${eventAction} is not supported`)
-          process.exit()
-        }
+        logger.log(`Pull request action: ${eventAction} is not supported`)
+        process.exit()
+      }
       case 'issue_comment':
         return 'comment'
       default:

src/commands/cdxgen/cmd-cdxgen.ts

@@ -8,6 +8,7 @@ import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import { runCycloneDX } from './run-cyclonedx'
 import constants from '../../constants'
+import { isHelpFlag } from '../../utils/cmd'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 
@@ -143,7 +144,7 @@ async function run(
   const cli = meowOrExit({
     allowUnknownFlags: true,
     // Don't let meow take over --help.
-    argv: argv.filter(s => s !== '--help' && s !== '-h'),
+    argv: argv.filter(isHelpFlag),
     config,
     importMeta,
     parentName

src/commands/cdxgen/run-cyclonedx.ts

@@ -69,10 +69,14 @@ export async function runCycloneDX(yargv: any) {
 function argvToArray(argv: {
   [key: string]: boolean | null | number | string | Array<string | number>
 }): string[] {
-  if (argv['help']) return ['--help']
+  if (argv['help']) {
+    return ['--help']
+  }
   const result = []
   for (const { 0: key, 1: value } of Object.entries(argv)) {
-    if (key === '_' || key === '--') continue
+    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.

src/utils/cmd.ts

@@ -1,3 +1,5 @@
+const helpFlags = new Set(['--help', '-h'])
+
 export function cmdFlagsToString(args: string[]) {
   const result = []
   for (let i = 0, { length } = args; i < length; i += 1) {
@@ -18,3 +20,7 @@ export function cmdPrefixMessage(cmdName: string, text: string): string {
   const cmdPrefix = cmdName ? `${cmdName}: ` : ''
   return `${cmdPrefix}${text}`
 }
+
+export function isHelpFlag(cmdArg: string) {
+  return helpFlags.has(cmdArg)
+}