From da5b85a233a325318b2626bb439b2c08c1b68b65 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Fri, 21 Apr 2023 13:10:33 +0200 Subject: [PATCH 01/23] bump lib to rc0 Signed-off-by: Jan Kowalleck --- package-lock.json | 1162 ++++++++++++++++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 1097 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ed7336b3..cb9337330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.13.0", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.0", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.13.3.tgz", - "integrity": "sha512-L3i4OWc5pUbmds7dy4jdrHmVQ2qwiqdNrh62g1OpDtBxOUMbMhlGtNTK8htJOvrAeyj7oBxghpOCjHgAMpdtYQ==", + "version": "1.14.0-rc.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.0.tgz", + "integrity": "sha512-kyUQVBj7F7SRUsOVyk5UoDqCl6LYdANsOfiZ2KExU1IjNnZETcirmfQxasVcz8wVvyXsBARi40xk/fHXn5MYNg==", "funding": [ { "type": "github", @@ -681,9 +681,35 @@ "node": ">=14.0.0" }, "optionalDependencies": { + "ajv": "^8.12.0", + "ajv-formats": "^2.1.1", + "ajv-formats-draft2019": "^1.6.1", + "libxmljs2": "^0.31.0", "xmlbuilder2": "^3.0.2" } }, + "node_modules/@cyclonedx/cyclonedx-library/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@cyclonedx/cyclonedx-library/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "optional": true + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -1207,6 +1233,26 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1634,6 +1680,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "optional": true + }, "node_modules/acorn": { "version": "8.8.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", @@ -1655,11 +1707,23 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, + "devOptional": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1671,6 +1735,60 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "optional": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats-draft2019": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/ajv-formats-draft2019/-/ajv-formats-draft2019-1.6.1.tgz", + "integrity": "sha512-JQPvavpkWDvIsBp2Z33UkYCtXCSpW4HD3tAZ+oL4iEFOk9obQZffx0yANwECt6vzr6ET+7HN5czRyqXbnq/u0Q==", + "optional": true, + "dependencies": { + "punycode": "^2.1.1", + "schemes": "^1.4.0", + "smtp-address-parser": "^1.0.3", + "uri-js": "^4.4.1" + }, + "peerDependencies": { + "ajv": "*" + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "optional": true + }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -1702,7 +1820,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, + "devOptional": true, "engines": { "node": ">=8" } @@ -1735,6 +1853,25 @@ "node": ">= 8" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "optional": true + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "optional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -1928,13 +2065,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "devOptional": true + }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, + "devOptional": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2081,6 +2227,15 @@ "node": ">=10" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "optional": true, + "engines": { + "node": ">=10" + } + }, "node_modules/ci-info": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", @@ -2150,6 +2305,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "optional": true, + "bin": { + "color-support": "bin.js" + } + }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -2162,7 +2326,13 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "devOptional": true + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "optional": true }, "node_modules/convert-source-map": { "version": "2.0.0", @@ -2188,7 +2358,7 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, + "devOptional": true, "dependencies": { "ms": "2.1.2" }, @@ -2238,6 +2408,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "optional": true + }, + "node_modules/detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "optional": true, + "engines": { + "node": ">=8" + } + }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -2268,6 +2453,12 @@ "node": ">=8" } }, + "node_modules/discontinuous-range": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", + "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==", + "optional": true + }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -2302,7 +2493,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "devOptional": true }, "node_modules/error-ex": { "version": "1.3.2", @@ -2958,11 +3149,17 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "optional": true + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "devOptional": true }, "node_modules/fast-glob": { "version": "3.2.12", @@ -2996,7 +3193,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "devOptional": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", @@ -3034,6 +3231,12 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -3090,11 +3293,35 @@ "is-callable": "^1.1.3" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "devOptional": true }, "node_modules/fsevents": { "version": "2.3.2", @@ -3142,6 +3369,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "optional": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -3215,7 +3462,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, + "devOptional": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3397,6 +3644,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "optional": true + }, "node_modules/hosted-git-info": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", @@ -3422,6 +3675,19 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -3488,7 +3754,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, + "devOptional": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3498,7 +3764,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "devOptional": true }, "node_modules/internal-slot": { "version": "1.0.5", @@ -3613,7 +3879,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, + "devOptional": true, "engines": { "node": ">=8" } @@ -4495,7 +4761,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "devOptional": true }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -4546,6 +4812,21 @@ "node": ">= 0.8.0" } }, + "node_modules/libxmljs2": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.31.0.tgz", + "integrity": "sha512-+o8y4lhmmf7zUA67watbLcAcxE0lkBkuatoIwgFkWTmuFTPEOZKunNpSjW6V7ONzAj8Ey1qVeR12q1JMU/sTlQ==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.10", + "bindings": "~1.5.0", + "nan": "~2.17.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -4625,7 +4906,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, + "devOptional": true, "dependencies": { "semver": "^6.0.0" }, @@ -4640,7 +4921,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, + "devOptional": true, "bin": { "semver": "bin/semver.js" } @@ -4704,7 +4985,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, + "devOptional": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4722,11 +5003,45 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "optional": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, + "devOptional": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -4734,11 +5049,23 @@ "node": ">=10" } }, + "node_modules/moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", + "optional": true + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "devOptional": true + }, + "node_modules/nan": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "optional": true }, "node_modules/natural-compare": { "version": "1.4.0", @@ -4753,12 +5080,60 @@ "dev": true, "peer": true }, + "node_modules/nearley": { + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", + "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==", + "optional": true, + "dependencies": { + "commander": "^2.19.0", + "moo": "^0.5.0", + "railroad-diagrams": "^1.0.0", + "randexp": "0.4.6" + }, + "bin": { + "nearley-railroad": "bin/nearley-railroad.js", + "nearley-test": "bin/nearley-test.js", + "nearley-unparse": "bin/nearley-unparse.js", + "nearleyc": "bin/nearleyc.js" + }, + "funding": { + "type": "individual", + "url": "https://nearley.js.org/#give-to-nearley" + } + }, + "node_modules/nearley/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "optional": true + }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "node_modules/node-fetch": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "optional": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -4771,6 +5146,21 @@ "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", "dev": true }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "optional": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/normalize-package-data": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", @@ -4969,6 +5359,27 @@ "node": ">=8" } }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "optional": true, + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -5027,7 +5438,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, + "devOptional": true, "dependencies": { "wrappy": "1" } @@ -5151,7 +5562,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, + "devOptional": true, "engines": { "node": ">=0.10.0" } @@ -5344,7 +5755,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true, + "devOptional": true, "engines": { "node": ">=6" } @@ -5385,6 +5796,25 @@ } ] }, + "node_modules/railroad-diagrams": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", + "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==", + "optional": true + }, + "node_modules/randexp": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", + "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", + "optional": true, + "dependencies": { + "discontinuous-range": "1.0.0", + "ret": "~0.1.10" + }, + "engines": { + "node": ">=0.12" + } + }, "node_modules/react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", @@ -5444,6 +5874,20 @@ "semver": "bin/semver" } }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/regexp.prototype.flags": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", @@ -5483,6 +5927,15 @@ "node": ">=0.10.0" } }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/resolve": { "version": "1.22.3", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz", @@ -5539,6 +5992,15 @@ "node": ">=10" } }, + "node_modules/ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "optional": true, + "engines": { + "node": ">=0.12" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -5553,7 +6015,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, + "devOptional": true, "dependencies": { "glob": "^7.1.3" }, @@ -5587,6 +6049,26 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, "node_modules/safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -5601,6 +6083,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/schemes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/schemes/-/schemes-1.4.0.tgz", + "integrity": "sha512-ImFy9FbCsQlVgnE3TCWmLPCFnVzx0lHL/l+umHplDqAKd0dzFpnS6lFZIpagBlYhKwzVmlV36ec0Y1XTu8JBAQ==", + "optional": true, + "dependencies": { + "extend": "^3.0.0" + } + }, "node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -5615,6 +6106,12 @@ "node": ">=10" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "optional": true + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -5663,7 +6160,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "devOptional": true }, "node_modules/sisteransi": { "version": "1.0.5", @@ -5680,6 +6177,18 @@ "node": ">=8" } }, + "node_modules/smtp-address-parser": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/smtp-address-parser/-/smtp-address-parser-1.0.10.tgz", + "integrity": "sha512-Osg9LmvGeAG/hyao4mldbflLOkkr3a+h4m1lwKCK5U8M6ZAr7tdXEz/+/vr752TSGE4MNUlUl9cIK2cB8cgzXg==", + "optional": true, + "dependencies": { + "nearley": "^2.20.1" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -5753,6 +6262,15 @@ "node": ">=8" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "optional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-length": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", @@ -5770,7 +6288,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, + "devOptional": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5846,7 +6364,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, + "devOptional": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5908,6 +6426,23 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tar": { + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", + "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "optional": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^4.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -5955,6 +6490,12 @@ "node": ">=8.0" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "optional": true + }, "node_modules/tsconfig-paths": { "version": "3.14.2", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", @@ -6121,11 +6662,17 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, + "devOptional": true, "dependencies": { "punycode": "^2.1.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "optional": true + }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -6173,6 +6720,22 @@ "makeerror": "1.0.12" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "optional": true + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "optional": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -6224,6 +6787,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "optional": true, + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -6254,7 +6826,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "devOptional": true }, "node_modules/write-file-atomic": { "version": "4.0.2", @@ -6834,12 +7406,36 @@ "dev": true }, "@cyclonedx/cyclonedx-library": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.13.3.tgz", - "integrity": "sha512-L3i4OWc5pUbmds7dy4jdrHmVQ2qwiqdNrh62g1OpDtBxOUMbMhlGtNTK8htJOvrAeyj7oBxghpOCjHgAMpdtYQ==", - "requires": { + "version": "1.14.0-rc.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.0.tgz", + "integrity": "sha512-kyUQVBj7F7SRUsOVyk5UoDqCl6LYdANsOfiZ2KExU1IjNnZETcirmfQxasVcz8wVvyXsBARi40xk/fHXn5MYNg==", + "requires": { + "ajv": "^8.12.0", + "ajv-formats": "^2.1.1", + "ajv-formats-draft2019": "^1.6.1", + "libxmljs2": "^0.31.0", "packageurl-js": ">=0.0.6 <0.0.8 || ^1", "xmlbuilder2": "^3.0.2" + }, + "dependencies": { + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "optional": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "optional": true + } } }, "@eslint-community/eslint-utils": { @@ -7245,6 +7841,23 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "optional": true, + "requires": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -7562,6 +8175,12 @@ "eslint-visitor-keys": "^3.3.0" } }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "optional": true + }, "acorn": { "version": "8.8.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", @@ -7575,11 +8194,20 @@ "dev": true, "requires": {} }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "optional": true, + "requires": { + "debug": "4" + } + }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, + "devOptional": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -7587,6 +8215,47 @@ "uri-js": "^4.2.2" } }, + "ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "optional": true, + "requires": { + "ajv": "^8.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "optional": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "optional": true + } + } + }, + "ajv-formats-draft2019": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/ajv-formats-draft2019/-/ajv-formats-draft2019-1.6.1.tgz", + "integrity": "sha512-JQPvavpkWDvIsBp2Z33UkYCtXCSpW4HD3tAZ+oL4iEFOk9obQZffx0yANwECt6vzr6ET+7HN5czRyqXbnq/u0Q==", + "optional": true, + "requires": { + "punycode": "^2.1.1", + "schemes": "^1.4.0", + "smtp-address-parser": "^1.0.3", + "uri-js": "^4.4.1" + } + }, "ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -7608,7 +8277,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "devOptional": true }, "ansi-styles": { "version": "4.3.0", @@ -7629,6 +8298,22 @@ "picomatch": "^2.0.4" } }, + "aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "optional": true + }, + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -7771,13 +8456,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "devOptional": true + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, + "devOptional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7873,6 +8567,12 @@ "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "dev": true }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "optional": true + }, "ci-info": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", @@ -7923,6 +8623,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "optional": true + }, "commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -7932,7 +8638,13 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "devOptional": true + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "optional": true }, "convert-source-map": { "version": "2.0.0", @@ -7955,7 +8667,7 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, + "devOptional": true, "requires": { "ms": "2.1.2" } @@ -7988,6 +8700,18 @@ "object-keys": "^1.1.1" } }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "optional": true + }, + "detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "optional": true + }, "detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -8009,6 +8733,12 @@ "path-type": "^4.0.0" } }, + "discontinuous-range": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", + "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==", + "optional": true + }, "doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -8034,7 +8764,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "devOptional": true }, "error-ex": { "version": "1.3.2", @@ -8517,11 +9247,17 @@ "jest-util": "^29.5.0" } }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "optional": true + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "devOptional": true }, "fast-glob": { "version": "3.2.12", @@ -8551,7 +9287,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "devOptional": true }, "fast-levenshtein": { "version": "2.0.6", @@ -8586,6 +9322,12 @@ "flat-cache": "^3.0.4" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8630,11 +9372,31 @@ "is-callable": "^1.1.3" } }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "optional": true, + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "optional": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "devOptional": true }, "fsevents": { "version": "2.3.2", @@ -8666,6 +9428,23 @@ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true }, + "gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "optional": true, + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -8715,7 +9494,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, + "devOptional": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8837,6 +9616,12 @@ "has-symbols": "^1.0.2" } }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "optional": true + }, "hosted-git-info": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", @@ -8858,6 +9643,16 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "optional": true, + "requires": { + "agent-base": "6", + "debug": "4" + } + }, "human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -8900,7 +9695,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, + "devOptional": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -8910,7 +9705,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "devOptional": true }, "internal-slot": { "version": "1.0.5", @@ -8992,7 +9787,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "devOptional": true }, "is-generator-fn": { "version": "2.1.0", @@ -9650,7 +10445,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "devOptional": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -9686,6 +10481,17 @@ "type-check": "~0.4.0" } }, + "libxmljs2": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.31.0.tgz", + "integrity": "sha512-+o8y4lhmmf7zUA67watbLcAcxE0lkBkuatoIwgFkWTmuFTPEOZKunNpSjW6V7ONzAj8Ey1qVeR12q1JMU/sTlQ==", + "optional": true, + "requires": { + "@mapbox/node-pre-gyp": "^1.0.10", + "bindings": "~1.5.0", + "nan": "~2.17.0" + } + }, "lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -9749,7 +10555,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, + "devOptional": true, "requires": { "semver": "^6.0.0" }, @@ -9758,7 +10564,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "devOptional": true } } }, @@ -9809,7 +10615,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, + "devOptional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9821,17 +10627,56 @@ "dev": true, "peer": true }, + "minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "optional": true + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "optional": true, + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "optional": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true + "devOptional": true + }, + "moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", + "optional": true }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "devOptional": true + }, + "nan": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "optional": true }, "natural-compare": { "version": "1.4.0", @@ -9846,12 +10691,41 @@ "dev": true, "peer": true }, + "nearley": { + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", + "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==", + "optional": true, + "requires": { + "commander": "^2.19.0", + "moo": "^0.5.0", + "railroad-diagrams": "^1.0.0", + "randexp": "0.4.6" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "optional": true + } + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "node-fetch": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "optional": true, + "requires": { + "whatwg-url": "^5.0.0" + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -9864,6 +10738,15 @@ "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", "dev": true }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "optional": true, + "requires": { + "abbrev": "1" + } + }, "normalize-package-data": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", @@ -10014,6 +10897,24 @@ "path-key": "^3.0.0" } }, + "npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "optional": true, + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "optional": true + }, "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", @@ -10054,7 +10955,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, + "devOptional": true, "requires": { "wrappy": "1" } @@ -10142,7 +11043,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true + "devOptional": true }, "path-key": { "version": "3.1.1", @@ -10279,7 +11180,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true + "devOptional": true }, "pure-rand": { "version": "6.0.1", @@ -10293,6 +11194,22 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, + "railroad-diagrams": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", + "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==", + "optional": true + }, + "randexp": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", + "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", + "optional": true, + "requires": { + "discontinuous-range": "1.0.0", + "ret": "~0.1.10" + } + }, "react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", @@ -10345,6 +11262,17 @@ } } }, + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "optional": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "regexp.prototype.flags": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", @@ -10369,6 +11297,12 @@ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "optional": true + }, "resolve": { "version": "1.22.3", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz", @@ -10409,6 +11343,12 @@ "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "optional": true + }, "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -10419,7 +11359,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, + "devOptional": true, "requires": { "glob": "^7.1.3" } @@ -10433,6 +11373,12 @@ "queue-microtask": "^1.2.2" } }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "optional": true + }, "safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -10444,6 +11390,15 @@ "is-regex": "^1.1.4" } }, + "schemes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/schemes/-/schemes-1.4.0.tgz", + "integrity": "sha512-ImFy9FbCsQlVgnE3TCWmLPCFnVzx0lHL/l+umHplDqAKd0dzFpnS6lFZIpagBlYhKwzVmlV36ec0Y1XTu8JBAQ==", + "optional": true, + "requires": { + "extend": "^3.0.0" + } + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -10452,6 +11407,12 @@ "lru-cache": "^6.0.0" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "optional": true + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -10488,7 +11449,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "devOptional": true }, "sisteransi": { "version": "1.0.5", @@ -10502,6 +11463,15 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, + "smtp-address-parser": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/smtp-address-parser/-/smtp-address-parser-1.0.10.tgz", + "integrity": "sha512-Osg9LmvGeAG/hyao4mldbflLOkkr3a+h4m1lwKCK5U8M6ZAr7tdXEz/+/vr752TSGE4MNUlUl9cIK2cB8cgzXg==", + "optional": true, + "requires": { + "nearley": "^2.20.1" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -10568,6 +11538,15 @@ } } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + } + }, "string-length": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", @@ -10582,7 +11561,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, + "devOptional": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10637,7 +11616,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, + "devOptional": true, "requires": { "ansi-regex": "^5.0.1" } @@ -10675,6 +11654,20 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, + "tar": { + "version": "6.1.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", + "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "optional": true, + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^4.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -10713,6 +11706,12 @@ "is-number": "^7.0.0" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "optional": true + }, "tsconfig-paths": { "version": "3.14.2", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", @@ -10824,11 +11823,17 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, + "devOptional": true, "requires": { "punycode": "^2.1.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "optional": true + }, "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -10872,6 +11877,22 @@ "makeerror": "1.0.12" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "optional": true + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "optional": true, + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -10908,6 +11929,15 @@ "is-typed-array": "^1.1.10" } }, + "wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -10929,7 +11959,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "devOptional": true }, "write-file-atomic": { "version": "4.0.2", diff --git a/package.json b/package.json index f849b78a9..ab2b3586c 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.13.0", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.0", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" From 98598f06449ad3a11d4a28d53c834d28d133f0eb Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Fri, 21 Apr 2023 14:05:28 +0200 Subject: [PATCH 02/23] have validator running Signed-off-by: Jan Kowalleck --- src/cli.ts | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index f9a48cffc..be890e526 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -17,7 +17,7 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) OWASP Foundation. All Rights Reserved. */ -import { Builders, Enums, Factories, Serialize, Spec } from '@cyclonedx/cyclonedx-library' +import { Builders, Enums, Factories, Serialize, Spec, Validation } from '@cyclonedx/cyclonedx-library' import { Argument, Command, Option } from 'commander' import { existsSync, openSync, writeSync } from 'fs' import { dirname, resolve } from 'path' @@ -47,6 +47,7 @@ interface CommandOptions { outputReproducible: boolean outputFormat: OutputFormat outputFile: string + noValidate: boolean mcType: Enums.ComponentType } @@ -137,6 +138,11 @@ function makeCommand (process: NodeJS.Process): Command { OutputStdOut, 'write to STDOUT' ) + ).addOption( + new Option( + '--no-validate', + 'Disable validation of resulting output.' + ).default(false) ).addOption( new Option( '--mc-type ', @@ -168,7 +174,7 @@ function makeCommand (process: NodeJS.Process): Command { ) } -export function run (process: NodeJS.Process): void { +export async function run (process: NodeJS.Process): Promise { process.title = 'cyclonedx-node-npm' // all output shall be bound to stdError - stdOut is for result output only @@ -232,24 +238,49 @@ export function run (process: NodeJS.Process): void { } let serializer: Serialize.Types.Serializer + let validator: Validation.Validator switch (options.outputFormat) { case OutputFormat.XML: serializer = new Serialize.XmlSerializer(new Serialize.XML.Normalize.Factory(spec)) + validator = new Validation.XmlValidator(spec.version) break case OutputFormat.JSON: serializer = new Serialize.JsonSerializer(new Serialize.JSON.Normalize.Factory(spec)) + validator = new Validation.JsonValidator(spec.version) break } + myConsole.log('LOG | serialize BOM') + const serialized = serializer.serialize(bom, { + sortLists: options.outputReproducible, + space: 2 + }) + + if (!options.noValidate) { + myConsole.log('LOG | try validate BOM result ...') + try { + await validator.validate(serialized) + } catch (err) { + if (err instanceof Validation.MissingOptionalDependencyError) { + myConsole.warn('WARN | skipped validate BOM result:', err.message) + } else { + if (err instanceof Validation.ValidationError) { + myConsole.error('ERROR | BOM result invalid:', err.message) + myConsole.info('INFO | BOM result invalid. details: ', err.details) + } else { + myConsole.error('ERROR | unexpected error') + } + throw err + } + } + } + // TODO use instead ? : https://www.npmjs.com/package/debug ? myConsole.log('LOG | writing BOM to', options.outputFile) writeSync( options.outputFile === OutputStdOut ? process.stdout.fd : openSync(resolve(process.cwd(), options.outputFile), 'w'), - serializer.serialize(bom, { - sortLists: options.outputReproducible, - space: 2 - }) + serialized ) } From f3bf2832d5563fac827bc089dedbdcc90500f4ab Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:21:20 +0200 Subject: [PATCH 03/23] tests Signed-off-by: Jan Kowalleck --- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- demo/gen-boms.sh | 2 +- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- .../example-results/bare/bom.1.2.json | 4 +- .../example-results/bare/bom.1.2.xml | 4 +- .../example-results/bare/bom.1.3.json | 4 +- .../example-results/bare/bom.1.3.xml | 4 +- .../example-results/bare/bom.1.4.json | 4 +- .../example-results/bare/bom.1.4.xml | 4 +- .../example-results/flat/bom.1.2.json | 4 +- .../example-results/flat/bom.1.2.xml | 4 +- .../example-results/flat/bom.1.3.json | 4 +- .../example-results/flat/bom.1.3.xml | 4 +- .../example-results/flat/bom.1.4.json | 4 +- .../example-results/flat/bom.1.4.xml | 4 +- package-lock.json | 14 +++--- package.json | 2 +- tests/integration/synthetics/cli.run.test.js | 50 +++++++++---------- 76 files changed, 178 insertions(+), 178 deletions(-) diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.2.json b/demo/bundled-dependencies/example-results/bare/bom.1.2.json index 1aea1e488..f4679af47 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.2.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.2.xml b/demo/bundled-dependencies/example-results/bare/bom.1.2.xml index 124ac71cf..ade1c27fb 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.3.json b/demo/bundled-dependencies/example-results/bare/bom.1.3.json index 8596fd524..35a32f56d 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.3.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.3.xml b/demo/bundled-dependencies/example-results/bare/bom.1.3.xml index 0a89df7a0..27e991fe1 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.4.json b/demo/bundled-dependencies/example-results/bare/bom.1.4.json index 5e01b7187..61a397915 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.4.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.4.xml b/demo/bundled-dependencies/example-results/bare/bom.1.4.xml index 8918bae21..cb86b9ed0 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.2.json b/demo/bundled-dependencies/example-results/flat/bom.1.2.json index 4a1446667..bcc07192b 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.2.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.2.xml b/demo/bundled-dependencies/example-results/flat/bom.1.2.xml index bc940ad94..bc4f46251 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.3.json b/demo/bundled-dependencies/example-results/flat/bom.1.3.json index acd4bd498..5f34c0d1e 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.3.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.3.xml b/demo/bundled-dependencies/example-results/flat/bom.1.3.xml index 667a3b1ff..8967ae0ed 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.4.json b/demo/bundled-dependencies/example-results/flat/bom.1.4.json index 5adad1849..c3f098e26 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.4.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.4.xml b/demo/bundled-dependencies/example-results/flat/bom.1.4.xml index 3029a35ef..28c9bec80 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/dev-dependencies/example-results/bare/bom.1.2.json b/demo/dev-dependencies/example-results/bare/bom.1.2.json index d5c385ab3..a09c2a844 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.2.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/dev-dependencies/example-results/bare/bom.1.2.xml b/demo/dev-dependencies/example-results/bare/bom.1.2.xml index 19e13779b..b3a027523 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/dev-dependencies/example-results/bare/bom.1.3.json b/demo/dev-dependencies/example-results/bare/bom.1.3.json index ce13168c3..5a39a2656 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.3.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/dev-dependencies/example-results/bare/bom.1.3.xml b/demo/dev-dependencies/example-results/bare/bom.1.3.xml index 5f84801fe..7515f5848 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/dev-dependencies/example-results/bare/bom.1.4.json b/demo/dev-dependencies/example-results/bare/bom.1.4.json index 9a6216876..8cc3c9dec 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.4.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/dev-dependencies/example-results/bare/bom.1.4.xml b/demo/dev-dependencies/example-results/bare/bom.1.4.xml index 58794038b..bfd030dbc 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/dev-dependencies/example-results/flat/bom.1.2.json b/demo/dev-dependencies/example-results/flat/bom.1.2.json index d5c385ab3..a09c2a844 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.2.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/dev-dependencies/example-results/flat/bom.1.2.xml b/demo/dev-dependencies/example-results/flat/bom.1.2.xml index 19e13779b..b3a027523 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/dev-dependencies/example-results/flat/bom.1.3.json b/demo/dev-dependencies/example-results/flat/bom.1.3.json index ce13168c3..5a39a2656 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.3.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/dev-dependencies/example-results/flat/bom.1.3.xml b/demo/dev-dependencies/example-results/flat/bom.1.3.xml index 5f84801fe..7515f5848 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/dev-dependencies/example-results/flat/bom.1.4.json b/demo/dev-dependencies/example-results/flat/bom.1.4.json index 9a6216876..8cc3c9dec 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.4.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/dev-dependencies/example-results/flat/bom.1.4.xml b/demo/dev-dependencies/example-results/flat/bom.1.4.xml index 58794038b..bfd030dbc 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/gen-boms.sh b/demo/gen-boms.sh index cb5f8c73f..008da7f77 100755 --- a/demo/gen-boms.sh +++ b/demo/gen-boms.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -e +set -ex ## purpose: generate example results from the demos diff --git a/demo/juice-shop/example-results/bare/bom.1.2.json b/demo/juice-shop/example-results/bare/bom.1.2.json index 7c0b0fa9d..f8086a9fa 100644 --- a/demo/juice-shop/example-results/bare/bom.1.2.json +++ b/demo/juice-shop/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/juice-shop/example-results/bare/bom.1.2.xml b/demo/juice-shop/example-results/bare/bom.1.2.xml index 29027318d..5660d3701 100644 --- a/demo/juice-shop/example-results/bare/bom.1.2.xml +++ b/demo/juice-shop/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/juice-shop/example-results/bare/bom.1.3.json b/demo/juice-shop/example-results/bare/bom.1.3.json index 17e64022d..0e183c71c 100644 --- a/demo/juice-shop/example-results/bare/bom.1.3.json +++ b/demo/juice-shop/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/juice-shop/example-results/bare/bom.1.3.xml b/demo/juice-shop/example-results/bare/bom.1.3.xml index 409b921bd..0c8abc4b1 100644 --- a/demo/juice-shop/example-results/bare/bom.1.3.xml +++ b/demo/juice-shop/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/juice-shop/example-results/bare/bom.1.4.json b/demo/juice-shop/example-results/bare/bom.1.4.json index 45823d5b1..165aefa3e 100644 --- a/demo/juice-shop/example-results/bare/bom.1.4.json +++ b/demo/juice-shop/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/juice-shop/example-results/bare/bom.1.4.xml b/demo/juice-shop/example-results/bare/bom.1.4.xml index ea85931a6..9f9428015 100644 --- a/demo/juice-shop/example-results/bare/bom.1.4.xml +++ b/demo/juice-shop/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/juice-shop/example-results/flat/bom.1.2.json b/demo/juice-shop/example-results/flat/bom.1.2.json index 24c8b7a15..cbbfb877b 100644 --- a/demo/juice-shop/example-results/flat/bom.1.2.json +++ b/demo/juice-shop/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/juice-shop/example-results/flat/bom.1.2.xml b/demo/juice-shop/example-results/flat/bom.1.2.xml index d441fb478..dc16c20cd 100644 --- a/demo/juice-shop/example-results/flat/bom.1.2.xml +++ b/demo/juice-shop/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/juice-shop/example-results/flat/bom.1.3.json b/demo/juice-shop/example-results/flat/bom.1.3.json index 7e01b4e2f..373fc854f 100644 --- a/demo/juice-shop/example-results/flat/bom.1.3.json +++ b/demo/juice-shop/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/juice-shop/example-results/flat/bom.1.3.xml b/demo/juice-shop/example-results/flat/bom.1.3.xml index fadfc219c..d50219da0 100644 --- a/demo/juice-shop/example-results/flat/bom.1.3.xml +++ b/demo/juice-shop/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/juice-shop/example-results/flat/bom.1.4.json b/demo/juice-shop/example-results/flat/bom.1.4.json index 6dc92eac0..dafdf0c4a 100644 --- a/demo/juice-shop/example-results/flat/bom.1.4.json +++ b/demo/juice-shop/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/juice-shop/example-results/flat/bom.1.4.xml b/demo/juice-shop/example-results/flat/bom.1.4.xml index 40f5a6570..b288ba44c 100644 --- a/demo/juice-shop/example-results/flat/bom.1.4.xml +++ b/demo/juice-shop/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/local-dependencies/example-results/bare/bom.1.2.json b/demo/local-dependencies/example-results/bare/bom.1.2.json index 7498bb4ca..092e0b6a0 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.2.json +++ b/demo/local-dependencies/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-dependencies/example-results/bare/bom.1.2.xml b/demo/local-dependencies/example-results/bare/bom.1.2.xml index d02c6e26a..52fd06653 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-dependencies/example-results/bare/bom.1.3.json b/demo/local-dependencies/example-results/bare/bom.1.3.json index 15455ff7f..af5b4a4de 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.3.json +++ b/demo/local-dependencies/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-dependencies/example-results/bare/bom.1.3.xml b/demo/local-dependencies/example-results/bare/bom.1.3.xml index cef1a9da1..39053f4e1 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-dependencies/example-results/bare/bom.1.4.json b/demo/local-dependencies/example-results/bare/bom.1.4.json index 51946b582..64040b98f 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.4.json +++ b/demo/local-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/local-dependencies/example-results/bare/bom.1.4.xml b/demo/local-dependencies/example-results/bare/bom.1.4.xml index dbbbe4287..2174479cc 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/local-dependencies/example-results/flat/bom.1.2.json b/demo/local-dependencies/example-results/flat/bom.1.2.json index 7498bb4ca..092e0b6a0 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.2.json +++ b/demo/local-dependencies/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-dependencies/example-results/flat/bom.1.2.xml b/demo/local-dependencies/example-results/flat/bom.1.2.xml index d02c6e26a..52fd06653 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-dependencies/example-results/flat/bom.1.3.json b/demo/local-dependencies/example-results/flat/bom.1.3.json index 15455ff7f..af5b4a4de 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.3.json +++ b/demo/local-dependencies/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-dependencies/example-results/flat/bom.1.3.xml b/demo/local-dependencies/example-results/flat/bom.1.3.xml index cef1a9da1..39053f4e1 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-dependencies/example-results/flat/bom.1.4.json b/demo/local-dependencies/example-results/flat/bom.1.4.json index 51946b582..64040b98f 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.4.json +++ b/demo/local-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/local-dependencies/example-results/flat/bom.1.4.xml b/demo/local-dependencies/example-results/flat/bom.1.4.xml index dbbbe4287..2174479cc 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/local-workspaces/example-results/bare/bom.1.2.json b/demo/local-workspaces/example-results/bare/bom.1.2.json index ee11fbc24..5a822d75a 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.2.json +++ b/demo/local-workspaces/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-workspaces/example-results/bare/bom.1.2.xml b/demo/local-workspaces/example-results/bare/bom.1.2.xml index af2ff92fe..a0f9fb3ab 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.2.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-workspaces/example-results/bare/bom.1.3.json b/demo/local-workspaces/example-results/bare/bom.1.3.json index 07161abb1..670db5e83 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.3.json +++ b/demo/local-workspaces/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-workspaces/example-results/bare/bom.1.3.xml b/demo/local-workspaces/example-results/bare/bom.1.3.xml index 5ddd1fce0..9dccd7a29 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.3.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-workspaces/example-results/bare/bom.1.4.json b/demo/local-workspaces/example-results/bare/bom.1.4.json index f41f79890..30527c69b 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.4.json +++ b/demo/local-workspaces/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/local-workspaces/example-results/bare/bom.1.4.xml b/demo/local-workspaces/example-results/bare/bom.1.4.xml index 725366181..5af94dbc7 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.4.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/local-workspaces/example-results/flat/bom.1.2.json b/demo/local-workspaces/example-results/flat/bom.1.2.json index ee11fbc24..5a822d75a 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.2.json +++ b/demo/local-workspaces/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-workspaces/example-results/flat/bom.1.2.xml b/demo/local-workspaces/example-results/flat/bom.1.2.xml index af2ff92fe..a0f9fb3ab 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.2.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-workspaces/example-results/flat/bom.1.3.json b/demo/local-workspaces/example-results/flat/bom.1.3.json index 07161abb1..670db5e83 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.3.json +++ b/demo/local-workspaces/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/local-workspaces/example-results/flat/bom.1.3.xml b/demo/local-workspaces/example-results/flat/bom.1.3.xml index 5ddd1fce0..9dccd7a29 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.3.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/local-workspaces/example-results/flat/bom.1.4.json b/demo/local-workspaces/example-results/flat/bom.1.4.json index f41f79890..30527c69b 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.4.json +++ b/demo/local-workspaces/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/local-workspaces/example-results/flat/bom.1.4.xml b/demo/local-workspaces/example-results/flat/bom.1.4.xml index 725366181..5af94dbc7 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.4.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/package-with-build-id/example-results/bare/bom.1.2.json b/demo/package-with-build-id/example-results/bare/bom.1.2.json index c5adec136..ef5908d33 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.2.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/package-with-build-id/example-results/bare/bom.1.2.xml b/demo/package-with-build-id/example-results/bare/bom.1.2.xml index df6174732..7c7dafcfb 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.2.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/package-with-build-id/example-results/bare/bom.1.3.json b/demo/package-with-build-id/example-results/bare/bom.1.3.json index 150a95720..eae8a4fc4 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.3.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/package-with-build-id/example-results/bare/bom.1.3.xml b/demo/package-with-build-id/example-results/bare/bom.1.3.xml index 0bfa01ac5..a1ba02321 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.3.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/package-with-build-id/example-results/bare/bom.1.4.json b/demo/package-with-build-id/example-results/bare/bom.1.4.json index 608ece02d..2e9bdaa33 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.4.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/package-with-build-id/example-results/bare/bom.1.4.xml b/demo/package-with-build-id/example-results/bare/bom.1.4.xml index 4eedea6f3..2b0f4c4c3 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.4.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/demo/package-with-build-id/example-results/flat/bom.1.2.json b/demo/package-with-build-id/example-results/flat/bom.1.2.json index c5adec136..ef5908d33 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.2.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.2.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/package-with-build-id/example-results/flat/bom.1.2.xml b/demo/package-with-build-id/example-results/flat/bom.1.2.xml index df6174732..7c7dafcfb 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.2.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.2.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/package-with-build-id/example-results/flat/bom.1.3.json b/demo/package-with-build-id/example-results/flat/bom.1.3.json index 150a95720..eae8a4fc4 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.3.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.3.json @@ -8,12 +8,12 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3" + "version": "1.14.0-rc.1" }, { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2" + "version": "1.10.0" } ], "component": { diff --git a/demo/package-with-build-id/example-results/flat/bom.1.3.xml b/demo/package-with-build-id/example-results/flat/bom.1.3.xml index 0bfa01ac5..a1ba02321 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.3.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.3.xml @@ -5,12 +5,12 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 diff --git a/demo/package-with-build-id/example-results/flat/bom.1.4.json b/demo/package-with-build-id/example-results/flat/bom.1.4.json index 608ece02d..2e9bdaa33 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.4.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.13.3", + "version": "1.14.0-rc.1", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", @@ -30,7 +30,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-npm", - "version": "1.9.2", + "version": "1.10.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-node-npm/issues", diff --git a/demo/package-with-build-id/example-results/flat/bom.1.4.xml b/demo/package-with-build-id/example-results/flat/bom.1.4.xml index 4eedea6f3..2b0f4c4c3 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.4.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.13.3 + 1.14.0-rc.1 https://github.com/CycloneDX/cyclonedx-javascript-library/issues @@ -24,7 +24,7 @@ @cyclonedx cyclonedx-npm - 1.9.2 + 1.10.0 https://github.com/CycloneDX/cyclonedx-node-npm/issues diff --git a/package-lock.json b/package-lock.json index cb9337330..72c16b7c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.0", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.1", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.0.tgz", - "integrity": "sha512-kyUQVBj7F7SRUsOVyk5UoDqCl6LYdANsOfiZ2KExU1IjNnZETcirmfQxasVcz8wVvyXsBARi40xk/fHXn5MYNg==", + "version": "1.14.0-rc.1", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.1.tgz", + "integrity": "sha512-9IzUNbqYhKoGNyeWRy/3ru4Nq6ZKRONGUCaoU9bGj7Wgctts6ovFq9jdr/4bA/BCM6wSV/HYlED6dTrAk1Bt3A==", "funding": [ { "type": "github", @@ -7406,9 +7406,9 @@ "dev": true }, "@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.0", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.0.tgz", - "integrity": "sha512-kyUQVBj7F7SRUsOVyk5UoDqCl6LYdANsOfiZ2KExU1IjNnZETcirmfQxasVcz8wVvyXsBARi40xk/fHXn5MYNg==", + "version": "1.14.0-rc.1", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.1.tgz", + "integrity": "sha512-9IzUNbqYhKoGNyeWRy/3ru4Nq6ZKRONGUCaoU9bGj7Wgctts6ovFq9jdr/4bA/BCM6wSV/HYlED6dTrAk1Bt3A==", "requires": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", diff --git a/package.json b/package.json index ab2b3586c..746529747 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.0", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.1", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" diff --git a/tests/integration/synthetics/cli.run.test.js b/tests/integration/synthetics/cli.run.test.js index be24cd3f3..b93df3783 100644 --- a/tests/integration/synthetics/cli.run.test.js +++ b/tests/integration/synthetics/cli.run.test.js @@ -53,7 +53,7 @@ describe('cli.run()', () => { test.each([ ['no-lockfile', /missing evidence/i], ['no-manifest', /missing .*manifest file/i] - ])('%s', (folderName, expectedError) => { + ])('%s', async (folderName, expectedError) => { const logFileBase = join(tmpRootRun, folderName) const outFile = `${logFileBase}.out` @@ -80,12 +80,12 @@ describe('cli.run()', () => { } try { - expect(() => { + await expect( cli.run(mockProcess) - }).toThrow(expectedError) + ).rejects.toBe(expectedError) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } }) }) @@ -94,7 +94,7 @@ describe('cli.run()', () => { const tmpRootRun = join(tmpRoot, 'with-broken') mkdirSync(tmpRootRun) - test('error on non-existing binary', () => { + test('error on non-existing binary', async () => { const logFileBase = join(tmpRootRun, 'non-existing') const outFile = `${logFileBase}.out` @@ -120,16 +120,16 @@ describe('cli.run()', () => { } try { - expect(() => { + await expect( cli.run(mockProcess) - }).toThrow(/^unexpected npm execpath/i) + ).rejects.toThrow(/^unexpected npm execpath/i) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } }) - test('error on non-zero exit', () => { + test('error on non-zero exit', async () => { const logFileBase = join(tmpRootRun, 'error-exit-nonzero') const expectedExitCode = 1 + Math.floor(254 * Math.random()) @@ -160,16 +160,16 @@ describe('cli.run()', () => { } try { - expect(() => { + await expect( cli.run(mockProcess) - }).toThrow(`npm-ls exited with errors: ${expectedExitCode} noSignal`) + ).rejects.toThrow(`npm-ls exited with errors: ${expectedExitCode} noSignal`) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } }) - test('error on broken json response', () => { + test('error on broken json response', async () => { const logFileBase = join(tmpRootRun, 'error-json-broken') const outFile = `${logFileBase}.out` @@ -197,12 +197,12 @@ describe('cli.run()', () => { } try { - expect(() => { + await expect( cli.run(mockProcess) - }).toThrow(/failed to parse npm-ls response/i) + ).rejects.toThrow(/failed to parse npm-ls response/i) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } }) }) @@ -219,7 +219,7 @@ describe('cli.run()', () => { describe.each(useCases)('$subject', (ud) => { mkdirSync(join(tmpRootRun, ud.subject)) - test.each(demoCases)('$subject npm$npm node$node $os', (dd) => { + test.each(demoCases)('$subject npm$npm node$node $os', async (dd) => { const expectedOutSnap = resolve(demoResultsRoot, ud.subject, `${dd.subject}_npm${dd.npm}_node${dd.node}_${dd.os}.snap.json`) const logFileBase = join(tmpRootRun, ud.subject, `${dd.subject}_npm${dd.npm}_node${dd.node}_${dd.os}`) @@ -263,10 +263,10 @@ describe('cli.run()', () => { } try { - cli.run(mockProcess) + await cli.run(mockProcess) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } const actualOutput = makeReproducible('json', readFileSync(outFile, 'utf8')) @@ -283,7 +283,7 @@ describe('cli.run()', () => { }) }) - test('suppressed error on non-zero exit', () => { + test('suppressed error on non-zero exit', async () => { const dd = { subject: 'dev-dependencies', npm: '8', node: '16', os: 'ubuntu-latest' } mkdirSync(join(tmpRoot, 'suppressed-error-on-non-zero-exit')) @@ -331,10 +331,10 @@ describe('cli.run()', () => { } try { - cli.run(mockProcess) + await cli.run(mockProcess) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } const actualOutput = makeReproducible('json', readFileSync(outFile, 'utf8')) @@ -378,7 +378,7 @@ describe('cli.run()', () => { ['package-lock-only npm 7', `7.${rMinor}.${rPatch}`, ['--package-lock-only'], [...npm7ArgsGeneral, '--package-lock-only']], ['package-lock-only npm 8', `8.${rMinor}.${rPatch}`, ['--package-lock-only'], [...npm8ArgsGeneral, '--package-lock-only']] // endregion - ])('%s', (purpose, npmVersion, cdxArgs, expectedArgs) => { + ])('%s', async (purpose, npmVersion, cdxArgs, expectedArgs) => { const logFileBase = join(tmpRootRun, purpose.replace(/\W/g, '_')) const outFile = `${logFileBase}.out` @@ -409,10 +409,10 @@ describe('cli.run()', () => { } try { - cli.run(mockProcess) + await cli.run(mockProcess) } finally { - closeSync(stdout.fd) stderr.close() + closeSync(stdout.fd) } }) }) From 2fdd2f9d23e848c4b25f0af28f2ed9bb415cdd80 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:30:49 +0200 Subject: [PATCH 04/23] validation error template Signed-off-by: Jan Kowalleck --- .../ISSUE_TEMPLATE/ValidationError-report.md | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/ValidationError-report.md diff --git a/.github/ISSUE_TEMPLATE/ValidationError-report.md b/.github/ISSUE_TEMPLATE/ValidationError-report.md new file mode 100644 index 000000000..23cc24772 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ValidationError-report.md @@ -0,0 +1,34 @@ +--- +name: ValidationError report +about: Report a ValidationError to help us improve +title: "[ValidationError]" +labels: ValidationError +assignees: '' + +--- + +## To Reproduce + +Steps to reproduce the behavior: + +1. How was _@cyclonedx/cyclonedx-npm_ called? + +2. What kind of evidence was processed? + +3. Error report: + +4. Expected result: + + +## Environment + +- _@cyclonedx/cyclonedx-npm_ version: +- NPM version: +- Node version: +- OS: + +## Additional context + +Add any other context about the problem here. From 33344979fdabf61849b7b161df50c7eb9b811a46 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:32:51 +0200 Subject: [PATCH 05/23] docs Signed-off-by: Jan Kowalleck --- README.md | 1 + src/cli.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b83c4dc9..057927321 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,7 @@ Options: --output-file Path to the output file. Set to "-" to write to STDOUT. (default: write to STDOUT) + --no-validate Disable validation of resulting BOM. --mc-type Type of the main component. (choices: "application", "firmware", "library", default: "application") -V, --version output the version number diff --git a/src/cli.ts b/src/cli.ts index be890e526..d7884b854 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -141,7 +141,7 @@ function makeCommand (process: NodeJS.Process): Command { ).addOption( new Option( '--no-validate', - 'Disable validation of resulting output.' + 'Disable validation of resulting BOM.' ).default(false) ).addOption( new Option( From 3e86e1dac4c750017de5e93a326e3d9ebca53bf4 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:35:02 +0200 Subject: [PATCH 06/23] fix tests Signed-off-by: Jan Kowalleck --- tests/integration/synthetics/cli.run.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/synthetics/cli.run.test.js b/tests/integration/synthetics/cli.run.test.js index b93df3783..7ada41f79 100644 --- a/tests/integration/synthetics/cli.run.test.js +++ b/tests/integration/synthetics/cli.run.test.js @@ -82,7 +82,7 @@ describe('cli.run()', () => { try { await expect( cli.run(mockProcess) - ).rejects.toBe(expectedError) + ).rejects.toThrow(expectedError) } finally { stderr.close() closeSync(stdout.fd) From 98e29d4537baa61f1eb5a921a9428efdd1c737fa Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:36:38 +0200 Subject: [PATCH 07/23] prep docs Signed-off-by: Jan Kowalleck --- HISTORY.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index fe3b8423b..b85876482 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. ## unreleased +* Added + * SBOM results might be validated ([#] via [#]) + requires optional dependnecies - see (LINK HERE)[TODO] + @TODO + ## 1.10.0 - 2023-04-17 * Added From ee57cc5e7080bfc0095d4d6e747e8d43e525a225 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 12:49:00 +0200 Subject: [PATCH 08/23] improved validation error outpur Signed-off-by: Jan Kowalleck --- src/cli.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index d7884b854..a5564ecd4 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -262,15 +262,19 @@ export async function run (process: NodeJS.Process): Promise { await validator.validate(serialized) } catch (err) { if (err instanceof Validation.MissingOptionalDependencyError) { - myConsole.warn('WARN | skipped validate BOM result:', err.message) + myConsole.info('INFO | skipped validate BOM:', err.message) } else { if (err instanceof Validation.ValidationError) { - myConsole.error('ERROR | BOM result invalid:', err.message) + myConsole.error('ERROR | Failed to generate valid BOM:', err.message) myConsole.info('INFO | BOM result invalid. details: ', err.details) + myConsole.warn( + 'WARN | Please report the issue and provide the npm lock file of the current project to:\n' + + ' | https://github.com/CycloneDX/cyclonedx-node-npm/issues/new?template=ValidationError-report.md&labels=ValidationError&title=%5BValidationError%5D') + return } else { myConsole.error('ERROR | unexpected error') + throw err } - throw err } } } From f9ef14dc6f4611f2afe3cfba5cee562b4fd73c96 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sun, 23 Apr 2023 14:58:24 +0200 Subject: [PATCH 09/23] @cyclonedx/cyclonedx-library@^1.14.0-rc.2 Signed-off-by: Jan Kowalleck --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72c16b7c8..ddfc71eab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.1", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.2", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.1", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.1.tgz", - "integrity": "sha512-9IzUNbqYhKoGNyeWRy/3ru4Nq6ZKRONGUCaoU9bGj7Wgctts6ovFq9jdr/4bA/BCM6wSV/HYlED6dTrAk1Bt3A==", + "version": "1.14.0-rc.2", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.2.tgz", + "integrity": "sha512-n7L8K4Pp5wF3GCCwUuBI+MMD5jWV1DHySnStoT/7UEcs7GksEFdma1LHA0gaqokT5X0YYjZp5z8JGE5uG2iZJw==", "funding": [ { "type": "github", @@ -684,7 +684,7 @@ "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", - "libxmljs2": "^0.31.0", + "libxmljs2": "^0.31.0 || ^0.32.0", "xmlbuilder2": "^3.0.2" } }, @@ -7406,14 +7406,14 @@ "dev": true }, "@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.1", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.1.tgz", - "integrity": "sha512-9IzUNbqYhKoGNyeWRy/3ru4Nq6ZKRONGUCaoU9bGj7Wgctts6ovFq9jdr/4bA/BCM6wSV/HYlED6dTrAk1Bt3A==", + "version": "1.14.0-rc.2", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.2.tgz", + "integrity": "sha512-n7L8K4Pp5wF3GCCwUuBI+MMD5jWV1DHySnStoT/7UEcs7GksEFdma1LHA0gaqokT5X0YYjZp5z8JGE5uG2iZJw==", "requires": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", - "libxmljs2": "^0.31.0", + "libxmljs2": "^0.31.0 || ^0.32.0", "packageurl-js": ">=0.0.6 <0.0.8 || ^1", "xmlbuilder2": "^3.0.2" }, diff --git a/package.json b/package.json index 746529747..12ca4cf43 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.1", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.2", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" From 3fdbc1fbcd8f55ba53075a9e7c0d47dd926d0b7d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 24 Apr 2023 14:38:17 +0200 Subject: [PATCH 10/23] bump deps Signed-off-by: Jan Kowalleck --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ddfc71eab..9519d0130 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.2", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.3", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.2", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.2.tgz", - "integrity": "sha512-n7L8K4Pp5wF3GCCwUuBI+MMD5jWV1DHySnStoT/7UEcs7GksEFdma1LHA0gaqokT5X0YYjZp5z8JGE5uG2iZJw==", + "version": "1.14.0-rc.3", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.3.tgz", + "integrity": "sha512-L+u3dPxgYmvEqXgksxf2MAGiZ+34ZiTMWagQ6NGU5hIcepLIXXZ/XMBtQRCVsUfHHsoRGOqnTn309+CD8kL5TA==", "funding": [ { "type": "github", @@ -7406,9 +7406,9 @@ "dev": true }, "@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.2", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.2.tgz", - "integrity": "sha512-n7L8K4Pp5wF3GCCwUuBI+MMD5jWV1DHySnStoT/7UEcs7GksEFdma1LHA0gaqokT5X0YYjZp5z8JGE5uG2iZJw==", + "version": "1.14.0-rc.3", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.3.tgz", + "integrity": "sha512-L+u3dPxgYmvEqXgksxf2MAGiZ+34ZiTMWagQ6NGU5hIcepLIXXZ/XMBtQRCVsUfHHsoRGOqnTn309+CD8kL5TA==", "requires": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", diff --git a/package.json b/package.json index 12ca4cf43..c8f81d0b2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.2", + "@cyclonedx/cyclonedx-library": "^1.14.0-rc.3", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" From c0df81ee16febb04870e582385c21b4786978b8d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 24 Apr 2023 15:20:37 +0200 Subject: [PATCH 11/23] adjust to latest Signed-off-by: Jan Kowalleck --- .github/workflows/nodejs.yml | 8 ++++---- bin/cyclonedx-npm-cli.js | 15 +++++++++------ src/cli.ts | 35 +++++++++++++++++++++-------------- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index a1ab01234..7cc3b6412 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -34,7 +34,7 @@ jobs: node-version: ${{ env.NODE_ACTIVE_LTS }} cache: 'npm' - name: setup subject - run: npm ci --ignore-scripts + run: npm ci --ignore-scripts --loglevel=silly - name: build run: npm run build - name: artifact build result @@ -59,7 +59,7 @@ jobs: node-version: ${{ env.NODE_ACTIVE_LTS }} cache: 'npm' - name: install subject - run: npm ci + run: npm ci --loglevel=silly - name: run tests run: npm run test:standard test-jest: @@ -92,7 +92,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject - run: npm ci --ignore-scripts + run: npm ci --ignore-scripts --loglevel=silly - name: fetch build artifact # see https://github.com/actions/download-artifact uses: actions/download-artifact@v3 @@ -153,7 +153,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject - run: npm i --ignore-scripts + run: npm ci --ignore-scripts --omit=dev --loglevel=silly - name: fetch build artifact # see https://github.com/actions/download-artifact uses: actions/download-artifact@v3 diff --git a/bin/cyclonedx-npm-cli.js b/bin/cyclonedx-npm-cli.js index 71ac5081b..e2daa375e 100755 --- a/bin/cyclonedx-npm-cli.js +++ b/bin/cyclonedx-npm-cli.js @@ -1,7 +1,10 @@ #!/usr/bin/env node -try { - require('../dist/cli.js').run(process) -} catch (e) { - process.stderr.write(`\n${e}\n`) - process.exit(Math.floor(Number(e?.code)) || 1) -} +require('../dist/cli.js') + .run(process) + .catch(e => { + process.stderr.write(`\n${e}\n`) + return Math.max(1, Math.floor(Number(e?.code)) || 254) + }) + .then(exitCode => { + process.exitCode = exitCode + }) diff --git a/src/cli.ts b/src/cli.ts index a5564ecd4..db79b4e5a 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -174,7 +174,13 @@ function makeCommand (process: NodeJS.Process): Command { ) } -export async function run (process: NodeJS.Process): Promise { +const ExitCode: Readonly> = Object.freeze({ + SUCCESS: 0, + FAILURE: 1, + INVALID: 2 +}) + +export async function run (process: NodeJS.Process): Promise { process.title = 'cyclonedx-node-npm' // all output shall be bound to stdError - stdOut is for result output only @@ -238,7 +244,7 @@ export async function run (process: NodeJS.Process): Promise { } let serializer: Serialize.Types.Serializer - let validator: Validation.Validator + let validator: Validation.Types.Validator switch (options.outputFormat) { case OutputFormat.XML: serializer = new Serialize.XmlSerializer(new Serialize.XML.Normalize.Factory(spec)) @@ -259,22 +265,21 @@ export async function run (process: NodeJS.Process): Promise { if (!options.noValidate) { myConsole.log('LOG | try validate BOM result ...') try { - await validator.validate(serialized) + const validationErrors = await validator.validate(serialized) + if (validationErrors !== null) { + myConsole.debug('DEBUG | BOM result invalid. details: ', validationErrors) + myConsole.error('ERROR | Failed to generate valid BOM.') + myConsole.warn( + 'WARN | Please report the issue and provide the npm lock file of the current project to:\n' + + ' | https://github.com/CycloneDX/cyclonedx-node-npm/issues/new?template=ValidationError-report.md&labels=ValidationError&title=%5BValidationError%5D') + return ExitCode.FAILURE + } } catch (err) { if (err instanceof Validation.MissingOptionalDependencyError) { myConsole.info('INFO | skipped validate BOM:', err.message) } else { - if (err instanceof Validation.ValidationError) { - myConsole.error('ERROR | Failed to generate valid BOM:', err.message) - myConsole.info('INFO | BOM result invalid. details: ', err.details) - myConsole.warn( - 'WARN | Please report the issue and provide the npm lock file of the current project to:\n' + - ' | https://github.com/CycloneDX/cyclonedx-node-npm/issues/new?template=ValidationError-report.md&labels=ValidationError&title=%5BValidationError%5D') - return - } else { - myConsole.error('ERROR | unexpected error') - throw err - } + myConsole.error('ERROR | unexpected error') + throw err } } } @@ -287,4 +292,6 @@ export async function run (process: NodeJS.Process): Promise { : openSync(resolve(process.cwd(), options.outputFile), 'w'), serialized ) + + return ExitCode.SUCCESS } From 430679265c2a86c63ce1ac1246775030c30ca7e9 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 25 Apr 2023 11:57:17 +0200 Subject: [PATCH 12/23] adjust Signed-off-by: Jan Kowalleck --- .github/workflows/nodejs.yml | 6 +++++- bin/cyclonedx-npm-cli.js | 15 ++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 7cc3b6412..724628ee2 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -92,7 +92,11 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject - run: npm ci --ignore-scripts --loglevel=silly + run: | + set -ex + npm ci --ignore-scripts --loglevel=silly + ## rebuild deps for which scripts were ignored, or partially installed - since "ignore-scripts" was used + npm rebuild --loglevel=silly libxmljs2 || npm uninstall --no-save libxmljs2 - name: fetch build artifact # see https://github.com/actions/download-artifact uses: actions/download-artifact@v3 diff --git a/bin/cyclonedx-npm-cli.js b/bin/cyclonedx-npm-cli.js index e2daa375e..1c78398dc 100755 --- a/bin/cyclonedx-npm-cli.js +++ b/bin/cyclonedx-npm-cli.js @@ -1,10 +1,7 @@ #!/usr/bin/env node -require('../dist/cli.js') - .run(process) - .catch(e => { - process.stderr.write(`\n${e}\n`) - return Math.max(1, Math.floor(Number(e?.code)) || 254) - }) - .then(exitCode => { - process.exitCode = exitCode - }) +require('../dist/cli.js').run(process).catch(e => { + process.stderr.write(`\n${e}\n`) + return Math.max(1, Math.floor(Number(e?.code)) || 254) +}).then(exitCode => { + process.exitCode = exitCode +}) From f7a19911ff874eecd63f46179bf86a08c798e33e Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 25 Apr 2023 12:41:32 +0200 Subject: [PATCH 13/23] ci Signed-off-by: Jan Kowalleck --- .github/workflows/nodejs.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 724628ee2..67982636c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -157,7 +157,12 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject - run: npm ci --ignore-scripts --omit=dev --loglevel=silly + run: | + | + set -ex + npm ci --ignore-scripts --omit=dev --loglevel=silly + ## rebuild deps for which scripts were ignored, or partially installed - since "ignore-scripts" was used + npm rebuild --loglevel=silly libxmljs2 || npm uninstall --no-save libxmljs2 - name: fetch build artifact # see https://github.com/actions/download-artifact uses: actions/download-artifact@v3 From 238b2fd8c430f451106074cac2bc3e5212c560b5 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 25 Apr 2023 12:45:15 +0200 Subject: [PATCH 14/23] ci Signed-off-by: Jan Kowalleck --- .github/workflows/nodejs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 67982636c..312a7ffa5 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -92,6 +92,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject + shell: bash run: | set -ex npm ci --ignore-scripts --loglevel=silly From 1bd0cf1bc6423e2decb7f035007b187cdd798dd1 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 25 Apr 2023 12:45:44 +0200 Subject: [PATCH 15/23] ci Signed-off-by: Jan Kowalleck --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 312a7ffa5..e868fb92b 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -158,8 +158,8 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - name: setup subject + shell: bash run: | - | set -ex npm ci --ignore-scripts --omit=dev --loglevel=silly ## rebuild deps for which scripts were ignored, or partially installed - since "ignore-scripts" was used From ef65c4c86ceee4de1624ee249445c7e34d4d30ae Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 25 Apr 2023 19:04:37 +0200 Subject: [PATCH 16/23] update deps Signed-off-by: Jan Kowalleck --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9519d0130..18ef71efe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.3", + "@cyclonedx/cyclonedx-library": "^1.14.0", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.3", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.3.tgz", - "integrity": "sha512-L+u3dPxgYmvEqXgksxf2MAGiZ+34ZiTMWagQ6NGU5hIcepLIXXZ/XMBtQRCVsUfHHsoRGOqnTn309+CD8kL5TA==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0.tgz", + "integrity": "sha512-zJ5FQ2f4xKbusJZGxdE+RYnVry0vGwhHwh7etxQYqIc0HKOV4T2TUyTxFqDAbJ6WZGMOvCbaKS3nIcUl9wWZAA==", "funding": [ { "type": "github", @@ -4813,9 +4813,9 @@ } }, "node_modules/libxmljs2": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.31.0.tgz", - "integrity": "sha512-+o8y4lhmmf7zUA67watbLcAcxE0lkBkuatoIwgFkWTmuFTPEOZKunNpSjW6V7ONzAj8Ey1qVeR12q1JMU/sTlQ==", + "version": "0.32.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz", + "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==", "hasInstallScript": true, "optional": true, "dependencies": { @@ -4824,7 +4824,7 @@ "nan": "~2.17.0" }, "engines": { - "node": ">=12" + "node": ">=16" } }, "node_modules/lines-and-columns": { @@ -7406,9 +7406,9 @@ "dev": true }, "@cyclonedx/cyclonedx-library": { - "version": "1.14.0-rc.3", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0-rc.3.tgz", - "integrity": "sha512-L+u3dPxgYmvEqXgksxf2MAGiZ+34ZiTMWagQ6NGU5hIcepLIXXZ/XMBtQRCVsUfHHsoRGOqnTn309+CD8kL5TA==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.14.0.tgz", + "integrity": "sha512-zJ5FQ2f4xKbusJZGxdE+RYnVry0vGwhHwh7etxQYqIc0HKOV4T2TUyTxFqDAbJ6WZGMOvCbaKS3nIcUl9wWZAA==", "requires": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", @@ -10482,9 +10482,9 @@ } }, "libxmljs2": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.31.0.tgz", - "integrity": "sha512-+o8y4lhmmf7zUA67watbLcAcxE0lkBkuatoIwgFkWTmuFTPEOZKunNpSjW6V7ONzAj8Ey1qVeR12q1JMU/sTlQ==", + "version": "0.32.0", + "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz", + "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==", "optional": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.10", diff --git a/package.json b/package.json index c8f81d0b2..3b4ba7eee 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "dependencies": { - "@cyclonedx/cyclonedx-library": "^1.14.0-rc.3", + "@cyclonedx/cyclonedx-library": "^1.14.0", "commander": "^10.0.0", "normalize-package-data": "^3||^4||^5", "xmlbuilder2": "^3.0.2" From 4b514c72dadc41aea1eb83b3fcd4b67a8c30a74c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 09:54:37 +0200 Subject: [PATCH 17/23] tests: extend timeout Signed-off-by: Jan Kowalleck --- tests/integration/synthetics/cli.run.test.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/integration/synthetics/cli.run.test.js b/tests/integration/synthetics/cli.run.test.js index 7ada41f79..b641d09fb 100644 --- a/tests/integration/synthetics/cli.run.test.js +++ b/tests/integration/synthetics/cli.run.test.js @@ -32,6 +32,8 @@ const { version: thisVersion } = require('../../../package.json') const cli = require('../../../dist/cli') describe('cli.run()', () => { + const cliRunTestTimeout = 15000 + const tmpRoot = mkdtempSync(join(__dirname, '..', '..', '_log', 'CDX-IT-CLI.run.')) const dummyProjectsRoot = resolve(__dirname, '..', '..', '_data', 'dummy_projects') @@ -87,7 +89,7 @@ describe('cli.run()', () => { stderr.close() closeSync(stdout.fd) } - }) + }, cliRunTestTimeout) }) describe('with broken npm-ls', () => { @@ -127,7 +129,7 @@ describe('cli.run()', () => { stderr.close() closeSync(stdout.fd) } - }) + }, cliRunTestTimeout) test('error on non-zero exit', async () => { const logFileBase = join(tmpRootRun, 'error-exit-nonzero') @@ -167,7 +169,7 @@ describe('cli.run()', () => { stderr.close() closeSync(stdout.fd) } - }) + }, cliRunTestTimeout) test('error on broken json response', async () => { const logFileBase = join(tmpRootRun, 'error-json-broken') @@ -204,7 +206,7 @@ describe('cli.run()', () => { stderr.close() closeSync(stdout.fd) } - }) + }, cliRunTestTimeout) }) describe('with prepared npm-ls', () => { @@ -279,7 +281,7 @@ describe('cli.run()', () => { readFileSync(expectedOutSnap, 'utf8'), `${outFile} should equal ${expectedOutSnap}` ) - }) + }, cliRunTestTimeout) }) }) @@ -347,7 +349,7 @@ describe('cli.run()', () => { readFileSync(expectedOutSnap, 'utf8'), `${outFile} should equal ${expectedOutSnap}` ) - }) + }, cliRunTestTimeout) describe('npm-version depending npm-args', () => { const tmpRootRun = join(tmpRoot, 'npmVersion-depending-npmArgs') @@ -414,7 +416,7 @@ describe('cli.run()', () => { stderr.close() closeSync(stdout.fd) } - }) + }, cliRunTestTimeout) }) }) From d003b386c1be5e82b0e52970cad339d470f22bc2 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 10:33:47 +0200 Subject: [PATCH 18/23] docs Signed-off-by: Jan Kowalleck --- HISTORY.md | 9 ++++++--- README.md | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index b85876482..e026ad992 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,9 +5,12 @@ All notable changes to this project will be documented in this file. ## unreleased * Added - * SBOM results might be validated ([#] via [#]) - requires optional dependnecies - see (LINK HERE)[TODO] - @TODO + * SBOM results might be validated (via [#660]) + This feature is enabled per default and can be disabled via CLI switch `--no-validate`. + Validation is skipped, if dependencies are missing or not met. + Requires [transitive optional dependencies](https://github.com/CycloneDX/cyclonedx-javascript-library/blob/main/README.md#optional-dependencies) + +[#660]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/660 ## 1.10.0 - 2023-04-17 diff --git a/README.md b/README.md index 057927321..e1fa783d9 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,8 @@ Read more on the topic in the [dedicated docs "Component Deduplication"](https:/ ## Internals -This tool utilizes the [CycloneDX library][cyclonedx-library] to generate the actual data structures. +This tool utilizes the [CycloneDX library][cyclonedx-library] to generate the actual data structures, and serialize and validate them. +Validation requires [transitive optional dependencies](https://github.com/CycloneDX/cyclonedx-javascript-library/blob/main/README.md#optional-dependencies). This tool does **not** expose any additional _public_ API or classes - all code is intended to be internal and might change without any notice during version upgrades. From 890292ff80349c6f3a07c9931323fa52561cbc76 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 11:47:39 +0200 Subject: [PATCH 19/23] pos and neg for validation Signed-off-by: Jan Kowalleck --- README.md | 7 +++++-- src/cli.ts | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e1fa783d9..f90467609 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Usage: cyclonedx-npm [options] [--] [] Create CycloneDX Software Bill of Materials (SBOM) from Node.js NPM projects. Arguments: - Path to project's manifest file. + Path to project's manifest file. (default: "package.json" file in current working directory) Options: @@ -84,8 +84,9 @@ Options: (choices: "dev", "optional", "peer", default: "dev" if the NODE_ENV environment variable is set to "production", otherwise empty) --flatten-components Whether to flatten the components. This means the actual nesting of node packages is not represented in the SBOM result. + (default: false) --short-PURLs Omit all qualifiers from PackageURLs. - This causes information loss in trade of shorter PURLs, which might improve digesting these strings. + This causes information loss in trade of shorter PURLs, which might improve digesting these strings. (default: false) --spec-version Which version of CycloneDX spec to use. (choices: "1.2", "1.3", "1.4", default: "1.4") @@ -97,6 +98,8 @@ Options: --output-file Path to the output file. Set to "-" to write to STDOUT. (default: write to STDOUT) + --validate Validate resulting BOM before outputting. Validation is skipped, if dependencies are missing or not met. + (default: true) --no-validate Disable validation of resulting BOM. --mc-type Type of the main component. (choices: "application", "firmware", "library", default: "application") diff --git a/src/cli.ts b/src/cli.ts index db79b4e5a..49bbbdd7a 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -47,7 +47,7 @@ interface CommandOptions { outputReproducible: boolean outputFormat: OutputFormat outputFile: string - noValidate: boolean + validate: boolean mcType: Enums.ComponentType } @@ -138,11 +138,17 @@ function makeCommand (process: NodeJS.Process): Command { OutputStdOut, 'write to STDOUT' ) + ).addOption( + new Option( + '--validate', + 'Validate resulting BOM before outputting. ' + + 'Validation is skipped, if dependencies are missing or not met.' + ).default(true) ).addOption( new Option( '--no-validate', 'Disable validation of resulting BOM.' - ).default(false) + ) ).addOption( new Option( '--mc-type ', @@ -262,7 +268,7 @@ export async function run (process: NodeJS.Process): Promise { space: 2 }) - if (!options.noValidate) { + if (options.validate) { myConsole.log('LOG | try validate BOM result ...') try { const validationErrors = await validator.validate(serialized) From 1d549b6e5c7e948a6e477676b796ce49590fe249 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 12:04:31 +0200 Subject: [PATCH 20/23] test: force validate Signed-off-by: Jan Kowalleck --- tests/integration/synthetics/cli.run.test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/synthetics/cli.run.test.js b/tests/integration/synthetics/cli.run.test.js index b641d09fb..f6492b8ef 100644 --- a/tests/integration/synthetics/cli.run.test.js +++ b/tests/integration/synthetics/cli.run.test.js @@ -241,9 +241,10 @@ describe('cli.run()', () => { process.argv[0], 'dummy_process', '--output-reproducible', + '--validate', // no intention to test all the spec-versions nor all the output-formats - this would be not our scope. - // just use json with the latest most feature-rich version. '--spec-version', '1.4', + // just use json with the latest most feature-rich version. '--output-format', 'JSON', // prevent file interaction in this synthetic scenario - they would not exist anyway '--package-lock-only', @@ -310,8 +311,9 @@ describe('cli.run()', () => { process.argv[0], 'dummy_process', '--ignore-npm-errors', - // no intention to test all the spec-versions nor all the output-formats - this would be not our scope. '--output-reproducible', + '--validate', + // no intention to test all the spec-versions nor all the output-formats - this would be not our scope. '--spec-version', '1.4', '--output-format', 'JSON', // prevent file interaction in this synthetic scenario - they would not exist anyway From 6cc17121bb2aeb38ae34374bbadca76f92e46535 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 12:22:06 +0200 Subject: [PATCH 21/23] demos forced validated Signed-off-by: Jan Kowalleck --- demo/bundled-dependencies/example-results/bare/bom.1.2.json | 2 +- demo/bundled-dependencies/example-results/bare/bom.1.2.xml | 2 +- demo/bundled-dependencies/example-results/bare/bom.1.3.json | 2 +- demo/bundled-dependencies/example-results/bare/bom.1.3.xml | 2 +- demo/bundled-dependencies/example-results/bare/bom.1.4.json | 2 +- demo/bundled-dependencies/example-results/bare/bom.1.4.xml | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.2.json | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.2.xml | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.3.json | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.3.xml | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.4.json | 2 +- demo/bundled-dependencies/example-results/flat/bom.1.4.xml | 2 +- demo/dev-dependencies/example-results/bare/bom.1.2.json | 2 +- demo/dev-dependencies/example-results/bare/bom.1.2.xml | 2 +- demo/dev-dependencies/example-results/bare/bom.1.3.json | 2 +- demo/dev-dependencies/example-results/bare/bom.1.3.xml | 2 +- demo/dev-dependencies/example-results/bare/bom.1.4.json | 2 +- demo/dev-dependencies/example-results/bare/bom.1.4.xml | 2 +- demo/dev-dependencies/example-results/flat/bom.1.2.json | 2 +- demo/dev-dependencies/example-results/flat/bom.1.2.xml | 2 +- demo/dev-dependencies/example-results/flat/bom.1.3.json | 2 +- demo/dev-dependencies/example-results/flat/bom.1.3.xml | 2 +- demo/dev-dependencies/example-results/flat/bom.1.4.json | 2 +- demo/dev-dependencies/example-results/flat/bom.1.4.xml | 2 +- demo/gen-boms.sh | 2 ++ demo/juice-shop/example-results/bare/bom.1.2.json | 2 +- demo/juice-shop/example-results/bare/bom.1.2.xml | 2 +- demo/juice-shop/example-results/bare/bom.1.3.json | 2 +- demo/juice-shop/example-results/bare/bom.1.3.xml | 2 +- demo/juice-shop/example-results/bare/bom.1.4.json | 2 +- demo/juice-shop/example-results/bare/bom.1.4.xml | 2 +- demo/juice-shop/example-results/flat/bom.1.2.json | 2 +- demo/juice-shop/example-results/flat/bom.1.2.xml | 2 +- demo/juice-shop/example-results/flat/bom.1.3.json | 2 +- demo/juice-shop/example-results/flat/bom.1.3.xml | 2 +- demo/juice-shop/example-results/flat/bom.1.4.json | 2 +- demo/juice-shop/example-results/flat/bom.1.4.xml | 2 +- demo/local-dependencies/example-results/bare/bom.1.2.json | 2 +- demo/local-dependencies/example-results/bare/bom.1.2.xml | 2 +- demo/local-dependencies/example-results/bare/bom.1.3.json | 2 +- demo/local-dependencies/example-results/bare/bom.1.3.xml | 2 +- demo/local-dependencies/example-results/bare/bom.1.4.json | 2 +- demo/local-dependencies/example-results/bare/bom.1.4.xml | 2 +- demo/local-dependencies/example-results/flat/bom.1.2.json | 2 +- demo/local-dependencies/example-results/flat/bom.1.2.xml | 2 +- demo/local-dependencies/example-results/flat/bom.1.3.json | 2 +- demo/local-dependencies/example-results/flat/bom.1.3.xml | 2 +- demo/local-dependencies/example-results/flat/bom.1.4.json | 2 +- demo/local-dependencies/example-results/flat/bom.1.4.xml | 2 +- demo/local-workspaces/example-results/bare/bom.1.2.json | 2 +- demo/local-workspaces/example-results/bare/bom.1.2.xml | 2 +- demo/local-workspaces/example-results/bare/bom.1.3.json | 2 +- demo/local-workspaces/example-results/bare/bom.1.3.xml | 2 +- demo/local-workspaces/example-results/bare/bom.1.4.json | 2 +- demo/local-workspaces/example-results/bare/bom.1.4.xml | 2 +- demo/local-workspaces/example-results/flat/bom.1.2.json | 2 +- demo/local-workspaces/example-results/flat/bom.1.2.xml | 2 +- demo/local-workspaces/example-results/flat/bom.1.3.json | 2 +- demo/local-workspaces/example-results/flat/bom.1.3.xml | 2 +- demo/local-workspaces/example-results/flat/bom.1.4.json | 2 +- demo/local-workspaces/example-results/flat/bom.1.4.xml | 2 +- demo/package-with-build-id/example-results/bare/bom.1.2.json | 2 +- demo/package-with-build-id/example-results/bare/bom.1.2.xml | 2 +- demo/package-with-build-id/example-results/bare/bom.1.3.json | 2 +- demo/package-with-build-id/example-results/bare/bom.1.3.xml | 2 +- demo/package-with-build-id/example-results/bare/bom.1.4.json | 2 +- demo/package-with-build-id/example-results/bare/bom.1.4.xml | 2 +- demo/package-with-build-id/example-results/flat/bom.1.2.json | 2 +- demo/package-with-build-id/example-results/flat/bom.1.2.xml | 2 +- demo/package-with-build-id/example-results/flat/bom.1.3.json | 2 +- demo/package-with-build-id/example-results/flat/bom.1.3.xml | 2 +- demo/package-with-build-id/example-results/flat/bom.1.4.json | 2 +- demo/package-with-build-id/example-results/flat/bom.1.4.xml | 2 +- 73 files changed, 74 insertions(+), 72 deletions(-) diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.2.json b/demo/bundled-dependencies/example-results/bare/bom.1.2.json index f4679af47..097301d79 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.2.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.2.xml b/demo/bundled-dependencies/example-results/bare/bom.1.2.xml index ade1c27fb..3111dbe90 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.3.json b/demo/bundled-dependencies/example-results/bare/bom.1.3.json index 35a32f56d..744102c82 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.3.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.3.xml b/demo/bundled-dependencies/example-results/bare/bom.1.3.xml index 27e991fe1..031b38bb3 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.4.json b/demo/bundled-dependencies/example-results/bare/bom.1.4.json index 61a397915..451f877bc 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.4.json +++ b/demo/bundled-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/bundled-dependencies/example-results/bare/bom.1.4.xml b/demo/bundled-dependencies/example-results/bare/bom.1.4.xml index cb86b9ed0..23c6092c5 100644 --- a/demo/bundled-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/bundled-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.2.json b/demo/bundled-dependencies/example-results/flat/bom.1.2.json index bcc07192b..28788f1ce 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.2.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.2.xml b/demo/bundled-dependencies/example-results/flat/bom.1.2.xml index bc4f46251..5d46dae78 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.3.json b/demo/bundled-dependencies/example-results/flat/bom.1.3.json index 5f34c0d1e..b67b84b98 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.3.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.3.xml b/demo/bundled-dependencies/example-results/flat/bom.1.3.xml index 8967ae0ed..1f95fa2a5 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.4.json b/demo/bundled-dependencies/example-results/flat/bom.1.4.json index c3f098e26..b6e057325 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.4.json +++ b/demo/bundled-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/bundled-dependencies/example-results/flat/bom.1.4.xml b/demo/bundled-dependencies/example-results/flat/bom.1.4.xml index 28c9bec80..0425b1af8 100644 --- a/demo/bundled-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/bundled-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/dev-dependencies/example-results/bare/bom.1.2.json b/demo/dev-dependencies/example-results/bare/bom.1.2.json index a09c2a844..3013eb863 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.2.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/dev-dependencies/example-results/bare/bom.1.2.xml b/demo/dev-dependencies/example-results/bare/bom.1.2.xml index b3a027523..4ce4f5cd9 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/dev-dependencies/example-results/bare/bom.1.3.json b/demo/dev-dependencies/example-results/bare/bom.1.3.json index 5a39a2656..e4b9e19c2 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.3.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/dev-dependencies/example-results/bare/bom.1.3.xml b/demo/dev-dependencies/example-results/bare/bom.1.3.xml index 7515f5848..73a80778c 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/dev-dependencies/example-results/bare/bom.1.4.json b/demo/dev-dependencies/example-results/bare/bom.1.4.json index 8cc3c9dec..9794e566f 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.4.json +++ b/demo/dev-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/dev-dependencies/example-results/bare/bom.1.4.xml b/demo/dev-dependencies/example-results/bare/bom.1.4.xml index bfd030dbc..13f7382a1 100644 --- a/demo/dev-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/dev-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/dev-dependencies/example-results/flat/bom.1.2.json b/demo/dev-dependencies/example-results/flat/bom.1.2.json index a09c2a844..3013eb863 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.2.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/dev-dependencies/example-results/flat/bom.1.2.xml b/demo/dev-dependencies/example-results/flat/bom.1.2.xml index b3a027523..4ce4f5cd9 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/dev-dependencies/example-results/flat/bom.1.3.json b/demo/dev-dependencies/example-results/flat/bom.1.3.json index 5a39a2656..e4b9e19c2 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.3.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/dev-dependencies/example-results/flat/bom.1.3.xml b/demo/dev-dependencies/example-results/flat/bom.1.3.xml index 7515f5848..73a80778c 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/dev-dependencies/example-results/flat/bom.1.4.json b/demo/dev-dependencies/example-results/flat/bom.1.4.json index 8cc3c9dec..9794e566f 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.4.json +++ b/demo/dev-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/dev-dependencies/example-results/flat/bom.1.4.xml b/demo/dev-dependencies/example-results/flat/bom.1.4.xml index bfd030dbc..13f7382a1 100644 --- a/demo/dev-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/dev-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/gen-boms.sh b/demo/gen-boms.sh index 008da7f77..5ff38360c 100755 --- a/demo/gen-boms.sh +++ b/demo/gen-boms.sh @@ -26,6 +26,7 @@ do node -- "$BIN_CDX_N" \ --spec-version "$spec" \ --output-reproducible \ + --validate \ --output-format "$format" \ --output-file "$result_dir/bare/bom.$spec.$format" \ "$package" @@ -36,6 +37,7 @@ do --flatten-components \ --spec-version "$spec" \ --output-reproducible \ + --validate \ --output-format "$format" \ --output-file "$result_dir/flat/bom.$spec.$format" \ "$package" diff --git a/demo/juice-shop/example-results/bare/bom.1.2.json b/demo/juice-shop/example-results/bare/bom.1.2.json index f8086a9fa..1d73a70fe 100644 --- a/demo/juice-shop/example-results/bare/bom.1.2.json +++ b/demo/juice-shop/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/juice-shop/example-results/bare/bom.1.2.xml b/demo/juice-shop/example-results/bare/bom.1.2.xml index 5660d3701..8fdea1480 100644 --- a/demo/juice-shop/example-results/bare/bom.1.2.xml +++ b/demo/juice-shop/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/juice-shop/example-results/bare/bom.1.3.json b/demo/juice-shop/example-results/bare/bom.1.3.json index 0e183c71c..07b9d504f 100644 --- a/demo/juice-shop/example-results/bare/bom.1.3.json +++ b/demo/juice-shop/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/juice-shop/example-results/bare/bom.1.3.xml b/demo/juice-shop/example-results/bare/bom.1.3.xml index 0c8abc4b1..a2b94b0d7 100644 --- a/demo/juice-shop/example-results/bare/bom.1.3.xml +++ b/demo/juice-shop/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/juice-shop/example-results/bare/bom.1.4.json b/demo/juice-shop/example-results/bare/bom.1.4.json index 165aefa3e..eb89532fa 100644 --- a/demo/juice-shop/example-results/bare/bom.1.4.json +++ b/demo/juice-shop/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/juice-shop/example-results/bare/bom.1.4.xml b/demo/juice-shop/example-results/bare/bom.1.4.xml index 9f9428015..e6a92a1aa 100644 --- a/demo/juice-shop/example-results/bare/bom.1.4.xml +++ b/demo/juice-shop/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/juice-shop/example-results/flat/bom.1.2.json b/demo/juice-shop/example-results/flat/bom.1.2.json index cbbfb877b..fa8750c93 100644 --- a/demo/juice-shop/example-results/flat/bom.1.2.json +++ b/demo/juice-shop/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/juice-shop/example-results/flat/bom.1.2.xml b/demo/juice-shop/example-results/flat/bom.1.2.xml index dc16c20cd..db8f23a3e 100644 --- a/demo/juice-shop/example-results/flat/bom.1.2.xml +++ b/demo/juice-shop/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/juice-shop/example-results/flat/bom.1.3.json b/demo/juice-shop/example-results/flat/bom.1.3.json index 373fc854f..72a8a258b 100644 --- a/demo/juice-shop/example-results/flat/bom.1.3.json +++ b/demo/juice-shop/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/juice-shop/example-results/flat/bom.1.3.xml b/demo/juice-shop/example-results/flat/bom.1.3.xml index d50219da0..0a3daf1e1 100644 --- a/demo/juice-shop/example-results/flat/bom.1.3.xml +++ b/demo/juice-shop/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/juice-shop/example-results/flat/bom.1.4.json b/demo/juice-shop/example-results/flat/bom.1.4.json index dafdf0c4a..b663d67cc 100644 --- a/demo/juice-shop/example-results/flat/bom.1.4.json +++ b/demo/juice-shop/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/juice-shop/example-results/flat/bom.1.4.xml b/demo/juice-shop/example-results/flat/bom.1.4.xml index b288ba44c..318cc38bb 100644 --- a/demo/juice-shop/example-results/flat/bom.1.4.xml +++ b/demo/juice-shop/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/local-dependencies/example-results/bare/bom.1.2.json b/demo/local-dependencies/example-results/bare/bom.1.2.json index 092e0b6a0..c8d52c528 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.2.json +++ b/demo/local-dependencies/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-dependencies/example-results/bare/bom.1.2.xml b/demo/local-dependencies/example-results/bare/bom.1.2.xml index 52fd06653..93257d03c 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.2.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-dependencies/example-results/bare/bom.1.3.json b/demo/local-dependencies/example-results/bare/bom.1.3.json index af5b4a4de..55fbe0b26 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.3.json +++ b/demo/local-dependencies/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-dependencies/example-results/bare/bom.1.3.xml b/demo/local-dependencies/example-results/bare/bom.1.3.xml index 39053f4e1..4cddefab0 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.3.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-dependencies/example-results/bare/bom.1.4.json b/demo/local-dependencies/example-results/bare/bom.1.4.json index 64040b98f..2499d3a91 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.4.json +++ b/demo/local-dependencies/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/local-dependencies/example-results/bare/bom.1.4.xml b/demo/local-dependencies/example-results/bare/bom.1.4.xml index 2174479cc..5e872b02f 100644 --- a/demo/local-dependencies/example-results/bare/bom.1.4.xml +++ b/demo/local-dependencies/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/local-dependencies/example-results/flat/bom.1.2.json b/demo/local-dependencies/example-results/flat/bom.1.2.json index 092e0b6a0..c8d52c528 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.2.json +++ b/demo/local-dependencies/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-dependencies/example-results/flat/bom.1.2.xml b/demo/local-dependencies/example-results/flat/bom.1.2.xml index 52fd06653..93257d03c 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.2.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-dependencies/example-results/flat/bom.1.3.json b/demo/local-dependencies/example-results/flat/bom.1.3.json index af5b4a4de..55fbe0b26 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.3.json +++ b/demo/local-dependencies/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-dependencies/example-results/flat/bom.1.3.xml b/demo/local-dependencies/example-results/flat/bom.1.3.xml index 39053f4e1..4cddefab0 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.3.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-dependencies/example-results/flat/bom.1.4.json b/demo/local-dependencies/example-results/flat/bom.1.4.json index 64040b98f..2499d3a91 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.4.json +++ b/demo/local-dependencies/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/local-dependencies/example-results/flat/bom.1.4.xml b/demo/local-dependencies/example-results/flat/bom.1.4.xml index 2174479cc..5e872b02f 100644 --- a/demo/local-dependencies/example-results/flat/bom.1.4.xml +++ b/demo/local-dependencies/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/local-workspaces/example-results/bare/bom.1.2.json b/demo/local-workspaces/example-results/bare/bom.1.2.json index 5a822d75a..2a23c8333 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.2.json +++ b/demo/local-workspaces/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-workspaces/example-results/bare/bom.1.2.xml b/demo/local-workspaces/example-results/bare/bom.1.2.xml index a0f9fb3ab..b7ac5b901 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.2.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-workspaces/example-results/bare/bom.1.3.json b/demo/local-workspaces/example-results/bare/bom.1.3.json index 670db5e83..8deadfd8f 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.3.json +++ b/demo/local-workspaces/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-workspaces/example-results/bare/bom.1.3.xml b/demo/local-workspaces/example-results/bare/bom.1.3.xml index 9dccd7a29..4950a3ab3 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.3.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-workspaces/example-results/bare/bom.1.4.json b/demo/local-workspaces/example-results/bare/bom.1.4.json index 30527c69b..127a24907 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.4.json +++ b/demo/local-workspaces/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/local-workspaces/example-results/bare/bom.1.4.xml b/demo/local-workspaces/example-results/bare/bom.1.4.xml index 5af94dbc7..137b08a8b 100644 --- a/demo/local-workspaces/example-results/bare/bom.1.4.xml +++ b/demo/local-workspaces/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/local-workspaces/example-results/flat/bom.1.2.json b/demo/local-workspaces/example-results/flat/bom.1.2.json index 5a822d75a..2a23c8333 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.2.json +++ b/demo/local-workspaces/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-workspaces/example-results/flat/bom.1.2.xml b/demo/local-workspaces/example-results/flat/bom.1.2.xml index a0f9fb3ab..b7ac5b901 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.2.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-workspaces/example-results/flat/bom.1.3.json b/demo/local-workspaces/example-results/flat/bom.1.3.json index 670db5e83..8deadfd8f 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.3.json +++ b/demo/local-workspaces/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/local-workspaces/example-results/flat/bom.1.3.xml b/demo/local-workspaces/example-results/flat/bom.1.3.xml index 9dccd7a29..4950a3ab3 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.3.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/local-workspaces/example-results/flat/bom.1.4.json b/demo/local-workspaces/example-results/flat/bom.1.4.json index 30527c69b..127a24907 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.4.json +++ b/demo/local-workspaces/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/local-workspaces/example-results/flat/bom.1.4.xml b/demo/local-workspaces/example-results/flat/bom.1.4.xml index 5af94dbc7..137b08a8b 100644 --- a/demo/local-workspaces/example-results/flat/bom.1.4.xml +++ b/demo/local-workspaces/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/package-with-build-id/example-results/bare/bom.1.2.json b/demo/package-with-build-id/example-results/bare/bom.1.2.json index ef5908d33..4a87adda4 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.2.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/package-with-build-id/example-results/bare/bom.1.2.xml b/demo/package-with-build-id/example-results/bare/bom.1.2.xml index 7c7dafcfb..12b8ce1c1 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.2.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/package-with-build-id/example-results/bare/bom.1.3.json b/demo/package-with-build-id/example-results/bare/bom.1.3.json index eae8a4fc4..2caff0125 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.3.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/package-with-build-id/example-results/bare/bom.1.3.xml b/demo/package-with-build-id/example-results/bare/bom.1.3.xml index a1ba02321..d904e1c59 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.3.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/package-with-build-id/example-results/bare/bom.1.4.json b/demo/package-with-build-id/example-results/bare/bom.1.4.json index 2e9bdaa33..725bd0689 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.4.json +++ b/demo/package-with-build-id/example-results/bare/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/package-with-build-id/example-results/bare/bom.1.4.xml b/demo/package-with-build-id/example-results/bare/bom.1.4.xml index 2b0f4c4c3..f8700e509 100644 --- a/demo/package-with-build-id/example-results/bare/bom.1.4.xml +++ b/demo/package-with-build-id/example-results/bare/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues diff --git a/demo/package-with-build-id/example-results/flat/bom.1.2.json b/demo/package-with-build-id/example-results/flat/bom.1.2.json index ef5908d33..4a87adda4 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.2.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.2.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/package-with-build-id/example-results/flat/bom.1.2.xml b/demo/package-with-build-id/example-results/flat/bom.1.2.xml index 7c7dafcfb..12b8ce1c1 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.2.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.2.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/package-with-build-id/example-results/flat/bom.1.3.json b/demo/package-with-build-id/example-results/flat/bom.1.3.json index eae8a4fc4..2caff0125 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.3.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.3.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1" + "version": "1.14.0" }, { "vendor": "@cyclonedx", diff --git a/demo/package-with-build-id/example-results/flat/bom.1.3.xml b/demo/package-with-build-id/example-results/flat/bom.1.3.xml index a1ba02321..d904e1c59 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.3.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.3.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 @cyclonedx diff --git a/demo/package-with-build-id/example-results/flat/bom.1.4.json b/demo/package-with-build-id/example-results/flat/bom.1.4.json index 2e9bdaa33..725bd0689 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.4.json +++ b/demo/package-with-build-id/example-results/flat/bom.1.4.json @@ -8,7 +8,7 @@ { "vendor": "@cyclonedx", "name": "cyclonedx-library", - "version": "1.14.0-rc.1", + "version": "1.14.0", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-javascript-library/issues", diff --git a/demo/package-with-build-id/example-results/flat/bom.1.4.xml b/demo/package-with-build-id/example-results/flat/bom.1.4.xml index 2b0f4c4c3..f8700e509 100644 --- a/demo/package-with-build-id/example-results/flat/bom.1.4.xml +++ b/demo/package-with-build-id/example-results/flat/bom.1.4.xml @@ -5,7 +5,7 @@ @cyclonedx cyclonedx-library - 1.14.0-rc.1 + 1.14.0 https://github.com/CycloneDX/cyclonedx-javascript-library/issues From 18020da8cb9e81eb10ce907ce562cc382212ec49 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 12:31:12 +0200 Subject: [PATCH 22/23] docs Signed-off-by: Jan Kowalleck --- README.md | 2 +- src/cli.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f90467609..8f4efb6e5 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ Options: --output-file Path to the output file. Set to "-" to write to STDOUT. (default: write to STDOUT) - --validate Validate resulting BOM before outputting. Validation is skipped, if dependencies are missing or not met. + --validate Validate resulting BOM before outputting. Validation is skipped, if requirements not met. (default: true) --no-validate Disable validation of resulting BOM. --mc-type Type of the main component. diff --git a/src/cli.ts b/src/cli.ts index 49bbbdd7a..528159f40 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -142,7 +142,7 @@ function makeCommand (process: NodeJS.Process): Command { new Option( '--validate', 'Validate resulting BOM before outputting. ' + - 'Validation is skipped, if dependencies are missing or not met.' + 'Validation is skipped, if requirements not met. See the README.' ).default(true) ).addOption( new Option( From 327f43367526ed8c1b4d652f421372cf55194634 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 26 Apr 2023 12:45:30 +0200 Subject: [PATCH 23/23] fix issue template Signed-off-by: Jan Kowalleck --- .github/ISSUE_TEMPLATE/ValidationError-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/ValidationError-report.md b/.github/ISSUE_TEMPLATE/ValidationError-report.md index 23cc24772..5eb07ba21 100644 --- a/.github/ISSUE_TEMPLATE/ValidationError-report.md +++ b/.github/ISSUE_TEMPLATE/ValidationError-report.md @@ -19,7 +19,7 @@ Steps to reproduce the behavior: 4. Expected result: ## Environment