Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler/moduleNameResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 shorted path that has the same resolution
// directory: /a/b/c/d/e
Expand Down
24 changes: 24 additions & 0 deletions src/testRunner/unittests/moduleResolution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,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", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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