Use generic type for c/c++ instead of conan

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> Updated wrapdb Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> Load evinser dynamically. Fixes #686 Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> Update atom to bring improved peformance in header analysis mode
CycloneDX · Nov 2, 2023 · a3bc5f1 · a3bc5f1
1 parent 0456929
commit a3bc5f1
Show file tree

Hide file tree

Showing 8 changed files with 731 additions and 236 deletions.
diff --git a/bin/cdxgen.js b/bin/cdxgen.js
@@ -21,7 +21,6 @@ import {
 import { findUpSync } from "find-up";
 import { load as _load } from "js-yaml";
 import { postProcess } from "../postgen.js";
-import { analyzeProject, createEvinseFile, prepareDB } from "../evinser.js";
 import { ATOM_DB } from "../utils.js";
 
 // Support for config files
@@ -490,6 +489,7 @@ const checkPermissions = (filePath) => {
   }
   // Evidence generation
   if (args.evidence) {
+    const evinserModule = await import("../evinser.js");
     const evinseOptions = {
       _: args._,
       input: options.output,
@@ -503,10 +503,16 @@ const checkPermissions = (filePath) => {
       dataFlowSlicesFile: options.dataFlowSlicesFile,
       reachablesSlicesFile: options.reachablesSlicesFile
     };
-    const dbObjMap = await prepareDB(evinseOptions);
+    const dbObjMap = await evinserModule.prepareDB(evinseOptions);
     if (dbObjMap) {
-      const sliceArtefacts = await analyzeProject(dbObjMap, evinseOptions);
-      const evinseJson = createEvinseFile(sliceArtefacts, evinseOptions);
+      const sliceArtefacts = await evinserModule.analyzeProject(
+        dbObjMap,
+        evinseOptions
+      );
+      const evinseJson = evinserModule.createEvinseFile(
+        sliceArtefacts,
+        evinseOptions
+      );
       bomNSData.bomJson = evinseJson;
       if (args.print && evinseJson) {
         printOccurrences(evinseJson);