Merge branch 'main' into barslev/add-option-reach-use-unreachable-from-precomputation

jdalton · web-flow · commit dbd1c0bf4d66 · 2025-11-02T06:55:48.000-05:00
diff --git a/packages/cli/src/commands/analytics/fetch-org-analytics.mts b/packages/cli/src/commands/analytics/fetch-org-analytics.mts
@@ -24,7 +24,10 @@ export async function fetchOrgAnalyticsData(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getOrgAnalytics(time.toString()), {
-    description: 'analytics data',
-  })
+  return await handleApiCall<'getOrgAnalytics'>(
+    sockSdk.getOrgAnalytics(time.toString()),
+    {
+      description: 'analytics data',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/analytics/fetch-repo-analytics.mts b/packages/cli/src/commands/analytics/fetch-repo-analytics.mts
@@ -25,7 +25,10 @@ export async function fetchRepoAnalyticsData(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getRepoAnalytics(repo, time.toString()), {
-    description: 'analytics data',
-  })
+  return await handleApiCall<'getRepoAnalytics'>(
+    sockSdk.getRepoAnalytics(repo, time.toString()),
+    {
+      description: 'analytics data',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/audit-log/fetch-audit-log.mts b/packages/cli/src/commands/audit-log/fetch-audit-log.mts
@@ -34,16 +34,16 @@ export async function fetchAuditLog(
     ...config,
   } as FetchAuditLogsConfig
 
-  return await handleApiCall(
+  return await handleApiCall<'getAuditLogEvents'>(
     sockSdk.getAuditLogEvents(orgSlug, {
       // I'm not sure this is used at all.
-      outputJson: String(outputKind === 'json'),
+      outputJson: outputKind === 'json',
       // I'm not sure this is used at all.
-      outputMarkdown: String(outputKind === 'markdown'),
+      outputMarkdown: outputKind === 'markdown',
       orgSlug,
       type: logType,
-      page: String(page),
-      per_page: String(perPage),
+      page,
+      per_page: perPage,
     }),
     { description: `audit log for ${orgSlug}` },
   )
diff --git a/packages/cli/src/commands/fix/coana-fix.mts b/packages/cli/src/commands/fix/coana-fix.mts
@@ -98,13 +98,13 @@ export async function coanaFix(
   })
 
   // SDK v3.0 automatically validates file readability via onFileValidation callback.
-  const uploadCResult = await handleApiCall(
+  const uploadCResult = (await handleApiCall(
     sockSdk.uploadManifestFiles(orgSlug, scanFilepaths),
     {
       description: 'upload manifests',
       spinner,
     },
-  )
+  )) as any
 
   if (!uploadCResult.ok) {
     return uploadCResult
diff --git a/packages/cli/src/commands/organization/fetch-dependencies.mts b/packages/cli/src/commands/organization/fetch-dependencies.mts
@@ -34,7 +34,10 @@ export async function fetchDependencies(
     ...config,
   } as FetchDependenciesConfig
 
-  return await handleApiCall(sockSdk.searchDependencies({ limit, offset }), {
-    description: 'organization dependencies',
-  })
+  return await handleApiCall<'searchDependencies'>(
+    sockSdk.searchDependencies({ limit, offset }),
+    {
+      description: 'organization dependencies',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/organization/fetch-license-policy.mts b/packages/cli/src/commands/organization/fetch-license-policy.mts
@@ -24,7 +24,10 @@ export async function fetchLicensePolicy(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getOrgLicensePolicy(orgSlug), {
-    description: 'organization license policy',
-  })
+  return await handleApiCall<'getOrgLicensePolicy'>(
+    sockSdk.getOrgLicensePolicy(orgSlug),
+    {
+      description: 'organization license policy',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/organization/fetch-organization-list.mts b/packages/cli/src/commands/organization/fetch-organization-list.mts
@@ -47,9 +47,12 @@ export async function fetchOrganization(
     sockSdk = sockSdkCResult.data
   }
 
-  const orgsCResult = await handleApiCall(sockSdk.listOrganizations(), {
-    description,
-  })
+  const orgsCResult = await handleApiCall<'listOrganizations'>(
+    sockSdk.listOrganizations(),
+    {
+      description,
+    },
+  )
   if (!orgsCResult.ok) {
     return orgsCResult
   }
diff --git a/packages/cli/src/commands/organization/fetch-quota.mts b/packages/cli/src/commands/organization/fetch-quota.mts
@@ -20,5 +20,7 @@ export async function fetchQuota(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getQuota(), { description: 'token quota' })
+  return await handleApiCall<'getQuota'>(sockSdk.getQuota(), {
+    description: 'token quota',
+  })
 }
diff --git a/packages/cli/src/commands/organization/fetch-security-policy.mts b/packages/cli/src/commands/organization/fetch-security-policy.mts
@@ -24,7 +24,10 @@ export async function fetchSecurityPolicy(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getOrgSecurityPolicy(orgSlug), {
-    description: 'organization security policy',
-  })
+  return await handleApiCall<'getOrgSecurityPolicy'>(
+    sockSdk.getOrgSecurityPolicy(orgSlug),
+    {
+      description: 'organization security policy',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/package/fetch-purls-shallow-score.mts b/packages/cli/src/commands/package/fetch-purls-shallow-score.mts
@@ -35,7 +35,7 @@ export async function fetchPurlsShallowScore(
     `Requesting shallow score data for ${purls.length} package urls (purl): ${displayPurls}`,
   )
 
-  const batchPackageCResult = await handleApiCall(
+  const batchPackageCResult = await handleApiCall<'batchPackageFetch'>(
     sockSdk.batchPackageFetch(
       { components: purls.map(purl => ({ purl })) },
       {
diff --git a/packages/cli/src/commands/package/output-purls-shallow-score.mts b/packages/cli/src/commands/package/output-purls-shallow-score.mts
@@ -241,24 +241,22 @@ export function preProcess(
         row.score.license = artifact.score?.license || 100
       }
 
-      artifact.alerts?.forEach(
-        ({ severity, type }: { severity: string; type: string }) => {
-          row.alerts.set(`${type}:${severity}`, {
-            type,
-            severity,
-          })
-        },
-      )
+      artifact.alerts?.forEach((alert: any) => {
+        const { severity, type } = alert
+        row.alerts.set(`${type}:${severity}`, {
+          type,
+          severity,
+        })
+      })
     } else {
       const alerts = new Map<string, { type: string; severity: string }>()
-      artifact.alerts?.forEach(
-        ({ severity, type }: { severity: string; type: string }) => {
-          alerts.set(`${type}:${severity}`, {
-            type,
-            severity,
-          })
-        },
-      )
+      artifact.alerts?.forEach((alert: any) => {
+        const { severity, type } = alert
+        alerts.set(`${type}:${severity}`, {
+          type,
+          severity,
+        })
+      })
 
       rows.set(purl, {
         ecosystem: artifact.type,
diff --git a/packages/cli/src/commands/repository/fetch-create-repo.mts b/packages/cli/src/commands/repository/fetch-create-repo.mts
@@ -42,7 +42,7 @@ export async function fetchCreateRepo(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(
+  return await handleApiCall<'createRepository'>(
     sockSdk.createRepository(orgSlug, {
       default_branch: defaultBranch,
       description,
diff --git a/packages/cli/src/commands/repository/fetch-delete-repo.mts b/packages/cli/src/commands/repository/fetch-delete-repo.mts
@@ -25,7 +25,10 @@ export async function fetchDeleteRepo(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.deleteRepository(orgSlug, repoName), {
-    description: 'to delete a repository',
-  })
+  return await handleApiCall<'deleteRepository'>(
+    sockSdk.deleteRepository(orgSlug, repoName),
+    {
+      description: 'to delete a repository',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/repository/fetch-list-all-repos.mts b/packages/cli/src/commands/repository/fetch-list-all-repos.mts
@@ -38,12 +38,12 @@ export async function fetchListAllRepos(
       }
     }
     // eslint-disable-next-line no-await-in-loop
-    const orgRepoListCResult = await handleApiCall(
+    const orgRepoListCResult = await handleApiCall<'listRepositories'>(
       sockSdk.listRepositories(orgSlug, {
-        sort,
-        direction,
-        per_page: String(100), // max
-        page: String(nextPage),
+        ...(sort ? { sort: sort as 'name' | 'created_at' } : {}),
+        ...(direction ? { direction: direction as 'asc' | 'desc' } : {}),
+        per_page: 100, // max
+        page: nextPage,
       }),
       { description: 'list of repositories' },
     )
diff --git a/packages/cli/src/commands/repository/fetch-list-repos.mts b/packages/cli/src/commands/repository/fetch-list-repos.mts
@@ -37,12 +37,12 @@ export async function fetchListRepos(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(
+  return await handleApiCall<'listRepositories'>(
     sockSdk.listRepositories(orgSlug, {
-      sort,
-      direction,
-      per_page: String(perPage),
-      page: String(page),
+      ...(sort ? { sort: sort as 'name' | 'created_at' } : {}),
+      ...(direction ? { direction: direction as 'asc' | 'desc' } : {}),
+      per_page: perPage,
+      page,
     }),
     { description: 'list of repositories' },
   )
diff --git a/packages/cli/src/commands/repository/fetch-update-repo.mts b/packages/cli/src/commands/repository/fetch-update-repo.mts
@@ -42,7 +42,7 @@ export async function fetchUpdateRepo(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(
+  return await handleApiCall<'updateRepository'>(
     sockSdk.updateRepository(orgSlug, repoName, {
       default_branch: defaultBranch,
       description,
diff --git a/packages/cli/src/commands/repository/fetch-view-repo.mts b/packages/cli/src/commands/repository/fetch-view-repo.mts
@@ -22,7 +22,10 @@ export async function fetchViewRepo(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getRepository(orgSlug, repoName), {
-    description: 'repository data',
-  })
+  return await handleApiCall<'getRepository'>(
+    sockSdk.getRepository(orgSlug, repoName),
+    {
+      description: 'repository data',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/scan/fetch-create-org-full-scan.mts b/packages/cli/src/commands/scan/fetch-create-org-full-scan.mts
@@ -54,19 +54,23 @@ export async function fetchCreateOrgFullScan(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(
+  return await handleApiCall<'createFullScan'>(
     sockSdk.createFullScan(orgSlug, packagePaths, {
       pathsRelativeTo: cwd,
       ...(branchName ? { branch: branchName } : {}),
       ...(commitHash ? { commit_hash: commitHash } : {}),
       ...(commitMessage ? { commit_message: commitMessage } : {}),
       ...(committers ? { committers } : {}),
-      make_default_branch: String(defaultBranch),
+      ...(defaultBranch !== undefined
+        ? { make_default_branch: Boolean(defaultBranch) }
+        : {}),
       ...(pullRequest ? { pull_request: String(pullRequest) } : {}),
       ...(repoName ? { repo: repoName } : {}),
-      set_as_pending_head: String(pendingHead),
-      tmp: String(tmp),
-    }),
+      ...(pendingHead !== undefined
+        ? { set_as_pending_head: Boolean(pendingHead) }
+        : {}),
+      ...(tmp !== undefined ? { tmp: Boolean(tmp) } : {}),
+    } as any),
     {
       description: 'to create a scan',
       spinner,
diff --git a/packages/cli/src/commands/scan/fetch-delete-org-full-scan.mts b/packages/cli/src/commands/scan/fetch-delete-org-full-scan.mts
@@ -25,7 +25,10 @@ export async function fetchDeleteOrgFullScan(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.deleteFullScan(orgSlug, scanId), {
-    description: 'to delete a scan',
-  })
+  return await handleApiCall<'deleteFullScan'>(
+    sockSdk.deleteFullScan(orgSlug, scanId),
+    {
+      description: 'to delete a scan',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/scan/fetch-list-scans.mts b/packages/cli/src/commands/scan/fetch-list-scans.mts
@@ -40,15 +40,15 @@ export async function fetchOrgFullScanList(
     ...config,
   } as FetchOrgFullScanListConfig
 
-  return await handleApiCall(
+  return await handleApiCall<'listFullScans'>(
     sockSdk.listFullScans(orgSlug, {
       ...(branch ? { branch } : {}),
       ...(repo ? { repo } : {}),
-      sort,
-      direction,
+      ...(sort ? { sort: sort as 'name' | 'created_at' } : {}),
+      ...(direction ? { direction: direction as 'asc' | 'desc' } : {}),
       from: from_time,
-      page: String(page),
-      per_page: String(perPage),
+      page,
+      per_page: perPage,
     }),
     { description: 'list of scans' },
   )
diff --git a/packages/cli/src/commands/scan/fetch-report-data.mts b/packages/cli/src/commands/scan/fetch-report-data.mts
@@ -116,10 +116,10 @@ export async function fetchScanData(
   async function fetchSecurityPolicy(): Promise<
     CResult<SocketSdkSuccessResult<'getOrgSecurityPolicy'>['data']>
   > {
-    const result = await handleApiCallNoSpinner(
+    const result = (await handleApiCallNoSpinner(
       sockSdk.getOrgSecurityPolicy(orgSlug),
       'GetOrgSecurityPolicy',
-    )
+    )) as CResult<SocketSdkSuccessResult<'getOrgSecurityPolicy'>['data']>
 
     updatePolicy('received policy')
 
diff --git a/packages/cli/src/commands/scan/fetch-scan-metadata.mts b/packages/cli/src/commands/scan/fetch-scan-metadata.mts
@@ -25,7 +25,10 @@ export async function fetchScanMetadata(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getFullScanMetadata(orgSlug, scanId), {
-    description: 'meta data for a full scan',
-  })
+  return await handleApiCall<'getFullScanMetadata'>(
+    sockSdk.getFullScanMetadata(orgSlug, scanId),
+    {
+      description: 'meta data for a full scan',
+    },
+  )
 }
diff --git a/packages/cli/src/commands/scan/fetch-supported-scan-file-names.mts b/packages/cli/src/commands/scan/fetch-supported-scan-file-names.mts
@@ -25,8 +25,11 @@ export async function fetchSupportedScanFileNames(
   }
   const sockSdk = sockSdkCResult.data
 
-  return await handleApiCall(sockSdk.getSupportedScanFiles(), {
-    description: 'supported scan file types',
-    spinner,
-  })
+  return await handleApiCall<'getReportSupportedFiles'>(
+    sockSdk.getSupportedScanFiles(),
+    {
+      description: 'supported scan file types',
+      spinner,
+    },
+  )
 }
diff --git a/packages/cli/src/commands/scan/perform-reachability-analysis.mts b/packages/cli/src/commands/scan/perform-reachability-analysis.mts
@@ -110,13 +110,13 @@ export async function performReachabilityAnalysis(
 
     spinner?.start('Uploading manifests for reachability analysis...')
 
-    const uploadCResult = await handleApiCall(
+    const uploadCResult = (await handleApiCall(
       sockSdk.uploadManifestFiles(orgSlug, filepathsToUpload),
       {
         description: 'upload manifests',
         spinner,
       },
-    )
+    )) as any
 
     spinner?.stop()
 
diff --git a/packages/cli/src/commands/scan/stream-scan.mts b/packages/cli/src/commands/scan/stream-scan.mts
@@ -28,7 +28,7 @@ export async function streamScan(
   getDefaultLogger().info('Requesting data from API...')
 
   // Note: This will write to stdout or target file. It is not a noop.
-  return await handleApiCall(
+  return await handleApiCall<'getOrgFullScan'>(
     sockSdk.streamFullScan(orgSlug, scanId, {
       output: file === '-' ? undefined : file,
     }),
diff --git a/packages/cli/src/utils/git/providers.test.mts b/packages/cli/src/utils/git/providers.test.mts
diff --git a/packages/cli/src/utils/npm/config.test.mts b/packages/cli/src/utils/npm/config.test.mts
diff --git a/packages/cli/src/utils/socket/api.mts b/packages/cli/src/utils/socket/api.mts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,10 @@ export async function fetchOrgAnalyticsData(`
`24`	`24`	`}`
`25`	`25`	`const sockSdk = sockSdkCResult.data`
`26`	`26`
`27`		`- return await handleApiCall(sockSdk.getOrgAnalytics(time.toString()), {`
`28`		`- description: 'analytics data',`
`29`		`- })`
	`27`	`+ return await handleApiCall<'getOrgAnalytics'>(`
	`28`	`+ sockSdk.getOrgAnalytics(time.toString()),`
	`29`	`+ {`
	`30`	`+ description: 'analytics data',`
	`31`	`+ },`
	`32`	`+ )`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,10 @@ export async function fetchRepoAnalyticsData(`
`25`	`25`	`}`
`26`	`26`	`const sockSdk = sockSdkCResult.data`
`27`	`27`
`28`		`- return await handleApiCall(sockSdk.getRepoAnalytics(repo, time.toString()), {`
`29`		`- description: 'analytics data',`
`30`		`- })`
	`28`	`+ return await handleApiCall<'getRepoAnalytics'>(`
	`29`	`+ sockSdk.getRepoAnalytics(repo, time.toString()),`
	`30`	`+ {`
	`31`	`+ description: 'analytics data',`
	`32`	`+ },`
	`33`	`+ )`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,7 @@ export async function fetchQuota(`
`20`	`20`	`}`
`21`	`21`	`const sockSdk = sockSdkCResult.data`
`22`	`22`
`23`		`- return await handleApiCall(sockSdk.getQuota(), { description: 'token quota' })`
	`23`	`+ return await handleApiCall<'getQuota'>(sockSdk.getQuota(), {`
	`24`	`+ description: 'token quota',`
	`25`	`+ })`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export async function fetchPurlsShallowScore(`
`35`	`35`	`Requesting shallow score data for ${purls.length} package urls (purl): ${displayPurls}`,
`36`	`36`	`)`
`37`	`37`
`38`		`- const batchPackageCResult = await handleApiCall(`
	`38`	`+ const batchPackageCResult = await handleApiCall<'batchPackageFetch'>(`
`39`	`39`	`sockSdk.batchPackageFetch(`
`40`	`40`	`{ components: purls.map(purl => ({ purl })) },`
`41`	`41`	`{`