Cleanup spinner use

Author: jdalton

src/commands/manifest/convert_gradle_to_maven.mts

@@ -113,7 +113,7 @@ async function execGradleWithSpinner(
     logger.info(
       '(It will show no output, you can use --verbose to see its output)',
     )
-    spinner.start(`Running gradlew`)
+    spinner.start(`Running gradlew...`)
 
     const output = await spawn(bin, commandArgs, {
       // We can pipe the output through to have the user see the result

src/utils/alerts-map.mts

@@ -5,7 +5,6 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { extractPurlsFromPnpmLockfile } from './pnpm.mts'
 import { getPublicToken, setupSdk } from './sdk.mts'
 import { addArtifactToAlertsMap } from './socket-package-alert.mts'
-import constants from '../constants.mts'
 
 import type { CompactSocketArtifact } from './alert/artifact.mts'
 import type {
@@ -121,8 +120,7 @@ export async function getAlertsMapFromPurls(
         `Socket API server error (${statusCode}): ${statusMessage}`,
       )
     } else {
-      const { spinner } = constants
-      spinner.stop()
+      spinner?.stop()
       debugFn('Received a result=false:', batchResult)
       logger.fail(
         `Received a ${batchResult.status} response from Socket API which we consider a permanent failure:`,
@@ -132,9 +130,8 @@ export async function getAlertsMapFromPurls(
       break
     }
     remaining -= 1
-    if (spinner && remaining > 0) {
-      spinner.start()
-      spinner.setText(getText())
+    if (remaining > 0) {
+      spinner?.start(getText())
     }
   }
 

src/utils/api.mts

@@ -199,31 +199,25 @@ export async function queryApiSafeText(
     }
   }
 
-  if (fetchSpinnerDesc) {
-    // Lazily access constants.spinner.
-    const { spinner } = constants
+  // Lazily access constants.spinner.
+  const { spinner } = constants
 
+  if (fetchSpinnerDesc) {
     spinner.start(`Requesting ${fetchSpinnerDesc} from API...`)
   }
 
   let result
   try {
     result = await queryApi(path, apiToken)
     if (fetchSpinnerDesc) {
-      // Lazily access constants.spinner.
-      const { spinner } = constants
-
       spinner.successAndStop(
         `Received API response (after requesting ${fetchSpinnerDesc}).`,
       )
     }
   } catch (e) {
     if (fetchSpinnerDesc) {
-      // Lazily access constants.spinner.
-      const { spinner } = constants
-
       spinner.failAndStop(
-        `An error was thrown while requesting ${fetchSpinnerDesc}`,
+        `An error was thrown while requesting ${fetchSpinnerDesc}.`,
       )
     }