fix(core): nesting npm lock file deps should support multi nests (#14949)

meeroslav · web-flow · commit 8d0c09fffab5 · 2023-02-13T11:30:40.000-05:00
diff --git a/packages/nx/src/lock-file/npm-parser.ts b/packages/nx/src/lock-file/npm-parser.ts
@@ -496,9 +496,9 @@ function nestMappedPackages(
   }
 
   nestedNodes.forEach((node) => {
-    if (invertedGraph.dependencies[node.name].length === 1) {
-      const targetName = invertedGraph.dependencies[node.name][0].target;
-      const targetNode = invertedGraph.externalNodes[targetName];
+    let unresolvedParents = invertedGraph.dependencies[node.name].length;
+    invertedGraph.dependencies[node.name].forEach(({ target }) => {
+      const targetNode = invertedGraph.externalNodes[target];
 
       if (visitedNodes.has(targetNode)) {
         visitedNodes.get(targetNode).forEach((path) => {
@@ -518,8 +518,11 @@ function nestMappedPackages(
           }
           visitedPaths.add(mappedPackage.path);
         });
-        nestedNodes.delete(node);
+        unresolvedParents--;
       }
+    });
+    if (!unresolvedParents) {
+      nestedNodes.delete(node);
     }
   });
 

Original file line number	Diff line number	Diff line change
`@@ -496,9 +496,9 @@ function nestMappedPackages(`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`nestedNodes.forEach((node) => {`
`499`		`- if (invertedGraph.dependencies[node.name].length === 1) {`
`500`		`- const targetName = invertedGraph.dependencies[node.name][0].target;`
`501`		`- const targetNode = invertedGraph.externalNodes[targetName];`
	`499`	`+ let unresolvedParents = invertedGraph.dependencies[node.name].length;`
	`500`	`+ invertedGraph.dependencies[node.name].forEach(({ target }) => {`
	`501`	`+ const targetNode = invertedGraph.externalNodes[target];`
`502`	`502`
`503`	`503`	`if (visitedNodes.has(targetNode)) {`
`504`	`504`	`visitedNodes.get(targetNode).forEach((path) => {`
`@@ -518,8 +518,11 @@ function nestMappedPackages(`
`518`	`518`	`}`
`519`	`519`	`visitedPaths.add(mappedPackage.path);`
`520`	`520`	`});`
`521`		`- nestedNodes.delete(node);`
	`521`	`+ unresolvedParents--;`
`522`	`522`	`}`
	`523`	`+ });`
	`524`	`+ if (!unresolvedParents) {`
	`525`	`+ nestedNodes.delete(node);`
`523`	`526`	`}`
`524`	`527`	`});`
`525`	`528`