diff --git a/src/packagedcode/cargo.py b/src/packagedcode/cargo.py index 3b2d342d828..917dd2cea85 100644 --- a/src/packagedcode/cargo.py +++ b/src/packagedcode/cargo.py @@ -223,6 +223,20 @@ def parse(cls, location, package_only=False): if key.endswith('dependencies'): dependencies.extend(dependency_mapper(dependencies=value, scope=key)) + targets = package_data_toml.get('target', {}) + if isinstance(targets, dict): + for target_name, target_data in targets.items(): + if isinstance(target_data, dict): + for key, value in target_data.items(): + if key.endswith('dependencies') and isinstance(value, dict): + dependencies.extend( + dependency_mapper( + dependencies=value, + scope=key, + extra_data=dict(target=target_name), + ) + ) + # TODO: add file refs: # - readme, include and exclude @@ -330,13 +344,15 @@ def parse(cls, location, package_only=False): yield models.PackageData.from_data(package_data, package_only) -def dependency_mapper(dependencies, scope='dependencies'): +def dependency_mapper(dependencies, scope='dependencies', extra_data=None): """ Yield DependentPackage collected from a list of cargo dependencies """ is_runtime = not scope.endswith(('dev-dependencies', 'build-dependencies')) for name, requirement in dependencies.items(): - extra_data = {} + dep_extra_data = {} + if extra_data: + dep_extra_data.update(extra_data) extracted_requirement = None if isinstance(requirement, str): # plain version requirement @@ -348,12 +364,13 @@ def dependency_mapper(dependencies, scope='dependencies'): # everything else is just dumped in extra data # here {workspace = true} means dependency version # should be inherited + requirement = requirement.copy() is_optional = requirement.pop('optional', False) if 'version' in requirement: extracted_requirement = requirement.get('version') if requirement: - extra_data = requirement + dep_extra_data.update(requirement) yield models.DependentPackage( purl=PackageURL( @@ -365,7 +382,7 @@ def dependency_mapper(dependencies, scope='dependencies'): is_runtime=is_runtime, is_optional=is_optional, is_pinned=False, - extra_data=extra_data, + extra_data=dep_extra_data, ) diff --git a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json index 12aa1bf2154..0a1d6eb3507 100644 --- a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json +++ b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json @@ -1130,6 +1130,334 @@ "datafile_path": "tauri/core/tauri/Cargo.toml", "datasource_id": "cargo_toml" }, + { + "purl": "pkg:cargo/muda", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))", + "version": "0.11", + "default-features": false, + "features": [ + "serde" + ] + }, + "dependency_uid": "pkg:cargo/muda?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/tray-icon", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": true, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))", + "version": "0.11", + "default-features": false, + "features": [ + "serde" + ] + }, + "dependency_uid": "pkg:cargo/tray-icon?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/gtk", + "extracted_requirement": "0.18", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "0.18", + "features": [ + "v3_24" + ] + }, + "dependency_uid": "pkg:cargo/gtk?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/webkit2gtk", + "extracted_requirement": "=2.0.1", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "=2.0.1", + "features": [ + "v2_38" + ] + }, + "dependency_uid": "pkg:cargo/webkit2gtk?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/embed_plist", + "extracted_requirement": "1.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/embed_plist?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/cocoa", + "extracted_requirement": "0.25", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/cocoa?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/objc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/objc?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/window-vibrancy", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/window-vibrancy?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/webview2-com", + "extracted_requirement": "0.27", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + }, + "dependency_uid": "pkg:cargo/webview2-com?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/window-vibrancy", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + }, + "dependency_uid": "pkg:cargo/window-vibrancy?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/windows", + "extracted_requirement": "0.51", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)", + "version": "0.51", + "features": [ + "Win32_Foundation" + ] + }, + "dependency_uid": "pkg:cargo/windows?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/log", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"android\", target_os = \"ios\"))" + }, + "dependency_uid": "pkg:cargo/log?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/heck", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"android\", target_os = \"ios\"))" + }, + "dependency_uid": "pkg:cargo/heck?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/jni", + "extracted_requirement": "0.21", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"android\")" + }, + "dependency_uid": "pkg:cargo/jni?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/libc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + }, + "dependency_uid": "pkg:cargo/libc?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/objc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + }, + "dependency_uid": "pkg:cargo/objc?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/cocoa", + "extracted_requirement": "0.25", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + }, + "dependency_uid": "pkg:cargo/cocoa?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/swift-rs", + "extracted_requirement": "1.0.6", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + }, + "dependency_uid": "pkg:cargo/swift-rs?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri@2.0.0-alpha.17?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, { "purl": "pkg:cargo/serde", "extracted_requirement": "1.0", @@ -1245,6 +1573,82 @@ "datafile_path": "tauri/core/tauri-runtime/Cargo.toml", "datasource_id": "cargo_toml" }, + { + "purl": "pkg:cargo/windows", + "extracted_requirement": "0.51", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)", + "version": "0.51", + "features": [ + "Win32_Foundation" + ] + }, + "dependency_uid": "pkg:cargo/windows?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-runtime@1.0.0-alpha.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-runtime/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/gtk", + "extracted_requirement": "0.18", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "0.18", + "features": [ + "v3_24" + ] + }, + "dependency_uid": "pkg:cargo/gtk?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-runtime@1.0.0-alpha.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-runtime/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/jni", + "extracted_requirement": "0.21", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"android\")" + }, + "dependency_uid": "pkg:cargo/jni?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-runtime@1.0.0-alpha.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-runtime/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/url", + "extracted_requirement": "2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/url?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-runtime@1.0.0-alpha.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-runtime/Cargo.toml", + "datasource_id": "cargo_toml" + }, { "purl": "pkg:cargo/anyhow", "extracted_requirement": "1", @@ -1452,6 +1856,44 @@ "datafile_path": "tauri/core/tauri-build/Cargo.toml", "datasource_id": "cargo_toml" }, + { + "purl": "pkg:cargo/swift-rs", + "extracted_requirement": "1.0.6", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")", + "version": "1.0.6", + "features": [ + "build" + ] + }, + "dependency_uid": "pkg:cargo/swift-rs?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-build@2.0.0-alpha.11?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-build/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/plist", + "extracted_requirement": "1", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + }, + "dependency_uid": "pkg:cargo/plist?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/tauri-build@2.0.0-alpha.11?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/core/tauri-build/Cargo.toml", + "datasource_id": "cargo_toml" + }, { "purl": "pkg:cargo/tauri", "extracted_requirement": null, @@ -1910,6 +2352,36 @@ "is_direct": true, "resolved_package": {}, "extra_data": {} + }, + { + "purl": "pkg:cargo/swift-rs", + "extracted_requirement": "1.0.6", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")", + "version": "1.0.6", + "features": [ + "build" + ] + } + }, + { + "purl": "pkg:cargo/plist", + "extracted_requirement": "1", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } } ], "repository_homepage_url": "https://crates.io/crates/tauri-build", @@ -2026,11 +2498,60 @@ "is_pinned": false, "is_direct": true, "resolved_package": {}, - "extra_data": {} + "extra_data": {} + }, + { + "purl": "pkg:cargo/tauri-utils", + "extracted_requirement": "2.0.0-alpha.10", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "version": "2.0.0-alpha.10", + "path": "../tauri-utils" + } + }, + { + "purl": "pkg:cargo/http", + "extracted_requirement": "0.2.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:cargo/raw-window-handle", + "extracted_requirement": "0.5", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:cargo/url", + "extracted_requirement": "2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "version": "2" + } }, { - "purl": "pkg:cargo/tauri-utils", - "extracted_requirement": "2.0.0-alpha.10", + "purl": "pkg:cargo/windows", + "extracted_requirement": "0.51", "scope": "dependencies", "is_runtime": true, "is_optional": false, @@ -2038,31 +2559,42 @@ "is_direct": true, "resolved_package": {}, "extra_data": { - "version": "2.0.0-alpha.10", - "path": "../tauri-utils" + "target": "cfg(windows)", + "version": "0.51", + "features": [ + "Win32_Foundation" + ] } }, { - "purl": "pkg:cargo/http", - "extracted_requirement": "0.2.4", + "purl": "pkg:cargo/gtk", + "extracted_requirement": "0.18", "scope": "dependencies", "is_runtime": true, "is_optional": false, "is_pinned": false, "is_direct": true, "resolved_package": {}, - "extra_data": {} + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "0.18", + "features": [ + "v3_24" + ] + } }, { - "purl": "pkg:cargo/raw-window-handle", - "extracted_requirement": "0.5", + "purl": "pkg:cargo/jni", + "extracted_requirement": "0.21", "scope": "dependencies", "is_runtime": true, "is_optional": false, "is_pinned": false, "is_direct": true, "resolved_package": {}, - "extra_data": {} + "extra_data": { + "target": "cfg(target_os = \"android\")" + } }, { "purl": "pkg:cargo/url", @@ -2074,7 +2606,7 @@ "is_direct": true, "resolved_package": {}, "extra_data": { - "version": "2" + "target": "cfg(target_os = \"macos\")" } } ], @@ -2691,6 +3223,262 @@ "is_direct": true, "resolved_package": {}, "extra_data": {} + }, + { + "purl": "pkg:cargo/muda", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))", + "version": "0.11", + "default-features": false, + "features": [ + "serde" + ] + } + }, + { + "purl": "pkg:cargo/tray-icon", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": true, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))", + "version": "0.11", + "default-features": false, + "features": [ + "serde" + ] + } + }, + { + "purl": "pkg:cargo/gtk", + "extracted_requirement": "0.18", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "0.18", + "features": [ + "v3_24" + ] + } + }, + { + "purl": "pkg:cargo/webkit2gtk", + "extracted_requirement": "=2.0.1", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "=2.0.1", + "features": [ + "v2_38" + ] + } + }, + { + "purl": "pkg:cargo/embed_plist", + "extracted_requirement": "1.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } + }, + { + "purl": "pkg:cargo/cocoa", + "extracted_requirement": "0.25", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } + }, + { + "purl": "pkg:cargo/objc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } + }, + { + "purl": "pkg:cargo/window-vibrancy", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } + }, + { + "purl": "pkg:cargo/webview2-com", + "extracted_requirement": "0.27", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + } + }, + { + "purl": "pkg:cargo/window-vibrancy", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + } + }, + { + "purl": "pkg:cargo/windows", + "extracted_requirement": "0.51", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)", + "version": "0.51", + "features": [ + "Win32_Foundation" + ] + } + }, + { + "purl": "pkg:cargo/log", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"android\", target_os = \"ios\"))" + } + }, + { + "purl": "pkg:cargo/heck", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"android\", target_os = \"ios\"))" + } + }, + { + "purl": "pkg:cargo/jni", + "extracted_requirement": "0.21", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"android\")" + } + }, + { + "purl": "pkg:cargo/libc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + } + }, + { + "purl": "pkg:cargo/objc", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + } + }, + { + "purl": "pkg:cargo/cocoa", + "extracted_requirement": "0.25", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + } + }, + { + "purl": "pkg:cargo/swift-rs", + "extracted_requirement": "1.0.6", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"ios\")" + } } ], "repository_homepage_url": "https://crates.io/crates/tauri", @@ -3289,6 +4077,34 @@ "test" ] } + }, + { + "purl": "pkg:cargo/tauri-plugin-cli", + "extracted_requirement": null, + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "git": "https://github.com/tauri-apps/plugins-workspace", + "branch": "v2" + } + }, + { + "purl": "pkg:cargo/window-shadows", + "extracted_requirement": "0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"windows\")" + } } ], "repository_homepage_url": "https://crates.io/crates/api", diff --git a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected index 79b0a84c7c8..84d4b9bcad2 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected @@ -220,6 +220,20 @@ "is_direct": true, "resolved_package": {}, "extra_data": {} + }, + { + "purl": "pkg:cargo/ansi_term", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": true, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(not(windows))", + "version": "0.11" + } } ], "repository_homepage_url": "https://crates.io/crates/clap", diff --git a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected index 6a60afc8816..49fe7f73a8e 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected @@ -344,6 +344,54 @@ "is_direct": true, "resolved_package": {}, "extra_data": {} + }, + { + "purl": "pkg:cargo/winapi", + "extracted_requirement": "0.3", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)", + "version": "0.3", + "features": [ + "jobapi", + "jobapi2", + "processthreadsapi", + "psapi", + "synchapi", + "winuser" + ] + } + }, + { + "purl": "pkg:cargo/winreg", + "extracted_requirement": "0.5.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + } + }, + { + "purl": "pkg:cargo/gcc", + "extracted_requirement": "0.3.50", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)" + } } ], "repository_homepage_url": "https://crates.io/crates/rustup", diff --git a/tests/packagedcode/data/cargo/cargo_toml/tauri/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/tauri/Cargo.toml.expected index 25b7f94cd55..64164740707 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/tauri/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/tauri/Cargo.toml.expected @@ -131,6 +131,66 @@ "extra_data": { "version": "2" } + }, + { + "purl": "pkg:cargo/windows", + "extracted_requirement": "0.51", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(windows)", + "version": "0.51", + "features": [ + "Win32_Foundation" + ] + } + }, + { + "purl": "pkg:cargo/gtk", + "extracted_requirement": "0.18", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))", + "version": "0.18", + "features": [ + "v3_24" + ] + } + }, + { + "purl": "pkg:cargo/jni", + "extracted_requirement": "0.21", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"android\")" + } + }, + { + "purl": "pkg:cargo/url", + "extracted_requirement": "2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "target": "cfg(target_os = \"macos\")" + } } ], "repository_homepage_url": "https://crates.io/crates/tauri-runtime", diff --git a/tests/packagedcode/test_cargo.py b/tests/packagedcode/test_cargo.py index 2f6a2baa796..4661323d0e1 100644 --- a/tests/packagedcode/test_cargo.py +++ b/tests/packagedcode/test_cargo.py @@ -98,6 +98,52 @@ def test_parse_cargo_toml_tauri_workspace_in_version(self): packages_data = cargo.CargoTomlHandler.parse(test_file) self.check_packages_data(packages_data, expected_loc, regen=REGEN_TEST_FIXTURES) + def test_parse_cargo_toml_target_dependencies(self): + test_file = self.get_temp_file('Cargo.toml') + with open(test_file, 'w') as f: + f.write( + '[package]\n' + 'name = "test-crate"\n' + 'version = "1.0.0"\n\n' + '[dependencies]\n' + 'serde = "1.0"\n\n' + '[target.\'cfg(windows)\'.dependencies]\n' + 'winapi = "0.3"\n\n' + '[target.x86_64-unknown-linux-gnu.dependencies]\n' + 'openssl = "0.10"\n\n' + '[target.\'cfg(unix)\'.dev-dependencies]\n' + 'nix = "0.26"\n' + ) + packages_data = list(cargo.CargoTomlHandler.parse(test_file)) + assert len(packages_data) == 1 + package = packages_data[0] + assert package.name == 'test-crate' + deps = package.dependencies + assert len(deps) == 4 + deps_by_name = {d.purl: d for d in deps} + assert 'pkg:cargo/serde' in deps_by_name + assert 'pkg:cargo/winapi' in deps_by_name + assert 'pkg:cargo/openssl' in deps_by_name + assert 'pkg:cargo/nix' in deps_by_name + + winapi_dep = deps_by_name['pkg:cargo/winapi'] + assert winapi_dep.extracted_requirement == '0.3' + assert winapi_dep.scope == 'dependencies' + assert winapi_dep.is_runtime is True + assert winapi_dep.extra_data == {'target': 'cfg(windows)'} + + openssl_dep = deps_by_name['pkg:cargo/openssl'] + assert openssl_dep.extracted_requirement == '0.10' + assert openssl_dep.scope == 'dependencies' + assert openssl_dep.is_runtime is True + assert openssl_dep.extra_data == {'target': 'x86_64-unknown-linux-gnu'} + + nix_dep = deps_by_name['pkg:cargo/nix'] + assert nix_dep.extracted_requirement == '0.26' + assert nix_dep.scope == 'dev-dependencies' + assert nix_dep.is_runtime is False + assert nix_dep.extra_data == {'target': 'cfg(unix)'} + def test_parse_cargo_lock_sample1(self): test_file = self.get_test_loc('cargo/cargo_lock/sample1/Cargo.lock') expected_loc = self.get_test_loc('cargo/cargo_lock/sample1/output.expected.json')