fix(cli): resolve TypeScript strict mode errors

jdalton · jdalton · commit 94350fddd8ac · 2025-10-26T02:06:36.000-04:00
Fix TypeScript compilation errors across patch, scan, and util modules:

Spinner type fixes:
- Update handler interfaces to accept `Spinner | null` instead of `Spinner`
- Add optional chaining (`?.`) for all spinner method calls
- Convert `Spinner | null` to `Spinner | undefined` where needed

Process.env fixes:
- Use bracket notation for environment variable access (`process.env['VITEST']` instead of `process.env.VITEST`)
- Fixes index signature violations in interactive-help.mts and with-subcommands.mts

Optional models fixes:
- Add type cast through `unknown` for MODEL_REGISTRY indexing
- Use conditional spread for optional checksum parameter

These fixes enable strict TypeScript checking without compromising functionality.
diff --git a/packages/cli/src/commands/patch/handle-patch-apply.mts b/packages/cli/src/commands/patch/handle-patch-apply.mts
@@ -196,7 +196,7 @@ async function applyNpmPatches(
   logger.groupEnd()
 
   if (wasSpinning) {
-    spinner.start()
+    spinner?.start()
   }
   return result
 }
@@ -388,7 +388,7 @@ export interface HandlePatchApplyConfig {
   dryRun: boolean
   outputKind: OutputKind
   purlObjs: PackageURL[]
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 export async function handlePatchApply({
@@ -437,9 +437,9 @@ export async function handlePatchApply({
         purls.length > 3
           ? `${purls.slice(0, 3).join(', ')} … and ${purls.length - 3} more`
           : joinAnd(purls)
-      spinner.start(`Checking patches for: ${displayPurls}`)
+      spinner?.start(`Checking patches for: ${displayPurls}`)
     } else {
-      spinner.start('Scanning all dependencies for available patches')
+      spinner?.start('Scanning all dependencies for available patches')
     }
 
     const patched = []
@@ -453,7 +453,7 @@ export async function handlePatchApply({
           cwd,
           dryRun,
           purlObjs,
-          spinner,
+          spinner: spinner ?? undefined,
         },
       )
       patched.push(...patchingResults.passed)
@@ -491,7 +491,7 @@ export async function handlePatchApply({
       }
     }
 
-    spinner.stop()
+    spinner?.stop()
 
     await outputPatchResult(
       {
@@ -503,7 +503,7 @@ export async function handlePatchApply({
       outputKind,
     )
   } catch (e) {
-    spinner.stop()
+    spinner?.stop()
 
     let message = 'Failed to apply patches'
     let cause = getErrorCause(e)
diff --git a/packages/cli/src/commands/patch/handle-patch-cleanup.mts b/packages/cli/src/commands/patch/handle-patch-cleanup.mts
@@ -29,7 +29,7 @@ export interface HandlePatchCleanupConfig {
   all: boolean
   cwd: string
   outputKind: OutputKind
-  spinner: Spinner
+  spinner: Spinner | null
   uuid: string | undefined
 }
 
diff --git a/packages/cli/src/commands/patch/handle-patch-download.mts b/packages/cli/src/commands/patch/handle-patch-download.mts
@@ -52,7 +52,7 @@ export type HandlePatchDownloadConfig = {
   cwd: string
   outputKind: OutputKind
   scanId?: string
-  spinner: Spinner
+  spinner: Spinner | null
   uuids: string[]
 }
 
@@ -124,7 +124,7 @@ export async function handlePatchDownload({
   // Setup SDK.
   const sdkResult = await setupSdk()
   if (!sdkResult.ok) {
-    spinner.failAndStop('Failed to initialize Socket SDK')
+    spinner?.failAndStop('Failed to initialize Socket SDK')
     await outputPatchDownloadResult(
       {
         ok: false,
@@ -141,7 +141,7 @@ export async function handlePatchDownload({
   // Get organization slug.
   const orgSlug = await getOrgSlug(sdk)
   if (!orgSlug) {
-    spinner.failAndStop('Failed to determine organization')
+    spinner?.failAndStop('Failed to determine organization')
 
     // Check if SOCKET_CLI_API_TOKEN is set to provide helpful guidance.
     const hasEnvToken = !!ENV.SOCKET_CLI_API_TOKEN
@@ -164,10 +164,10 @@ export async function handlePatchDownload({
   let patchUuids = uuids
 
   if (scanId) {
-    spinner.start('Fetching patches from scan...')
+    spinner?.start('Fetching patches from scan...')
     const scanUuids = await collectPatchesFromScan(sdk, orgSlug, scanId)
     if (!scanUuids.length) {
-      spinner.failAndStop('No patches found in scan')
+      spinner?.failAndStop('No patches found in scan')
       await outputPatchDownloadResult(
         {
           ok: false,
@@ -179,13 +179,13 @@ export async function handlePatchDownload({
       return
     }
     patchUuids = scanUuids
-    spinner.successAndStop(
+    spinner?.successAndStop(
       `Found ${patchUuids.length} ${pluralize('patch', { count: patchUuids.length })} in scan`,
     )
   }
 
   if (!patchUuids.length) {
-    spinner.failAndStop('No patches to download')
+    spinner?.failAndStop('No patches to download')
     await outputPatchDownloadResult(
       {
         ok: false,
@@ -205,7 +205,7 @@ export async function handlePatchDownload({
 
   for (const uuid of patchUuids) {
     try {
-      spinner.start(`Downloading patch ${uuid}...`)
+      spinner?.start(`Downloading patch ${uuid}...`)
       // eslint-disable-next-line no-await-in-loop
       await downloadPatch(sdk, orgSlug, uuid, cwd)
       // eslint-disable-next-line no-await-in-loop
@@ -214,9 +214,9 @@ export async function handlePatchDownload({
         purl: patchDetails.purl,
         uuid,
       })
-      spinner.successAndStop(`Downloaded patch ${uuid}`)
+      spinner?.successAndStop(`Downloaded patch ${uuid}`)
     } catch (e: any) {
-      spinner.failAndStop(`Failed to download patch ${uuid}`)
+      spinner?.failAndStop(`Failed to download patch ${uuid}`)
       results.failed.push({
         error: e.message,
         uuid,
diff --git a/packages/cli/src/commands/patch/handle-patch-get.mts b/packages/cli/src/commands/patch/handle-patch-get.mts
@@ -29,7 +29,7 @@ export interface HandlePatchGetConfig {
   outputDir: string | undefined
   outputKind: OutputKind
   purl: string
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 export async function handlePatchGet({
diff --git a/packages/cli/src/commands/patch/handle-patch-info.mts b/packages/cli/src/commands/patch/handle-patch-info.mts
@@ -33,7 +33,7 @@ export interface HandlePatchInfoConfig {
   cwd: string
   outputKind: OutputKind
   purl: string
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 export async function handlePatchInfo({
diff --git a/packages/cli/src/commands/patch/handle-patch-list.mts b/packages/cli/src/commands/patch/handle-patch-list.mts
@@ -37,7 +37,7 @@ export interface HandlePatchListConfig {
   cwd: string
   interactive: boolean
   outputKind: OutputKind
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 export async function handlePatchList({
diff --git a/packages/cli/src/commands/patch/handle-patch-rm.mts b/packages/cli/src/commands/patch/handle-patch-rm.mts
@@ -34,7 +34,7 @@ export interface HandlePatchRmConfig {
   keepBackups: boolean
   outputKind: OutputKind
   purl: string
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 export async function handlePatchRm({
diff --git a/packages/cli/src/commands/patch/handle-patch-status.mts b/packages/cli/src/commands/patch/handle-patch-status.mts
@@ -43,7 +43,7 @@ export interface HandlePatchStatusConfig {
     failed: boolean
   }
   outputKind: OutputKind
-  spinner: Spinner
+  spinner: Spinner | null
 }
 
 /**
@@ -188,7 +188,7 @@ export async function handlePatchStatus({
   spinner,
 }: HandlePatchStatusConfig): Promise<void> {
   try {
-    spinner.start('Reading patch manifest')
+    spinner?.start('Reading patch manifest')
 
     const dotSocketDirPath = normalizePath(path.join(cwd, DOT_SOCKET_DIR))
     const manifestPath = normalizePath(
@@ -198,7 +198,7 @@ export async function handlePatchStatus({
     const manifestData = JSON.parse(manifestContent)
     const validated = PatchManifestSchema.parse(manifestData)
 
-    spinner.text('Checking patch status')
+    spinner?.start('Checking patch status')
 
     const statuses: PatchStatus[] = []
 
@@ -224,7 +224,7 @@ export async function handlePatchStatus({
       })
     }
 
-    spinner.stop()
+    spinner?.stop()
 
     // Apply filters.
     let filteredStatuses = statuses
@@ -257,7 +257,7 @@ export async function handlePatchStatus({
       outputKind,
     )
   } catch (e) {
-    spinner.stop()
+    spinner?.stop()
 
     let message = 'Failed to get patch status'
     let cause = getErrorCause(e)
diff --git a/packages/cli/src/commands/scan/handle-create-new-scan.mts b/packages/cli/src/commands/scan/handle-create-new-scan.mts
@@ -104,7 +104,7 @@ export async function handleCreateNewScan({
   }
 
   const spinner = getSpinner()
-  const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner })
+  const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner: spinner ?? undefined })
   if (!supportedFilesCResult.ok) {
     debug('Failed to fetch supported scan file names')
     debugDir({ supportedFilesCResult })
@@ -164,7 +164,7 @@ export async function handleCreateNewScan({
       packagePaths,
       reachabilityOptions: reach,
       repoName,
-      spinner,
+      spinner: spinner ?? undefined,
     })
 
     spinner?.stop()
@@ -247,7 +247,7 @@ export async function handleCreateNewScan({
       )
     }
   } else {
-    spinner.stop()
+    spinner?.stop()
 
     await outputCreateNewScan(fullScanCResult, { interactive, outputKind })
   }
diff --git a/packages/cli/src/commands/scan/handle-scan-reach.mts b/packages/cli/src/commands/scan/handle-scan-reach.mts
@@ -33,7 +33,7 @@ export async function handleScanReach({
   const spinner = getSpinner()
 
   // Get supported file names
-  const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner })
+  const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner: spinner ?? undefined })
   if (!supportedFilesCResult.ok) {
     await outputScanReach(supportedFilesCResult, {
       cwd,
@@ -79,11 +79,11 @@ export async function handleScanReach({
     outputPath,
     packagePaths,
     reachabilityOptions,
-    spinner,
+    spinner: spinner ?? undefined,
     uploadManifests: true,
   })
 
-  spinner.stop()
+  spinner?.stop()
 
   await outputScanReach(result, { cwd, outputKind, outputPath })
 }
diff --git a/packages/cli/src/utils/cli/interactive-help.mts b/packages/cli/src/utils/cli/interactive-help.mts
@@ -274,7 +274,7 @@ const helpCategories: HelpCategory[] = [
 
 export async function showInteractiveHelp(): Promise<void> {
   // Skip interactive help in test/CI environments
-  if (process.env.VITEST === '1' || process.env.CI === 'true') {
+  if (process.env['VITEST'] === '1' || process.env['CI'] === 'true') {
     return
   }
 
diff --git a/packages/cli/src/utils/cli/with-subcommands.mts b/packages/cli/src/utils/cli/with-subcommands.mts
@@ -875,8 +875,8 @@ export async function meowWithSubcommands(
       (helpFlag || helpCategory !== null) &&
       !cli2.flags['helpFull'] &&
       !helpCategory &&
-      process.env.VITEST !== '1' &&
-      process.env.CI !== 'true'
+      process.env['VITEST'] !== '1' &&
+      process.env['CI'] !== 'true'
 
     if (shouldShowInteractive) {
       // Show interactive help for root --help command
diff --git a/packages/cli/src/utils/optional-models.mts b/packages/cli/src/utils/optional-models.mts
@@ -104,7 +104,7 @@ interface ModelInfo {
 export async function loadOptionalModel(
   packageName: string,
 ): Promise<{ modelPaths: string[]; downloaded: boolean }> {
-  const modelInfo = MODEL_REGISTRY[packageName] as ModelInfo | undefined
+  const modelInfo = (MODEL_REGISTRY as unknown as Record<string, ModelInfo | undefined>)[packageName]
   if (!modelInfo) {
     throw new Error(`Unknown optional model: ${packageName}`)
   }
@@ -119,10 +119,11 @@ export async function loadOptionalModel(
 
   for (const file of modelInfo.files) {
     // Download via dlx (uses cache if available).
+    const checksumValue = file.checksum || undefined
     const result = await dlxBinary([], {
       url: file.url,
       name: file.name,
-      checksum: file.checksum || undefined,
+      ...(checksumValue && { checksum: checksumValue }),
       cacheTtl: 30 * 24 * 60 * 60 * 1000, // 30 days.
     })
 
@@ -142,7 +143,7 @@ export async function loadOptionalModel(
  * @returns True if all model files exist in cache
  */
 export function isModelCached(packageName: string): boolean {
-  const modelInfo = MODEL_REGISTRY[packageName] as ModelInfo | undefined
+  const modelInfo = (MODEL_REGISTRY as unknown as Record<string, ModelInfo | undefined>)[packageName]
   if (!modelInfo) {
     return false
   }
@@ -177,6 +178,6 @@ export function listAvailableModels(): string[] {
  * @returns Model information or null if not found
  */
 export function getModelInfo(packageName: string): ModelInfo | null {
-  const modelInfo = MODEL_REGISTRY[packageName] as ModelInfo | undefined
+  const modelInfo = (MODEL_REGISTRY as unknown as Record<string, ModelInfo | undefined>)[packageName]
   return modelInfo || null
 }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ async function applyNpmPatches(`
`196`	`196`	`logger.groupEnd()`
`197`	`197`
`198`	`198`	`if (wasSpinning) {`
`199`		`- spinner.start()`
	`199`	`+ spinner?.start()`
`200`	`200`	`}`
`201`	`201`	`return result`
`202`	`202`	`}`
`@@ -388,7 +388,7 @@ export interface HandlePatchApplyConfig {`
`388`	`388`	`dryRun: boolean`
`389`	`389`	`outputKind: OutputKind`
`390`	`390`	`purlObjs: PackageURL[]`
`391`		`- spinner: Spinner`
	`391`	`+ spinner: Spinner \| null`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`export async function handlePatchApply({`
`@@ -437,9 +437,9 @@ export async function handlePatchApply({`
`437`	`437`	`purls.length > 3`
`438`	`438`	? `${purls.slice(0, 3).join(', ')} … and ${purls.length - 3} more`
`439`	`439`	`: joinAnd(purls)`
`440`		- spinner.start(`Checking patches for: ${displayPurls}`)
	`440`	+ spinner?.start(`Checking patches for: ${displayPurls}`)
`441`	`441`	`} else {`
`442`		`- spinner.start('Scanning all dependencies for available patches')`
	`442`	`+ spinner?.start('Scanning all dependencies for available patches')`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`const patched = []`
`@@ -453,7 +453,7 @@ export async function handlePatchApply({`
`453`	`453`	`cwd,`
`454`	`454`	`dryRun,`
`455`	`455`	`purlObjs,`
`456`		`- spinner,`
	`456`	`+ spinner: spinner ?? undefined,`
`457`	`457`	`},`
`458`	`458`	`)`
`459`	`459`	`patched.push(...patchingResults.passed)`
`@@ -491,7 +491,7 @@ export async function handlePatchApply({`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`
`494`		`- spinner.stop()`
	`494`	`+ spinner?.stop()`
`495`	`495`
`496`	`496`	`await outputPatchResult(`
`497`	`497`	`{`
`@@ -503,7 +503,7 @@ export async function handlePatchApply({`
`503`	`503`	`outputKind,`
`504`	`504`	`)`
`505`	`505`	`} catch (e) {`
`506`		`- spinner.stop()`
	`506`	`+ spinner?.stop()`
`507`	`507`
`508`	`508`	`let message = 'Failed to apply patches'`
`509`	`509`	`let cause = getErrorCause(e)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export interface HandlePatchCleanupConfig {`
`29`	`29`	`all: boolean`
`30`	`30`	`cwd: string`
`31`	`31`	`outputKind: OutputKind`
`32`		`- spinner: Spinner`
	`32`	`+ spinner: Spinner \| null`
`33`	`33`	`uuid: string \| undefined`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export interface HandlePatchInfoConfig {`
`33`	`33`	`cwd: string`
`34`	`34`	`outputKind: OutputKind`
`35`	`35`	`purl: string`
`36`		`- spinner: Spinner`
	`36`	`+ spinner: Spinner \| null`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`export async function handlePatchInfo({`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export interface HandlePatchListConfig {`
`37`	`37`	`cwd: string`
`38`	`38`	`interactive: boolean`
`39`	`39`	`outputKind: OutputKind`
`40`		`- spinner: Spinner`
	`40`	`+ spinner: Spinner \| null`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`export async function handlePatchList({`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export interface HandlePatchRmConfig {`
`34`	`34`	`keepBackups: boolean`
`35`	`35`	`outputKind: OutputKind`
`36`	`36`	`purl: string`
`37`		`- spinner: Spinner`
	`37`	`+ spinner: Spinner \| null`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`export async function handlePatchRm({`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ export async function handleCreateNewScan({`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`const spinner = getSpinner()`
`107`		`- const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner })`
	`107`	`+ const supportedFilesCResult = await fetchSupportedScanFileNames({ spinner: spinner ?? undefined })`
`108`	`108`	`if (!supportedFilesCResult.ok) {`
`109`	`109`	`debug('Failed to fetch supported scan file names')`
`110`	`110`	`debugDir({ supportedFilesCResult })`
`@@ -164,7 +164,7 @@ export async function handleCreateNewScan({`
`164`	`164`	`packagePaths,`
`165`	`165`	`reachabilityOptions: reach,`
`166`	`166`	`repoName,`
`167`		`- spinner,`
	`167`	`+ spinner: spinner ?? undefined,`
`168`	`168`	`})`
`169`	`169`
`170`	`170`	`spinner?.stop()`
`@@ -247,7 +247,7 @@ export async function handleCreateNewScan({`
`247`	`247`	`)`
`248`	`248`	`}`
`249`	`249`	`} else {`
`250`		`- spinner.stop()`
	`250`	`+ spinner?.stop()`
`251`	`251`
`252`	`252`	`await outputCreateNewScan(fullScanCResult, { interactive, outputKind })`
`253`	`253`	`}`