Skip to content

Commit 277d821

Browse files
committed
Update to fix broken tests
1 parent 96880dc commit 277d821

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

dist/index.js

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ function getManifestFromSpdxFile(document, fileName) {
4343
document.packages?.forEach(pkg => {
4444
let packageName = pkg.name;
4545
let packageVersion = pkg.packageVersion;
46-
46+
let referenceLocator = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
47+
let genericPurl = `pkg:generic/${packageName}@${packageVersion}`;
4748
// SPDX 2.3 defines a purl field
48-
let purl = pkg.purl;
49-
50-
if (purl == null || purl == undefined) {
51-
purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
52-
} else if (purl == null || purl == undefined) {
53-
purl = `pkg:generic/${packageName}@${packageVersion}`;
49+
let purl;
50+
if (pkg.purl != undefined) {
51+
purl = pkg.purl;
52+
} else if (referenceLocator != undefined) {
53+
purl = referenceLocator;
54+
} else {
55+
purl = genericPurl;
5456
}
5557

5658
// Working around weird encoding issues from an SBOM generator

0 commit comments

Comments
 (0)