maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wip: tests pass

Browse source
This commit is contained in:
Andy Hanson 2017-05-30 15:21:17 -07:00
parent 2648af160d
commit 62e079520d
4 changed files with 76 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/compiler/moduleNameResolver.ts
View file

@ -19,17 +19,25 @@ namespace ts {
push(value: T): void;
}
//killme?
//name
interface ResolvedMini {
path: string;
extension: Extension;
}
function withPackageName(r: ResolvedMini, packageName: string | undefined): Resolved {
return { ...r, packageName };
function maybeWithPackageName(packageName: string | undefined, r: ResolvedMini | undefined): Resolved | undefined {
return r && { ...r, packageName: packageName && normalizePackageName(packageName) };
}
function maybeWithPackageName(r: ResolvedMini | undefined, packageName: string | undefined): Resolved | undefined {
return r ? withPackageName(r, packageName) : undefined;
function normalizePackageName(packageName: string): string {
let components = getNormalizedPathComponents(packageName, "");
if (components[0] === "") {
components = components.slice(1);
}
if (components[0] === "@types") {
components = components.slice(1);
}
return getNormalizedPathFromPathComponents(components);
}
/**
@ -60,6 +68,7 @@ namespace ts {
}
function createResolvedModuleWithFailedLookupLocations(resolved: Resolved | undefined, isExternalLibraryImport: boolean, failedLookupLocations: string[]): ResolvedModuleWithFailedLookupLocations {
Debug.assert(!resolved || resolved.path !== undefined); //kill
return {
resolvedModule: resolved && { resolvedFileName: resolved.path, extension: resolved.extension, packageName: resolved.packageName, isExternalLibraryImport },
failedLookupLocations
@ -552,10 +561,10 @@ namespace ts {
failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
if (moduleHasNonRelativeName(moduleName)) {
return maybeWithPackageName(tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state), moduleName);
return maybeWithPackageName(moduleName, tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state)); //TODO: Test with baseUrl settings...
}
else {
return maybeWithPackageName(tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state), undefined);
return maybeWithPackageName(undefined, tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state));
}
}
@ -736,18 +745,14 @@ namespace ts {
// For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
return resolved && {
value: resolved.value && {
resolved: {
path: realpath(resolved.value.path, host, traceEnabled),
packageName: moduleName,
extension: resolved.value.extension
},
resolved: maybeWithPackageName(moduleName, { path: realpath(resolved.value.path, host, traceEnabled), extension: resolved.value.extension }),
isExternalLibraryImport: true
}
};
}
else {
const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
const resolved = maybeWithPackageName(nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true), undefined);
const resolved = maybeWithPackageName(undefined, nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true));
return resolved && toSearchResult({ resolved, isExternalLibraryImport: false });
}
}
@ -1071,7 +1076,7 @@ namespace ts {
return resolutionFromCache;
}
const searchName = normalizePath(combinePaths(directory, moduleName));
return toSearchResult(maybeWithPackageName(loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state), moduleName));
return toSearchResult(maybeWithPackageName(moduleName, loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state)));
});
if (resolved) {
return resolved;
@ -1079,12 +1084,12 @@ namespace ts {
if (extensions === Extensions.TypeScript) {
// If we didn't find the file normally, look it up in @types.
const x = loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
return x ? (x.value ? { value: withPackageName(x.value, moduleName) } : { value: undefined }) : undefined;
return x && { value: maybeWithPackageName(moduleName, x.value) }
}
}
else {
const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
return toSearchResult(maybeWithPackageName(loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state), undefined));
return toSearchResult(maybeWithPackageName(undefined, loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state)));
}
}
}
@ -1101,7 +1106,7 @@ namespace ts {
}
const state: ModuleResolutionState = { compilerOptions, host, traceEnabled };
const failedLookupLocations: string[] = [];
const resolved = withPackageName(loadModuleFromNodeModulesOneLevel(Extensions.DtsOnly, moduleName, globalCache, failedLookupLocations, state), moduleName);
const resolved = maybeWithPackageName(moduleName, loadModuleFromNodeModulesOneLevel(Extensions.DtsOnly, moduleName, globalCache, failedLookupLocations, state));
return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
}

19
tests/baselines/reference/moduleResolution_packageNameConsistent.errors.txt Normal file
View file

@ -0,0 +1,19 @@
/a.ts(6,23): error TS6137: Cannot import type declaration files. Consider importing 'foo/' instead of '@types/foo/'.
==== /a.ts (1 errors) ====
// These imports must all resolve with the same packageName of "foo",
// or else it will trigger an assertion in `setPackageName` in `program.ts`
import * as foo from "foo";
import * as foo2 from "foo/";
import * as foo3 from "@types/foo/";
~~~~~~~~~~~~~
!!! error TS6137: Cannot import type declaration files. Consider importing 'foo/' instead of '@types/foo/'.
import * as foo4 from "@types\\foo\\";
// Relative imports do not have any packageName, so ignored.
import * as foo5 from "./node_modules/@types/foo";
==== /node_modules/@types/foo/index.d.ts (0 errors) ====
export const x: number;

22
tests/baselines/reference/moduleResolution_packageNameConsistent.js Normal file
View file

@ -0,0 +1,22 @@
//// [tests/cases/compiler/moduleResolution_packageNameConsistent.ts] ////
//// [a.ts]
// These imports must all resolve with the same packageName of "foo",
// or else it will trigger an assertion in `setPackageName` in `program.ts`
import * as foo from "foo";
import * as foo2 from "foo/";
import * as foo3 from "@types/foo/";
import * as foo4 from "@types\\foo\\";
// Relative imports do not have any packageName, so ignored.
import * as foo5 from "./node_modules/@types/foo";
//// [index.d.ts]
export const x: number;
//// [a.js]
"use strict";
// These imports must all resolve with the same packageName of "foo",
// or else it will trigger an assertion in `setPackageName` in `program.ts`
exports.__esModule = true;

13
tests/cases/compiler/moduleResolution_packageNameConsistent.ts Normal file
View file

@ -0,0 +1,13 @@
// These imports must all resolve with the same packageName of "foo",
// or else it will trigger an assertion in `setPackageName` in `program.ts`
// @Filename: /a.ts
import * as foo from "foo";
import * as foo2 from "foo/";
import * as foo3 from "@types/foo/";
import * as foo4 from "@types\\foo\\";
// Relative imports do not have any packageName, so ignored.
import * as foo5 from "./node_modules/@types/foo";
// @Filename: /node_modules/@types/foo/index.d.ts
export const x: number;