fix(core): fix missing top-level dependencies (#14832)

packages/workspace/src/utilities/buildable-libs-utils.spec.ts

@@ -68,7 +68,7 @@ describe('calculateProjectDependencies', () => {
       },
     };
 
-    const results = await calculateProjectDependencies(
+    const results = calculateProjectDependencies(
       graph,
       'root',
       'example',
@@ -162,6 +162,103 @@ describe('calculateProjectDependencies', () => {
       ],
     });
   });
+
+  it('should include all top-level dependencies, even ones that are also transitive', async () => {
+    const graph: ProjectGraph = {
+      nodes: {
+        example: {
+          type: 'lib',
+          name: 'example',
+          data: {
+            files: [],
+            root: '/root/example',
+            targets: {
+              build: {
+                executor: 'x',
+              },
+            },
+          },
+        },
+        example2: {
+          type: 'lib',
+          name: 'example2',
+          data: {
+            files: [],
+            root: '/root/example2',
+            targets: {
+              build: {
+                executor: 'x',
+              },
+            },
+          },
+        },
+      },
+      externalNodes: {
+        'npm:formik': {
+          type: 'npm',
+          name: 'npm:formik',
+          data: {
+            packageName: 'formik',
+            version: '0.0.0',
+          },
+        },
+        'npm:foo': {
+          type: 'npm',
+          name: 'npm:foo',
+          data: {
+            packageName: 'foo',
+            version: '0.0.0',
+          },
+        },
+      },
+      dependencies: {
+        example: [
+          // when example2 dependency is listed first
+          {
+            source: 'example',
+            target: 'example2',
+            type: DependencyType.static,
+          },
+          {
+            source: 'example',
+            target: 'npm:formik',
+            type: DependencyType.static,
+          },
+        ],
+        example2: [
+          // and example2 also depends on npm:formik
+          {
+            source: 'example2',
+            target: 'npm:formik',
+            type: DependencyType.static,
+          },
+          {
+            source: 'example2',
+            target: 'npm:foo',
+            type: DependencyType.static,
+          },
+        ],
+      },
+    };
+
+    const results = calculateProjectDependencies(
+      graph,
+      'root',
+      'example',
+      'build',
+      undefined
+    );
+    expect(results).toMatchObject({
+      target: {
+        name: 'example',
+      },
+      topLevelDependencies: [
+        // expect example2 and formik as top-level deps, but not foo
+        expect.objectContaining({ name: 'example2' }),
+        expect.objectContaining({ name: 'formik' }),
+      ],
+    });
+  });
 });
 
 describe('missingDependencies', () => {

packages/workspace/src/utilities/buildable-libs-utils.ts

@@ -139,7 +139,8 @@ function collectDependencies(
   areTopLevelDeps = true
 ): { name: string; isTopLevel: boolean }[] {
   (projGraph.dependencies[project] || []).forEach((dependency) => {
-    if (!acc.some((dep) => dep.name === dependency.target)) {
+    const existingEntry = acc.find((dep) => dep.name === dependency.target);
+    if (!existingEntry) {
       // Temporary skip this. Currently the set of external nodes is built from package.json, not lock file.
       // As a result, some nodes might be missing. This should not cause any issues, we can just skip them.
       if (
@@ -153,6 +154,8 @@ function collectDependencies(
       if (!shallow && isInternalTarget) {
         collectDependencies(dependency.target, projGraph, acc, shallow, false);
       }
+    } else if (areTopLevelDeps && !existingEntry.isTopLevel) {
+      existingEntry.isTopLevel = true;
     }
   });
   return acc;