diff --git a/.gitignore b/.gitignore
index e61c3510e37..bbb2e62c8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ internal/
 **/.vscode
 !**/.vscode/tasks.json
 !tests/cases/projects/projectOption/**/node_modules
+!tests/cases/projects/NodeModulesSearch/**/*
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
new file mode 100644
index 00000000000..5b8a451c781
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+});
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
new file mode 100644
index 00000000000..dd2b221798c
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -0,0 +1,40 @@
+importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+    
+==== importHigher/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    import * as m2 from "m2";
+    
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json
new file mode 100644
index 00000000000..6f422876d33
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that a higher import loads a module that was previously skipped",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "importHigher",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "importHigher/node_modules/m2/entry.js",
+        "importHigher/node_modules/m1/index.js",
+        "importHigher/node_modules/m2/node_modules/m3/index.js",
+        "importHigher/root.ts"
+    ],
+    "emittedFiles": [
+        "importHigher/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
new file mode 100644
index 00000000000..59944c663e9
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
new file mode 100644
index 00000000000..dd2b221798c
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
@@ -0,0 +1,40 @@
+importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+    
+==== importHigher/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    import * as m2 from "m2";
+    
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json
new file mode 100644
index 00000000000..6f422876d33
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that a higher import loads a module that was previously skipped",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "importHigher",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "importHigher/node_modules/m2/entry.js",
+        "importHigher/node_modules/m1/index.js",
+        "importHigher/node_modules/m2/node_modules/m3/index.js",
+        "importHigher/root.ts"
+    ],
+    "emittedFiles": [
+        "importHigher/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js
new file mode 100644
index 00000000000..73cef6fc02c
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+});
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
new file mode 100644
index 00000000000..81612e2a387
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -0,0 +1,32 @@
+maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== maxDepthExceeded/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    ~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
new file mode 100644
index 00000000000..80a0a0fb93d
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
@@ -0,0 +1,17 @@
+{
+    "scenario": "Verify that JavaScript modules are not resolved if too many hops",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthExceeded",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js",
+        "maxDepthExceeded/node_modules/m1/index.js",
+        "maxDepthExceeded/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthExceeded/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js
new file mode 100644
index 00000000000..28f91fb9b91
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = "10"; // Error: Should be number
+m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
new file mode 100644
index 00000000000..81612e2a387
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -0,0 +1,32 @@
+maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== maxDepthExceeded/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    ~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
new file mode 100644
index 00000000000..80a0a0fb93d
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
@@ -0,0 +1,17 @@
+{
+    "scenario": "Verify that JavaScript modules are not resolved if too many hops",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthExceeded",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js",
+        "maxDepthExceeded/node_modules/m1/index.js",
+        "maxDepthExceeded/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthExceeded/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
new file mode 100644
index 00000000000..77951a4889d
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+});
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
new file mode 100644
index 00000000000..5a395b70ee6
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -0,0 +1,38 @@
+maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== maxDepthIncreased/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json
new file mode 100644
index 00000000000..1350bf6441e
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that the setting to search node_modules deeper takes effect",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthIncreased",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthIncreased/node_modules/m2/node_modules/m3/index.js",
+        "maxDepthIncreased/node_modules/m2/entry.js",
+        "maxDepthIncreased/node_modules/m1/index.js",
+        "maxDepthIncreased/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthIncreased/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
new file mode 100644
index 00000000000..3a0a96991b0
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
new file mode 100644
index 00000000000..5a395b70ee6
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
@@ -0,0 +1,38 @@
+maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+    
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+    
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+    
+    exports.f2 = m2;
+    
+==== maxDepthIncreased/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json
new file mode 100644
index 00000000000..1350bf6441e
--- /dev/null
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that the setting to search node_modules deeper takes effect",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthIncreased",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthIncreased/node_modules/m2/node_modules/m3/index.js",
+        "maxDepthIncreased/node_modules/m2/entry.js",
+        "maxDepthIncreased/node_modules/m1/index.js",
+        "maxDepthIncreased/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthIncreased/root.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/cases/project/nodeModulesImportHigher.json b/tests/cases/project/nodeModulesImportHigher.json
new file mode 100644
index 00000000000..2cca8c03f00
--- /dev/null
+++ b/tests/cases/project/nodeModulesImportHigher.json
@@ -0,0 +1,8 @@
+{
+  "scenario": "Verify that a higher import loads a module that was previously skipped",
+  "projectRoot": "tests/cases/projects/NodeModulesSearch",
+  "baselineCheck": true,
+  "declaration": false,
+  "moduleResolution": "node",
+  "project": "importHigher"
+}
diff --git a/tests/cases/project/nodeModulesMaxDepthExceeded.json b/tests/cases/project/nodeModulesMaxDepthExceeded.json
new file mode 100644
index 00000000000..45e1210aa8c
--- /dev/null
+++ b/tests/cases/project/nodeModulesMaxDepthExceeded.json
@@ -0,0 +1,8 @@
+{
+  "scenario": "Verify that JavaScript modules are not resolved if too many hops",
+  "projectRoot": "tests/cases/projects/NodeModulesSearch",
+  "baselineCheck": true,
+  "declaration": false,
+  "moduleResolution": "node",
+  "project": "maxDepthExceeded"
+}
diff --git a/tests/cases/project/nodeModulesMaxDepthIncreased.json b/tests/cases/project/nodeModulesMaxDepthIncreased.json
new file mode 100644
index 00000000000..0973ae4bd5b
--- /dev/null
+++ b/tests/cases/project/nodeModulesMaxDepthIncreased.json
@@ -0,0 +1,8 @@
+{
+  "scenario": "Verify that the setting to search node_modules deeper takes effect",
+  "projectRoot": "tests/cases/projects/NodeModulesSearch",
+  "baselineCheck": true,
+  "declaration": false,
+  "moduleResolution": "node",
+  "project": "maxDepthIncreased"
+}
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js
new file mode 100644
index 00000000000..7ff454a2402
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js
@@ -0,0 +1,10 @@
+var m2 = require('m2');
+
+/**
+ * @param {string} p1 The first param
+ */
+exports.f1 = function(p1) {
+	return 42;
+};
+
+exports.f2 = m2;
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js
new file mode 100644
index 00000000000..ce3eee6d895
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js
@@ -0,0 +1,7 @@
+var m3 = require("m3");
+
+module.exports = {
+	"a": 42,
+	"b": "hello, world",
+	"person": m3.person
+};
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js
new file mode 100644
index 00000000000..aeec6707697
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js
@@ -0,0 +1,4 @@
+exports.person = {
+    "name": "John Doe",
+    "age": 42
+}
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/package.json b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/package.json
new file mode 100644
index 00000000000..33534249d41
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "entry.js"
+}
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/root.ts b/tests/cases/projects/NodeModulesSearch/importHigher/root.ts
new file mode 100644
index 00000000000..9bf5b1f82c3
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/root.ts
@@ -0,0 +1,6 @@
+import * as m1 from "m1";
+import * as m2 from "m2";
+
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/tests/cases/projects/NodeModulesSearch/importHigher/tsconfig.json b/tests/cases/projects/NodeModulesSearch/importHigher/tsconfig.json
new file mode 100644
index 00000000000..c7b95984b42
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/importHigher/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": { 
+    "allowJs": true,
+    "declaration": false,
+    "moduleResolution": "node"
+  }
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js
new file mode 100644
index 00000000000..7ff454a2402
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js
@@ -0,0 +1,10 @@
+var m2 = require('m2');
+
+/**
+ * @param {string} p1 The first param
+ */
+exports.f1 = function(p1) {
+	return 42;
+};
+
+exports.f2 = m2;
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js
new file mode 100644
index 00000000000..ce3eee6d895
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js
@@ -0,0 +1,7 @@
+var m3 = require("m3");
+
+module.exports = {
+	"a": 42,
+	"b": "hello, world",
+	"person": m3.person
+};
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/node_modules/m3/index.js b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/node_modules/m3/index.js
new file mode 100644
index 00000000000..aeec6707697
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/node_modules/m3/index.js
@@ -0,0 +1,4 @@
+exports.person = {
+    "name": "John Doe",
+    "age": 42
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/package.json b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/package.json
new file mode 100644
index 00000000000..33534249d41
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "entry.js"
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/root.ts b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/root.ts
new file mode 100644
index 00000000000..62604408648
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/root.ts
@@ -0,0 +1,4 @@
+import * as m1 from "m1";
+m1.f1("test");
+m1.f2.a = "10"; // Error: Should be number
+m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/tsconfig.json b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/tsconfig.json
new file mode 100644
index 00000000000..0aafe67d688
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": { 
+    "allowJs": true
+  }
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js
new file mode 100644
index 00000000000..7ff454a2402
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js
@@ -0,0 +1,10 @@
+var m2 = require('m2');
+
+/**
+ * @param {string} p1 The first param
+ */
+exports.f1 = function(p1) {
+	return 42;
+};
+
+exports.f2 = m2;
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js
new file mode 100644
index 00000000000..ce3eee6d895
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js
@@ -0,0 +1,7 @@
+var m3 = require("m3");
+
+module.exports = {
+	"a": 42,
+	"b": "hello, world",
+	"person": m3.person
+};
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js
new file mode 100644
index 00000000000..aeec6707697
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js
@@ -0,0 +1,4 @@
+exports.person = {
+    "name": "John Doe",
+    "age": 42
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/package.json b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/package.json
new file mode 100644
index 00000000000..33534249d41
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "entry.js"
+}
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/root.ts b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/root.ts
new file mode 100644
index 00000000000..9ed943bebba
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/root.ts
@@ -0,0 +1,4 @@
+import * as m1 from "m1";
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number
diff --git a/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/tsconfig.json b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/tsconfig.json
new file mode 100644
index 00000000000..5388cc5d39f
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": { 
+    "allowJs": true,
+    "maxNodeModuleJsDepth": 3
+  }
+}