Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace toml library #1468

Merged
merged 4 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/repotests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: true
matrix:
node-version: ['23.x']
os: ['ubuntu-latest', 'windows-latest', 'self-hosted']
os: ['ubuntu-latest', 'windows-latest']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Our philosophy:

## Documentation

Please visit our [documentation site][docs-homepage] for detailed usage, tutorials, and support documentation.
Please visit our [GPT app][cdxgen-gpt] or the [documentation site][docs-homepage] for detailed usage, tutorials, and support documentation.

Sections include:

Expand Down Expand Up @@ -556,3 +556,4 @@ pnpm test
[podman-github-rootless]: https://github.com/containers/podman/blob/master/docs/tutorials/rootless_tutorial.md
[podman-github-remote]: https://github.com/containers/podman/blob/master/docs/tutorials/mac_win_client.md
[swh-cdxgen]: https://archive.softwareheritage.org/browse/origin/?origin_url=https://github.com/CycloneDX/cdxgen
[cdxgen-gpt]: https://chatgpt.com/g/g-673bfeb4037481919be8a2cd1bf868d2-cyclonedx-generator-cdxgen
7 changes: 5 additions & 2 deletions data/component-tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@
"sbom": [
{
"test": [
"(junit|xmlunit|testng|chai|mocha|jest|test4j|xunit|coverlet|Test\\.Sdk)"
"(junit|xmlunit|testng|mocha|jest|test4j|xunit|coverlet|Test\\.Sdk)",
"^(chai)$"
]
},
{
Expand All @@ -244,7 +245,9 @@
{ "parse": ["(parser)"] },
{ "transform": ["(transformer)"] },
{ "telemetry": ["(OpenTelemetry)"] },
{ "logging": ["(Microsoft\\.Extensions\\.Logging|Log4net)"] }
{ "logging": ["(Microsoft\\.Extensions\\.Logging|Log4net)"] },
{ "ml": ["^(llama|langchain|openai)", "(generativeai)"] },
{ "devel": ["^(types-|typing-|virtualenv|ruff|poetry)"] }
],
"obom": [
{
Expand Down
3 changes: 3 additions & 0 deletions data/frameworks-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
"pkg:pypi/botocore",
"pkg:pypi/boto3",
"pkg:pypi/azure",
"pkg:pypi/langchain",
"pkg:pypi/llama",
"pkg:pypi/sqlalchemy",
"vibora",
"koa",
"-sdk",
Expand Down
5 changes: 3 additions & 2 deletions deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "11.0.2",
"version": "11.0.3",
"exports": "./lib/cli/index.js",
"compilerOptions": {
"lib": ["deno.window"],
Expand Down Expand Up @@ -82,6 +82,7 @@
"body-parser": "npm:body-parser@^2.0.1",
"compression": "npm:compression@^1.7.5",
"connect": "npm:connect@^3.7.0",
"jsonata": "npm:jsonata@^2.0.5"
"jsonata": "npm:jsonata@^2.0.5",
"@iarna/toml": "npm:@iarna/[email protected]"
}
}
2 changes: 1 addition & 1 deletion jsr.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "11.0.2",
"version": "11.0.3",
"exports": "./lib/cli/index.js",
"include": ["*.js", "lib/**", "bin/**", "data/**", "types/**"],
"exclude": [
Expand Down
11 changes: 9 additions & 2 deletions lib/helpers/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import path, {
} from "node:path";
import process from "node:process";
import { URL, fileURLToPath } from "node:url";
import toml from "@iarna/toml";
import Arborist from "@npmcli/arborist";
import { load } from "cheerio";
import { parseEDNString } from "edn-data";
Expand All @@ -45,7 +46,6 @@ import {
satisfies,
valid,
} from "semver";
import toml from "toml";
import { IriValidationStrategy, validateIri } from "validate-iri";
import { xml2js } from "xml-js";
import { getTreeWithPlugin } from "../managers/piptree.js";
Expand Down Expand Up @@ -4081,7 +4081,14 @@ export async function parsePoetrylockData(lockData, lockFile, pyProjectFile) {
pyProjectFile = lockFile.replace("poetry.lock", "pyproject.toml");
if (existsSync(pyProjectFile)) {
const pyprojTomlFile = readFileSync(pyProjectFile, { encoding: "utf-8" });
const tomlData = toml.parse(pyprojTomlFile);
let tomlData;
try {
tomlData = toml.parse(pyprojTomlFile);
} catch (err) {
console.log(
`Error while parsing the file ${pyprojTomlFile}. Dependency tree information might be incorrect.`,
);
}
if (tomlData?.tool?.poetry) {
for (const adep of Object.keys(tomlData?.tool?.poetry?.dependencies)) {
if (
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "11.0.2",
"version": "11.0.3",
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
"homepage": "http://github.com/cyclonedx/cdxgen",
"author": "Prabhu Subramanian <[email protected]>",
Expand Down Expand Up @@ -65,7 +65,7 @@
"bugs": {
"url": "https://github.com/cyclonedx/cdxgen/issues"
},
"packageManager": "pnpm@9.13.2",
"packageManager": "pnpm@9.14.2",
"lint-staged": {
"*": "biome check --fix --no-errors-on-unmatched"
},
Expand All @@ -92,11 +92,11 @@
"ssri": "^12.0.0",
"table": "^6.8.2",
"tar": "^7.4.3",
"toml": "^3.0.0",
"uuid": "^11.0.2",
"validate-iri": "^1.0.1",
"xml-js": "^1.6.11",
"yargs": "^17.7.2"
"yargs": "^17.7.2",
"@iarna/toml": "2.2.5"
},
"optionalDependencies": {
"@appthreat/atom": "2.0.25",
Expand Down
Loading
Loading