Abstract the meow function

src/commands/action/cmd-action.ts

@@ -1,10 +1,11 @@
 // https://github.com/SocketDev/socket-python-cli/blob/6d4fc56faee68d3a4764f1f80f84710635bdaf05/socketsecurity/socketcli.py
-import meowOrExit from 'meow'
 
 import { runAction } from './run-action.ts'
-import { type CliCommandConfig } from '../../utils/meow-with-subcommands'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
+import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
+
 const config: CliCommandConfig = {
   commandName: 'action',
   description: 'Socket action command', // GitHub Action ?
@@ -47,11 +48,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const githubEventBefore = String(cli.flags['githubEventBefore'] || '')

src/commands/analytics/cmd-analytics.ts

@@ -1,9 +1,9 @@
-import meowOrExit from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { displayAnalytics } from './display-analytics.ts'
 import { commonFlags, outputFlags } from '../../flags'
 import { AuthError } from '../../utils/errors'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk.ts'
 
@@ -70,11 +70,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const { repo, scope, time } = cli.flags

src/commands/audit-log/cmd-audit-log.ts

@@ -1,9 +1,9 @@
-import meowOrExit from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { getAuditLog } from './get-audit-log.ts'
 import { commonFlags, outputFlags } from '../../flags'
 import { AuthError } from '../../utils/errors'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
 
@@ -35,15 +35,15 @@ const config: CliCommandConfig = {
     ...commonFlags,
     ...outputFlags
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName} <org slug>
+      $ ${command} <org slug>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${parentName} ${config.commandName} FakeOrg
+      $ ${command} FakeOrg
   `
 }
 
@@ -58,11 +58,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const type = String(cli.flags['type'] || '')

src/commands/cdxgen/cmd-cdxgen.ts

@@ -1,15 +1,14 @@
-// import meowOrExit from 'meow'
+// import { meowOrExit } from '../../utils/meow-with-subcommands'
 import process from 'node:process'
 
 import yargsParse from 'yargs-parser'
 
 import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import { runCycloneDX } from './run-cyclonedx.ts'
+import { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
-
 // TODO: convert yargs to meow. Or convert all the other things to yargs.
 const toLower = (arg: string) => arg.toLowerCase()
 const arrayToLower = (arg: string[]) => arg.map(toLower)
@@ -110,9 +109,9 @@ const config: CliCommandConfig = {
   flags: {
     // TODO: convert from yargsConfig
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName} [options]
+      $ ${command} [options]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
@@ -130,12 +129,12 @@ async function run(
   _importMeta: ImportMeta,
   { parentName: _parentName }: { parentName: string }
 ): Promise<void> {
-  // const cli = meowOrExit(config.help(parentName, config), {
+  // const cli = meowOrExit({
+  //   allowUnknownFlags: true,
   //   argv,
-  //   description: config.description,
+  //   config,
   //   importMeta,
-  //   // Note: we pass the args through so unknown args are allowed for this command
-  //   flags: config.flags
+  //   parentName,
   // })
   //
   //

src/commands/dependencies/cmd-dependencies.ts

@@ -1,7 +1,6 @@
-import meowOrExit from 'meow'
-
 import { findDependencies } from './find-dependencies.ts'
 import { commonFlags, outputFlags } from '../../flags'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
@@ -27,15 +26,15 @@ const config: CliCommandConfig = {
     },
     ...outputFlags
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      ${parentName} ${config.commandName}
+      ${command}
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      ${parentName} ${config.commandName}
+      ${command} --limit 20 --offset 10
   `
 }
 
@@ -50,11 +49,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   // TODO: markdown flag is ignored

src/commands/diff-scan/cmd-diff-scan-get.ts

@@ -1,9 +1,9 @@
-import meowOrExit from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { getDiffScan } from './get-diff-scan.ts'
 import { commonFlags, outputFlags } from '../../flags'
 import { AuthError } from '../../utils/errors'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
 
@@ -41,15 +41,15 @@ const config: CliCommandConfig = {
     },
     ...outputFlags
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName} <org slug> --before=<before> --after=<after>
+      $ ${command} <org slug> --before=<before> --after=<after>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${parentName} ${config.commandName} FakeCorp --before=aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 --after=aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+      $ ${command} FakeCorp --before=aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 --after=aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
   `
 }
 
@@ -64,12 +64,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags,
-    allowUnknownFlags: false
+    parentName
   })
 
   const before = String(cli.flags['before'] || '')

src/commands/fix/cmd-fix.ts

@@ -1,6 +1,5 @@
-import meowOrExit from 'meow'
-
 import { runFix } from './run-fix.ts'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
@@ -10,9 +9,9 @@ const config: CliCommandConfig = {
   description: 'Fix "fixable" Socket alerts',
   hidden: true,
   flags: {},
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName}
+      $ ${command}
 
     Options
       ${getFlagListOutput(config.flags, 6)}
@@ -30,11 +29,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  meowOrExit(config.help(parentName, config), {
+  meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   await runFix()

src/commands/info/cmd-info.ts

@@ -1,8 +1,7 @@
-import meowOrExit from 'meow'
-
 import { getPackageInfo } from './get-package-info.ts'
 import { commonFlags, outputFlags, validationFlags } from '../../flags'
 import { InputError } from '../../utils/errors'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
@@ -16,16 +15,16 @@ const config: CliCommandConfig = {
     ...outputFlags,
     ...validationFlags
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName} <name>
+      $ ${command} <name>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${parentName} ${config.commandName} webtorrent
-      $ ${parentName} ${config.commandName} [email protected]
+      $ ${command} webtorrent
+      $ ${command} [email protected]
   `
 }
 
@@ -40,11 +39,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   if (cli.input.length > 1) {

src/commands/login/cmd-login.ts

@@ -1,9 +1,8 @@
-import meowOrExit from 'meow'
-
 import isInteractive from '@socketregistry/is-interactive/index.cjs'
 
 import { attemptLogin } from './attempt-login.ts'
 import { InputError } from '../../utils/errors'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
@@ -22,17 +21,18 @@ const config: CliCommandConfig = {
       description: 'Proxy to use when making connection to API server'
     }
   },
-  help: (parentName, config) => `
+  help: (command, config) => `
     Usage
-      $ ${parentName} ${config.commandName}
+      $ ${command}
 
     Logs into the Socket API by prompting for an API key
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${parentName} ${config.commandName}
+      $ ${command}
+      $ ${command} --api-proxy=http://localhost:1234
   `
 }
 
@@ -47,11 +47,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meowOrExit(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   if (!isInteractive()) {