fix json output for cycles

Author: milaninfy

lib/commands/ls.js

@@ -104,20 +104,14 @@ class LS extends ArboristWorkspaceCmd {
       return true
     }
 
-    const getChildren = (node, nodeResult, seenNodes, traversePathMap) => {
+    const getChildren = (node, nodeResult, seenNodes) => {
       const seenPaths = new Set()
       const workspace = node.isWorkspace
       const currentDepth = workspace ? 0 : node[_depth]
       const target = (node.target)?.edgesOut
 
-      const traversePath = [...(traversePathMap.get(nodeResult[_parent]) || [])]
-      const isCircular = traversePath?.includes(node.realpath + '-' + node.pkgid)
-      traversePath.push(node.realpath + '-' + node.pkgid)
-      traversePathMap.set(nodeResult, traversePath)
-
       const shouldSkipChildren =
        (currentDepth > depthToPrint) || !nodeResult
-        || isCircular
 
       return (shouldSkipChildren || !target)
         ? []
@@ -256,12 +250,20 @@ const exploreDependencyGraph = (
   }
 
   const currentNodeResult = visit(node, problems)
-  if (count > 2) {
+
+  const traversePath = [...(traversePathMap.get(currentNodeResult[_parent]) || [])]
+  const isCircular = traversePath?.includes(node.pkgid)
+  traversePath.push(node.pkgid)
+  traversePathMap.set(currentNodeResult, traversePath)
+
+  if (count > 1) {
     cache.set(node.path, currentNodeResult)
   }
 
   // Get children of current node
-  const children = getChildren(node, currentNodeResult, seenNodes, traversePathMap)
+  const children = isCircular
+    ? []
+    : getChildren(node, currentNodeResult, seenNodes, traversePathMap)
 
   // Recurse on each child
   for (const child of children) {
@@ -390,7 +392,7 @@ const getHumanOutputItem = (node, { args, chalk, global, long }) => {
 }
 
 const getJsonOutputItem = (node, { global, long }) => {
-  const item = { [_include]: node[_include] }
+  const item = { [_include]: node[_include], [_parent]: node[_parent] }
 
   if (node.version) {
     item.version = node.version

tap-snapshots/test/lib/commands/ls.js.test.cjs

@@ -600,7 +600,7 @@ exports[`test/lib/commands/ls.js TAP ls with args and dedupe entries > should pr
 | \`-- @npmcli/b@1.1.2 deduped
 +-- @npmcli/b@1.1.2
 \`-- @npmcli/c@1.0.0
-[0m  \`-- [33m@npmcli/b@1.1.2[39m [2mdeduped[22m[0m
+[0m  \`-- [33m@npmcli/b@1.1.2[39m[0m
 
 `
 
@@ -610,7 +610,7 @@ dedupe-entries@1.0.0 {CWD}/prefix
 | \`-- @npmcli/c@1.0.0 deduped
 +-- @npmcli/b@1.1.2
 | \`-- @npmcli/c@1.0.0 deduped
-\`-- @npmcli/c@1.0.0
+\`-- @npmcli/c@1.0.0 deduped
 `
 
 exports[`test/lib/commands/ls.js TAP ls with dot filter arg > should output tree contaning only occurrences of filtered by package and colored output 1`] = `
@@ -648,7 +648,7 @@ dedupe-entries@1.0.0 {CWD}/prefix
 | \`-- @npmcli/b@1.1.2 deduped
 +-- @npmcli/b@1.1.2
 \`-- @npmcli/c@1.0.0
-  \`-- @npmcli/b@1.1.2 deduped
+  \`-- @npmcli/b@1.1.2
 `
 
 exports[`test/lib/commands/ls.js TAP ls with no args dedupe entries and not displaying all > should print tree output containing deduped ref 1`] = `
@@ -672,6 +672,6 @@ test-npm-ls@1.0.0 {CWD}/prefix
 +-- chai@1.0.0 extraneous
 | \`-- dog@1.0.0 deduped invalid: "^1.2.3" from the root project, "^2.0.0" from node_modules/cat, "2.x" from node_modules/chai
 |   \`-- cat@1.0.0 deduped invalid: "^2.0.0" from the root project
-|     \`-- dog@1.0.0 deduped invalid: "^1.2.3" from the root project, "^2.0.0" from node_modules/cat, "2.x" from node_modules/chai, "^2.0.0" from node_modules/cat
-\`-- dog@1.0.0 deduped invalid: "^1.2.3" from the root project, "^2.0.0" from node_modules/cat, "2.x" from node_modules/chai, "^2.0.0" from node_modules/cat
+\`-- dog@1.0.0 deduped invalid: "^1.2.3" from the root project, "^2.0.0" from node_modules/cat, "2.x" from node_modules/chai
+  \`-- cat@1.0.0 deduped invalid: "^2.0.0" from the root project
 `