Use path.basename to compare DOT_SOCKET_DOT_FACTS_JSON

Author: jdalton

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

@@ -1,3 +1,5 @@
+import path from 'node:path'
+
 import terminalLink from 'terminal-link'
 
 import { debugDir } from '@socketsecurity/registry/lib/debug'
@@ -151,14 +153,19 @@ export async function handleCreateNewScan({
 
     logger.success('Reachability analysis completed successfully')
 
+    const reachabilityReport = reachResult.data?.reachabilityReport
+
     scanPaths = [
       ...packagePaths.filter(
         // Ensure the .socket.facts.json isn't duplicated in case it happened
         // to be in the scan folder before the analysis was run.
-        p => !p.endsWith(constants.DOT_SOCKET_DOT_FACTS_JSON),
+        p =>
+          path.basename(p).toLowerCase() !==
+          constants.DOT_SOCKET_DOT_FACTS_JSON,
       ),
-      reachResult.data?.reachabilityReport,
+      ...(reachabilityReport ? [reachabilityReport] : []),
     ]
+
     tier1ReachabilityScanId = reachResult.data?.tier1ReachabilityScanId
   }
 

src/commands/scan/perform-reachability-analysis.mts

@@ -1,3 +1,5 @@
+import path from 'node:path'
+
 import terminalLink from 'terminal-link'
 
 import constants from '../../constants.mts'
@@ -86,10 +88,11 @@ export async function performReachabilityAnalysis(
 
     const wasSpinning = !!spinner?.isSpinning
 
-    // Exclude any .socket.facts.json files that happen to be
-    // in the scan folder before the analysis was run.
+    // Exclude any .socket.facts.json files that happen to be in the scan
+    // folder before the analysis was run.
     const filepathsToUpload = packagePaths.filter(
-      p => !p.endsWith(constants.DOT_SOCKET_DOT_FACTS_JSON),
+      p =>
+        path.basename(p).toLowerCase() !== constants.DOT_SOCKET_DOT_FACTS_JSON,
     )
 
     spinner?.start('Uploading manifests for reachability analysis...')
@@ -151,7 +154,7 @@ export async function performReachabilityAnalysis(
     ...(tarHash
       ? ['--run-without-docker', '--manifests-tar-hash', tarHash]
       : []),
-    // Empty reachEcosystems implies scan all ecosystems.
+    // Empty reachEcosystems implies scanning all ecosystems.
     ...(reachabilityOptions.reachEcosystems.length
       ? ['--purl-types', ...reachabilityOptions.reachEcosystems]
       : []),