Swap from nodeModuleNamesOnly boolean nodeModuleNames (keeps backwards compatibility with old prop).

New `nodeModuleNames` options are: "exclude", "include", or "only".

nodeModuleNamesOnly: false maps to "exclude" (default)
nodeModuleNamesOnly: true maps to "only"
New option is "include"

Author: zachleat

main.js

@@ -36,9 +36,20 @@ function getNodeModuleName(filename) {
 
 /* unordered */
 function getDependenciesFor(filename, avoidCircular, optionsArg = {}) {
+  // backwards compatibility with `nodeModuleNamesOnly` boolean option
+  // Using `nodeModuleNames` property moving forward
+  if(("nodeModuleNamesOnly" in optionsArg) && !("nodeModuleNames" in optionsArg)) {
+    if(optionsArg.nodeModuleNamesOnly === true) {
+      optionsArg.nodeModuleNames = "only";
+    }
+    if(optionsArg.nodeModuleNamesOnly === false) {
+      optionsArg.nodeModuleNames = "exclude";
+    }
+  }
+
   let options = Object.assign({
     allowNotFound: false,
-    nodeModuleNamesOnly: false,
+    nodeModuleNames: "exclude", // also "include" or "only"
   }, optionsArg);
   let absoluteFilename = getAbsolutePath(filename)
 
@@ -71,7 +82,7 @@ function getDependenciesFor(filename, avoidCircular, optionsArg = {}) {
     let relativeFilename = getRelativePath(mod.filename);
     if(!avoidCircular) {
       avoidCircular = {};
-    } else if(!options.nodeModuleNamesOnly) {
+    } else if(options.nodeModuleNames !== "only") {
       dependencies.add(relativeFilename);
     }
 
@@ -82,13 +93,16 @@ function getDependenciesFor(filename, avoidCircular, optionsArg = {}) {
         let relativeChildFilename = getRelativePath(child.filename);
         let nodeModuleName = getNodeModuleName(child.filename);
 
-        if(options.nodeModuleNamesOnly && nodeModuleName) {
+        if(options.nodeModuleNames !== "exclude" && nodeModuleName) {
           dependencies.add(nodeModuleName);
-        } else if(nodeModuleName === false && // filter out node_modules
-          !dependencies.has(relativeChildFilename) && // avoid infinite looping with circular deps
-          !avoidCircular[relativeChildFilename] ) {
-          for(let dependency of getDependenciesFor(relativeChildFilename, avoidCircular, options)) {
-            dependencies.add(dependency);
+        }
+        // Add dependencies of this dependency (not top level node_modules)
+        if(nodeModuleName === false) {
+          if(!dependencies.has(relativeChildFilename) && // avoid infinite looping with circular deps
+            !avoidCircular[relativeChildFilename] ) {
+            for(let dependency of getDependenciesFor(relativeChildFilename, avoidCircular, options)) {
+              dependencies.add(dependency);
+            }
           }
         }
       }

test/mainTest.js

@@ -77,4 +77,16 @@ test("only node_modules", t => {
 test("getNodeModuleName", t => {
 	t.is(DependencyTree.getNodeModuleName("./eleventy-dependency-tree/node_modules/lodash/lodash.js"), "lodash");
 	t.is(DependencyTree.getNodeModuleName("./eleventy-dependency-tree/node_modules/@sindresorhus/is/dist/index.js"), "@sindresorhus/is");
+});
+
+test("both files and node_modules", t => {
+	t.deepEqual(DependencyTree("./test/stubs/uses_node_modules.js", {
+		nodeModuleNames: "include"
+	}).sort(), [
+		"./test/stubs/parent/child1.js",
+		"./test/stubs/parent/grandchild.js",
+		"./test/stubs/parent/greatgrandchild.js",
+		"@sindresorhus/is",
+		"lodash",
+	]);
 });