Remove logging from getPackageFilesForScan

Author: jdalton

src/commands/scan/handle-create-new-scan.mts

@@ -1,9 +1,12 @@
+import { debugDir, debugFn } from '@socketsecurity/registry/lib/debug'
 import { logger } from '@socketsecurity/registry/lib/logger'
+import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import { fetchCreateOrgFullScan } from './fetch-create-org-full-scan.mts'
 import { fetchSupportedScanFileNames } from './fetch-supported-scan-file-names.mts'
 import { handleScanReport } from './handle-scan-report.mts'
 import { outputCreateNewScan } from './output-create-new-scan.mts'
+import constants from '../../constants.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
 import { getPackageFilesForScan } from '../../utils/path-resolve.mts'
 import { readOrDefaultSocketJson } from '../../utils/socketjson.mts'
@@ -50,7 +53,7 @@ export async function handleCreateNewScan({
   tmp: boolean
 }): Promise<void> {
   if (autoManifest) {
-    logger.info('Auto generating manifest files ...')
+    logger.info('Auto-generating manifest files ...')
     const sockJson = await readOrDefaultSocketJson(cwd)
     const detected = await detectManifestActions(sockJson, cwd)
     await generateAutoManifest({
@@ -59,20 +62,26 @@ export async function handleCreateNewScan({
       outputKind,
       verbose: false,
     })
-    logger.info('Auto generation finished. Proceeding with Scan creation.')
+    logger.info('Auto-generation finished. Proceeding with Scan creation.')
   }
 
-  const fileNamesCResult = await fetchSupportedScanFileNames()
-  if (!fileNamesCResult.ok) {
-    await outputCreateNewScan(fileNamesCResult, outputKind, interactive)
+  const supportedFilesCResult = await fetchSupportedScanFileNames()
+  if (!supportedFilesCResult.ok) {
+    await outputCreateNewScan(supportedFilesCResult, outputKind, interactive)
     return
   }
 
-  const packagePaths = await getPackageFilesForScan(
+  // Lazily access constants.spinner.
+  const { spinner } = constants
+
+  spinner.start('Searching for local files to include in scan...')
+
+  const supportedFiles = supportedFilesCResult.data
+  const packagePaths = await getPackageFilesForScan(targets, supportedFiles, {
     cwd,
-    targets,
-    fileNamesCResult.data,
-  )
+  })
+
+  spinner.stop()
 
   const wasValidInput = checkCommandInput(outputKind, {
     nook: true,
@@ -86,12 +95,18 @@ export async function handleCreateNewScan({
     return
   }
 
+  debugFn(
+    'notice',
+    `found: ${packagePaths.length} local ${pluralize('file', packagePaths.length)}`,
+  )
+  debugDir('inspect', { packagePaths })
+
   if (readOnly) {
     logger.log('[ReadOnly] Bailing now')
     return
   }
 
-  const data = await fetchCreateOrgFullScan(
+  const fullScanCResult = await fetchCreateOrgFullScan(
     packagePaths,
     orgSlug,
     defaultBranch,
@@ -108,16 +123,16 @@ export async function handleCreateNewScan({
     },
   )
 
-  if (data.ok && report) {
-    if (data.data?.id) {
+  if (fullScanCResult.ok && report) {
+    if (fullScanCResult.data?.id) {
       await handleScanReport({
         filePath: '-',
         fold: 'version',
         includeLicensePolicy: true,
         orgSlug,
         outputKind,
         reportLevel: 'error',
-        scanId: data.data.id,
+        scanId: fullScanCResult.data.id,
         short: false,
       })
     } else {
@@ -126,13 +141,13 @@ export async function handleCreateNewScan({
           ok: false,
           message: 'Missing Scan ID',
           cause: 'Server did not respond with a scan ID',
-          data: data.data,
+          data: fullScanCResult.data,
         },
         outputKind,
         interactive,
       )
     }
   } else {
-    await outputCreateNewScan(data, outputKind, interactive)
+    await outputCreateNewScan(fullScanCResult, outputKind, interactive)
   }
 }

src/utils/path-resolve.mts

@@ -3,9 +3,7 @@ import path from 'node:path'
 
 import which from 'which'
 
-import { debugDir, debugFn, isDebug } from '@socketsecurity/registry/lib/debug'
 import { resolveBinPathSync } from '@socketsecurity/registry/lib/npm'
-import { pluralize } from '@socketsecurity/registry/lib/words'
 
 import constants from '../constants.mts'
 import { safeStatsSync } from './fs.mts'
@@ -93,52 +91,23 @@ export function findNpmPathSync(npmBinPath: string): string | undefined {
   }
 }
 
+export type PackageFilesForScanOptions = {
+  cwd?: string | undefined
+  config?: SocketYml | undefined
+}
+
 export async function getPackageFilesForScan(
-  cwd: string,
   inputPaths: string[],
   supportedFiles: SocketSdkReturnType<'getReportSupportedFiles'>['data'],
-  config?: SocketYml | undefined,
+  options?: PackageFilesForScanOptions | undefined,
 ): Promise<string[]> {
-  debugFn('notice', `resolve: ${inputPaths.length} paths`, inputPaths)
-
-  // Lazily access constants.spinner.
-  const { spinner } = constants
-
-  const patterns = pathsToGlobPatterns(inputPaths)
-
-  spinner.start('Searching for local files to include in scan...')
-
-  const entries = await globWithGitIgnore(patterns, {
+  const { config: socketConfig, cwd = process.cwd() } = {
+    __proto__: null,
+    ...options,
+  } as PackageFilesForScanOptions
+  const entries = await globWithGitIgnore(pathsToGlobPatterns(inputPaths), {
     cwd,
-    socketConfig: config,
+    socketConfig,
   })
-
-  if (isDebug('notice')) {
-    spinner.stop()
-
-    debugFn(
-      'notice',
-      `Resolved ${inputPaths.length} paths to ${entries.length} local paths:\n`,
-      entries,
-    )
-
-    spinner.start('Searching for files now...')
-  } else {
-    spinner.start(
-      `Resolved ${inputPaths.length} paths to ${entries.length} local paths, searching for files now...`,
-    )
-  }
-
-  const packageFiles = await filterGlobResultToSupportedFiles(
-    entries,
-    supportedFiles,
-  )
-
-  spinner.successAndStop(
-    `Found ${packageFiles.length} local ${pluralize('file', packageFiles.length)}`,
-  )
-
-  debugDir('inspect', { packageFiles })
-
-  return packageFiles
+  return await filterGlobResultToSupportedFiles(entries, supportedFiles)
 }