Update call signatures

Author: jdalton

src/commands/package/fetch-purls-shallow-score.mts

@@ -32,10 +32,10 @@ export async function fetchPurlsShallowScore(
 
   const result = await handleApiCall(
     sockSdk.batchPackageFetch(
+      { components: purls.map(purl => ({ purl })) },
       {
         alerts: 'true',
       },
-      { components: purls.map(purl => ({ purl })) },
     ),
     { desc: 'looking up package' },
   )

src/commands/repository/fetch-list-all-repos.mts

@@ -4,18 +4,25 @@ import { handleApiCall } from '../../utils/api.mts'
 import { setupSdk } from '../../utils/sdk.mts'
 
 import type { CResult } from '../../types.mts'
+import type { SetupSdkOptions } from '../../utils/sdk.mts'
 import type { SocketSdkSuccessResult } from '@socketsecurity/sdk'
 
-export async function fetchListAllRepos({
-  direction,
-  orgSlug,
-  sort,
-}: {
-  direction: string
-  orgSlug: string
-  sort: string
-}): Promise<CResult<SocketSdkSuccessResult<'getOrgRepoList'>['data']>> {
-  const sockSdkCResult = await setupSdk()
+export type FetchListAllReposOptions = {
+  direction?: string | undefined
+  sdkOptions?: SetupSdkOptions | undefined
+  sort?: string | undefined
+}
+
+export async function fetchListAllRepos(
+  orgSlug: string,
+  options?: FetchListAllReposOptions | undefined,
+): Promise<CResult<SocketSdkSuccessResult<'getOrgRepoList'>['data']>> {
+  const { direction, sdkOptions, sort } = {
+    __proto__: null,
+    ...options,
+  } as FetchListAllReposOptions
+
+  const sockSdkCResult = await setupSdk(sdkOptions)
   if (!sockSdkCResult.ok) {
     return sockSdkCResult
   }

src/commands/repository/handle-list-repos.mts

@@ -22,7 +22,7 @@ export async function handleListRepos({
   sort: string
 }): Promise<void> {
   if (all) {
-    const data = await fetchListAllRepos({ direction, orgSlug, sort })
+    const data = await fetchListAllRepos(orgSlug, { direction, sort })
 
     await outputListRepos(data, outputKind, 0, 0, sort, Infinity, direction)
   } else {

src/commands/scan/cmd-scan-view.mts

@@ -150,7 +150,7 @@ async function run(
   }
 
   if (json && stream) {
-    await streamScan(orgSlug, scanId, file)
+    await streamScan(orgSlug, scanId, { file })
   } else {
     await handleScanView(orgSlug, scanId, file, outputKind)
   }

src/commands/scan/create-scan-from-github.mts

@@ -40,9 +40,8 @@ export async function createScanFromGithub({
     .filter(Boolean)
   if (all || targetRepos.length === 0) {
     // Fetch from Socket API
-    const result = await fetchListAllRepos({
+    const result = await fetchListAllRepos(orgSlug, {
       direction: 'asc',
-      orgSlug,
       sort: 'name',
     })
     if (!result.ok) {

src/commands/scan/fetch-create-org-full-scan.mts

@@ -52,22 +52,17 @@ export async function fetchCreateOrgFullScan(
   const sockSdk = sockSdkCResult.data
 
   return await handleApiCall(
-    sockSdk.createOrgFullScan(
-      orgSlug,
-      {
-        ...(branchName ? { branch: branchName } : {}),
-        ...(commitHash ? { commit_hash: commitHash } : {}),
-        ...(commitMessage ? { commit_message: commitMessage } : {}),
-        ...(committers ? { committers } : {}),
-        make_default_branch: String(defaultBranch),
-        ...(pullRequest ? { pull_request: String(pullRequest) } : {}),
-        repo: repoName,
-        set_as_pending_head: String(pendingHead),
-        tmp: String(tmp),
-      },
-      packagePaths,
-      cwd,
-    ),
+    sockSdk.createOrgFullScan(orgSlug, packagePaths, cwd, {
+      ...(branchName ? { branch: branchName } : {}),
+      ...(commitHash ? { commit_hash: commitHash } : {}),
+      ...(commitMessage ? { commit_message: commitMessage } : {}),
+      ...(committers ? { committers } : {}),
+      make_default_branch: String(defaultBranch),
+      ...(pullRequest ? { pull_request: String(pullRequest) } : {}),
+      repo: repoName,
+      set_as_pending_head: String(pendingHead),
+      tmp: String(tmp),
+    }),
     { desc: 'to create a scan' },
   )
 }

src/utils/alerts-map.mts

@@ -98,15 +98,17 @@ export async function getAlertsMapFromPurls(
 
   for await (const batchResult of sockSdk.batchPackageStream(
     {
-      alerts: 'true',
-      compact: 'true',
-      ...(opts.include.actions
-        ? { actions: opts.include.actions.join(',') }
-        : {}),
-      ...(opts.include.unfixable ? {} : { fixable: 'true' }),
+      components: uniqPurls.map(purl => ({ purl })),
     },
     {
-      components: uniqPurls.map(purl => ({ purl })),
+      queryParams: {
+        alerts: 'true',
+        compact: 'true',
+        ...(opts.include.actions
+          ? { actions: opts.include.actions.join(',') }
+          : {}),
+        ...(opts.include.unfixable ? {} : { fixable: 'true' }),
+      },
     },
   )) {
     if (batchResult.success) {