Track workspaces for transitive dependencies for uv monorepos

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 20, 2025 · 0095b9b · 0095b9b
1 parent d470c3e
commit 0095b9b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -4943,14 +4943,14 @@ export async function parsePyLockData(lockData, lockFile, pyProjectFile) {
           ) {
             const dependentPkg = pkgBomRefMap[existingPkgMap[nameStr]];
             dependentPkg.properties = dependentPkg.properties || [];
-            const wsprops = dependentPkg.properties.filter(
-              (p) => p.name === "internal:workspaceRef",
-            );
-            if (!wsprops.length) {
-              for (const pprop of pkg.properties) {
-                if (pprop.name.startsWith("internal:workspace")) {
-                  dependentPkg.properties.push(pprop);
-                }
+            const addedValue = {};
+            for (const pprop of pkg.properties) {
+              if (
+                pprop.name.startsWith("internal:workspace") &&
+                !addedValue[pprop.value]
+              ) {
+                dependentPkg.properties.push(pprop);
+                addedValue[pprop.value] = true;
               }
             }
           }
@@ -4982,15 +4982,19 @@ export async function parsePyLockData(lockData, lockFile, pyProjectFile) {
         // We need to propagate the workspace properties from the parent
         const dependentPkg = pkgBomRefMap[depRef];
         dependentPkg.properties = dependentPkg.properties || [];
-        const hasWorkspaceProps =
-          dependentPkg.properties.filter((p) =>
-            p.name.startsWith("internal:workspace"),
-          ).length > 0;
-        if (!hasWorkspaceProps) {
-          for (const pprop of parentPkg.properties) {
-            if (pprop.name.startsWith("internal:workspace")) {
-              dependentPkg.properties.push(pprop);
-            }
+        const addedValue = {};
+        for (const p of dependentPkg.properties) {
+          if (p.name.startsWith("internal:workspace")) {
+            addedValue[p.value] = true;
+          }
+        }
+        for (const pprop of parentPkg.properties) {
+          if (
+            pprop.name.startsWith("internal:workspace") &&
+            !addedValue[pprop.value]
+          ) {
+            dependentPkg.properties.push(pprop);
+            addedValue[pprop.value] = true;
           }
         }
       }

diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map