From dfb0dcde0e2a5b4db9bd426dd8f49f34a947f3d0 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sat, 13 Feb 2016 07:48:25 -0800
Subject: [PATCH 01/16] Load JS from node_modules

---
 src/compiler/commandLineParser.ts    |  5 ++
 src/compiler/diagnosticMessages.json |  4 ++
 src/compiler/program.ts              | 70 ++++++++++++++++++++--------
 src/compiler/types.ts                |  3 ++
 src/compiler/utilities.ts            | 10 ++--
 5 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 86d073f7d49e0..9a4a96f373a0c 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -326,6 +326,11 @@ namespace ts {
             name: "noImplicitUseStrict",
             type: "boolean",
             description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "maxNodeModuleJsDepth",
+            type: "number",
+            description: Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
         }
     ];
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 25b86e67d34fe..d7b567468027c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2576,6 +2576,10 @@
         "category": "Message",
         "code": 6112
     },
+    "The maximum dependency depth to search under node_modules and load JavaScript files": {
+        "category": "Message",
+        "code": 6113
+    },
 
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 7a2e65ed33bad..08d7a553b5560 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -9,10 +9,10 @@ namespace ts {
     /* @internal */ export let ioWriteTime = 0;
 
     /** The version of the TypeScript compiler release */
+    export const version = "1.9.0";
 
     const emptyArray: any[] = [];
-
-    export const version = "1.9.0";
+    const startsWithDotSlashOrDotDotSlash = /^(\.\/|\.\.\/)/;
 
     export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string {
         let fileName = "tsconfig.json";
@@ -79,9 +79,7 @@ namespace ts {
             return false;
         }
 
-        const i = moduleName.lastIndexOf("./", 1);
-        const startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === CharacterCodes.dot);
-        return !startsWithDotSlashOrDotDotSlash;
+        return !startsWithDotSlashOrDotDotSlash.test(moduleName);
     }
 
     interface ModuleResolutionState {
@@ -448,11 +446,11 @@ namespace ts {
                 trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
 
-            let jsonContent: { typings?: string };
+            let jsonContent: { typings?: string; main?: string };
 
             try {
                 const jsonText = state.host.readFile(packageJsonPath);
-                jsonContent = jsonText ? <{ typings?: string }>JSON.parse(jsonText) : { typings: undefined };
+                jsonContent = jsonText ? <{ typings?: string; main?: string }>JSON.parse(jsonText) : { typings: undefined, main: undefined };
             }
             catch (e) {
                 // gracefully handle if readFile fails or returns not JSON
@@ -465,7 +463,7 @@ namespace ts {
                     if (state.traceEnabled) {
                         trace(state.host, Diagnostics.package_json_has_typings_field_0_that_references_1, jsonContent.typings, typingsFile);
                     }
-                    const result = loadModuleFromFile(typingsFile, extensions, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typingsFile), state.host), state);
+                    const result = loadModuleFromFile(typingsFile, /* don't add extension */ [""], failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typingsFile), state.host), state);
                     if (result) {
                         return result;
                     }
@@ -479,6 +477,15 @@ namespace ts {
                     trace(state.host, Diagnostics.package_json_does_not_have_typings_field);
                 }
             }
