wip

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

Author: jkowalleck

cyclonedx/output/__init__.py

@@ -33,7 +33,7 @@
 if TYPE_CHECKING:  # pragma: no cover
     from ..model.bom import Bom
     from ..model.bom_ref import BomRef
-    from ..model.contact import OrganizationalEntity
+    from ..model.contact import OrganizationalContact, OrganizationalEntity
     from ..model.license import License
     from .json import Json as JsonOutputter
     from .xml import Xml as XmlOutputter
@@ -175,12 +175,18 @@ 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: Iterable['OrganizationalEntity'] = filter(lambda o: o is not None, chain(  # type:ignore[arg-type]
+        orgs: list['OrganizationalEntity'] = list(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),
             chain.from_iterable(v.credits.organizations for v in vulnerabilities if v.credits),
-        ))
+        )))
+        contacts: Iterable['OrganizationalContact'] = chain(
+            bom.metadata.authors,
+            chain.from_iterable(c.authors for c in components),
+            chain.from_iterable(v.credits.individuals for v in vulnerabilities if v.credits),
+            chain.from_iterable(o.contacts for o in orgs),
+        )
         licenses: Iterable['License'] = chain(
             bom.metadata.licenses,
             chain.from_iterable(c.licenses for c in components),
@@ -193,6 +199,7 @@ def from_bom(cls, bom: 'Bom', prefix: str = 'BomRef') -> 'BomRefDiscriminator':
                 services,
                 vulnerabilities,
                 orgs,
+                contacts,
                 (o.address for o in orgs if o.address is not None),
                 licenses,
             )),