wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/output/__init__.py

@@ -33,7 +33,8 @@
 if TYPE_CHECKING:  # pragma: no cover
     from ..model.bom import Bom
     from ..model.bom_ref import BomRef
-    from ..model.contact import OrganizationalContact, OrganizationalEntity
+    from ..model.contact import OrganizationalContact, OrganizationalEntity, PostalAddress
+    from ..model.definition import Level, Requirement, Standard
     from ..model.license import License
     from .json import Json as JsonOutputter
     from .xml import Xml as XmlOutputter
@@ -175,7 +176,7 @@ def from_bom(cls, bom: 'Bom', prefix: str = 'BomRef') -> 'BomRefDiscriminator':
         components = tuple(bom._get_all_components())
         services = tuple(bom.services)
         vulnerabilities = tuple(bom.vulnerabilities)
-        orgs: list['OrganizationalEntity'] = list(filter(lambda o: o is not None, chain(  # type:ignore[arg-type]
+        orgs: tuple['OrganizationalEntity', ...] = tuple(filter(lambda o: o is not None, chain(  # type:ignore[arg-type]
             (bom.metadata.manufacture, bom.metadata.manufacturer, bom.metadata.supplier),
             chain.from_iterable((c.manufacturer, c.supplier,) for c in components),
             (s.provider for s in services),
@@ -187,20 +188,29 @@ def from_bom(cls, bom: 'Bom', prefix: str = 'BomRef') -> 'BomRefDiscriminator':
             chain.from_iterable(v.credits.individuals for v in vulnerabilities if v.credits),
             chain.from_iterable(o.contacts for o in orgs),
         )
+        addresses: Iterable['PostalAddress'] = (o.address for o in orgs if o.address is not None)
         licenses: Iterable['License'] = chain(
             bom.metadata.licenses,
             chain.from_iterable(c.licenses for c in components),
             chain.from_iterable(c.evidence.licenses for c in components if c.evidence is not None),
             chain.from_iterable(s.licenses for s in services),
         )
+        standards: tuple['Standard', ...] = () \
+            if bom.definitions is None \
+            else tuple(bom.definitions.standards)
+        requirements: Iterable['Requirement'] = chain.from_iterable(s.requirements for s in standards)
+        levels: Iterable['Level'] = chain.from_iterable(s.levels for s in standards)
         return cls(
             (i.bom_ref for i in chain(
                 components,
                 services,
                 vulnerabilities,
                 orgs,
                 contacts,
-                (o.address for o in orgs if o.address is not None),
+                addresses,
                 licenses,
+                standards,
+                requirements,
+                levels,
             )),
             prefix)