wip

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

Author: jkowalleck

src/serialize/json/normalize.ts

@@ -294,7 +294,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

@@ -258,7 +258,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
       ? {
@@ -376,7 +376,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),
@@ -968,11 +968,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

@@ -48,6 +48,7 @@ export interface _SpecProtocol {
   supportsExternalReferenceHashes: boolean
   supportsLicenseAcknowledgement: boolean
   supportsServices:boolean
+  supportsToolsComponentsServices:boolean
 }
 
 /**
@@ -77,6 +78,7 @@ export class _Spec implements _SpecProtocol {
   readonly #supportsExternalReferenceHashes: boolean
   readonly #supportsLicenseAcknowledgement: boolean
   readonly #supportsServices: boolean
+  readonly #supportsToolsComponentsServices:boolean
 
   constructor (
     version: Version,
@@ -98,6 +100,8 @@ export class _Spec implements _SpecProtocol {
     supportsExternalReferenceHashes: boolean,
     supportsLicenseAcknowledgement: boolean,
     supportsServices:boolean
+    supportsLicenseAcknowledgement: boolean,
+    supportsToolsComponentsServices:boolean
   ) {
     this.#version = version
     this.#formats = new Set(formats)
@@ -118,6 +122,7 @@ export class _Spec implements _SpecProtocol {
     this.#supportsExternalReferenceHashes = supportsExternalReferenceHashes
     this.#supportsLicenseAcknowledgement = supportsLicenseAcknowledgement
     this.#supportsServices = supportsServices
+    this.#supportsToolsComponentsServices=supportsToolsComponentsServices
   }
 
   get version (): Version {
@@ -202,4 +207,8 @@ export class _Spec implements _SpecProtocol {
   get supportsServices (): boolean {
     return this.#supportsServices
   }
+
+  get supportsToolsComponentsServices(): boolean {
+    return this.#supportsToolsComponentsServices
+  }
 }

src/spec/consts.ts

@@ -86,7 +86,8 @@ export const Spec1dot2: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   false,
   false,
   false,
-  true
+  true,
+  false
 ))
 
 /** Specification v1.3 */
@@ -150,7 +151,8 @@ export const Spec1dot3: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   false,
-  true
+  true,
+  false
 ))
 
 /** Specification v1.4 */
@@ -221,7 +223,8 @@ export const Spec1dot4: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   false,
-  true
+  true,
+  false
 ))
 
 /** Specification v1.5 */
@@ -321,6 +324,7 @@ export const Spec1dot5: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   false,
+  true,
   true
 ))
 
@@ -426,6 +430,7 @@ export const Spec1dot6: Readonly<_SpecProtocol> = Object.freeze(new _Spec(
   true,
   true,
   true,
+  true,
   true
 ))