From 2391c35d88b29c46d92befe5a2f509d7750dcd76 Mon Sep 17 00:00:00 2001 From: Adnan9-63 Date: Tue, 17 Nov 2026 08:01:28 +0000 Subject: [PATCH] Handle non-string and dict dependencies in pubspec build_dep Signed-off-by: Adnan9-63 --- src/packagedcode/pubspec.py | 33 ++++++++++++++++------ tests/packagedcode/test_pubspec.py | 44 ++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 8 deletions(-) diff --git a/src/packagedcode/pubspec.py b/src/packagedcode/pubspec.py index bbc36038c0d..16c10985916 100644 --- a/src/packagedcode/pubspec.py +++ b/src/packagedcode/pubspec.py @@ -208,17 +208,34 @@ def build_dep(name, version, scope, is_runtime=True, is_optional=False): # 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 - version = ', '.join(': '.join([k, str(v)]) for k, v in version.items()) + extra_data = {} + extracted_requirement = None - if version.replace('.', '').isdigit(): + if isinstance(version, dict): + if 'sdk' in version: + # {'sdk': 'flutter'} type of deps.... + # which is a wart that we keep as a requirement + extracted_requirement = ', '.join(': '.join([k, str(v)]) for k, v in version.items()) + else: + extra_data = dict(version) + if 'version' in version and isinstance(version['version'], str): + extracted_requirement = version['version'] + elif isinstance(version, str): + extracted_requirement = version + elif version is not None: + extracted_requirement = str(version) + + is_pinned = False + if ( + extracted_requirement + and isinstance(extracted_requirement, str) + and extracted_requirement.replace('.', '').isdigit() + ): # version is pinned exactly if it is only made of dots and digits purl = PackageURL( type='pubspec', name=name, - version=version, + version=extracted_requirement, ) is_pinned = True else: @@ -226,15 +243,15 @@ def build_dep(name, version, scope, is_runtime=True, is_optional=False): type='pubspec', name=name, ) - is_pinned = False dep = models.DependentPackage( purl=purl.to_string(), - extracted_requirement=version, + extracted_requirement=extracted_requirement, scope=scope, is_runtime=is_runtime, is_optional=is_optional, is_pinned=is_pinned, + extra_data=extra_data, ) return dep diff --git a/tests/packagedcode/test_pubspec.py b/tests/packagedcode/test_pubspec.py index f0a5b6d5e25..2654d64bb4f 100644 --- a/tests/packagedcode/test_pubspec.py +++ b/tests/packagedcode/test_pubspec.py @@ -34,6 +34,50 @@ def test_parse_lock(self): package_data = pubspec.DartPubspecLockHandler.parse(test_loc) self.check_packages_data(package_data, expected_loc, regen=REGEN_TEST_FIXTURES) + def test_build_dep_path_dependency(self): + dep = pubspec.build_dep( + name='my_local_package', + version={'path': '../my_local_package'}, + scope='dependencies', + ) + assert dep.purl == 'pkg:pubspec/my_local_package' + assert dep.extracted_requirement is None + assert not dep.is_pinned + assert dep.extra_data == {'path': '../my_local_package'} + + def test_build_dep_git_dependency(self): + dep = pubspec.build_dep( + name='kittens', + version={'git': {'url': 'git://github.com/munificent/kittens.git', 'ref': 'some-branch'}}, + scope='dependencies', + ) + assert dep.purl == 'pkg:pubspec/kittens' + assert dep.extracted_requirement is None + assert not dep.is_pinned + assert dep.extra_data == {'git': {'url': 'git://github.com/munificent/kittens.git', 'ref': 'some-branch'}} + + def test_build_dep_unversioned_dependency(self): + dep = pubspec.build_dep( + name='collection', + version=None, + scope='dependencies', + ) + assert dep.purl == 'pkg:pubspec/collection' + assert dep.extracted_requirement is None + assert not dep.is_pinned + assert dep.extra_data == {} + + def test_build_dep_hosted_with_version(self): + dep = pubspec.build_dep( + name='transmogrify', + version={'hosted': 'https://some-package-repo.com', 'version': '^1.4.0'}, + scope='dependencies', + ) + assert dep.purl == 'pkg:pubspec/transmogrify' + assert dep.extracted_requirement == '^1.4.0' + assert not dep.is_pinned + assert dep.extra_data == {'hosted': 'https://some-package-repo.com', 'version': '^1.4.0'} + def pub_tester(location,): manifests = []