microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 20:14:01 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

addressed PR feedback

Browse Source
This commit is contained in:
Vladimir Matveev 2015-08-18 14:52:21 -07:00
parent 049a5fba07
commit f415097d0d
2 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/compiler/program.ts
View File

@ -36,7 +36,7 @@ namespace ts {
}
export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModule {
switch(compilerOptions.moduleResolution) {
switch (compilerOptions.moduleResolution) {
case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, host);
case ModuleResolutionKind.BaseUrl: return baseUrlModuleNameResolver(moduleName, containingFile, compilerOptions.baseUrl, host);
default: return legacyNameResolver(moduleName, containingFile, compilerOptions, host);
@ -141,26 +141,7 @@ namespace ts {
let failedLookupLocations: string[] = [];
let hasSupportedExtension = forEach(supportedExtensions, ext => fileExtensionIs(candidate, ext));
if (hasSupportedExtension) {
// module name already has extension - use it as is
let result = tryLoadFile(candidate);
if (result) {
return result;
}
}
else {
// module name does not have extension - try every supported extension
for(let ext of supportedExtensions) {
let result = tryLoadFile(candidate + ext);
if (result) {
return result;
}
}
}
return { resolvedFileName: undefined, failedLookupLocations };
return forEach(supportedExtensions, ext => tryLoadFile(candidate + ext)) || { resolvedFileName: undefined, failedLookupLocations };
function tryLoadFile(location: string): ResolvedModule {
if (host.fileExists(location)) {
@ -179,23 +160,9 @@ namespace ts {
}
function useBaseUrl(moduleName: string): boolean {
// path is rooted
if (getRootLength(moduleName) !== 0) {
return false;
}
// module name starts with './' or '../'
if (nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
return false;
}
// module name has one of supported extesions
for(let ext of supportedExtensions ) {
if (fileExtensionIs(moduleName, ext)) {
return false;
}
}
return true;
// path is not rooted
// module name does not start with './' or '../'
return getRootLength(moduleName) === 0 && !nameStartsWithDotSlashOrDotDotSlash(moduleName);
}
export function legacyNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModule {

5
tests/cases/unittests/moduleResolution.ts
View File

@ -253,7 +253,6 @@ module ts {
assert.deepEqual(resolution.failedLookupLocations, expectedFailedLookupLocations)
}
test("/a/b/c/d.ts", "/foo.ts", "/foo.ts");
test("/a/b/c/d.ts", "/foo.ts", "/foo");
test("/a/b/c/d.ts", "/foo.d.ts", "/foo");
test("/a/b/c/d.ts", "/foo.tsx", "/foo");
@ -265,10 +264,6 @@ module ts {
test("/a/b/c/d.ts", "/a/b/foo.ts", "../foo");
test("/a/b/c/d.ts", "/a/b/foo.d.ts", "../foo");
test("/a/b/c/d.ts", "/a/b/foo.tsx", "../foo");
test("/a/b/c/d.ts", "/a/b/c/foo.ts", "foo.ts");
test("/a/b/c/d.ts", "/a/b/c/foo.tsx", "foo.tsx");
test("/a/b/c/d.ts", "/a/b/c/foo.d.ts", "foo.d.ts");
});
it ("load module using base url", () => {