Ensuring that the evidence.identity format is maintained after compon…

…ents are trimmed (#1591) Co-authored-by: emcfins <erin.mcgill@gmail.com>
CycloneDX · Jan 23, 2025 · 3d35d2a · 3d35d2a
1 parent 5b96b6c
commit 3d35d2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -6026,7 +6026,8 @@ export function trimComponents(components) {
         }
         // comp.evidence.identity can be an array or object
         // Merge the evidence.identity based on methods or objects
-        const identities = Array.isArray(comp.evidence.identity)
+        const isArray = Array.isArray(comp.evidence.identity);
+        const identities = isArray
           ? comp.evidence.identity
           : [comp.evidence.identity];
         for (const aident of identities) {
@@ -6057,6 +6058,11 @@ export function trimComponents(components) {
             existingComponent.evidence.identity.push(aident);
           }
         }
+        if (!isArray) {
+          existingComponent.evidence = {
+            identity: existingComponent.evidence.identity[0],
+          };
+        }
       }
       // If the component is required in any of the child projects, then make it required
       if (

diff --git a/types/lib/cli/index.d.ts.map b/types/lib/cli/index.d.ts.map