feat(CSAF2.1): #287 add mandatory test 6.1.42 - refactor input schema

Author: rainer-exxcellent

csaf_2_1/mandatoryTests/mandatoryTest_6_1_42.js

@@ -3,43 +3,33 @@ import Ajv from 'ajv/dist/jtd.js'
 
 const ajv = new Ajv()
 
-const branchSchema = /** @type {const} */ ({
+const fullProductNameSchema = /** @type {const} */ ({
   additionalProperties: true,
   optionalProperties: {
-    branches: {
-      elements: {
-        additionalProperties: true,
-        properties: {},
-      },
-    },
-    product: {
+    product_identification_helper: {
       additionalProperties: true,
       optionalProperties: {
-        product_identification_helper: {
-          additionalProperties: true,
-          optionalProperties: {
-            purls: { elements: { type: 'string' } },
-          },
-        },
+        purls: { elements: { type: 'string' } },
       },
     },
   },
 })
 
-const validateBranch = ajv.compile(branchSchema)
-
-const fullProductNameSchema = /** @type {const} */ ({
+const branchSchema = /** @type {const} */ ({
   additionalProperties: true,
   optionalProperties: {
-    product_identification_helper: {
-      additionalProperties: true,
-      optionalProperties: {
-        purls: { elements: { type: 'string' } },
+    branches: {
+      elements: {
+        additionalProperties: true,
+        properties: {},
       },
     },
+    product: fullProductNameSchema,
   },
 })
 
+const validateBranch = ajv.compile(branchSchema)
+
 /*
   This is the jtd schema that needs to match the input document so that the
   test is activated. If this schema doesn't match, it normally means that the input
@@ -81,24 +71,24 @@ const validate = ajv.compile(inputSchema)
 /**
  *
  * @param {PackageURL | null} firstPurl
- * @param {PackageURL | null} secondPurl
+ * @param {PackageURL | null} otherPurl
  * @return {Array<string>} the parts of the PURLS that differ
  */
-function purlPartsThatDifferExceptQualifiers(firstPurl, secondPurl) {
+function purlPartsThatDifferExceptQualifiers(firstPurl, otherPurl) {
   /** @type {Array<string>}*/
   const partsThatDiffer = []
 
-  if (firstPurl && secondPurl) {
-    if (firstPurl.type !== secondPurl.type) {
+  if (firstPurl && otherPurl) {
+    if (firstPurl.type !== otherPurl.type) {
       partsThatDiffer.push('type')
     }
-    if (firstPurl.namespace !== secondPurl.namespace) {
+    if (firstPurl.namespace !== otherPurl.namespace) {
       partsThatDiffer.push('namespace')
     }
-    if (firstPurl.name !== secondPurl.name) {
+    if (firstPurl.name !== otherPurl.name) {
       partsThatDiffer.push('name')
     }
-    if (firstPurl.version !== secondPurl.version) {
+    if (firstPurl.version !== otherPurl.version) {
       partsThatDiffer.push('version')
     }
   }