Reduce validation errors

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 20, 2025 · 74ebbbf · 74ebbbf
1 parent 5b4c4bd
commit 74ebbbf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -4928,12 +4928,32 @@ export async function parsePyLockData(lockData, lockFile, pyProjectFile) {
         depsMap[pkgParentRef].add(pkg["bom-ref"]);
       }
     }
-    const devDependencies = apkg?.["dev-dependencies"]?.dev || [];
-    if (apkg.dependencies || devDependencies.length) {
+    let optionalDependencies = [];
+    let devDependencies = [];
+    if (apkg["dev-dependencies"]) {
+      for (const agroup of Object.keys(apkg["dev-dependencies"])) {
+        devDependencies = devDependencies.concat(
+          apkg["dev-dependencies"][agroup],
+        );
+      }
+    }
+    if (apkg["optional-dependencies"]) {
+      for (const agroup of Object.keys(apkg["optional-dependencies"])) {
+        optionalDependencies = optionalDependencies.concat(
+          apkg["optional-dependencies"][agroup],
+        );
+      }
+    }
+    if (
+      apkg.dependencies ||
+      devDependencies.length ||
+      optionalDependencies.length
+    ) {
       if (Array.isArray(apkg.dependencies)) {
         // pdm.lock files
         let allDeps = apkg.dependencies;
         allDeps = allDeps.concat(devDependencies);
+        allDeps = allDeps.concat(optionalDependencies);
         for (const apkgDep of allDeps) {
           // Example: "msgpack>=0.5.2"
           const nameStr =

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