fix: workspace query bug

Fixes a query bug which omits some dependencies in scenarios where a
workspace has a dependency on another workspace in the project.

Signed-off-by: Brian DeHamer <bdehamer@github.com>

Author: bdehamer

workspaces/arborist/lib/query-selector-all.js

@@ -710,25 +710,33 @@ const hasParent = (node, compareNodes) => {
   return false
 }
 
-// checks if a given node is a descendant of any of the nodes provided in the
-// compareNodes array
-const hasAscendant = (node, compareNodes, seen = new Set()) => {
-  // TODO (future) loop over ancestry property
-  if (hasParent(node, compareNodes)) {
-    return true
+// checks if a given node is a child of the provided compareNode
+const isChild = (node, compareNode) => {
+  for (const edge of compareNode.edgesOut.values()) {
+    if (edge.to === node || edge.to?.target === node) {
+      return true
+    }
   }
+  return false
+}
 
-  if (node.isTop && node.resolveParent) {
-    return hasAscendant(node.resolveParent, compareNodes)
+// checks if a given node is the descendant of the provided compareNode
+const isDescendant = (node, compareNode, seen = new Set()) => {
+  // Direct child
+  if (isChild(node, compareNode)) {
+    return true
   }
-  for (const edge of node.edgesIn) {
-    // TODO Need a test with an infinite loop
+
+  // Loop through edgesOut of compareNode to see if there is a path to node
+  for (const edge of compareNode.edgesOut.values()) {
     if (seen.has(edge)) {
       continue
     }
     seen.add(edge)
-    if (edge && edge.from && hasAscendant(edge.from, compareNodes, seen)) {
-      return true
+    if (edge.to) {
+      if (isDescendant(node, edge.to.isLink ? edge.to.target : edge.to, seen)) {
+        return true
+      }
     }
   }
   return false
@@ -741,7 +749,9 @@ const combinators = {
   },
   // any descendant
   ' ' (prevResults, nextResults) {
-    return nextResults.filter(node => hasAscendant(node, prevResults))
+    return nextResults.filter(node =>
+      prevResults.some(compareNode => isDescendant(node, compareNode))
+    )
   },
   // sibling
   '~' (prevResults, nextResults) {

workspaces/arborist/test/query-selector-all.js

@@ -24,6 +24,7 @@ t.test('query-selector-all', async t => {
     │   └── lorem@1.0.0 (production dep of baz)
     ├── abbrev@1.1.1 (production dep of query-selector-all-tests)
     ├─┬ b@1.0.0 -> ./b (workspace)
+    │ ├── a@2.0.0 (dev dep of b, deduped)
     │ └── bar@2.0.0 (production dep of b, deduped)
     ├─┬ bar@2.0.0 (production dep of query-selector-all-tests)
     │ └── moo@3.0.0 (production dep of bar)
@@ -513,7 +514,7 @@ t.test('query-selector-all', async t => {
     ['*:has(* > #bar:semver(1.4.0))', ['foo@2.2.2']],
     ['*:has(> #bar:semver(1.4.0))', ['foo@2.2.2']],
     ['.workspace:has(> * > #lorem)', ['a@1.0.0']],
-    ['.workspace:has(* #lorem, ~ #b)', ['a@1.0.0']],
+    ['.workspace:has(* #lorem, ~ #b)', ['a@1.0.0', 'b@1.0.0']],
 
     // is pseudo
     [':is(#a, #b) > *', ['a@1.0.0', 'bar@2.0.0', 'baz@1.0.0']],
@@ -960,5 +961,6 @@ t.test('query-selector-all', async t => {
     [':root #bar:semver(1) ~ *', ['dash-separated-pkg@1.0.0']],
     ['#bar:semver(2), #foo', ['bar@2.0.0', 'foo@2.2.2']],
     ['#a, #bar:semver(2), #foo:semver(2.2.2)', ['a@1.0.0', 'bar@2.0.0', 'foo@2.2.2']],
+    ['#b *', ['a@1.0.0', 'bar@2.0.0', 'baz@1.0.0', 'lorem@1.0.0', 'moo@3.0.0']],
   ])
 })