Merge pull request #26 from pkgjs/refactor-arborist-tree-walk

Author: dominykas

lib/deps.js

@@ -15,21 +15,8 @@ const internals = {};
 internals.log = Debug('detect-node-support');
 
 
-internals.walk = (node, callback) => {
-
-    callback(node);
-
-    node.children.forEach((child) => {
-
-        internals.walk(child, callback);
-    });
-};
-
-
 internals.resolve = async ({ packageJson, lockfile }, options) => {
 
-    const { deep, dev } = options;
-
     const tmpDir = Tmp.dirSync({ unsafeCleanup: true });
     const path = tmpDir.name;
 
@@ -39,47 +26,26 @@ internals.resolve = async ({ packageJson, lockfile }, options) => {
         Fs.writeFileSync(Path.join(path, 'package-lock.json'), JSON.stringify(lockfile, null, '  '));
     }
 
-    const direct = new Set();
-    ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'].forEach((depType) => {
-
-        if (!packageJson[depType]) {
-            return;
-        }
-
-        Object.keys(packageJson[depType]).forEach((dep) => direct.add(dep));
-    });
-
     const arborist = new Arborist({ path });
 
     await arborist.buildIdealTree();
 
     const map = {};
 
-    internals.walk(arborist.idealTree, (node) => {
-
-        if (node.isRoot) {
-            return;
-        }
+    for (const dep of arborist.idealTree.inventory.values()) {
 
-        if (!dev && node.dev) {
+        if (!options.dev && dep.dev) {
             // only include dev deps when `options.dev` flag is set
-            return;
-        }
-
-        if (!deep && !node.parent.isRoot) {
-            // only include deep deps when `options.deep` flag is set
-            return;
+            continue;
         }
 
-        if (!deep && !direct.has(node.name)) {
-            // only include deep deps when `options.deep` flag is set
-            // workaround for https://github.com/npm/arborist/issues/60
-            return;
+        if (!options.deep && ![...dep.edgesIn].some(({ from }) => from === arborist.idealTree)) {
+            continue;
         }
 
-        map[node.name] = map[node.name] || new Set();
-        map[node.name].add(node.package.version);
-    });
+        map[dep.name] = map[dep.name] || new Set();
+        map[dep.name].add(dep.package.version);
+    }
 
     const result = {};