Fix logging of module resolution errors (microsoft#17144)

Andy · web-flow · commit 382785a5282f · 2017-08-08T07:54:08.000-07:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -678,7 +678,7 @@ namespace ts {
         const { resolvedModule, failedLookupLocations } =
             nodeModuleNameResolverWorker(moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, /*cache*/ undefined, /*jsOnly*/ true);
         if (!resolvedModule) {
-            throw new Error(`Could not resolve JS module ${moduleName} starting at ${initialDir}. Looked in: ${failedLookupLocations.join(", ")}`);
+            throw new Error(`Could not resolve JS module '${moduleName}' starting at '${initialDir}'. Looked in: ${failedLookupLocations.join(", ")}`);
         }
         return resolvedModule.resolvedFileName;
     }
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -795,7 +795,7 @@ namespace Harness.LanguageService {
                 default:
                     return {
                         module: undefined,
-                        error: "Could not resolve module"
+                        error: new Error("Could not resolve module")
                     };
             }
 
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -170,7 +170,8 @@ namespace ts.server {
             log(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
             const result = host.require(resolvedPath, moduleName);
             if (result.error) {
-                log(`Failed to load module: ${JSON.stringify(result.error)}`);
+                const err = result.error.stack || result.error.message || JSON.stringify(result.error);
+                log(`Failed to load module '${moduleName}': ${err}`);
                 return undefined;
             }
             return result.module;
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -116,8 +116,6 @@ namespace ts.server {
         birthtime: Date;
     }
 
-    type RequireResult = { module: {}, error: undefined } | { module: undefined, error: {} };
-
     const readline: {
         createInterface(options: ReadLineOptions): NodeJS.EventEmitter;
     } = require("readline");
diff --git a/src/server/types.ts b/src/server/types.ts
@@ -9,7 +9,7 @@ declare namespace ts.server {
         data: any;
     }
 
-    type RequireResult = { module: {}, error: undefined } | { module: undefined, error: {} };
+    type RequireResult = { module: {}, error: undefined } | { module: undefined, error: { stack?: string, message?: string } };
     export interface ServerHost extends System {
         setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
         clearTimeout(timeoutId: any): void;

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ namespace ts {`
`678`	`678`	`const { resolvedModule, failedLookupLocations } =`
`679`	`679`	`nodeModuleNameResolverWorker(moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, /cache/ undefined, /jsOnly/ true);`
`680`	`680`	`if (!resolvedModule) {`
`681`		- throw new Error(`Could not resolve JS module ${moduleName} starting at ${initialDir}. Looked in: ${failedLookupLocations.join(", ")}`);
	`681`	+ throw new Error(`Could not resolve JS module '${moduleName}' starting at '${initialDir}'. Looked in: ${failedLookupLocations.join(", ")}`);
`682`	`682`	`}`
`683`	`683`	`return resolvedModule.resolvedFileName;`
`684`	`684`	`}`
Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ namespace Harness.LanguageService {`
`795`	`795`	`default:`
`796`	`796`	`return {`
`797`	`797`	`module: undefined,`
`798`		`- error: "Could not resolve module"`
	`798`	`+ error: new Error("Could not resolve module")`
`799`	`799`	`};`
`800`	`800`	`}`
`801`	`801`
Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,6 @@ namespace ts.server {`
`116`	`116`	`birthtime: Date;`
`117`	`117`	`}`
`118`	`118`
`119`		`- type RequireResult = { module: {}, error: undefined } \| { module: undefined, error: {} };`
`120`		`-`
`121`	`119`	`const readline: {`
`122`	`120`	`createInterface(options: ReadLineOptions): NodeJS.EventEmitter;`
`123`	`121`	`} = require("readline");`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ declare namespace ts.server {`
`9`	`9`	`data: any;`
`10`	`10`	`}`
`11`	`11`
`12`		`- type RequireResult = { module: {}, error: undefined } \| { module: undefined, error: {} };`
	`12`	`+ type RequireResult = { module: {}, error: undefined } \| { module: undefined, error: { stack?: string, message?: string } };`
`13`	`13`	`export interface ServerHost extends System {`
`14`	`14`	`setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;`
`15`	`15`	`clearTimeout(timeoutId: any): void;`