Skip to content

Commit 9c5df1f

Browse files
authored
chore: update examples (#692)
update examples Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 6774356 commit 9c5df1f

File tree

4 files changed

+64
-28
lines changed

4 files changed

+64
-28
lines changed

examples/node-javascript/example.cjs

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,31 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
4141
const serializedJson = jsonSerializer.serialize(bom)
4242
console.log(serializedJson)
4343
const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
44-
jsonValidator.validate(serializedJson).catch(err => {
45-
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
46-
console.error('invalid SBOM;', err)
47-
}
48-
})
44+
jsonValidator.validate(serializedJson)
45+
.then(validationErrors => {
46+
if (validationErrors !== null) {
47+
throw new Error('JSON ValidationError:\n' + JSON.stringify(validationErrors))
48+
}
49+
})
50+
.catch(err => {
51+
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
52+
throw err
53+
}
54+
})
4955

5056
const xmlSerializer = new CDX.Serialize.XmlSerializer(
5157
new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
5258
const serializedXML = xmlSerializer.serialize(bom)
5359
console.log(serializedXML)
5460
const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
55-
xmlValidator.validate(serializedXML).catch(err => {
56-
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
57-
console.error('invalid SBOM;', err)
58-
}
59-
})
61+
xmlValidator.validate(serializedXML)
62+
.then(validationErrors => {
63+
if (validationErrors !== null) {
64+
throw new Error('XML ValidationError:\n' + JSON.stringify(validationErrors))
65+
}
66+
})
67+
.catch(err => {
68+
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
69+
throw err
70+
}
71+
})

examples/node-javascript/example.mjs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ const serializedJson = jsonSerializer.serialize(bom)
4242
console.log(serializedJson)
4343
const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
4444
try {
45-
await jsonValidator.validate(serializedJson)
45+
const validationErrors = await jsonValidator.validate(serializedJson)
46+
if (validationErrors !== null) {
47+
throw new Error('ValidationError:\n' + JSON.stringify(validationErrors))
48+
}
4649
} catch (err) {
4750
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
48-
console.error('invalid SBOM;', err)
51+
throw err
4952
}
5053
}
5154

@@ -55,9 +58,12 @@ const serializedXML = xmlSerializer.serialize(bom)
5558
console.log(serializedXML)
5659
const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
5760
try {
58-
await xmlValidator.validate(serializedXML)
61+
const validationErrors = await xmlValidator.validate(serializedXML)
62+
if (validationErrors !== null) {
63+
throw new Error('ValidationError:\n' + JSON.stringify(validationErrors))
64+
}
5965
} catch (err) {
6066
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
61-
console.error('invalid SBOM;', err)
67+
throw err
6268
}
6369
}

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

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,31 @@ const jsonSerializer = new CDX.Serialize.JsonSerializer(
4141
const serializedJson = jsonSerializer.serialize(bom)
4242
console.log(serializedJson)
4343
const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
44-
jsonValidator.validate(serializedJson).catch(err => {
45-
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
46-
console.error('invalid SBOM;', err)
47-
}
48-
})
44+
jsonValidator.validate(serializedJson)
45+
.then(validationErrors => {
46+
if (validationErrors !== null) {
47+
throw new Error('JSON ValidationError:\n' + JSON.stringify(validationErrors))
48+
}
49+
})
50+
.catch(err => {
51+
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
52+
throw err
53+
}
54+
})
4955

5056
const xmlSerializer = new CDX.Serialize.XmlSerializer(
5157
new CDX.Serialize.XML.Normalize.Factory(serializeSpec))
5258
const serializedXML = xmlSerializer.serialize(bom)
5359
console.log(serializedXML)
5460
const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
55-
xmlValidator.validate(serializedXML).catch(err => {
56-
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
57-
console.error('invalid SBOM;', err)
58-
}
59-
})
61+
xmlValidator.validate(serializedXML)
62+
.then(validationErrors => {
63+
if (validationErrors !== null) {
64+
throw new Error('XML ValidationError:\n' + JSON.stringify(validationErrors))
65+
}
66+
})
67+
.catch(err => {
68+
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
69+
throw err
70+
}
71+
})

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ const serializedJson = jsonSerializer.serialize(bom)
4242
console.log(serializedJson)
4343
const jsonValidator = new CDX.Validation.JsonStrictValidator(serializeSpec.version)
4444
try {
45-
await jsonValidator.validate(serializedJson)
45+
const validationErrors = await jsonValidator.validate(serializedJson)
46+
if (validationErrors !== null) {
47+
throw new Error('ValidationError:\n' + JSON.stringify(validationErrors))
48+
}
4649
} catch (err) {
4750
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
48-
console.error('invalid SBOM;', err)
51+
throw err
4952
}
5053
}
5154

@@ -55,9 +58,12 @@ const serializedXML = xmlSerializer.serialize(bom)
5558
console.log(serializedXML)
5659
const xmlValidator = new CDX.Validation.XmlValidator(serializeSpec.version)
5760
try {
58-
await xmlValidator.validate(serializedXML)
61+
const validationErrors = await xmlValidator.validate(serializedXML)
62+
if (validationErrors !== null) {
63+
throw new Error('ValidationError:\n' + JSON.stringify(validationErrors))
64+
}
5965
} catch (err) {
6066
if (!(err instanceof CDX.Validation.MissingOptionalDependencyError)) {
61-
console.error('invalid SBOM;', err)
67+
throw err
6268
}
6369
}

0 commit comments

Comments
 (0)