wip

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

Author: jkowalleck

src/serialize/json/normalize.ts

@@ -287,7 +287,7 @@ export class ToolNormalizer extends BaseJsonNormalizer<Models.Tool> {
 
 export class ToolsNormalizer extends BaseJsonNormalizer<Models.Tools> {
   normalize(data: Models.Tools, options: NormalizerOptions): Normalized.ToolsType {
-    if (data.tools.size > 0) {
+    if (data.tools.size > 0 || !this._factory.spec.supportsToolsComponentsServices) {
       return this._factory.makeForTool().normalizeIterable(
         new ToolRepository(chainI<Models.Tool>(
           Array.from(data.components, Tool.fromComponent),

src/serialize/xml/normalize.ts

@@ -244,7 +244,7 @@ export class MetadataNormalizer extends BaseXmlNormalizer<Models.Metadata> {
         }
       : undefined
     const tools: SimpleXml.Element | undefined = data.tools.size > 0
-      ? this._factory.makeForTools().normalize(data.tools, options)
+      ? this._factory.makeForTools().normalize(data.tools, options, 'tools')
       : undefined
     const authors: SimpleXml.Element | undefined = data.authors.size > 0
       ? {
@@ -362,7 +362,7 @@ export class ToolNormalizer extends BaseXmlNormalizer<Models.Tool> {
 export class ToolsNormalizer extends BaseXmlNormalizer<Models.Tools> {
   normalize (data: Models.Tools, options: NormalizerOptions, elementName: string): SimpleXml.Element {
     let children: SimpleXml.Element[]
-    if (data.tools.size > 0) {
+    if (data.tools.size > 0 || !this._factory.spec.supportsToolsComponentsServices) {
       children = this._factory.makeForTool().normalizeIterable(
         new ToolRepository(chainI<Models.Tool>(
           Array.from(data.components, Tool.fromComponent),
@@ -885,11 +885,7 @@ export class VulnerabilityNormalizer extends BaseXmlNormalizer<Models.Vulnerabil
         }
       : undefined
     const tools: SimpleXml.Element | undefined = data.tools.size > 0
-      ? {
-          type: 'element',
-          name: 'tools',
-          children: this._factory.makeForTools().normalize(data.tools, options)
-        }
+      ? this._factory.makeForTools().normalize(data.tools, options, 'tools')
       : undefined
     const affects: SimpleXml.Element | undefined = data.affects.size > 0
       ? {

src/spec/_protocol.ts

@@ -47,6 +47,7 @@ export interface _SpecProtocol {
   supportsMetadataProperties: boolean
   supportsExternalReferenceHashes: boolean
   supportsLicenseAcknowledgement: boolean
+  supportsToolsComponentsServices:boolean
 }
 
 /**
@@ -75,6 +76,7 @@ export class _Spec implements _SpecProtocol {
   readonly #supportsMetadataProperties: boolean
   readonly #supportsExternalReferenceHashes: boolean
   readonly #supportsLicenseAcknowledgement: boolean
+  readonly #supportsToolsComponentsServices:boolean
 
   constructor (
     version: Version,
@@ -94,7 +96,8 @@ export class _Spec implements _SpecProtocol {
     supportsMetadataLicenses: boolean,
     supportsMetadataProperties: boolean,
     supportsExternalReferenceHashes: boolean,
-    supportsLicenseAcknowledgement: boolean
+    supportsLicenseAcknowledgement: boolean,
+    supportsToolsComponentsServices:boolean
   ) {
     this.#version = version
     this.#formats = new Set(formats)
@@ -114,6 +117,7 @@ export class _Spec implements _SpecProtocol {
     this.#supportsMetadataProperties = supportsMetadataProperties
     this.#supportsExternalReferenceHashes = supportsExternalReferenceHashes
     this.#supportsLicenseAcknowledgement = supportsLicenseAcknowledgement
+    this.#supportsToolsComponentsServices=supportsToolsComponentsServices
   }
 
   get version (): Version {
@@ -194,4 +198,8 @@ export class _Spec implements _SpecProtocol {
   get supportsLicenseAcknowledgement (): boolean {
     return this.#supportsLicenseAcknowledgement
   }
+
+  get supportsToolsComponentsServices(): boolean {
+    return this.#supportsToolsComponentsServices
+  }
 }

src/spec/consts.ts

@@ -85,6 +85,7 @@ export const Spec1dot2: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   false,
   false,
   false,
+  false,
   false
 ))
 
@@ -148,6 +149,7 @@ export const Spec1dot3: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   true,
+  false,
   false
 ))
 
@@ -218,6 +220,7 @@ export const Spec1dot4: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   true,
+  false,
   false
 ))
 
@@ -317,7 +320,8 @@ export const Spec1dot5: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   true,
-  false
+  false,
+  true
 ))
 
 /** Specification v1.6 */
@@ -421,6 +425,7 @@ export const Spec1dot6: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   true,
+  true,
   true
 ))