@cyclonedx/cdxgen 12.4.3 → 12.4.4

package/lib/evinser/evinser.js

@@ -4,6 +4,10 @@ import process from "node:process";
 
 import { PackageURL } from "packageurl-js";
 
+import {
+  buildAtomCommandEnv,
+  filterAtomSlicesByExcludePatterns,
+} from "../helpers/atomUtils.js";
 import {
   collectDosaiCryptoComponents,
   findCryptoAlgos,
@@ -41,6 +45,10 @@ import { createSemanticsSlices } from "./swiftsem.js";
 
 const typePurlsCache = {};
 
+function filterAtomSliceData(sliceData, options = {}) {
+  return filterAtomSlicesByExcludePatterns(sliceData, options.exclude);
+}
+
 /**
  * Function to create the db for the libraries referred in the sbom.
  *
@@ -357,8 +365,10 @@ export async function createSlice(
     args.push(process.env.ATOM_SLICE_DEPTH);
   }
   args.push(resolve(filePath));
+  const atomExcludeEnv = buildAtomCommandEnv(options, language);
   // Execute atom
   const result = executeAtom(filePath, args, {
+    ...atomExcludeEnv,
     ATOM_TOOLS_OPENAPI_FILENAME: openapiSpecFile, // The file would get over-written
     ATOM_TOOLS_OPENAPI_FORMAT:
       process.env?.ATOM_TOOLS_OPENAPI_FORMAT || "openapi3.1.0", // editor.swagger.io doesn't support 3.1.0 yet
@@ -597,15 +607,17 @@ export async function analyzeProject(dbObjMap, options) {
       usableSlicesFile(options.reachablesSlicesFile)
     ) {
       reachablesSlicesFile = options.reachablesSlicesFile;
-      reachablesSlice = JSON.parse(
-        fs.readFileSync(options.reachablesSlicesFile, "utf-8"),
+      reachablesSlice = filterAtomSliceData(
+        JSON.parse(fs.readFileSync(options.reachablesSlicesFile, "utf-8")),
+        options,
       );
     } else {
       retMap = await createSlice(language, dirPath, "reachables", options);
       if (retMap?.slicesFile && safeExistsSync(retMap.slicesFile)) {
         reachablesSlicesFile = retMap.slicesFile;
-        reachablesSlice = JSON.parse(
-          fs.readFileSync(retMap.slicesFile, "utf-8"),
+        reachablesSlice = filterAtomSliceData(
+          JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8")),
+          options,
         );
       }
     }
@@ -618,13 +630,19 @@ export async function analyzeProject(dbObjMap, options) {
   }
   // Reuse existing usages slices
   if (options.usagesSlicesFile && usableSlicesFile(options.usagesSlicesFile)) {
-    usageSlice = JSON.parse(fs.readFileSync(options.usagesSlicesFile, "utf-8"));
+    usageSlice = filterAtomSliceData(
+      JSON.parse(fs.readFileSync(options.usagesSlicesFile, "utf-8")),
+      options,
+    );
     usagesSlicesFile = options.usagesSlicesFile;
   } else {
     // Generate our own slices
     retMap = await createSlice(language, dirPath, "usages", options);
     if (retMap?.slicesFile && safeExistsSync(retMap.slicesFile)) {
-      usageSlice = JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8"));
+      usageSlice = filterAtomSliceData(
+        JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8")),
+        options,
+      );
       usagesSlicesFile = retMap.slicesFile;
     }
     if (retMap?.semanticsSlicesFile) {
@@ -698,14 +716,18 @@ export async function analyzeProject(dbObjMap, options) {
       safeExistsSync(options.dataFlowSlicesFile)
     ) {
       dataFlowSlicesFile = options.dataFlowSlicesFile;
-      dataFlowSlice = JSON.parse(
-        fs.readFileSync(options.dataFlowSlicesFile, "utf-8"),
+      dataFlowSlice = filterAtomSliceData(
+        JSON.parse(fs.readFileSync(options.dataFlowSlicesFile, "utf-8")),
+        options,
       );
     } else if (!PROJECT_TYPE_ALIASES.scala.includes(language)) {
       retMap = await createSlice(language, dirPath, "data-flow", options);
       if (retMap?.slicesFile && safeExistsSync(retMap.slicesFile)) {
         dataFlowSlicesFile = retMap.slicesFile;
-        dataFlowSlice = JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8"));
+        dataFlowSlice = filterAtomSliceData(
+          JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8")),
+          options,
+        );
       }
     }
   }