fix: omitting version (#138)

fix omitting version - caused by #137

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

Author: jkowalleck

HISTORY.md

@@ -7,9 +7,10 @@ All notable changes to this project will be documented in this file.
 * Added
   * CycloneDX spec version 1.4 made element `bom.component.version` optional.  
     Therefore, serialization/normalization with this spec version will no longer render this element,
-    when its value is empty. (via [#137])
+    when its value is empty. (via [#137], [#138])
 
 [#137]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/137
+[#138]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/138
 
 ## 1.0.3 - 2022-07-28
 

src/serialize/json/normalize.ts

@@ -239,12 +239,15 @@ export class OrganizationalEntityNormalizer extends Base {
 export class ComponentNormalizer extends Base {
   normalize (data: Models.Component, options: NormalizerOptions): Normalized.Component | undefined {
     const spec = this._factory.spec
+    const version: string = data.version ?? ''
     return spec.supportsComponentType(data.type)
       ? {
           type: data.type,
           name: data.name,
           group: data.group || undefined,
-          version: data.version ?? (spec.requiresComponentVersion ? '' : undefined),
+          version: version.length > 0 || spec.requiresComponentVersion
+            ? version
+            : undefined,
           'bom-ref': data.bomRef.value || undefined,
           supplier: data.supplier === undefined
             ? undefined

tests/_data/models.js

@@ -46,6 +46,7 @@ module.exports.createComplexStructure = function () {
         new Models.Tool({
           vendor: 'tool vendor',
           name: 'other tool',
+          version: '', // empty string, not undefined
           externalReferences: new Models.ExternalReferenceRepository([
             new Models.ExternalReference(
               'https://cyclonedx.org/tool-center/',
@@ -156,6 +157,7 @@ module.exports.createComplexStructure = function () {
     return component
   }(new Models.Component(Enums.ComponentType.Library, 'a-component', {
     bomRef: 'a-component',
+    version: '', // empty string - not undefined
     dependencies: new Models.BomRefRepository([
       new Models.BomRef('unknown foreign ref that should not be rendered')
     ])