fix: modified comments and refactored redundant code

Author: Milan Meva

lib/commands/ls.js

@@ -144,10 +144,10 @@ class LS extends ArboristWorkspaceCmd {
       },
       visit (node) {
         // add to seenNodes as soon as we visit and not when the children are calculated in previous call
-        if (!seenNodes.has(node.path)) {
-          seenNodes.set(node.path, node)
-        } else {
+        if (seenNodes.has(node.path)) {
           node[_dedupe] = !node[_missing]
+        } else {
+          seenNodes.set(node.path, node)
         }
 
         node[_problems] = getProblems(node, { global })
@@ -507,33 +507,8 @@ const augmentNodesWithMetadata = ({
   args,
   currentDepth,
   nodeResult,
-  seenNodes,
 }) => (node) => {
-  // if the original edge was a deduped dep, treeverse will fail to
-  // revisit that node in tree traversal logic, so we make it so that
-  // we have a diff obj for deduped nodes:
-  if (seenNodes.has(node.path)) {
-    node = {
-      name: node.name,
-      version: node.version,
-      pkgid: node.pkgid,
-      target: node.target,
-      edgesOut: node.edgesOut,
-      children: node.children,
-      package: node.package,
-      path: node.path,
-      isLink: node.isLink,
-      realpath: node.realpath,
-      targetLocation: node.targetLocation,
-      [_type]: node[_type],
-      [_invalid]: node[_invalid],
-      [_missing]: node[_missing],
-      // if it's missing, it's not deduped, it's just missing
-      [_dedupe]: !node[_missing],
-    }
-  }
-
-  // _parent is going to be a ref to a treeverse-visited node (returned from
+  // _parent is going to be a ref to a traversed node (returned from
   // getHumanOutputItem, getJsonOutputItem, etc) so that we have an easy
   // shortcut to place new nodes in their right place during tree traversal
   node[_parent] = nodeResult
@@ -542,11 +517,7 @@ const augmentNodesWithMetadata = ({
   // _filteredBy is used to apply extra color info to the item that
   // was used in args in order to filter
   node[_filteredBy] = node[_include] =
-    filterByPositionalArgs(args, {
-      node: seenNodes.has(node.path)
-        ? seenNodes.get(node.path)
-        : node,
-    })
+    filterByPositionalArgs(args, { node })
   // _depth keeps track of how many levels deep tree traversal currently is
   // so that we can `npm ls --depth=1`
   node[_depth] = currentDepth + 1

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

@@ -528,7 +528,7 @@ exports[`test/lib/commands/ls.js TAP ls missing package.json > should output tre
 +-- [email protected] extraneous
 +-- [email protected] extraneous
 \`-- [email protected] extraneous
-  \`-- [email protected] deduped
+  \`-- [email protected] deduped extraneous
 `
 
 exports[`test/lib/commands/ls.js TAP ls missing/invalid/extraneous > should output tree containing missing, invalid, extraneous labels 1`] = `

test/lib/commands/ls.js

@@ -2748,6 +2748,11 @@ t.test('ls --json', async t => {
             dependencies: {
               dog: {
                 version: '1.0.0',
+                extraneous: true,
+                overridden: false,
+                problems: [
+                  'extraneous: [email protected] {CWD}/prefix/node_modules/dog',
+                ],
               },
             },
           },
@@ -4103,6 +4108,7 @@ t.test('ls --json', async t => {
                 dependencies: {
                   a: {
                     version: '1.0.0',
+                    overridden: false,
                   },
                 },
               },