Minor cleanup

Author: jdalton

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

@@ -29,8 +29,8 @@ export async function fetchReportData(
   }
   const sockSdk = sockSdkResult.data
 
-  let scanStatus = 'requested..'
-  let policyStatus = 'requested..'
+  let policyStatus = 'requested...'
+  let scanStatus = 'requested...'
   let finishedFetching = false
 
   // Lazily access constants.spinner.
@@ -70,10 +70,10 @@ export async function fetchReportData(
       return result
     }
 
-    const jsonsString = result.data
+    const ndJsonString = result.data
 
     // This is nd-json; each line is a json object.
-    const lines = jsonsString.split('\n').filter(Boolean)
+    const lines = ndJsonString.split('\n').filter(Boolean)
     let ok = true
     const data = lines.map(line => {
       try {
@@ -86,11 +86,11 @@ export async function fetchReportData(
     }) as unknown as SocketArtifact[]
 
     if (ok) {
-      updateScan(`success`)
+      updateScan('success')
       return { ok: true, data }
     }
 
-    updateScan(`received invalid JSON response`)
+    updateScan('received invalid JSON response')
 
     return {
       ok: false,
@@ -120,15 +120,15 @@ export async function fetchReportData(
     CResult<SocketSdkReturnType<'getOrgSecurityPolicy'>['data']>,
   ] = await Promise.all([
     fetchScanResult().catch(e => {
-      updateScan(`failure; unknown blocking problem occurred`)
+      updateScan('failure; unknown blocking problem occurred')
       return {
         ok: false as const,
         message: 'Unexpected API problem',
         cause: `We encountered an unexpected problem while requesting the Scan from the API: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`,
       }
     }),
     fetchSecurityPolicy().catch(e => {
-      updatePolicy(`failure; unknown blocking problem occurred`)
+      updatePolicy('failure; unknown blocking problem occurred')
       return {
         ok: false as const,
         message: 'Unexpected API problem',

src/commands/wrapper/remove-socket-wrapper.mts

@@ -3,25 +3,25 @@ import { readFileSync, writeFileSync } from 'node:fs'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 export function removeSocketWrapper(filepath: string): void {
-  let data: string | undefined
+  let content: string | undefined
   try {
-    data = readFileSync(filepath, 'utf8')
+    content = readFileSync(filepath, 'utf8')
   } catch (e) {
-    logger.fail('There was an error removing the alias:')
+    logger.fail(`There was an error removing the alias${e ? ':' : '.'}`)
     if (e) {
       logger.error(e)
     }
     return
   }
 
-  const linesWithoutSocketAlias = data
+  const linesWithoutSocketAlias = content
     .split('\n')
     .filter(
       l => l !== 'alias npm="socket npm"' && l !== 'alias npx="socket npx"',
     )
-  const updatedFileContent = linesWithoutSocketAlias.join('\n')
+  const updatedContent = linesWithoutSocketAlias.join('\n')
   try {
-    writeFileSync(filepath, updatedFileContent, 'utf8')
+    writeFileSync(filepath, updatedContent, 'utf8')
   } catch (e) {
     if (e) {
       logger.error(e)