Skip to content

prefix nested component's bomRef #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkowalleck merged 1 commit into from
Aug 15, 2022
Merged

prefix nested component's bomRef #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions src/builders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@ export class BomBuilder {

// region components

bom.components = this.nestComponents(
// remove rootComponent - so the elements that are nested below it are just returned.
new Map(Array.from(allComponents.entries()).filter(([, c]) => c !== rootComponent)),
this.treeBuilder.fromPaths(
new Set(allComponents.keys()),
data.path[0] === '/' ? '/' : '\\'
)
)
bom.components.forEach(c => this.adjustNestedBomRefs(c, ''))
rootComponent.components.clear()

if (this.flattenComponents) {
for (const component of allComponents.values()) {
component.properties.forEach(p => {
Expand All @@ -176,36 +187,34 @@ export class BomBuilder {
component.properties.delete(p)
}
})
component.components.clear()
if (component !== rootComponent) {
bom.components.add(component)
}
}
} else {
bom.components = this.nestComponents(
// remove rootComponent - so the elements that are nested below it are just returned.
new Map(Array.from(allComponents.entries()).filter(([, c]) => c !== rootComponent)),
this.treeBuilder.fromPaths(
new Set(allComponents.keys()),
data.path[0] === '/' ? '/' : '\\'
)
)
rootComponent.components = new Models.ComponentRepository()
}

// endregion components

return bom
}

private adjustNestedBomRefs (component: Models.Component, pref: string): void {
if (component.bomRef.value === undefined) {
return
}
component.bomRef.value = pref + component.bomRef.value
const fill = component.bomRef.value + '|'
component.components.forEach(c => this.adjustNestedBomRefs(c, fill))
}

private nestComponents (allComponents: AllComponents, tree: PTree): Models.ComponentRepository {
const children = new Models.ComponentRepository()
for (const [p, pTree] of tree) {
const component = allComponents.get(p)
const components = this.nestComponents(allComponents, pTree)
if (component === undefined) {
for (const c of components) {
children.add(c)
}
components.forEach(c => children.add(c))
} else {
component.components = components
children.add(component)
Expand Down