Merge pull request microsoft#26296 from ajafff/modulenameresolver-cache

sheetalkamat · web-flow · commit c8e10a9a6684 · 2018-08-10T14:36:54.000-07:00
fix moduleNameResolver cache
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -401,7 +401,8 @@ namespace ts {
                 }
                 directoryPathMap.set(path, result);
 
-                const resolvedFileName = result.resolvedModule && result.resolvedModule.resolvedFileName;
+                const resolvedFileName = result.resolvedModule &&
+                    (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
                 // find common prefix between directory and resolved file name
                 // this common prefix should be the shortest path that has the same resolution
                 // directory: /a/b/c/d/e
diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts
@@ -403,6 +403,30 @@ namespace ts {
                 checkResolvedModule(resolution.resolvedModule, createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ true));
             });
         }
+
+        it("uses originalPath for caching", () => {
+            const host = createModuleResolutionHost(
+                /*hasDirectoryExists*/ true,
+                {
+                    name: "/modules/a.ts",
+                    symlinks: ["/sub/node_modules/a/index.ts"],
+                },
+                {
+                    name: "/sub/node_modules/a/package.json",
+                    content: '{"version": "0.0.0", "main": "./index"}'
+                }
+            );
+            const compilerOptions: CompilerOptions = { moduleResolution: ModuleResolutionKind.NodeJs };
+            const cache = createModuleResolutionCache("/", (f) => f);
+            let resolution = resolveModuleName("a", "/sub/dir/foo.ts", compilerOptions, host, cache);
+            checkResolvedModule(resolution.resolvedModule, createResolvedModule("/modules/a.ts", /*isExternalLibraryImport*/ true));
+
+            resolution = resolveModuleName("a", "/sub/foo.ts", compilerOptions, host, cache);
+            checkResolvedModule(resolution.resolvedModule, createResolvedModule("/modules/a.ts", /*isExternalLibraryImport*/ true));
+
+            resolution = resolveModuleName("a", "/foo.ts", compilerOptions, host, cache);
+            assert.isUndefined(resolution.resolvedModule, "lookup in parent directory doesn't hit the cache");
+        });
     });
 
     describe("Module resolution - relative imports", () => {
diff --git a/tests/cases/compiler/symbolLinkDeclarationEmitModuleNames.ts b/tests/cases/compiler/symbolLinkDeclarationEmitModuleNames.ts
@@ -22,4 +22,4 @@ export class BindingKey<T> {
 export * from "./src/value-promise";
 export * from "./src/bindingkey";
 
-// @link: tests/cases/compiler/monorepo/context -> tests/cases/compiler/monorepo/core/node_modules/@loopback/context
+// @link: tests/cases/compiler/monorepo/context -> tests/cases/compiler/monorepo/node_modules/@loopback/context

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,8 @@ namespace ts {`
`401`	`401`	`}`
`402`	`402`	`directoryPathMap.set(path, result);`
`403`	`403`
`404`		`- const resolvedFileName = result.resolvedModule && result.resolvedModule.resolvedFileName;`
	`404`	`+ const resolvedFileName = result.resolvedModule &&`
	`405`	`+ (result.resolvedModule.originalPath \|\| result.resolvedModule.resolvedFileName);`
`405`	`406`	`// find common prefix between directory and resolved file name`
`406`	`407`	`// this common prefix should be the shortest path that has the same resolution`
`407`	`408`	`// directory: /a/b/c/d/e`