Apply meowOrExit logic to remaining commands

pvdz · pvdz · commit c55a5eb7e0b0 · 2025-02-24T15:13:34.000+01:00
diff --git a/src/commands/manifest/cmd-manifest-auto.ts b/src/commands/manifest/cmd-manifest-auto.ts
@@ -1,11 +1,10 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import meow from 'meow'
-
 import { cmdManifestGradle } from './cmd-manifest-gradle.ts'
 import { cmdManifestScala } from './cmd-manifest-scala.ts'
 import { commonFlags } from '../../flags.ts'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
@@ -51,12 +50,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meow(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags,
-    allowUnknownFlags: false
+    parentName
   })
 
   const verbose = cli.flags['verbose'] ?? false
@@ -93,24 +91,19 @@ async function run(
   }
 
   // Show new help screen and exit
-  meow(
+  console.log(
     `
-    $ ${parentName} ${config.commandName}
-
-    Unfortunately this script did not discover a supported language in the
-    current folder.
-
-    - Make sure this script would work with your target build
-    - Make sure to run it from the correct folder
-    - Make sure the necessary build tools are available (\`PATH\`)
-
-    If that doesn't work, see \`${parentName} <lang> --help\` for config details for
-    your target language.
-  `,
-    {
-      argv: [],
-      description: config.description,
-      importMeta
-    }
-  ).showHelp()
+$ ${parentName} ${config.commandName}
+
+Unfortunately this script did not discover a supported language in the
+current folder.
+
+- Make sure this script would work with your target build
+- Make sure to run it from the correct folder
+- Make sure the necessary build tools are available (\`PATH\`)
+
+If that doesn't work, see \`${parentName} <lang> --help\` for config details for
+your target language.
+    `.trim()
+  )
 }
diff --git a/src/commands/manifest/cmd-manifest-gradle.ts b/src/commands/manifest/cmd-manifest-gradle.ts
@@ -1,11 +1,10 @@
 import path from 'node:path'
 
-import meow from 'meow'
-
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { convertGradleToMaven } from './convert_gradle_to_maven.ts'
 import { commonFlags } from '../../flags.ts'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
@@ -96,13 +95,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  // note: meow will exit if it prints the --help screen
-  const cli = meow(config.help(parentName, config), {
-    flags: config.flags,
-    argv: argv.length === 0 ? ['--help'] : argv,
-    description: config.description,
-    allowUnknownFlags: false,
-    importMeta
+  const cli = meowOrExit({
+    argv,
+    config,
+    importMeta,
+    parentName
   })
 
   const verbose = Boolean(cli.flags['verbose'])
diff --git a/src/commands/manifest/cmd-manifest-kotlin.ts b/src/commands/manifest/cmd-manifest-kotlin.ts
@@ -1,11 +1,10 @@
 import path from 'node:path'
 
-import meow from 'meow'
-
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { convertGradleToMaven } from './convert_gradle_to_maven.ts'
 import { commonFlags } from '../../flags.ts'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
@@ -101,13 +100,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  // note: meow will exit if it prints the --help screen
-  const cli = meow(config.help(parentName, config), {
-    flags: config.flags,
-    argv: argv.length === 0 ? ['--help'] : argv,
-    description: config.description,
-    allowUnknownFlags: false,
-    importMeta
+  const cli = meowOrExit({
+    argv,
+    config,
+    importMeta,
+    parentName
   })
 
   const verbose = Boolean(cli.flags['verbose'])
diff --git a/src/commands/manifest/cmd-manifest-scala.ts b/src/commands/manifest/cmd-manifest-scala.ts
@@ -1,9 +1,8 @@
-import meow from 'meow'
-
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { convertSbtToMaven } from './convert_sbt_to_maven.ts'
 import { commonFlags } from '../../flags.ts'
+import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting.ts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
@@ -91,14 +90,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  // console.log('scala', argv, parentName)
-  // note: meow will exit if it prints the --help screen
-  const cli = meow(config.help(parentName, config), {
-    flags: config.flags,
-    argv: argv.length === 0 ? ['--help'] : argv,
-    description: config.description,
-    allowUnknownFlags: false,
-    importMeta
+  const cli = meowOrExit({
+    argv,
+    config,
+    importMeta,
+    parentName
   })
 
   const verbose = Boolean(cli.flags['verbose'])
diff --git a/src/commands/oops/cmd-oops.ts b/src/commands/oops/cmd-oops.ts
@@ -1,6 +1,6 @@
-import meowOrExit from 'meow'
+import { meowOrExit } from '../../utils/meow-with-subcommands.ts'
 
-import { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
+import type { CliCommandConfig } from '../../utils/meow-with-subcommands.ts'
 
 const config: CliCommandConfig = {
   commandName: 'oops',
@@ -26,11 +26,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
   })
 
   throw new Error('This error was intentionally left blank')
diff --git a/src/commands/scan/cmd-scan-delete.ts b/src/commands/scan/cmd-scan-delete.ts
@@ -1,9 +1,9 @@
-import meow from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { deleteOrgFullScan } from './delete-full-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'
 
@@ -40,11 +40,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meow(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const [orgSlug = '', fullScanId = ''] = cli.input
diff --git a/src/commands/scan/cmd-scan-list.ts b/src/commands/scan/cmd-scan-list.ts
@@ -1,9 +1,9 @@
-import meow from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { listFullScans } from './list-full-scans.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'
 
@@ -80,11 +80,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ) {
-  const cli = meow(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const orgSlug = cli.input[0]
diff --git a/src/commands/scan/cmd-scan-metadata.ts b/src/commands/scan/cmd-scan-metadata.ts
@@ -1,9 +1,9 @@
-import meow from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { getOrgScanMetadata } from './get-full-scan-metadata.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'
 
@@ -43,11 +43,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meow(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const [orgSlug = '', fullScanId = ''] = cli.input
diff --git a/src/commands/scan/cmd-scan-stream.ts b/src/commands/scan/cmd-scan-stream.ts
@@ -1,9 +1,9 @@
-import meow from 'meow'
 import colors from 'yoctocolors-cjs'
 
 import { getFullScan } from './get-full-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'
 
@@ -45,11 +45,11 @@ async function run(
   importMeta: ImportMeta,
   { parentName }: { parentName: string }
 ): Promise<void> {
-  const cli = meow(config.help(parentName, config), {
+  const cli = meowOrExit({
     argv,
-    description: config.description,
+    config,
     importMeta,
-    flags: config.flags
+    parentName
   })
 
   const [orgSlug = '', fullScanId = '', file = '-'] = cli.input
