fix: tools' services/components omit empty

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

Author: jkowalleck

src/serialize/json/normalize.ts

@@ -302,8 +302,12 @@ export class ToolsNormalizer extends BaseJsonNormalizer<Models.Tools> {
         )), options)
     }
     return {
-      components: this._factory.makeForComponent().normalizeIterable(data.components, options),
-      services: this._factory.makeForService().normalizeIterable(data.services, options)
+      components: data.components.size > 0
+        ? this._factory.makeForComponent().normalizeIterable(data.components, options)
+        : undefined,
+      services: data.services.size > 0
+        ? this._factory.makeForService().normalizeIterable(data.services, options)
+        : undefined
     }
   }
 }

src/serialize/json/types.ts

@@ -120,8 +120,8 @@ export namespace Normalized {
 
   /** since CDX 1.5 */
   export interface Tools {
-    components: Component[]
-    services: Service[]
+    components?: Component[]
+    services?: Service[]
   }
 
   export type ToolsType = Tools | Tool[]

src/serialize/xml/normalize.ts

@@ -389,7 +389,7 @@ export class ToolsNormalizer extends BaseXmlNormalizer<Models.Tools> {
           children: this._factory.makeForComponent().normalizeIterable(data.components, options, 'component')
         })
       }
-      if (data.components.size > 0) {
+      if (data.services.size > 0) {
         children.push({
           type: 'element',
           name: 'services',