+            // TODO (billti): tracing as per above
+            if (typeof jsonContent.main === "string") {
+                // If 'main' points to 'foo.js', we still want to try and load 'foo.d.ts' and 'foo.ts' first (and only 'foo.js' if 'allowJs' is set).
+                const mainFile = normalizePath(combinePaths(candidate, removeFileExtension(jsonContent.main)));
+                const result = loadModuleFromFile(mainFile, extensions, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(mainFile), state.host), state);
+                if (result) {
+                    return result;
+                }
+            }
         }
         else {
             if (state.traceEnabled) {
@@ -499,12 +506,13 @@ namespace ts {
                 const nodeModulesFolder = combinePaths(directory, "node_modules");
                 const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
                 const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
-                // Load only typescript files irrespective of allowJs option if loading from node modules
-                let result = loadModuleFromFile(candidate, supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+
+                const supportedExtensions = getSupportedExtensions(state.compilerOptions);
+                let result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
                 if (result) {
                     return result;
                 }
-                result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+                result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
                 if (result) {
                     return result;
                 }
@@ -1397,7 +1405,7 @@ namespace ts {
         }
 
         // Get source file from normalized fileName
-        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
+        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number, isFileFromNodeSearch?: boolean): SourceFile {
             if (filesByName.contains(path)) {
                 const file = filesByName.get(path);
                 // try to check if we've already seen this file but with a different casing in path
@@ -1406,6 +1414,13 @@ namespace ts {
                     reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
                 }
 
+                // If this was a file found by a node_modules search, set the nodeModuleSearchDistance to parent distance + 1.
+                if (isFileFromNodeSearch) {
+                    const newDistance = (refFile && refFile.nodeModuleSearchDistance) === undefined ? 1 : refFile.nodeModuleSearchDistance + 1;
+                    // If already set on the file, don't overwrite if it was already found closer (which may be '0' if added as a root file)
+                    file.nodeModuleSearchDistance = (typeof file.nodeModuleSearchDistance === "number") ? Math.min(file.nodeModuleSearchDistance, newDistance) : newDistance;
+                }
+
                 return file;
             }
 
@@ -1424,6 +1439,12 @@ namespace ts {
             if (file) {
                 file.path = path;
 
+                // Default to same distance as parent. Add one if found by a search.
+                file.nodeModuleSearchDistance = (refFile && refFile.nodeModuleSearchDistance) || 0;
+                if (isFileFromNodeSearch) {
+                    file.nodeModuleSearchDistance++;
+                }
+
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
                     const existingFile = filesByNameIgnoreCase.get(path);
@@ -1468,11 +1489,13 @@ namespace ts {
         }
 
         function processImportedModules(file: SourceFile, basePath: string) {
+            const maxJsNodeModuleSearchDistance = options.maxNodeModuleJsDepth || 0;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = {};
                 const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
                 const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                file.nodeModuleSearchDistance = file.nodeModuleSearchDistance || 0;
                 for (let i = 0; i < moduleNames.length; i++) {
                     const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
@@ -1480,16 +1503,23 @@ namespace ts {
                     // - resolution was successful
                     // - noResolve is falsy
                     // - module name come from the list fo imports
-                    const shouldAddFile = resolution &&
-                        !options.noResolve &&
-                        i < file.imports.length;
+                    // - it's not a top level JavaScript module that exceeded the search max
+                    const exceedsJsSearchDepth = resolution && resolution.isExternalLibraryImport &&
+                                                 hasJavaScriptFileExtension(resolution.resolvedFileName) &&
+                                                 file.nodeModuleSearchDistance >= maxJsNodeModuleSearchDistance;
+                    const shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !exceedsJsSearchDepth;
 
                     if (shouldAddFile) {
-                        const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
-
-                        if (importedFile && resolution.isExternalLibraryImport) {
-                            // Since currently irrespective of allowJs, we only look for supportedTypeScript extension external module files,
-                            // this check is ok. Otherwise this would be never true for javascript file
+                        const importedFile = findSourceFile(resolution.resolvedFileName,
+                                                            toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName),
+                                                            /*isDefaultLib*/ false,
+                                                            file,
+                                                            skipTrivia(file.text, file.imports[i].pos),
+                                                            file.imports[i].end,
+                                                            resolution.isExternalLibraryImport);
+
+                        // TODO (billti): Should we check here if a JavaScript file is a CommonJS file, or doesn't have /// references?
+                        if (importedFile && resolution.isExternalLibraryImport && !hasJavaScriptFileExtension(importedFile.fileName)) {
                             if (!isExternalModule(importedFile) && importedFile.statements.length) {
                                 const start = getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6b9f49cac014f..b414ad50aab1a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1536,6 +1536,8 @@ namespace ts {
         /* @internal */ externalModuleIndicator: Node;
         // The first node that causes this file to be a CommonJS module
         /* @internal */ commonJsModuleIndicator: Node;
+        // The number of times node_modules was searched to locate the package containing this file
+        /* @internal */ nodeModuleSearchDistance?: number;
 
         /* @internal */ identifiers: Map<string>;
         /* @internal */ nodeCount: number;
@@ -2419,6 +2421,7 @@ namespace ts {
         traceModuleResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
+        maxNodeModuleJsDepth?: number;
         noImplicitUseStrict?: boolean;
         /* @internal */ stripInternal?: boolean;
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 5494db5fbd6e8..7a443073688d1 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2035,7 +2035,8 @@ namespace ts {
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
             for (const sourceFile of sourceFiles) {
-                if (!isDeclarationFile(sourceFile)) {
+                // Don't emit if source file is a declaration file, or was found by a search under 'node_modules'
+                if (!isDeclarationFile(sourceFile) && !sourceFile.nodeModuleSearchDistance) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -2069,9 +2070,10 @@ namespace ts {
         function onBundledEmit(host: EmitHost) {
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             const bundledSources = filter(host.getSourceFiles(),
-                sourceFile => !isDeclarationFile(sourceFile) && // Not a declaration file
-                    (!isExternalModule(sourceFile) || // non module file
-                        (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+                sourceFile => !isDeclarationFile(sourceFile) &&        // Not a declaration file
+                              !sourceFile.nodeModuleSearchDistance &&  // Not loaded from searching under node_modules
+                              (!isExternalModule(sourceFile) ||        // non module file
+                              (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
             if (bundledSources.length) {
                 const jsFilePath = options.outFile || options.out;
                 const emitFileNames: EmitFileNames = {

From 6126f7b493d1ebae5ff74332591c8d92bc39d0d9 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sat, 13 Feb 2016 16:31:53 -0800
Subject: [PATCH 02/16] Added tests

---
 tests/cases/fourslash/importJsNodeModule1.ts | 18 ++++++++++++
 tests/cases/fourslash/importJsNodeModule2.ts | 23 +++++++++++++++
 tests/cases/fourslash/importJsNodeModule3.ts | 31 ++++++++++++++++++++
 tests/cases/fourslash/importJsNodeModule4.ts | 20 +++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 tests/cases/fourslash/importJsNodeModule1.ts
 create mode 100644 tests/cases/fourslash/importJsNodeModule2.ts
 create mode 100644 tests/cases/fourslash/importJsNodeModule3.ts
 create mode 100644 tests/cases/fourslash/importJsNodeModule4.ts

diff --git a/tests/cases/fourslash/importJsNodeModule1.ts b/tests/cases/fourslash/importJsNodeModule1.ts
new file mode 100644
index 0000000000000..2c4b6352cb02f
--- /dev/null
+++ b/tests/cases/fourslash/importJsNodeModule1.ts
@@ -0,0 +1,18 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+// @Filename: node_modules/myMod/index.js
+//// module.exports = { n: 3, s: 'foo', b: true };
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/importJsNodeModule2.ts b/tests/cases/fourslash/importJsNodeModule2.ts
new file mode 100644
index 0000000000000..c8b7c479ddf8c
--- /dev/null
+++ b/tests/cases/fourslash/importJsNodeModule2.ts
@@ -0,0 +1,23 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+
+// @Filename: node_modules/myMod/package.json
+//// {"main": "entry.js"}
+
+
+// @Filename: node_modules/myMod/entry.js
+//// module.exports = { n: 3, s: 'foo', b: true };
+
+// @Filename: consumer.js
+//// var x = require('myMod');
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/importJsNodeModule3.ts b/tests/cases/fourslash/importJsNodeModule3.ts
new file mode 100644
index 0000000000000..a48150a4218be
--- /dev/null
+++ b/tests/cases/fourslash/importJsNodeModule3.ts
@@ -0,0 +1,31 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+
+// @Filename: node_modules/myMod/index.js
+//// exports.n = 3;
+//// exports.s = 'foo';
+//// exports.b = true;
+
+// @Filename: node_modules/anotherMod/index.js
+//// exports.x = 3;
+//// exports.y = 'foo';
+//// exports.z = true;
+
+// @Filename: consumer.js
+//// import * as x from 'myMod';
+//// import {y,z} from 'anotherMod';
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+
+edit.backspace(4);
+edit.insert('y.');
+verify.completionListContains("toUpperCase", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/importJsNodeModule4.ts b/tests/cases/fourslash/importJsNodeModule4.ts
new file mode 100644
index 0000000000000..b4bdc7ce9f7e2
--- /dev/null
+++ b/tests/cases/fourslash/importJsNodeModule4.ts
@@ -0,0 +1,20 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+
+// @Filename: node_modules/myMod/index.js
+//// module.exports = { n: 3, s: 'foo', b: true };
+
+// @Filename: consumer.js
+//// import * as x from 'myMod';
+//// x/**/;
+
+goTo.file('consumer.js');
+goTo.marker();
+edit.insert('.');
+// TODO: Bug: Fix ES6 import of assignments to module.exports
+// verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+// verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+// verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+// edit.insert('n.');
+// verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");

From e2df645b1631201a704ac92a073a607095158215 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sat, 13 Feb 2016 16:47:15 -0800
Subject: [PATCH 03/16] Updated tests

---
 tests/baselines/reference/nodeResolution6.js             | 2 --
 tests/baselines/reference/nodeResolution8.js             | 2 --
 .../reference/pathMappingBasedModuleResolution5_node.js  | 3 ---
 tests/cases/fourslash/importJsNodeModule3.ts             | 9 ++++++++-
 tests/cases/unittests/moduleResolution.ts                | 3 +++
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js
index 58a9b907250d2..196e8ae57cf54 100644
--- a/tests/baselines/reference/nodeResolution6.js
+++ b/tests/baselines/reference/nodeResolution6.js
@@ -13,7 +13,5 @@ export declare var y;
 import y = require("a"); 
 
 
-//// [ref.js]
-var x = 1;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js
index 36b53eec553ef..1d90399ff706e 100644
--- a/tests/baselines/reference/nodeResolution8.js
+++ b/tests/baselines/reference/nodeResolution8.js
@@ -12,7 +12,5 @@ export declare var y;
 //// [b.ts]
 import y = require("a");
 
-//// [ref.js]
-var x = 1;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index 1958800f91893..e4440299cc75c 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -31,9 +31,6 @@ exports.x = 1;
 //// [file2.js]
 "use strict";
 exports.y = 1;
-//// [file4.js]
-"use strict";
-exports.z1 = 1;
 //// [file1.js]
 "use strict";
 var file1_1 = require("folder2/file1");
diff --git a/tests/cases/fourslash/importJsNodeModule3.ts b/tests/cases/fourslash/importJsNodeModule3.ts
index a48150a4218be..b790d351a1f80 100644
--- a/tests/cases/fourslash/importJsNodeModule3.ts
+++ b/tests/cases/fourslash/importJsNodeModule3.ts
@@ -10,7 +10,11 @@
 // @Filename: node_modules/anotherMod/index.js
 //// exports.x = 3;
 //// exports.y = 'foo';
-//// exports.z = true;
+//// /**
+////   * @param {(number | boolean)} a The first param
+////   * @param {Array<string>}      b The second param
+////   */
+//// exports.z = function(a,b){ return "test"; };
 
 // @Filename: consumer.js
 //// import * as x from 'myMod';
@@ -29,3 +33,6 @@ verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documenta
 edit.backspace(4);
 edit.insert('y.');
 verify.completionListContains("toUpperCase", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+edit.backspace(2);
+edit.insert('z(');
+verify.currentSignatureHelpIs("z(a: number | boolean, b: string[]): string");
diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
index 1173f579f2c9c..b1caed2d62ae7 100644
--- a/tests/cases/unittests/moduleResolution.ts
+++ b/tests/cases/unittests/moduleResolution.ts
@@ -179,6 +179,9 @@ module ts {
                     "/a/b/foo.ts",
                     "/a/b/foo.tsx",
                     "/a/b/foo.d.ts",
+                    "/c/d.ts",
+                    "/c/d.tsx",
+                    "/c/d.d.ts",
                     "/a/b/foo/index.ts",
                     "/a/b/foo/index.tsx",
                 ]);

From ac541948c95b778e0da6945d2cec86bb9fba557d Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 23 May 2016 17:06:48 -0700
Subject: [PATCH 04/16] Fixed diagnostic message wording

---
 src/compiler/diagnosticMessages.json | 2 +-
 src/compiler/program.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index efc90dbdc4891..9d8e7c7afda67 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2756,7 +2756,7 @@
         "category": "Message",
         "code": 6131
     },
-    "No types specified in 'package.json' and is 'allowJs' set. Returning package 'main' value of '{0}' for module": {
+    "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'": {
         "category": "Message",
         "code": 6132
     },
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 68ea6e71e41f2..49762cf22b411 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -180,7 +180,7 @@ namespace ts {
         // Use the main module for inferring types if no types package specified and the allowJs is set
         if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
             if (state.traceEnabled) {
-                trace(state.host, Diagnostics.No_types_specified_in_package_json_and_is_allowJs_set_Returning_package_main_value_of_0_for_module, jsonContent.main);
+                trace(state.host, Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
             }
             const mainFilePath = normalizePath(combinePaths(baseDirectory, jsonContent.main));
             return mainFilePath;

From dd31bf93e73f8c0b4eb41c031cec15fe87409acd Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 23 May 2016 17:25:10 -0700
Subject: [PATCH 05/16] Updated test

---
 tests/cases/unittests/moduleResolution.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
index c33d4a6ff0a1b..29fde3318928d 100644
--- a/tests/cases/unittests/moduleResolution.ts
+++ b/tests/cases/unittests/moduleResolution.ts
@@ -179,9 +179,6 @@ module ts {
                     "/a/b/foo.ts",
                     "/a/b/foo.tsx",
                     "/a/b/foo.d.ts",
-                    "/c/d.ts",
-                    "/c/d.tsx",
-                    "/c/d.d.ts",
                     "/a/b/foo/index.ts",
                     "/a/b/foo/index.tsx",
                 ]);

From 073f16e35956d96f773d81d9d9bca919cc5e150e Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 23 May 2016 17:28:41 -0700
Subject: [PATCH 06/16] Fixed whitespace

---
 src/compiler/diagnosticMessages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index eaffbe0364da9..94b73cfe51e95 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2759,7 +2759,7 @@
     "Resolving real path for '{0}', result '{1}'": {
         "category": "Message",
         "code": 6130
-    },    
+    },
     "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'.": {
         "category": "Error",
         "code": 6131

From 07bfbab6ffa819dff5fa845888e516b8adc669cf Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Tue, 21 Jun 2016 13:42:02 -0700
Subject: [PATCH 07/16] Changed implementation to use closure

---
 src/compiler/program.ts   | 66 ++++++++++++++++-----------------------
 src/compiler/types.ts     |  2 --
 src/compiler/utilities.ts | 12 +++----
 3 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 2917660fcc633..567eae7b9a807 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1066,6 +1066,16 @@ namespace ts {
         let resolvedTypeReferenceDirectives: Map<ResolvedTypeReferenceDirective> = {};
         let fileProcessingDiagnostics = createDiagnosticCollection();
 
+        // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules.
+        // This works as imported modules are discovered recursively in a depth first manner, specifically:
+        // - For each root file, findSourceFile is called.
+        // - This calls processImportedModules for each module imported in the source file.
+        // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
+        // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
+        // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
+        const maxNodeModulesJsDepth = options.maxNodeModuleJsDepth || 2;
+        let currentNodeModulesJsDepth = 0;
+
         const start = new Date().getTime();
 
         host = host || createCompilerHost(options);
@@ -1869,7 +1879,7 @@ namespace ts {
         }
 
         // Get source file from normalized fileName
-        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, isReference: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number, isFileFromNodeSearch?: boolean): SourceFile {
+        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, isReference: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
             if (filesByName.contains(path)) {
                 const file = filesByName.get(path);
                 // try to check if we've already seen this file but with a different casing in path
@@ -1878,12 +1888,6 @@ namespace ts {
                     reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
                 }
 
-                // If this was a file found by a node_modules search, set the nodeModuleSearchDistance to parent distance + 1.
-                if (isFileFromNodeSearch) {
-                    const newDistance = (refFile && refFile.nodeModuleSearchDistance) === undefined ? 1 : refFile.nodeModuleSearchDistance + 1;
-                    // If already set on the file, don't overwrite if it was already found closer (which may be '0' if added as a root file)
-                    file.nodeModuleSearchDistance = (typeof file.nodeModuleSearchDistance === "number") ? Math.min(file.nodeModuleSearchDistance, newDistance) : newDistance;
-                }
                 return file;
             }
 
@@ -1902,12 +1906,6 @@ namespace ts {
             if (file) {
                 file.path = path;
 
-                // Default to same distance as parent. Add one if found by a search.
-                file.nodeModuleSearchDistance = (refFile && refFile.nodeModuleSearchDistance) || 0;
-                if (isFileFromNodeSearch) {
-                    file.nodeModuleSearchDistance++;
-                }
-
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
                     const existingFile = filesByNameIgnoreCase.get(path);
@@ -2020,13 +2018,11 @@ namespace ts {
         }
 
         function processImportedModules(file: SourceFile, basePath: string) {
-            const maxJsNodeModuleSearchDistance = options.maxNodeModuleJsDepth || 0;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = {};
                 const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
                 const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
-                file.nodeModuleSearchDistance = file.nodeModuleSearchDistance || 0;
                 for (let i = 0; i < moduleNames.length; i++) {
                     const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
@@ -2035,32 +2031,24 @@ namespace ts {
                     // - noResolve is falsy
                     // - module name comes from the list of imports
                     // - it's not a top level JavaScript module that exceeded the search max
-                    const exceedsJsSearchDepth = resolution && resolution.isExternalLibraryImport &&
-                                                 hasJavaScriptFileExtension(resolution.resolvedFileName) &&
-                                                 file.nodeModuleSearchDistance >= maxJsNodeModuleSearchDistance;
-                    const shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !exceedsJsSearchDepth;
+                    let isJsFileUnderNodeModules = resolution && resolution.isExternalLibraryImport &&
+                                                 hasJavaScriptFileExtension(resolution.resolvedFileName);
+                    if (isJsFileUnderNodeModules) {
+                        currentNodeModulesJsDepth++;
+                    }
+                    const shouldAddFile = resolution && !options.noResolve && i < file.imports.length &&
+                            !(isJsFileUnderNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth);
 
                     if (shouldAddFile) {
-//                        const importedFile = findSourceFile(resolution.resolvedFileName,
-//                                                            toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName),
-//                                                            /*isDefaultLib*/ false, /*isReference*/ false,
-//                                                            file,
-//                                                            skipTrivia(file.text, file.imports[i].pos),
-//                                                            file.imports[i].end,
-//                                                            resolution.isExternalLibraryImport);
-//
-//                        // TODO (billti): Should we check here if a JavaScript file is a CommonJS file, or doesn't have /// references?
-//                        if (importedFile && resolution.isExternalLibraryImport && !hasJavaScriptFileExtension(importedFile.fileName)) {
-//                            if (!isExternalModule(importedFile) && importedFile.statements.length) {
-//                                const start = getTokenPosOfNode(file.imports[i], file);
-//                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
-//                            }
-//                            else if (importedFile.referencedFiles.length) {
-//                                const firstRef = importedFile.referencedFiles[0];
-//                                fileProcessingDiagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
-//                            }
-//                        }
-                        findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, /*isReference*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        findSourceFile(resolution.resolvedFileName,
+                                toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName),
+                                /*isDefaultLib*/ false, /*isReference*/ false,
+                                file,
+                                skipTrivia(file.text, file.imports[i].pos),
+                                file.imports[i].end);
+                    }
+                    if (isJsFileUnderNodeModules) {
+                        currentNodeModulesJsDepth--;
                     }
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 7e9ba86fa3230..bd123177a334a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1642,8 +1642,6 @@ namespace ts {
         /* @internal */ externalModuleIndicator: Node;
         // The first node that causes this file to be a CommonJS module
         /* @internal */ commonJsModuleIndicator: Node;
-        // The number of times node_modules was searched to locate the package containing this file
-        /* @internal */ nodeModuleSearchDistance?: number;
 
         /* @internal */ identifiers: Map<string>;
         /* @internal */ nodeCount: number;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 4c43564031603..d01678ac767de 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2275,8 +2275,8 @@ namespace ts {
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
             for (const sourceFile of sourceFiles) {
-                // Don't emit if source file is a declaration file, or was found by a search under 'node_modules'
-                if (!isDeclarationFile(sourceFile) && !sourceFile.nodeModuleSearchDistance) {
+                // Don't emit if source file is a declaration file, or TODO: was found by a search under 'node_modules'
+                if (!isDeclarationFile(sourceFile)) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -2310,10 +2310,10 @@ namespace ts {
         function onBundledEmit(host: EmitHost) {
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             const bundledSources = filter(host.getSourceFiles(),
-                sourceFile => !isDeclarationFile(sourceFile) &&        // Not a declaration file
-                              !sourceFile.nodeModuleSearchDistance &&  // Not loaded from searching under node_modules
-                              (!isExternalModule(sourceFile) ||        // non module file
-                              (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+                // TODO: Don't emit from source resolved by searching under node_modules
+                sourceFile => !isDeclarationFile(sourceFile) &&    // Not a declaration file
+                              (!isExternalModule(sourceFile) ||    // non module file
+                               !!getEmitModuleKind(options)));     // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
             if (bundledSources.length) {
                 const jsFilePath = options.outFile || options.out;
                 const emitFileNames: EmitFileNames = {

From d01d5b1cb25212407fe78e93fab8e804aefe9f75 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Tue, 21 Jun 2016 13:51:31 -0700
Subject: [PATCH 08/16] Updated tests

---
 tests/baselines/reference/nodeResolution6.js          |  2 ++
 tests/baselines/reference/nodeResolution8.js          |  2 ++
 .../pathMappingBasedModuleResolution5_node.js         |  3 +++
 tests/cases/fourslash/importJsNodeModule4.ts          | 11 +++++------
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js
index 196e8ae57cf54..58a9b907250d2 100644
--- a/tests/baselines/reference/nodeResolution6.js
+++ b/tests/baselines/reference/nodeResolution6.js
@@ -13,5 +13,7 @@ export declare var y;
 import y = require("a"); 
 
 
+//// [ref.js]
+var x = 1;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js
index 1d90399ff706e..36b53eec553ef 100644
--- a/tests/baselines/reference/nodeResolution8.js
+++ b/tests/baselines/reference/nodeResolution8.js
@@ -12,5 +12,7 @@ export declare var y;
 //// [b.ts]
 import y = require("a");
 
+//// [ref.js]
+var x = 1;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index e4440299cc75c..1958800f91893 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -31,6 +31,9 @@ exports.x = 1;
 //// [file2.js]
 "use strict";
 exports.y = 1;
+//// [file4.js]
+"use strict";
+exports.z1 = 1;
 //// [file1.js]
 "use strict";
 var file1_1 = require("folder2/file1");
diff --git a/tests/cases/fourslash/importJsNodeModule4.ts b/tests/cases/fourslash/importJsNodeModule4.ts
index b4bdc7ce9f7e2..917bea35842d6 100644
--- a/tests/cases/fourslash/importJsNodeModule4.ts
+++ b/tests/cases/fourslash/importJsNodeModule4.ts
@@ -12,9 +12,8 @@
 goTo.file('consumer.js');
 goTo.marker();
 edit.insert('.');
-// TODO: Bug: Fix ES6 import of assignments to module.exports
-// verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
-// verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
-// verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
-// edit.insert('n.');
-// verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
+edit.insert('n.');
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");

From 8ff2c1ad4f02579cd15eb32fc6aaf72cddaec869 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Tue, 21 Jun 2016 14:00:42 -0700
Subject: [PATCH 09/16] Fixed linting error

---
 src/compiler/program.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 567eae7b9a807..ecddd721211b6 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -2031,7 +2031,7 @@ namespace ts {
                     // - noResolve is falsy
                     // - module name comes from the list of imports
                     // - it's not a top level JavaScript module that exceeded the search max
-                    let isJsFileUnderNodeModules = resolution && resolution.isExternalLibraryImport &&
+                    const isJsFileUnderNodeModules = resolution && resolution.isExternalLibraryImport &&
                                                  hasJavaScriptFileExtension(resolution.resolvedFileName);
                     if (isJsFileUnderNodeModules) {
                         currentNodeModulesJsDepth++;

From 6fba804cd8d8768637609a8c088c13bad6175ac6 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sun, 26 Jun 2016 08:45:16 -0700
Subject: [PATCH 10/16] Remove extra baselines

---
 .../constDeclarations-useBeforeDefinition2.symbols     |  9 ---------
 .../constDeclarations-useBeforeDefinition2.types       | 10 ----------
 .../letDeclarations-useBeforeDefinition2.symbols       |  9 ---------
 .../letDeclarations-useBeforeDefinition2.types         | 10 ----------
 ...n compiler-options input is empty object.errors.txt |  6 ------
 ...rror when compiler-options input is empty object.js |  2 --
 ...n compiler-options input is empty string.errors.txt |  6 ------
 ...rror when compiler-options input is empty string.js |  2 --
 8 files changed, 54 deletions(-)
 delete mode 100644 tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols
 delete mode 100644 tests/baselines/reference/constDeclarations-useBeforeDefinition2.types
 delete mode 100644 tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols
 delete mode 100644 tests/baselines/reference/letDeclarations-useBeforeDefinition2.types
 delete mode 100644 tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.js
 delete mode 100644 tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt
 delete mode 100644 tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.js

diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols
deleted file mode 100644
index 281ce4277337f..0000000000000
--- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-c;
->c : Symbol(c, Decl(file2.ts, 0, 5))
-
-=== tests/cases/compiler/file2.ts ===
-const c = 0;
->c : Symbol(c, Decl(file2.ts, 0, 5))
-
diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types
deleted file mode 100644
index ae60fdfa47728..0000000000000
--- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types
+++ /dev/null
@@ -1,10 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-c;
->c : number
-
-=== tests/cases/compiler/file2.ts ===
-const c = 0;
->c : number
->0 : number
-
diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols
deleted file mode 100644
index c5a067ede4dd2..0000000000000
--- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-l;
->l : Symbol(l, Decl(file2.ts, 0, 5))
-
-=== tests/cases/compiler/file2.ts ===
-const l = 0;
->l : Symbol(l, Decl(file2.ts, 0, 5))
-
diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types
deleted file mode 100644
index 793a7a78ba71e..0000000000000
--- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types
+++ /dev/null
@@ -1,10 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-l;
->l : number
-
-=== tests/cases/compiler/file2.ts ===
-const l = 0;
->l : number
->0 : number
-
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt
deleted file mode 100644
index d7d6eb6930028..0000000000000
--- a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
-
-
-!!! error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
-==== file.ts (0 errors) ====
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.js b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.js
deleted file mode 100644
index 1ceb1bcd1464c..0000000000000
--- a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty object.js	
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt
deleted file mode 100644
index d7d6eb6930028..0000000000000
--- a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.errors.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
-
-
-!!! error TS6046: Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'
-==== file.ts (0 errors) ====
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.js b/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.js
deleted file mode 100644
index 1ceb1bcd1464c..0000000000000
--- a/tests/baselines/reference/transpile/Report an error when compiler-options input is empty string.js	
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=file.js.map
\ No newline at end of file

From e9a0c56d3c01ff684ebdd026c3dd5d966abba85c Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sun, 26 Jun 2016 20:48:22 -0700
Subject: [PATCH 11/16] Fixed bugs and linting

---
 src/compiler/program.ts   | 40 +++++++++++++++++++++++++++++++++------
 src/compiler/utilities.ts |  3 +--
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index ecddd721211b6..48a1dcc73e719 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1073,9 +1073,16 @@ namespace ts {
         // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
         // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
         // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
-        const maxNodeModulesJsDepth = options.maxNodeModuleJsDepth || 2;
+        const maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
         let currentNodeModulesJsDepth = 0;
 
+        // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
+        // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
+        const modulesWithElidedImports: Map<boolean> = {};
+
+        // Track source files that are JavaScript files found by searching under node_modules, as these shouldn't be compiled.
+        const jsFilesFoundSearchingNodeModules: Map<boolean> = {};
+
         const start = new Date().getTime();
 
         host = host || createCompilerHost(options);
@@ -1230,6 +1237,7 @@ namespace ts {
                 (oldOptions.rootDir !== options.rootDir) ||
                 (oldOptions.configFilePath !== options.configFilePath) ||
                 (oldOptions.baseUrl !== options.baseUrl) ||
+                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
                 !arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
                 !arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
                 !mapIsEqualTo(oldOptions.paths, options.paths)) {
@@ -1353,7 +1361,10 @@ namespace ts {
                 getNewLine: () => host.getNewLine(),
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
-                getSourceFiles: program.getSourceFiles,
+                getSourceFiles: () => filter(program.getSourceFiles(),
+                    // Remove JavaScript files found by searching node_modules from the source files to emit
+                    sourceFile => !lookUp(jsFilesFoundSearchingNodeModules, sourceFile.path)
+                ),
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
@@ -1888,6 +1899,14 @@ namespace ts {
                     reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
                 }
 
+                // See if we need to reprocess the imports due to prior skipped imports
+                if (file && lookUp(modulesWithElidedImports, file.path)) {
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) { // TODO: Check for off-by-ones
+                        modulesWithElidedImports[file.path] = false;
+                        processImportedModules(file, getDirectoryPath(fileName));
+                    }
+                }
+
                 return file;
             }
 
@@ -2026,6 +2045,8 @@ namespace ts {
                 for (let i = 0; i < moduleNames.length; i++) {
                     const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
+                    const resolvedPath = resolution ? toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName) : undefined;
+
                     // add file to program only if:
                     // - resolution was successful
                     // - noResolve is falsy
@@ -2033,20 +2054,27 @@ namespace ts {
                     // - it's not a top level JavaScript module that exceeded the search max
                     const isJsFileUnderNodeModules = resolution && resolution.isExternalLibraryImport &&
                                                  hasJavaScriptFileExtension(resolution.resolvedFileName);
+
                     if (isJsFileUnderNodeModules) {
+                        jsFilesFoundSearchingNodeModules[resolvedPath] = true;
                         currentNodeModulesJsDepth++;
                     }
-                    const shouldAddFile = resolution && !options.noResolve && i < file.imports.length &&
-                            !(isJsFileUnderNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth);
 
-                    if (shouldAddFile) {
+                    const elideImport = isJsFileUnderNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
+                    const shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+
+                    if (elideImport) {
+                        modulesWithElidedImports[file.path] = true;
+                    }
+                    else if (shouldAddFile) {
                         findSourceFile(resolution.resolvedFileName,
-                                toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName),
+                                resolvedPath,
                                 /*isDefaultLib*/ false, /*isReference*/ false,
                                 file,
                                 skipTrivia(file.text, file.imports[i].pos),
                                 file.imports[i].end);
                     }
+
                     if (isJsFileUnderNodeModules) {
                         currentNodeModulesJsDepth--;
                     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index d01678ac767de..c7fbeec6a63a9 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2275,7 +2275,7 @@ namespace ts {
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
             for (const sourceFile of sourceFiles) {
-                // Don't emit if source file is a declaration file, or TODO: was found by a search under 'node_modules'
+                // Don't emit if source file is a declaration file
                 if (!isDeclarationFile(sourceFile)) {
                     onSingleFileEmit(host, sourceFile);
                 }
@@ -2310,7 +2310,6 @@ namespace ts {
         function onBundledEmit(host: EmitHost) {
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             const bundledSources = filter(host.getSourceFiles(),
-                // TODO: Don't emit from source resolved by searching under node_modules
                 sourceFile => !isDeclarationFile(sourceFile) &&    // Not a declaration file
                               (!isExternalModule(sourceFile) ||    // non module file
                                !!getEmitModuleKind(options)));     // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted

From 885b0e902aa74e36874479aa5e2f038fdbaac2c2 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sun, 26 Jun 2016 23:14:43 -0700
Subject: [PATCH 12/16] Added project tests for node_modules JavaScript
 searches

---
 .gitignore                                    |  1 +
 .../amd/importHigher/root.js                  |  6 +++
 .../amd/nodeModulesImportHigher.errors.txt    | 40 +++++++++++++++++++
 .../amd/nodeModulesImportHigher.json          | 18 +++++++++
 .../node/importHigher/root.js                 |  5 +++
 .../node/nodeModulesImportHigher.errors.txt   | 40 +++++++++++++++++++
 .../node/nodeModulesImportHigher.json         | 18 +++++++++
 .../amd/maxDepthExceeded/root.js              |  6 +++
 .../nodeModulesMaxDepthExceeded.errors.txt    | 32 +++++++++++++++
 .../amd/nodeModulesMaxDepthExceeded.json      | 17 ++++++++
 .../node/maxDepthExceeded/root.js             |  5 +++
 .../nodeModulesMaxDepthExceeded.errors.txt    | 32 +++++++++++++++
 .../node/nodeModulesMaxDepthExceeded.json     | 17 ++++++++
 .../amd/maxDepthIncreased/root.js             |  6 +++
 .../nodeModulesMaxDepthIncreased.errors.txt   | 38 ++++++++++++++++++
 .../amd/nodeModulesMaxDepthIncreased.json     | 18 +++++++++
 .../node/maxDepthIncreased/root.js            |  5 +++
 .../nodeModulesMaxDepthIncreased.errors.txt   | 38 ++++++++++++++++++
 .../node/nodeModulesMaxDepthIncreased.json    | 18 +++++++++
 .../project/nodeModulesImportHigher.json      |  8 ++++
 .../project/nodeModulesMaxDepthExceeded.json  |  8 ++++
 .../project/nodeModulesMaxDepthIncreased.json |  8 ++++
 .../importHigher/node_modules/m1/index.js     | 10 +++++
 .../importHigher/node_modules/m2/entry.js     |  7 ++++
 .../node_modules/m2/node_modules/m3/index.js  |  4 ++
 .../importHigher/node_modules/m2/package.json |  3 ++
 .../NodeModulesSearch/importHigher/root.ts    |  6 +++
 .../importHigher/tsconfig.json                |  7 ++++
 .../maxDepthExceeded/node_modules/m1/index.js | 10 +++++
 .../maxDepthExceeded/node_modules/m2/entry.js |  7 ++++
 .../node_modules/m2/node_modules/m3/index.js  |  4 ++
 .../node_modules/m2/package.json              |  3 ++
 .../maxDepthExceeded/root.ts                  |  4 ++
 .../maxDepthExceeded/tsconfig.json            |  5 +++
 .../node_modules/m1/index.js                  | 10 +++++
 .../node_modules/m2/entry.js                  |  7 ++++
 .../node_modules/m2/node_modules/m3/index.js  |  4 ++
 .../node_modules/m2/package.json              |  3 ++
 .../maxDepthIncreased/root.ts                 |  4 ++
 .../maxDepthIncreased/tsconfig.json           |  6 +++
 40 files changed, 488 insertions(+)
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
 create mode 100644 tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json
 create mode 100644 tests/cases/project/nodeModulesImportHigher.json
 create mode 100644 tests/cases/project/nodeModulesMaxDepthExceeded.json
 create mode 100644 tests/cases/project/nodeModulesMaxDepthIncreased.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/package.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/root.ts
 create mode 100644 tests/cases/projects/NodeModulesSearch/importHigher/tsconfig.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/node_modules/m3/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/package.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/root.ts
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthExceeded/tsconfig.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/package.json
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/root.ts
 create mode 100644 tests/cases/projects/NodeModulesSearch/maxDepthIncreased/tsconfig.json

diff --git a/.gitignore b/.gitignore
index e61c3510e3709..bbb2e62c8bcc5 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 0000000000000..5b8a451c78130
--- /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 0000000000000..dd2b221798ca1
--- /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 0000000000000..6f422876d3365
--- /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 0000000000000..59944c663e92e
--- /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 0000000000000..dd2b221798ca1
--- /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 0000000000000..6f422876d3365
--- /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 0000000000000..73cef6fc02caa
--- /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 0000000000000..81612e2a38744
--- /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 0000000000000..80a0a0fb93dcd
--- /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 0000000000000..28f91fb9b916e
--- /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 0000000000000..81612e2a38744
--- /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 0000000000000..80a0a0fb93dcd
--- /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 0000000000000..77951a4889da7
--- /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 0000000000000..5a395b70ee6c3
--- /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 0000000000000..1350bf6441e25
--- /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 0000000000000..3a0a96991b058
--- /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 0000000000000..5a395b70ee6c3
--- /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 0000000000000..1350bf6441e25
--- /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 0000000000000..2cca8c03f001f
--- /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 0000000000000..45e1210aa8cb7
--- /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 0000000000000..0973ae4bd5b15
--- /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 0000000000000..7ff454a240273
--- /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 0000000000000..ce3eee6d895f0
--- /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 0000000000000..aeec67076973b
--- /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 0000000000000..33534249d414c
--- /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 0000000000000..9bf5b1f82c314
--- /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 0000000000000..c7b95984b42b7
--- /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 0000000000000..7ff454a240273
--- /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 0000000000000..ce3eee6d895f0
--- /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 0000000000000..aeec67076973b
--- /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 0000000000000..33534249d414c
--- /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 0000000000000..6260440864805
--- /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 0000000000000..0aafe67d68893
--- /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 0000000000000..7ff454a240273
--- /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 0000000000000..ce3eee6d895f0
--- /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 0000000000000..aeec67076973b
--- /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 0000000000000..33534249d414c
--- /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 0000000000000..9ed943bebba36
--- /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 0000000000000..5388cc5d39fdd
--- /dev/null
+++ b/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": { 
+    "allowJs": true,
+    "maxNodeModuleJsDepth": 3
+  }
+}

From 1b43bd8e83f629d86b79ae338d7606689680bbf9 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Sun, 26 Jun 2016 23:33:46 -0700
Subject: [PATCH 13/16] Removed old TODO comment

---
 src/compiler/program.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 48a1dcc73e719..cee0936fafd10 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1901,7 +1901,7 @@ namespace ts {
 
                 // See if we need to reprocess the imports due to prior skipped imports
                 if (file && lookUp(modulesWithElidedImports, file.path)) {
-                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) { // TODO: Check for off-by-ones
+                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
                         modulesWithElidedImports[file.path] = false;
                         processImportedModules(file, getDirectoryPath(fileName));
                     }

From de559fb3f4cdd2441403ca4b59d5501700f481ce Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 27 Jun 2016 01:23:22 -0700
Subject: [PATCH 14/16] Fixed the regexp for removing full paths

---
 src/harness/runnerbase.ts                            | 12 +++---------
 .../declarationEmit_invalidReference2.errors.txt     |  2 +-
 .../declarationFileOverwriteError.errors.txt         |  2 +-
 .../declarationFileOverwriteErrorWithOut.errors.txt  |  2 +-
 .../reference/exportStarFromEmptyModule.errors.txt   |  2 +-
 .../reference/importNonExternalModule.errors.txt     |  2 +-
 .../reference/invalidTripleSlashReference.errors.txt |  4 ++--
 ...tionWithDeclarationEmitPathSameAsInput.errors.txt |  2 +-
 ...utDeclarationFileNameSameAsInputJsFile.errors.txt |  2 +-
 .../reference/library-reference-5.errors.txt         |  2 +-
 .../baselines/reference/parserRealSource1.errors.txt |  2 +-
 .../reference/parserRealSource10.errors.txt          |  2 +-
 .../reference/parserRealSource11.errors.txt          |  2 +-
 .../reference/parserRealSource12.errors.txt          |  2 +-
 .../reference/parserRealSource13.errors.txt          |  2 +-
 .../reference/parserRealSource14.errors.txt          |  2 +-
 .../baselines/reference/parserRealSource2.errors.txt |  2 +-
 .../baselines/reference/parserRealSource3.errors.txt |  2 +-
 .../baselines/reference/parserRealSource4.errors.txt |  2 +-
 .../baselines/reference/parserRealSource5.errors.txt |  2 +-
 .../baselines/reference/parserRealSource6.errors.txt |  2 +-
 .../baselines/reference/parserRealSource7.errors.txt |  2 +-
 .../baselines/reference/parserRealSource8.errors.txt |  2 +-
 .../baselines/reference/parserRealSource9.errors.txt |  2 +-
 tests/baselines/reference/parserharness.errors.txt   |  8 ++++----
 tests/baselines/reference/parserindenter.errors.txt  |  2 +-
 .../amd/nodeModulesImportHigher.errors.txt           |  6 +++---
 .../node/nodeModulesImportHigher.errors.txt          |  6 +++---
 .../amd/nodeModulesMaxDepthExceeded.errors.txt       |  4 ++--
 .../node/nodeModulesMaxDepthExceeded.errors.txt      |  4 ++--
 .../amd/nodeModulesMaxDepthIncreased.errors.txt      |  6 +++---
 .../node/nodeModulesMaxDepthIncreased.errors.txt     |  6 +++---
 .../amd/rootDirectoryErrors.errors.txt               |  2 +-
 .../node/rootDirectoryErrors.errors.txt              |  2 +-
 .../reference/requireOfAnEmptyFile1.errors.txt       |  2 +-
 tests/baselines/reference/scannertest1.errors.txt    |  2 +-
 .../reference/selfReferencingFile2.errors.txt        |  2 +-
 37 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts
index a16eddcbeec8d..346382b7a5721 100644
--- a/src/harness/runnerbase.ts
+++ b/src/harness/runnerbase.ts
@@ -31,18 +31,12 @@ abstract class RunnerBase {
 
     /** Replaces instances of full paths with fileNames only */
     static removeFullPaths(path: string) {
-        let fixedPath = path;
-
-        // full paths either start with a drive letter or / for *nix, shouldn't have \ in the path at this point
-        const fullPath = /(\w+:|\/)?([\w+\-\.]|\/)*\.tsx?/g;
-        const fullPathList = fixedPath.match(fullPath);
-        if (fullPathList) {
-            fullPathList.forEach((match: string) => fixedPath = fixedPath.replace(match, Harness.Path.getFileName(match)));
-        }
+        // If its a full path (starts with "C:" or "/") replace with just the filename
+        let fixedPath = /^(\w:|\/)/.test(path) ? Harness.Path.getFileName(path) : path;
 
         // when running in the browser the 'full path' is the host name, shows up in error baselines
         const localHost = /http:\/localhost:\d+/g;
         fixedPath = fixedPath.replace(localHost, "");
         return fixedPath;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt b/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
index 1f3960a87ab83..9d480419022c9 100644
--- a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
+++ b/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
@@ -4,5 +4,5 @@ tests/cases/compiler/declarationEmit_invalidReference2.ts(1,1): error TS6053: Fi
 ==== tests/cases/compiler/declarationEmit_invalidReference2.ts (1 errors) ====
     /// <reference path="invalid.ts" />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'invalid.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/invalid.ts' not found.
     var x = 0;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationFileOverwriteError.errors.txt b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
index a12c60482e904..1974976dee1fe 100644
--- a/tests/baselines/reference/declarationFileOverwriteError.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
index 02251900345a4..658465de9c2d2 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'out.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/out.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
index 9d781da270792..8ca80fae40870 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
+++ b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
@@ -14,7 +14,7 @@ tests/cases/compiler/exportStarFromEmptyModule_module4.ts(4,5): error TS2339: Pr
 ==== tests/cases/compiler/exportStarFromEmptyModule_module3.ts (1 errors) ====
     export * from "./exportStarFromEmptyModule_module2";
                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'exportStarFromEmptyModule_module2.ts' is not a module.
+!!! error TS2306: File 'tests/cases/compiler/exportStarFromEmptyModule_module2.ts' is not a module.
     export * from "./exportStarFromEmptyModule_module1";
     
     export class A {
diff --git a/tests/baselines/reference/importNonExternalModule.errors.txt b/tests/baselines/reference/importNonExternalModule.errors.txt
index fb8294c5c0343..96f8959565c8a 100644
--- a/tests/baselines/reference/importNonExternalModule.errors.txt
+++ b/tests/baselines/reference/importNonExternalModule.errors.txt
@@ -4,7 +4,7 @@ tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2306: File 'test
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
     import foo = require("./foo_0");
                          ~~~~~~~~~
-!!! error TS2306: File 'foo_0.ts' is not a module.
+!!! error TS2306: File 'tests/cases/conformance/externalModules/foo_0.ts' is not a module.
     // Import should fail.  foo_0 not an external module
     if(foo.answer === 42){
     
diff --git a/tests/baselines/reference/invalidTripleSlashReference.errors.txt b/tests/baselines/reference/invalidTripleSlashReference.errors.txt
index 40d75004a99d8..1de5ecaaae157 100644
--- a/tests/baselines/reference/invalidTripleSlashReference.errors.txt
+++ b/tests/baselines/reference/invalidTripleSlashReference.errors.txt
@@ -5,10 +5,10 @@ tests/cases/compiler/invalidTripleSlashReference.ts(2,1): error TS6053: File 'te
 ==== tests/cases/compiler/invalidTripleSlashReference.ts (2 errors) ====
     /// <reference path='filedoesnotexist.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'filedoesnotexist.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/filedoesnotexist.ts' not found.
     /// <reference path='otherdoesnotexist.d.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'otherdoesnotexist.d.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/otherdoesnotexist.d.ts' not found.
     
     // this test doesn't actually give the errors you want due to the way the compiler reports errors
     var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
index 84900bccc8848..9e9c2adb0efa2 100644
--- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
index 826f906538fd1..10c7b8c90ddad 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'b.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/library-reference-5.errors.txt b/tests/baselines/reference/library-reference-5.errors.txt
index ea571cad1a3c5..a3729bc3a9953 100644
--- a/tests/baselines/reference/library-reference-5.errors.txt
+++ b/tests/baselines/reference/library-reference-5.errors.txt
@@ -18,7 +18,7 @@
 ==== /node_modules/bar/index.d.ts (1 errors) ====
     /// <reference types="alpha" />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! message TS4090: Conflicting library definitions for 'alpha' found at 'index.d.ts' and 'index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
+!!! message TS4090: Conflicting library definitions for 'alpha' found at '/node_modules/bar/node_modules/alpha/index.d.ts' and '/node_modules/foo/node_modules/alpha/index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
     declare var bar: any;
     
 ==== /node_modules/bar/node_modules/alpha/index.d.ts (0 errors) ====
diff --git a/tests/baselines/reference/parserRealSource1.errors.txt b/tests/baselines/reference/parserRealSource1.errors.txt
index 0d238dabf2bef..23d1a1d744a58 100644
--- a/tests/baselines/reference/parserRealSource1.errors.txt
+++ b/tests/baselines/reference/parserRealSource1.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export module CompilerDiagnostics {
diff --git a/tests/baselines/reference/parserRealSource10.errors.txt b/tests/baselines/reference/parserRealSource10.errors.txt
index b3c40202c4f54..d6199636e69f2 100644
--- a/tests/baselines/reference/parserRealSource10.errors.txt
+++ b/tests/baselines/reference/parserRealSource10.errors.txt
@@ -348,7 +348,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export enum TokenID {
diff --git a/tests/baselines/reference/parserRealSource11.errors.txt b/tests/baselines/reference/parserRealSource11.errors.txt
index 718bda19a6737..efae0f962fd1d 100644
--- a/tests/baselines/reference/parserRealSource11.errors.txt
+++ b/tests/baselines/reference/parserRealSource11.errors.txt
@@ -523,7 +523,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class ASTSpan {
diff --git a/tests/baselines/reference/parserRealSource12.errors.txt b/tests/baselines/reference/parserRealSource12.errors.txt
index b7b221cbc036e..22fb209d80c26 100644
--- a/tests/baselines/reference/parserRealSource12.errors.txt
+++ b/tests/baselines/reference/parserRealSource12.errors.txt
@@ -215,7 +215,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts(524,30): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export interface IAstWalker {
diff --git a/tests/baselines/reference/parserRealSource13.errors.txt b/tests/baselines/reference/parserRealSource13.errors.txt
index e9380882e286d..6ddc41ed6109c 100644
--- a/tests/baselines/reference/parserRealSource13.errors.txt
+++ b/tests/baselines/reference/parserRealSource13.errors.txt
@@ -122,7 +122,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts(135,36): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript.AstWalkerWithDetailCallback {
         export interface AstWalkerDetailCallback {
diff --git a/tests/baselines/reference/parserRealSource14.errors.txt b/tests/baselines/reference/parserRealSource14.errors.txt
index bc32a8e585be4..4881864e236aa 100644
--- a/tests/baselines/reference/parserRealSource14.errors.txt
+++ b/tests/baselines/reference/parserRealSource14.errors.txt
@@ -166,7 +166,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export function lastOf(items: any[]): any {
diff --git a/tests/baselines/reference/parserRealSource2.errors.txt b/tests/baselines/reference/parserRealSource2.errors.txt
index e552cb7781215..42fcff36c7052 100644
--- a/tests/baselines/reference/parserRealSource2.errors.txt
+++ b/tests/baselines/reference/parserRealSource2.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource3.errors.txt b/tests/baselines/reference/parserRealSource3.errors.txt
index 98aae9660a898..5b00994052bdd 100644
--- a/tests/baselines/reference/parserRealSource3.errors.txt
+++ b/tests/baselines/reference/parserRealSource3.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback
diff --git a/tests/baselines/reference/parserRealSource4.errors.txt b/tests/baselines/reference/parserRealSource4.errors.txt
index e0ae0d2221e4c..9722a5b670d4a 100644
--- a/tests/baselines/reference/parserRealSource4.errors.txt
+++ b/tests/baselines/reference/parserRealSource4.errors.txt
@@ -8,7 +8,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(195,37): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource5.errors.txt b/tests/baselines/reference/parserRealSource5.errors.txt
index 78894b2142003..7dc9b5942d525 100644
--- a/tests/baselines/reference/parserRealSource5.errors.txt
+++ b/tests/baselines/reference/parserRealSource5.errors.txt
@@ -16,7 +16,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts(61,65): error TS
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         // TODO: refactor indent logic for use in emit
diff --git a/tests/baselines/reference/parserRealSource6.errors.txt b/tests/baselines/reference/parserRealSource6.errors.txt
index aa646ca1aba20..aa6a9f4139227 100644
--- a/tests/baselines/reference/parserRealSource6.errors.txt
+++ b/tests/baselines/reference/parserRealSource6.errors.txt
@@ -67,7 +67,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts(215,20): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class TypeCollectionContext {
diff --git a/tests/baselines/reference/parserRealSource7.errors.txt b/tests/baselines/reference/parserRealSource7.errors.txt
index 7945e5d703474..a3635dabc485e 100644
--- a/tests/baselines/reference/parserRealSource7.errors.txt
+++ b/tests/baselines/reference/parserRealSource7.errors.txt
@@ -309,7 +309,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(828,13): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class Continuation {
diff --git a/tests/baselines/reference/parserRealSource8.errors.txt b/tests/baselines/reference/parserRealSource8.errors.txt
index d497b0884dbde..6249d3fd991ac 100644
--- a/tests/baselines/reference/parserRealSource8.errors.txt
+++ b/tests/baselines/reference/parserRealSource8.errors.txt
@@ -140,7 +140,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts(454,35): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource9.errors.txt b/tests/baselines/reference/parserRealSource9.errors.txt
index 9d89848ff20ca..caa142db60e9b 100644
--- a/tests/baselines/reference/parserRealSource9.errors.txt
+++ b/tests/baselines/reference/parserRealSource9.errors.txt
@@ -39,7 +39,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(200,48): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class Binder {
diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt
index 963ce12ddf18d..fd9ad6d3a107e 100644
--- a/tests/baselines/reference/parserharness.errors.txt
+++ b/tests/baselines/reference/parserharness.errors.txt
@@ -128,16 +128,16 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
     
     ///<reference path='..\compiler\io.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'io.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/compiler/io.ts' not found.
     ///<reference path='..\compiler\typescript.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/compiler/typescript.ts' not found.
     ///<reference path='..\services\typescriptServices.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescriptServices.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/services/typescriptServices.ts' not found.
     ///<reference path='diff.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'diff.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/RealWorld/diff.ts' not found.
     
     declare var assert: Harness.Assert;
                                 ~~~~~~
diff --git a/tests/baselines/reference/parserindenter.errors.txt b/tests/baselines/reference/parserindenter.errors.txt
index 8ccc92207108d..2f51281e7aab0 100644
--- a/tests/baselines/reference/parserindenter.errors.txt
+++ b/tests/baselines/reference/parserindenter.errors.txt
@@ -146,7 +146,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38):
     
     ///<reference path='formatting.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'formatting.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/RealWorld/formatting.ts' not found.
     
     
     module Formatting {
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
index dd2b221798ca1..68a1ef3b7c965 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -1,7 +1,7 @@
 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
@@ -22,7 +22,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     
     exports.f2 = m2;
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
index dd2b221798ca1..68a1ef3b7c965 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
@@ -1,7 +1,7 @@
 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
@@ -22,7 +22,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     
     exports.f2 = m2;
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index 81612e2a38744..f03b958275b27 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,7 +1,7 @@
 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
index 81612e2a38744..f03b958275b27 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,7 +1,7 @@
 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
index 5a395b70ee6c3..f63c2a789e8c4 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,13 +1,13 @@
 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) ====
+==== 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -16,7 +16,7 @@ maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
index 5a395b70ee6c3..f63c2a789e8c4 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,13 +1,13 @@
 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) ====
+==== 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) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -16,7 +16,7 @@ maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
index dfbdd67968588..f0809b38f27ae 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
@@ -1,7 +1,7 @@
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 
 
-!!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
+!!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 ==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
     class C {
     }
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
index dfbdd67968588..f0809b38f27ae 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
@@ -1,7 +1,7 @@
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 
 
-!!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
+!!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 ==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
     class C {
     }
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
index d02593feff988..922ff48ef586f 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests
     
     import fs = require('./requireOfAnEmptyFile1_b');
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'requireOfAnEmptyFile1_b.ts' is not a module.
+!!! error TS2306: File 'tests/cases/compiler/requireOfAnEmptyFile1_b.ts' is not a module.
     
 ==== tests/cases/compiler/requireOfAnEmptyFile1_b.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/scannertest1.errors.txt b/tests/baselines/reference/scannertest1.errors.txt
index 3831dbe398e33..fce2a0b292a22 100644
--- a/tests/baselines/reference/scannertest1.errors.txt
+++ b/tests/baselines/reference/scannertest1.errors.txt
@@ -19,7 +19,7 @@ tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(20,23): error TS2304
 ==== tests/cases/conformance/scanner/ecmascript5/scannertest1.ts (16 errors) ====
     ///<reference path='References.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'References.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/scanner/ecmascript5/References.ts' not found.
     
     class CharacterInfo {
         public static isDecimalDigit(c: number): boolean {
diff --git a/tests/baselines/reference/selfReferencingFile2.errors.txt b/tests/baselines/reference/selfReferencingFile2.errors.txt
index c993616784abe..002e087d60ec1 100644
--- a/tests/baselines/reference/selfReferencingFile2.errors.txt
+++ b/tests/baselines/reference/selfReferencingFile2.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/selfReferencingFile2.ts(1,1): error TS6053: File 'tests/cas
 ==== tests/cases/compiler/selfReferencingFile2.ts (1 errors) ====
     ///<reference path='../selfReferencingFile2.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'selfReferencingFile2.ts' not found.
+!!! error TS6053: File 'tests/cases/selfReferencingFile2.ts' not found.
     
     class selfReferencingFile2 {
     

From d8e3bd99e8430d85432066fe4e7fb00819fabb95 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 27 Jun 2016 16:32:29 -0700
Subject: [PATCH 15/16] Added emitHost method to return source from node
 modules

---
 src/compiler/program.ts   |  6 ++----
 src/compiler/utilities.ts | 17 +++++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index cee0936fafd10..fdc39e1eb353d 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1361,10 +1361,8 @@ namespace ts {
                 getNewLine: () => host.getNewLine(),
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
-                getSourceFiles: () => filter(program.getSourceFiles(),
-                    // Remove JavaScript files found by searching node_modules from the source files to emit
-                    sourceFile => !lookUp(jsFilesFoundSearchingNodeModules, sourceFile.path)
-                ),
+                getSourceFiles: program.getSourceFiles,
+                getFilesFromNodeModules: () => jsFilesFoundSearchingNodeModules,
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 6daf090348936..571c49bf44072 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -34,6 +34,7 @@ namespace ts {
 
     export interface EmitHost extends ScriptReferenceHost {
         getSourceFiles(): SourceFile[];
+        getFilesFromNodeModules(): Map<boolean>;
 
         getCommonSourceDirectory(): string;
         getCanonicalFileName(fileName: string): string;
@@ -2274,9 +2275,10 @@ namespace ts {
         }
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            const nodeModulesFiles = host.getFilesFromNodeModules();
             for (const sourceFile of sourceFiles) {
-                // Don't emit if source file is a declaration file
-                if (!isDeclarationFile(sourceFile)) {
+                // Don't emit if source file is a declaration file, or was located under node_modules
+                if (!isDeclarationFile(sourceFile) && !lookUp(nodeModulesFiles, sourceFile.path)) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -2308,11 +2310,14 @@ namespace ts {
         }
 
         function onBundledEmit(host: EmitHost) {
-            // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
+            // Can emit only sources that are not declaration file and are either non module code or module with
+            // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
+            const nodeModulesFiles = host.getFilesFromNodeModules();
             const bundledSources = filter(host.getSourceFiles(),
-                sourceFile => !isDeclarationFile(sourceFile) &&    // Not a declaration file
-                              (!isExternalModule(sourceFile) ||    // non module file
-                               !!getEmitModuleKind(options)));     // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+                sourceFile => !isDeclarationFile(sourceFile) &&
+                              !lookUp(nodeModulesFiles, sourceFile.path) &&
+                              (!isExternalModule(sourceFile) ||
+                               !!getEmitModuleKind(options)));
             if (bundledSources.length) {
                 const jsFilePath = options.outFile || options.out;
                 const emitFileNames: EmitFileNames = {

From ddad35a6809807c2446af73a49b858a704b12030 Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Mon, 27 Jun 2016 16:49:53 -0700
Subject: [PATCH 16/16] Marked new method internal

---
 src/compiler/utilities.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 571c49bf44072..e8f2832cd592e 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -34,6 +34,8 @@ namespace ts {
 
     export interface EmitHost extends ScriptReferenceHost {
         getSourceFiles(): SourceFile[];
+
+        /* @internal */
         getFilesFromNodeModules(): Map<boolean>;
 
         getCommonSourceDirectory(): string;