More cleanup

Author: jdalton

src/commands/scan/cmd-scan-create.mts

@@ -1,5 +1,6 @@
 import path from 'node:path'
 
+import { joinAnd } from '@socketsecurity/registry/lib/arrays'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleCreateNewScan } from './handle-create-new-scan.mts'
@@ -256,7 +257,7 @@ async function run(
   for (const ecosystem of reachEcosystemsRaw) {
     if (!validEcosystems.includes(ecosystem)) {
       throw new Error(
-        `Invalid ecosystem: "${ecosystem}". Valid values are: ${validEcosystems.join(', ')}`,
+        `Invalid ecosystem: "${ecosystem}". Valid values are: ${joinAnd(validEcosystems)}`,
       )
     }
     reachEcosystems.push(ecosystem as PURL_Type)
@@ -418,7 +419,7 @@ async function run(
       nook: true,
       test: hasApiToken,
       message: 'This command requires an API token for access',
-      fail: 'missing (try `socket login`)',
+      fail: 'try `socket login`',
     },
     {
       nook: true,
@@ -439,7 +440,6 @@ async function run(
         reachDisableAnalytics ===
           reachabilityFlags['reachDisableAnalytics']?.default,
       message: 'The --reachDisableAnalytics flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
     {
@@ -449,7 +449,6 @@ async function run(
         reachAnalysisMemoryLimit ===
           reachabilityFlags['reachAnalysisMemoryLimit']?.default,
       message: 'The --reachAnalysisMemoryLimit flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
     {
@@ -459,29 +458,25 @@ async function run(
         reachAnalysisTimeout ===
           reachabilityFlags['reachAnalysisTimeout']?.default,
       message: 'The --reachAnalysisTimeout flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
     {
       nook: true,
       test: reach || !reachEcosystems.length,
       message: 'The --reachEcosystems flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
     {
       nook: true,
       test: reach || !reachContinueOnFailingProjects,
       message:
         'The --reachContinueOnFailingProjects flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
     {
       nook: true,
       test: reach || !reachExcludePaths.length,
       message: 'The --reachExcludePaths flag requires --reach to be set',
-      pass: 'ok',
       fail: 'missing --reach flag',
     },
   )

src/commands/scan/cmd-scan-reach.mts

@@ -1,12 +1,13 @@
 import path from 'node:path'
 
+import { joinAnd } from '@socketsecurity/registry/lib/arrays'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleScanReach } from './handle-scan-reach.mts'
 import { reachabilityFlags } from './reachability-flags.mts'
 import { suggestTarget } from './suggest_target.mts'
 import constants from '../../constants.mts'
-import { type MeowFlags, commonFlags, outputFlags } from '../../flags.mts'
+import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
 import { cmdFlagValueToArray } from '../../utils/cmd.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
@@ -16,6 +17,7 @@ import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import { hasDefaultToken } from '../../utils/sdk.mts'
 
+import type { MeowFlags } from '../../flags.mts'
 import type { PURL_Type } from '../../utils/ecosystem.mts'
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
@@ -120,14 +122,12 @@ async function run(
   for (const ecosystem of reachEcosystemsRaw) {
     if (!validEcosystems.includes(ecosystem)) {
       throw new Error(
-        `Invalid ecosystem: "${ecosystem}". Valid values are: ${validEcosystems.join(', ')}`,
+        `Invalid ecosystem: "${ecosystem}". Valid values are: ${joinAnd(validEcosystems)}`,
       )
     }
     reachEcosystems.push(ecosystem as PURL_Type)
   }
 
-  const outputKind = getOutputKind(json, markdown)
-
   const cwd =
     cwdOverride && cwdOverride !== 'process.cwd()'
       ? path.resolve(process.cwd(), String(cwdOverride))
@@ -150,6 +150,8 @@ async function run(
 
   const hasApiToken = hasDefaultToken()
 
+  const outputKind = getOutputKind(json, markdown)
+
   const wasValidInput = checkCommandInput(
     outputKind,
     {
@@ -162,7 +164,7 @@ async function run(
       nook: true,
       test: hasApiToken,
       message: 'This command requires an API token for access',
-      fail: 'missing (try `socket login`)',
+      fail: 'try `socket login`',
     },
   )
   if (!wasValidInput) {