Set maxNodeModuleJsDepth for inferred projects

zhengbli · zhengbli · commit 536d703d9ec3 · 2016-10-12T18:05:01.000-07:00
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2387,4 +2387,26 @@ namespace ts.projectSystem {
             assert.isTrue(errorResult.length === 0);
         });
     });
+
+    describe("maxNodeModuleJsDepth for inferred projects", () => {
+        it("should be set by default", () => {
+            const file1: FileOrFolder = {
+                path: "/a/b/file1.js",
+                content: `var t = require("test"); t.`
+            };
+            const moduleFile: FileOrFolder = {
+                path: "/a/b/node_modules/test/index.js",
+                content: `var v = 10; module.exports = v;`
+            };
+
+            const host = createServerHost([file1, moduleFile]);
+            const projectService = createProjectService(host);
+            projectService.openClientFile(file1.path);
+
+            const project = projectService.inferredProjects[0];
+            const sourceFile = project.getSourceFile(<Path>file1.path);
+            assert.isTrue("test" in sourceFile.resolvedModules);
+            assert.equal((<ResolvedModule>sourceFile.resolvedModules["test"]).resolvedFileName, moduleFile.path);
+        });
+    });
 }
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -126,6 +126,13 @@ namespace ts.server {
                 this.compilerOptions.allowNonTsExtensions = true;
             }
 
+            if (this.projectKind === ProjectKind.Inferred) {
+                // Add default compiler options for inferred projects here
+                if (this.compilerOptions.maxNodeModuleJsDepth === undefined) {
+                    this.compilerOptions.maxNodeModuleJsDepth = 2;
+                }
+            }
+
             if (languageServiceEnabled) {
                 this.enableLanguageService();
             }

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,13 @@ namespace ts.server {`
`126`	`126`	`this.compilerOptions.allowNonTsExtensions = true;`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ if (this.projectKind === ProjectKind.Inferred) {`
	`130`	`+ // Add default compiler options for inferred projects here`
	`131`	`+ if (this.compilerOptions.maxNodeModuleJsDepth === undefined) {`
	`132`	`+ this.compilerOptions.maxNodeModuleJsDepth = 2;`
	`133`	`+ }`
	`134`	`+ }`
	`135`	`+`
`129`	`136`	`if (languageServiceEnabled) {`
`130`	`137`	`this.enableLanguageService();`
`131`	`138`	`}`