Cleanup utils

Author: jdalton

src/cli.ts

@@ -10,7 +10,7 @@ import colors from 'yoctocolors-cjs'
 import * as cliCommands from './commands'
 import constants from './constants'
 import { AuthError, InputError } from './utils/errors'
-import { logSymbols } from './utils/log-symbols'
+import { logSymbols } from './utils/logging'
 import { meowWithSubcommands } from './utils/meow-with-subcommands'
 
 const { rootPkgJsonPath } = constants

src/commands/analytics.ts

@@ -14,12 +14,9 @@ import colors from 'yoctocolors-cjs'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { commonFlags, outputFlags } from '../flags'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../utils/api-helpers'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api'
 import { AuthError, InputError } from '../utils/errors'
-import { getFlagListOutput } from '../utils/formatting'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { getDefaultToken, setupSdk } from '../utils/sdk'
 
 import type { CliSubcommand } from '../utils/meow-with-subcommands'

src/commands/audit-log.ts

@@ -5,12 +5,9 @@ import { Separator, select } from '@socketsecurity/registry/lib/prompts'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { commonFlags, outputFlags } from '../flags'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../utils/api-helpers'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api'
 import { AuthError } from '../utils/errors'
-import { getFlagListOutput } from '../utils/formatting'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { getDefaultToken, setupSdk } from '../utils/sdk'
 
 import type { CliSubcommand } from '../utils/meow-with-subcommands'

src/commands/dependencies.ts

@@ -6,12 +6,9 @@ import colors from 'yoctocolors-cjs'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { commonFlags, outputFlags } from '../flags'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../utils/api-helpers'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api'
 import { AuthError } from '../utils/errors'
-import { getFlagListOutput } from '../utils/formatting'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { getDefaultToken, setupSdk } from '../utils/sdk'
 
 import type { CliSubcommand } from '../utils/meow-with-subcommands'

src/commands/diff-scan/get.ts

@@ -7,9 +7,9 @@ import colors from 'yoctocolors-cjs'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { commonFlags, outputFlags } from '../../flags'
-import { handleAPIError, queryAPI } from '../../utils/api-helpers'
+import { handleAPIError, queryAPI } from '../../utils/api'
 import { AuthError } from '../../utils/errors'
-import { getFlagListOutput } from '../../utils/formatting'
+import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliSubcommand } from '../../utils/meow-with-subcommands'

src/commands/info.ts

@@ -7,23 +7,20 @@ import constants from '@socketsecurity/registry/lib/constants'
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import { commonFlags, outputFlags, validationFlags } from '../flags'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../utils/api-helpers'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api'
 import { ColorOrMarkdown } from '../utils/color-or-markdown'
 import { InputError } from '../utils/errors'
-import { formatSeverityCount, getSeverityCount } from '../utils/format-issues'
-import { getFlagListOutput } from '../utils/formatting'
 import { objectSome } from '../utils/objects'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { getPublicToken, setupSdk } from '../utils/sdk'
+import { formatSeverityCount, getSeverityCount } from '../utils/sdk-issues'
 import {
   getSocketDevAlertUrl,
   getSocketDevPackageOverviewUrl
 } from '../utils/socket-url'
 
-import type { SocketIssue } from '../utils/format-issues'
 import type { CliSubcommand } from '../utils/meow-with-subcommands'
+import type { SocketIssue } from '../utils/sdk-issues'
 import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 
 const { NPM } = constants

src/commands/login.ts

@@ -7,7 +7,7 @@ import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
 import constants from '../constants'
 import { AuthError, InputError } from '../utils/errors'
-import { getFlagListOutput } from '../utils/formatting'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { setupSdk } from '../utils/sdk'
 import { getSetting, updateSetting } from '../utils/settings'
 

src/commands/optimize.ts

@@ -28,8 +28,8 @@ import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import constants from '../constants'
 import { commonFlags } from '../flags'
-import { getFlagListOutput } from '../utils/formatting'
 import { existsSync } from '../utils/fs'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { detect } from '../utils/package-manager-detector'
 import { shadowNpmInstall } from '../utils/shadow-npm'
 

src/commands/organization.ts

@@ -3,10 +3,7 @@ import colors from 'yoctocolors-cjs'
 
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../utils/api-helpers'
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../utils/api'
 import { AuthError } from '../utils/errors'
 import { getDefaultToken, setupSdk } from '../utils/sdk'
 

src/commands/raw-npm.ts

@@ -5,7 +5,7 @@ import meow from 'meow'
 
 import constants from '../constants'
 import { commonFlags, validationFlags } from '../flags'
-import { getFlagListOutput } from '../utils/formatting'
+import { getFlagListOutput } from '../utils/output-formatting'
 import { findBinPathDetails } from '../utils/path-resolve'
 
 import type { CliSubcommand } from '../utils/meow-with-subcommands'