More cleanup

Author: jdalton

src/commands/login/attempt-login.mts

@@ -53,7 +53,6 @@ export async function attemptLogin(
   const orgsCResult = await handleApiCall(sockSdk.getOrganizations(), {
     desc: 'token verification',
   })
-
   if (!orgsCResult.ok) {
     process.exitCode = 1
     logger.fail(failMsgWithBadge(orgsCResult.message, orgsCResult.cause))

src/commands/package/fetch-purls-shallow-score.mts

@@ -30,7 +30,7 @@ export async function fetchPurlsShallowScore(
     `Requesting shallow score data for ${purls.length} package urls (purl): ${purls.join(', ')}`,
   )
 
-  const result = await handleApiCall(
+  const batchPackageCResult = await handleApiCall(
     sockSdk.batchPackageFetch(
       { components: purls.map(purl => ({ purl })) },
       {
@@ -39,15 +39,14 @@ export async function fetchPurlsShallowScore(
     ),
     { desc: 'looking up package' },
   )
-
-  if (!result.ok) {
-    return result
+  if (!batchPackageCResult.ok) {
+    return batchPackageCResult
   }
 
   // TODO: Seems like there's a bug in the typing since we absolutely have to
   // return the .data here.
   return {
     ok: true,
-    data: result.data as SocketSdkSuccessResult<'batchPackageFetch'>,
+    data: batchPackageCResult.data as SocketSdkSuccessResult<'batchPackageFetch'>,
   }
 }

src/commands/repository/fetch-list-all-repos.mts

@@ -50,12 +50,10 @@ export async function fetchListAllRepos(
       { desc: 'list of repositories' },
     )
     if (!orgRepoListCResult.ok) {
-      debugFn('error', 'fail: fetch repo')
-      debugDir('inspect', { orgRepoListCResult })
       return orgRepoListCResult
     }
 
-    orgRepoListCResult.data.results.forEach(row => rows.push(row))
+    rows.push(...orgRepoListCResult.data.results)
     nextPage = orgRepoListCResult.data.nextPage ?? -1
   }
 

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

@@ -13,7 +13,7 @@ import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import { hasDefaultToken } from '../../utils/sdk.mts'
-import { readOrDefaultSocketJson } from '../../utils/socketjson.mts'
+import { readOrDefaultSocketJson } from '../../utils/socket-json.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 

src/commands/scan/fetch-list-scans.mts

@@ -46,9 +46,9 @@ export async function fetchOrgFullScanList(
       ...(repo ? { repo } : {}),
       sort,
       direction,
-      per_page: String(perPage),
-      page: String(page),
       from: from_time,
+      page: String(page),
+      per_page: String(perPage),
     }),
     { desc: 'list of scans' },
   )

src/commands/scan/fetch-report-data.mts

@@ -88,10 +88,10 @@ export async function fetchScanData(
     const data = lines.map(line => {
       try {
         return JSON.parse(line)
-      } catch {
+      } catch (e) {
         ok = false
-        debugFn('error', 'fail: parse NDJSON')
-        debugDir('inspect', { line })
+        debugFn('error', 'caught: JSON.parse error')
+        debugDir('inspect', { error: e, line })
         return
       }
     }) as unknown as SocketArtifact[]

src/commands/scan/fetch-scan.mts

@@ -26,10 +26,10 @@ export async function fetchScan(
   const data = lines.map(line => {
     try {
       return JSON.parse(line)
-    } catch {
+    } catch (e) {
       ok = false
-      debugFn('error', 'fail: parse NDJSON')
-      debugDir('inspect', { line })
+      debugFn('error', 'caught: JSON.parse error')
+      debugDir('inspect', { error: e, line })
       return null
     }
   }) as unknown as SocketArtifact[]

src/commands/scan/handle-create-new-scan.mts

@@ -16,7 +16,7 @@ import {
 } from '../../utils/coana.mts'
 import { getPackageFilesForScan } from '../../utils/path-resolve.mts'
 import { setupSdk } from '../../utils/sdk.mts'
-import { readOrDefaultSocketJson } from '../../utils/socketjson.mts'
+import { readOrDefaultSocketJson } from '../../utils/socket-json.mts'
 import { detectManifestActions } from '../manifest/detect-manifest-actions.mts'
 import { generateAutoManifest } from '../manifest/generate_auto_manifest.mts'
 

src/commands/wrapper/postinstall-wrapper.mts

@@ -48,7 +48,7 @@ Do you want to install "safe npm" (this will create an alias to the socket-npm c
       }
     }
   } catch (e) {
-    debugFn('error', 'fail: setup tab completion')
+    debugFn('error', 'caught: tab completion setup error')
     debugDir('inspect', { error: e })
     // Ignore. Skip tab completion setup.
   }

src/constants.mts

@@ -346,13 +346,15 @@ const LAZY_ENV = () => {
     // https://github.com/SocketDev/socket-cli?tab=readme-ov-file#environment-variables-for-development
     SOCKET_CLI_API_BASE_URL:
       envAsString(env['SOCKET_CLI_API_BASE_URL']) ||
+      // TODO: Remove legacy environment variable name.
       envAsString(env['SOCKET_SECURITY_API_BASE_URL']) ||
       getConfigValueOrUndef('apiBaseUrl') ||
       'https://api.socket.dev/v0/',
     // Set the proxy that all requests are routed through.
     // https://github.com/SocketDev/socket-cli?tab=readme-ov-file#environment-variables-for-development
     SOCKET_CLI_API_PROXY:
       envAsString(env['SOCKET_CLI_API_PROXY']) ||
+      // TODO: Remove legacy environment variable name.
       envAsString(env['SOCKET_SECURITY_API_PROXY']) ||
       // Commonly used environment variables to specify routing requests through
       // a proxy server.
@@ -364,6 +366,7 @@ const LAZY_ENV = () => {
     // https://github.com/SocketDev/socket-cli?tab=readme-ov-file#environment-variables
     SOCKET_CLI_API_TOKEN:
       envAsString(env['SOCKET_CLI_API_TOKEN']) ||
+      // TODO: Remove legacy environment variable names.
       envAsString(env['SOCKET_CLI_API_KEY']) ||
       envAsString(env['SOCKET_SECURITY_API_TOKEN']) ||
       envAsString(env['SOCKET_SECURITY_API_KEY']),
@@ -384,6 +387,7 @@ const LAZY_ENV = () => {
     // https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens
     SOCKET_CLI_GITHUB_TOKEN:
       envAsString(env['SOCKET_CLI_GITHUB_TOKEN']) ||
+      // TODO: Remove undocumented legacy environment variable name.
       envAsString(env['SOCKET_SECURITY_GITHUB_PAT']) ||
       GITHUB_TOKEN,
     // Make the default API token `undefined`.