Use more yactoSpinner ending calls

Author: jdalton

src/commands/analytics.ts

@@ -189,6 +189,7 @@ async function fetchOrgAnalyticsData(
   if (result.success === false) {
     return handleUnsuccessfulApiResponse('getOrgAnalytics', result, spinner)
   }
+
   spinner.stop()
 
   if (!result.data.length) {
@@ -353,6 +354,7 @@ async function fetchRepoAnalyticsData(
   if (result.success === false) {
     return handleUnsuccessfulApiResponse('getRepoAnalytics', result, spinner)
   }
+
   spinner.stop()
 
   if (!result.data.length) {

src/commands/audit-log.ts

@@ -154,6 +154,7 @@ async function fetchOrgAuditLog(
     handleUnsuccessfulApiResponse('getAuditLogEvents', result, spinner)
     return
   }
+
   spinner.stop()
 
   const data: AuditChoices = []

src/commands/dependencies.ts

@@ -109,9 +109,7 @@ async function searchDeps({
       'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.'
     )
   }
-  const spinnerText = 'Searching dependencies...'
-  const spinner = yoctoSpinner({ text: spinnerText }).start()
-
+  const spinner = yoctoSpinner({ text: 'Searching dependencies...' }).start()
   const socketSdk = await setupSdk(apiKey)
 
   const result = await handleApiCall(
@@ -124,9 +122,7 @@ async function searchDeps({
     return
   }
 
-  spinner.stop()
-
-  console.log('Organization dependencies:\n')
+  spinner.stop('Organization dependencies:')
 
   if (outputJson) {
     console.log(result.data)

src/commands/diff-scan/get.ts

@@ -142,9 +142,8 @@ async function getDiffScan(
   const data = await response.json()
 
   if (!response.ok) {
-    spinner.stop()
     const err = await handleAPIError(response.status)
-    console.error(`${colors.bgRed(colors.white(response.statusText))}: ${err}`)
+    spinner.error(`${colors.bgRed(colors.white(response.statusText))}: ${err}`)
     return
   }
 

src/commands/info.ts

@@ -197,32 +197,27 @@ function formatPackageDataOutput(
     Object.entries(scoreResult).map(score =>
       console.log(`- ${score[0]}: ${formatScore(score[1])}`)
     )
-
+    console.log('\n')
     if (objectSome(severityCount)) {
-      const issueSummary = formatSeverityCount(severityCount)
-      console.log('\n')
       spinner[strict ? 'error' : 'success'](
-        `Package has these issues: ${issueSummary}`
+        `Package has these issues: ${formatSeverityCount(severityCount)}`
       )
       formatPackageIssuesDetails(data, outputMarkdown)
     } else {
-      console.log('\n')
       spinner.success('Package has no issues')
     }
 
     const format = new ColorOrMarkdown(!!outputMarkdown)
     const url = `https://socket.dev/npm/package/${pkgName}/overview/${pkgVersion}`
+
+    console.log('\n')
     if (pkgVersion === 'latest') {
       console.log(
-        '\nDetailed info on socket.dev: ' +
-          format.hyperlink(`${pkgName}`, url, { fallbackToUrl: true })
+        `Detailed info on socket.dev: ${format.hyperlink(`${pkgName}`, url, { fallbackToUrl: true })}`
       )
     } else {
       console.log(
-        '\nDetailed info on socket.dev: ' +
-          format.hyperlink(`${pkgName} v${pkgVersion}`, url, {
-            fallbackToUrl: true
-          })
+        `Detailed info on socket.dev: ${format.hyperlink(`${pkgName} v${pkgVersion}`, url, { fallbackToUrl: true })}`
       )
     }
     if (!outputMarkdown) {

src/commands/login.ts

@@ -102,15 +102,14 @@ export const login: CliSubcommand = {
     const spinner = yoctoSpinner({ text: 'Verifying API key...' }).start()
 
     let orgs: SocketSdkReturnType<'getOrganizations'>['data']
-
     try {
       const sdk = await setupSdk(apiKey, apiBaseUrl, apiProxy)
       const result = await sdk.getOrganizations()
       if (!result.success) {
         throw new AuthError()
       }
       orgs = result.data
-      spinner.success('API key verified\n')
+      spinner.success('API key verified')
     } catch {
       spinner.error('Invalid API key')
       return

src/commands/optimize.ts

@@ -775,32 +775,32 @@ export const optimize: CliSubcommand = {
     })
     if (!supported) {
       console.log(
-        `✘ ${COMMAND_TITLE}: No supported Node or browser range detected`
+        `✖️ ${COMMAND_TITLE}: No supported Node or browser range detected`
       )
       return
     }
     if (agent === 'vlt') {
       console.log(
-        `✘ ${COMMAND_TITLE}: ${agent} does not support overrides. Soon, though ⚡`
+        `✖️ ${COMMAND_TITLE}: ${agent} does not support overrides. Soon, though ⚡`
       )
       return
     }
     const lockName = lockPath ? path.basename(lockPath) : 'lock file'
     if (lockSrc === undefined) {
-      console.log(`✘ ${COMMAND_TITLE}: No ${lockName} found`)
+      console.log(`✖️ ${COMMAND_TITLE}: No ${lockName} found`)
       return
     }
     if (lockSrc.trim() === '') {
-      console.log(`✘ ${COMMAND_TITLE}: ${lockName} is empty`)
+      console.log(`✖️ ${COMMAND_TITLE}: ${lockName} is empty`)
       return
     }
     if (pkgPath === undefined) {
-      console.log(`✘ ${COMMAND_TITLE}: No package.json found`)
+      console.log(`✖️ ${COMMAND_TITLE}: No package.json found`)
       return
     }
     if (prod && (agent === 'bun' || agent === 'yarn/berry')) {
       console.log(
-        `✘ ${COMMAND_TITLE}: --prod not supported for ${agent}${agentVersion ? `@${agentVersion.toString()}` : ''}`
+        `✖️ ${COMMAND_TITLE}: --prod not supported for ${agent}${agentVersion ? `@${agentVersion.toString()}` : ''}`
       )
       return
     }
@@ -879,9 +879,8 @@ export const optimize: CliSubcommand = {
           )
         }
       } catch {
-        spinner.stop()
-        console.log(
-          `✘ ${COMMAND_TITLE}: ${agent} install failed to update ${lockName}`
+        spinner.error(
+          `${COMMAND_TITLE}: ${agent} install failed to update ${lockName}`
         )
       }
     }

src/commands/organization.ts

@@ -52,26 +52,23 @@ async function fetchOrganizations(): Promise<void> {
       'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.'
     )
   }
-  const socketSdk = await setupSdk(apiKey)
   const spinner = yoctoSpinner({ text: 'Fetching organizations...' }).start()
-
+  const socketSdk = await setupSdk(apiKey)
   const result = await handleApiCall(
     socketSdk.getOrganizations(),
     'looking up organizations'
   )
+
   if (result.success === false) {
     handleUnsuccessfulApiResponse('getOrganizations', result, spinner)
     return
   }
 
-  spinner.stop()
-
-  const organizations = Object.values(result.data.organizations)
-
-  console.log(
+  spinner.stop(
     `List of organizations associated with your API key: ${colors.italic(apiKey)}`
   )
 
+  const organizations = Object.values(result.data.organizations)
   for (const o of organizations) {
     console.log(`
 Name: ${o?.name}

src/commands/report/create.ts

@@ -271,15 +271,12 @@ async function createReport(
   )
   const result = await handleApiCall(apiCall, 'creating report')
 
-  if (result.success === false) {
-    return handleUnsuccessfulApiResponse('createReport', result, spinner)
+  if (result.success) {
+    spinner.success()
+    return result
   }
-
-  // Conclude the status of the API call
-
-  spinner.success()
-
-  return result
+  handleUnsuccessfulApiResponse('createReport', result, spinner)
+  return undefined
 }
 
 function formatReportCreationOutput(
@@ -293,11 +290,8 @@ function formatReportCreationOutput(
     console.log(JSON.stringify(data, undefined, 2))
     return
   }
-
   const format = new ColorOrMarkdown(!!outputMarkdown)
-
   console.log(
-    '\nNew report: ' +
-      format.hyperlink(data.id, data.url, { fallbackToUrl: true })
+    `New report: ${format.hyperlink(data.id, data.url, { fallbackToUrl: true })}`
   )
 }

src/commands/repos/create.ts

@@ -150,12 +150,9 @@ async function createRepo(
     'creating repository'
   )
 
-  if (!result.success) {
+  if (result.success) {
+    spinner.success('Repository created successfully')
+  } else {
     handleUnsuccessfulApiResponse('createOrgRepo', result, spinner)
-    return
   }
-
-  spinner.stop()
-
-  console.log('\n✅ Repository created successfully\n')
 }