fix examples

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

Author: jkowalleck

examples/node-javascript/example.cjs

@@ -40,24 +40,20 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
   new CDX.Serialize.JSON.Normalize.Factory(serializeSpec))
 const serializedJson = jsonSerializer.serialize(bom)
 console.log(serializedJson)
-try {
-  const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
-  jsonValidator.validate(serializedJson)
-} catch (err) {
+const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
+jsonValidator.validate(serializedJson).catch(err => {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
-}
+})
 
 const xmlSerializer = new CDX.Serialize.XmlSerializer(
   new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
 const serializedXML = xmlSerializer.serialize(bom)
 console.log(serializedXML)
-try {
-  const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
-  xmlValidator.validate(serializedXML)
-} catch (err) {
+const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
+xmlValidator.validate(serializedXML).catch(err => {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
-}
+})

examples/node-javascript/example.mjs

@@ -40,24 +40,24 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
   new CDX.Serialize.JSON.Normalize.Factory(serializeSpec))
 const serializedJson = jsonSerializer.serialize(bom)
 console.log(serializedJson)
+const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
 try {
-  const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
-  jsonValidator.validate(serializedJson)
+  await jsonValidator.validate(serializedJson)
 } catch (err) {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
 }
 
 const xmlSerializer = new CDX.Serialize.XmlSerializer(
   new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
 const serializedXML = xmlSerializer.serialize(bom)
 console.log(serializedXML)
+const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
 try {
-  const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
-  xmlValidator.validate(serializedXML)
+  await xmlValidator.validate(serializedXML)
 } catch (err) {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
 }

examples/node-typescript/example.cjs/src/example.ts

@@ -40,24 +40,20 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
   new CDX.Serialize.JSON.Normalize.Factory(serializeSpec))
 const serializedJson = jsonSerializer.serialize(bom)
 console.log(serializedJson)
-try {
-  const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
-  jsonValidator.validate(serializedJson)
-} catch (err) {
+const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
+jsonValidator.validate(serializedJson).catch(err => {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
-}
+})
 
 const xmlSerializer = new CDX.Serialize.XmlSerializer(
   new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
 const serializedXML = xmlSerializer.serialize(bom)
 console.log(serializedXML)
-try {
-  const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
-  xmlValidator.validate(serializedXML)
-} catch (err) {
+const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
+xmlValidator.validate(serializedXML).catch(err => {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
-}
+})

examples/node-typescript/example.mjs/src/example.ts

@@ -40,24 +40,24 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
   new CDX.Serialize.JSON.Normalize.Factory(serializeSpec))
 const serializedJson = jsonSerializer.serialize(bom)
 console.log(serializedJson)
+const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
 try {
-  const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
-  jsonValidator.validate(serializedJson)
+  await jsonValidator.validate(serializedJson)
 } catch (err) {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
 }
 
 const xmlSerializer = new CDX.Serialize.XmlSerializer(
   new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
 const serializedXML = xmlSerializer.serialize(bom)
 console.log(serializedXML)
+const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
 try {
-  const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
-  xmlValidator.validate(serializedXML)
+  await xmlValidator.validate(serializedXML)
 } catch (err) {
   if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
-    console.error('invalid SBOM', err)
+    console.error('invalid SBOM;', err)
   }
 }

src/validation/xmlValidator.node.ts

@@ -22,8 +22,8 @@ import type { Document, ParserOptions, parseXml } from 'libxmljs2'
 import { pathToFileURL } from 'url'
 
 import { FILES } from '../resources.node'
-import { MissingOptionalDependencyError, NotImplementedError, ValidationError } from './errors'
 import { BaseValidator } from './baseValidator'
+import { MissingOptionalDependencyError, NotImplementedError, ValidationError } from './errors'
 
 let _parser: typeof parseXml | undefined