Cleanup filterBySupportedScanFiles

Author: jdalton

src/utils/glob.mts

@@ -157,7 +157,7 @@ function workspacePatternToGlobPattern(workspace: string): string {
   return `${workspace}/package.json`
 }
 
-export function filterReportSupportedFiles(
+export function filterBySupportedScanFiles(
   filepaths: string[] | readonly string[],
   supportedFiles: SocketSdkSuccessResult<'getReportSupportedFiles'>['data'],
 ): string[] {
@@ -191,12 +191,13 @@ export async function globWithGitIgnore(
     socketConfig,
     ...additionalOptions
   } = { __proto__: null, ...options } as GlobWithGitIgnoreOptions
-  const projectIgnorePaths = socketConfig?.projectIgnorePaths
+
   const ignoreFiles = await tinyGlob(['**/.gitignore'], {
     absolute: true,
     cwd,
     expandDirectories: true,
   })
+  const projectIgnorePaths = socketConfig?.projectIgnorePaths
   const ignores = [
     ...ignoredDirPatterns,
     ...(Array.isArray(projectIgnorePaths)
@@ -220,25 +221,31 @@ export async function globWithGitIgnore(
   ]
   const hasNegatedPattern = ignores.some(p => p.charCodeAt(0) === 33 /*'!'*/)
   const globOptions = {
+    __proto__: null,
     absolute: true,
     cwd,
     dot: true,
     expandDirectories: false,
     ignore: hasNegatedPattern ? [] : ignores,
     ...additionalOptions,
   }
+
   const result = await tinyGlob(patterns as string[], globOptions)
   if (!hasNegatedPattern) {
     return result
   }
-  const { absolute } = globOptions
 
   // Note: the input files must be INSIDE the cwd. If you get strange looking
   // relative path errors here, most likely your path is outside the given cwd.
   const filtered = ignore()
     .add(ignores)
-    .filter(absolute ? result.map(p => path.relative(cwd, p)) : result)
-  return absolute ? filtered.map(p => path.resolve(cwd, p)) : filtered
+    .filter(
+      globOptions.absolute ? result.map(p => path.relative(cwd, p)) : result,
+    )
+
+  return globOptions.absolute
+    ? filtered.map(p => path.resolve(cwd, p))
+    : filtered
 }
 
 export async function globNodeModules(cwd = process.cwd()): Promise<string[]> {

src/utils/path-resolve.mts

@@ -8,7 +8,7 @@ import { resolveBinPathSync } from '@socketsecurity/registry/lib/npm'
 import constants from '../constants.mts'
 import { safeStatsSync } from './fs.mts'
 import {
-  filterReportSupportedFiles,
+  filterBySupportedScanFiles,
   globWithGitIgnore,
   pathsToGlobPatterns,
 } from './glob.mts'
@@ -105,9 +105,11 @@ export async function getPackageFilesForScan(
     __proto__: null,
     ...options,
   } as PackageFilesForScanOptions
+
   const filepaths = await globWithGitIgnore(pathsToGlobPatterns(inputPaths), {
     cwd,
     socketConfig,
   })
-  return filterReportSupportedFiles(filepaths, supportedFiles)
+
+  return filterBySupportedScanFiles(filepaths!, supportedFiles)
 }