Fixes #1498. Don't remove await (#1509)

* Fixes #1498. Don't remove await Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> * Tune partial check for cbom Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> --------- Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
CycloneDX · Dec 22, 2024 · 5e09a04 · 5e09a04
1 parent bc98665
commit 5e09a04
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/lib/evinser/evinser.js b/lib/evinser/evinser.js
@@ -212,7 +212,7 @@ export async function createSlice(
   options = {},
 ) {
   if (!filePath) {
-    return;
+    return undefined;
   }
   const firstLanguage = Array.isArray(purlOrLanguages)
     ? purlOrLanguages[0]
@@ -227,7 +227,7 @@ export async function createSlice(
     PROJECT_TYPE_ALIASES.swift.includes(language) &&
     sliceType !== "semantics"
   ) {
-    return;
+    return undefined;
   }
 
   let sliceOutputDir = fs.mkdtempSync(
@@ -388,7 +388,7 @@ export async function analyzeProject(dbObjMap, options) {
         fs.readFileSync(options.reachablesSlicesFile, "utf-8"),
       );
     } else {
-      retMap = createSlice(language, dirPath, "reachables", options);
+      retMap = await createSlice(language, dirPath, "reachables", options);
       if (retMap?.slicesFile && fs.existsSync(retMap.slicesFile)) {
         reachablesSlicesFile = retMap.slicesFile;
         reachablesSlice = JSON.parse(
@@ -409,7 +409,7 @@ export async function analyzeProject(dbObjMap, options) {
     usagesSlicesFile = options.usagesSlicesFile;
   } else {
     // Generate our own slices
-    retMap = createSlice(language, dirPath, "usages", options);
+    retMap = await createSlice(language, dirPath, "usages", options);
     if (retMap?.slicesFile && fs.existsSync(retMap.slicesFile)) {
       usageSlice = JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8"));
       usagesSlicesFile = retMap.slicesFile;
@@ -428,7 +428,7 @@ export async function analyzeProject(dbObjMap, options) {
       semanticsSlicesFile = options.semanticsSlicesFile;
     } else {
       // Generate our own slices
-      retMap = createSlice(language, dirPath, "semantics", options);
+      retMap = await createSlice(language, dirPath, "semantics", options);
       if (retMap?.slicesFile && fs.existsSync(retMap.slicesFile)) {
         semanticsSlice = JSON.parse(
           fs.readFileSync(retMap.slicesFile, "utf-8"),
@@ -471,7 +471,7 @@ export async function analyzeProject(dbObjMap, options) {
         fs.readFileSync(options.dataFlowSlicesFile, "utf-8"),
       );
     } else {
-      retMap = createSlice(language, dirPath, "data-flow", options);
+      retMap = await createSlice(language, dirPath, "data-flow", options);
       if (retMap?.slicesFile && fs.existsSync(retMap.slicesFile)) {
         dataFlowSlicesFile = retMap.slicesFile;
         dataFlowSlice = JSON.parse(fs.readFileSync(retMap.slicesFile, "utf-8"));

diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -12792,15 +12792,20 @@ export function isPartialTree(dependencies, componentsCount = 1) {
   if (dependencies?.length <= 1) {
     return true;
   }
+  let isCbom = false;
   let parentsWithChildsCount = 0;
   for (const adep of dependencies) {
     if (adep?.dependsOn.length > 0) {
       parentsWithChildsCount++;
     }
+    if (!isCbom && adep?.provides?.length > 0) {
+      isCbom = true;
+    }
   }
   return (
+    !isCbom &&
     parentsWithChildsCount <
-    Math.min(Math.round(componentsCount / 3), componentsCount)
+      Math.min(Math.round(componentsCount / 3), componentsCount)
   );
 }
 

diff --git a/lib/helpers/validator.js b/lib/helpers/validator.js
@@ -223,7 +223,7 @@ export const validateRefs = (bomJson) => {
   if (bomJson?.dependencies) {
     if (isPartialTree(bomJson.dependencies, bomJson?.components?.length)) {
       warningsList.push(
-        "Dependency tree is partial with multiple empty dependsOn attributes.",
+        "Dependency tree has multiple empty dependsOn attributes.",
       );
     }
     for (const dep of bomJson.dependencies) {

diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map