From 542e5196bb35c6fdef10e2e1371b5947fbe724a5 Mon Sep 17 00:00:00 2001 From: Sujal Giri Date: Sun, 15 Nov 2026 10:20:23 +0530 Subject: [PATCH] Handle dict dependency versions in Dart pubspec parsing Fixes #5482 Signed-off-by: Sujal Giri --- src/packagedcode/pubspec.py | 15 ++- ...deps-versions-path-git-hosted-pubspec.yaml | 23 ++++ ...path-git-hosted-pubspec.yaml-expected.json | 113 ++++++++++++++++++ 3 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml create mode 100644 tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml-expected.json diff --git a/src/packagedcode/pubspec.py b/src/packagedcode/pubspec.py index bbc36038c0d..5284e91c4b0 100644 --- a/src/packagedcode/pubspec.py +++ b/src/packagedcode/pubspec.py @@ -205,13 +205,16 @@ def build_dep(name, version, scope, is_runtime=True, is_optional=False): Return DependentPackage from the provided data. """ - # TODO: these can be more complex for SDKs - # https://dart.dev/tools/pub/dependencies#dependency-sources - - if isinstance(version, dict) and 'sdk' in version: - # {'sdk': 'flutter'} type of deps.... - # which is a wart that we keep as a requiremnet + # Dependency versions can be a plain version constraint string or a + # mapping describing the dependency source, e.g. {'sdk': 'flutter'}, + # {'path': '../foo'}, {'git': {...}} or {'hosted': {...}}. + # See https://dart.dev/tools/pub/dependencies#dependency-sources + # Keep the source as the requirement instead of failing the whole + # parse when the version is not a plain string. + if isinstance(version, dict): version = ', '.join(': '.join([k, str(v)]) for k, v in version.items()) + elif not isinstance(version, str): + version = str(version) if version.replace('.', '').isdigit(): # version is pinned exactly if it is only made of dots and digits diff --git a/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml b/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml new file mode 100644 index 00000000000..806e273bc06 --- /dev/null +++ b/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml @@ -0,0 +1,23 @@ +name: foobar +version: 1.0.0 + +environment: + sdk: ">=2.0.0 <3.0.0" + +dependencies: + # path dependencies are mappings, not version strings + # see https://github.com/aboutcode-org/scancode-toolkit/issues/5482 + path_dep: + path: ../shared_package + git_dep: + git: + url: https://github.com/example/some_package.git + ref: main + hosted_dep: + hosted: https://pub.example.com + version: ^1.2.0 + plain_dep: ^0.18.0 + +dev_dependencies: + _shared_test: + path: ../shared_test diff --git a/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml-expected.json b/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml-expected.json new file mode 100644 index 00000000000..98c227e02ae --- /dev/null +++ b/tests/packagedcode/data/pubspec/specs/deps-versions-path-git-hosted-pubspec.yaml-expected.json @@ -0,0 +1,113 @@ +[ + { + "type": "dart", + "namespace": null, + "name": "foobar", + "version": "1.0.0", + "qualifiers": {}, + "subpath": null, + "primary_language": "dart", + "description": null, + "release_date": null, + "parties": [], + "keywords": [], + "homepage_url": null, + "download_url": "https://pub.dartlang.org/packages/foobar/versions/1.0.0.tar.gz", + "size": null, + "sha1": null, + "md5": null, + "sha256": null, + "sha512": null, + "bug_tracking_url": null, + "code_view_url": null, + "vcs_url": null, + "copyright": null, + "holder": null, + "declared_license_expression": null, + "declared_license_expression_spdx": null, + "license_detections": [], + "other_license_expression": null, + "other_license_expression_spdx": null, + "other_license_detections": [], + "extracted_license_statement": null, + "notice_text": null, + "source_packages": [], + "file_references": [], + "is_private": false, + "is_virtual": false, + "extra_data": {}, + "dependencies": [ + { + "purl": "pkg:pubspec/path_dep", + "extracted_requirement": "path: ../shared_package", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:pubspec/git_dep", + "extracted_requirement": "git: {'url': 'https://github.com/example/some_package.git', 'ref': 'main'}", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:pubspec/hosted_dep", + "extracted_requirement": "hosted: https://pub.example.com, version: ^1.2.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:pubspec/plain_dep", + "extracted_requirement": "^0.18.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:pubspec/_shared_test", + "extracted_requirement": "path: ../shared_test", + "scope": "dev_dependencies", + "is_runtime": false, + "is_optional": true, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + }, + { + "purl": "pkg:pubspec/sdk", + "extracted_requirement": ">=2.0.0 <3.0.0", + "scope": "environment", + "is_runtime": true, + "is_optional": false, + "is_pinned": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {} + } + ], + "repository_homepage_url": "https://pub.dev/packages/foobar/versions/1.0.0", + "repository_download_url": "https://pub.dartlang.org/packages/foobar/versions/1.0.0.tar.gz", + "api_data_url": "https://pub.dev/api/packages/foobar/versions/1.0.0", + "datasource_id": "pubspec_yaml", + "purl": "pkg:dart/foobar@1.0.0" + } +] \ No newline at end of file