Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/serialize/json/normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,13 @@ export class AttachmentNormalizer extends Base {

export class DependencyGraphNormalizer extends Base {
normalize (data: Models.Bom, options: NormalizerOptions): Normalized.Dependency[] | undefined {
if (!data.metadata.component?.bomRef.value) {
// the graph is missing the entry point -> omit the graph
return undefined
}

const allRefs = new Map<Models.BomRef, Models.BomRefRepository>()
if (data.metadata.component !== undefined) {
allRefs.set(data.metadata.component.bomRef, data.metadata.component.dependencies)
}
for (const c of data.components) {
allRefs.set(c.bomRef, new Models.BomRefRepository(c.dependencies))
}
allRefs.set(data.metadata.component.bomRef, data.metadata.component.dependencies)

const normalized: Normalized.Dependency[] = []
for (const [ref, deps] of allRefs) {
Expand Down
9 changes: 3 additions & 6 deletions src/serialize/xml/normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -501,16 +501,13 @@ export class AttachmentNormalizer extends Base {

export class DependencyGraphNormalizer extends Base {
normalize (data: Models.Bom, options: NormalizerOptions, elementName: string): SimpleXml.Element | undefined {
if (!data.metadata.component?.bomRef.value) {
// the graph is missing the entry point -> omit the graph
return undefined
}

const allRefs = new Map<Models.BomRef, Models.BomRefRepository>()
if (data.metadata.component !== undefined) {
allRefs.set(data.metadata.component.bomRef, data.metadata.component.dependencies)
}
for (const c of data.components) {
allRefs.set(c.bomRef, new Models.BomRefRepository(c.dependencies))
}
allRefs.set(data.metadata.component.bomRef, data.metadata.component.dependencies)

const normalized: Array<(SimpleXml.Element & { attributes: { ref: string } })> = []
for (const [ref, deps] of allRefs) {
Expand Down
184 changes: 0 additions & 184 deletions tests/_data/normalizeResults/json_complex_spec1.2.json

This file was deleted.

Loading