Add version in resolved package

Signed-off-by: Tushar Goel <[email protected]>
aboutcode-org · Jun 25, 2024 · f368bd4 · f368bd4
1 parent c3d4449
commit f368bd4
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 39 deletions.
diff --git a/src/packagedcode/nuget.py b/src/packagedcode/nuget.py
@@ -218,23 +218,39 @@ def parse(cls, location, package_only=False):
                 version=package_info.get('resolved'),
                 )
                 resolved_package = models.PackageData.from_data(resolved_package_mapping)
+                package_type = package_info.get('type')
+                if package_type == "Direct":
+                    is_direct = True
+                elif package_type == "Transitive":
+                    is_direct = False
+                else:
+                    raise Exception(f"Unknown package type: {package_type}")
+
+
+                version = package_info.get('resolved')
+                requested = package_info.get('requested')
                 dependency = models.DependentPackage(
-                    purl=str(PackageURL(type='nuget', name=package_name, version=package_info.get('resolved'))),
-                    extracted_requirement=package_info.get('requested') or package_info.get('resolved'),
+                    purl=str(PackageURL(type='nuget', name=package_name, version=version)),
+                    extracted_requirement=requested or version,
                     is_resolved=True,
                     resolved_package=resolved_package.to_dict(),
-                    scope=package_info.get('type'),
+                    # We use the target framework as scope since there is no concept of scope in .NET
+                    # and we may have different resolutions for different target frameworks
+                    scope=target_framework,
                     is_optional=False,
                     is_runtime=True,
-                    is_direct=True if package_info.get('type') == 'Direct' else False,
+                    is_direct=is_direct,
                 )
                 top_dependencies.append(dependency.to_dict())
         package_data = dict(
             datasource_id=cls.datasource_id,
             type=cls.default_package_type,
             primary_language=cls.default_primary_language,
             extra_data=extra_data,
-            dependencies=top_dependencies,
+            dependencies=top_dependencies, 
+            # TODO: Check if we to put virtual or private for packages without a name and version
+            # is_virtual=True,
+            # is_private=True,
         )
         yield models.PackageData.from_data(package_data, package_only)
 

diff --git a/tests/packagedcode/data/nuget/packages.lock.json.expected b/tests/packagedcode/data/nuget/packages.lock.json.expected
@@ -42,7 +42,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "[4.0.1, )",
-        "scope": "Direct",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -130,7 +130,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "[6.0.1, )",
-        "scope": "Direct",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -416,7 +416,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "[6.0.0, )",
-        "scope": "Direct",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -504,7 +504,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "4.0.1",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -570,7 +570,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -647,7 +647,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -713,7 +713,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -779,7 +779,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -856,7 +856,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.1",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -933,7 +933,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1043,7 +1043,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1153,7 +1153,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.1",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1252,7 +1252,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1329,7 +1329,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1383,7 +1383,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1449,7 +1449,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1537,7 +1537,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1591,7 +1591,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1679,7 +1679,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1789,7 +1789,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1843,7 +1843,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -1986,7 +1986,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2107,7 +2107,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2195,7 +2195,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2305,7 +2305,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2437,7 +2437,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2514,7 +2514,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2624,7 +2624,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2690,7 +2690,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "5.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2744,7 +2744,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2810,7 +2810,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2864,7 +2864,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2918,7 +2918,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,
@@ -2984,7 +2984,7 @@
       {
         "purl": "pkg:nuget/[email protected]",
         "extracted_requirement": "6.0.0",
-        "scope": "Transitive",
+        "scope": "net6.0",
         "is_runtime": true,
         "is_optional": false,
         "is_resolved": true,