Skip to content

Process imports to source files to record module name resolutions #4368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2015
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
1 change: 0 additions & 1 deletion src/compiler/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5131,7 +5131,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
argumentsWritten++;
}
if (shouldEmitParamTypesMetadata(node)) {
debugger;
if (writeComma || argumentsWritten) {
write(", ");
}
Expand Down
39 changes: 15 additions & 24 deletions src/compiler/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,19 +221,9 @@ namespace ts {

host = host || createCompilerHost(options);

// initialize resolveModuleNameWorker only if noResolve is false
let resolveModuleNamesWorker: (moduleNames: string[], containingFile: string) => string[];
if (!options.noResolve) {
resolveModuleNamesWorker = host.resolveModuleNames;
if (!resolveModuleNamesWorker) {
resolveModuleNamesWorker = (moduleNames, containingFile) => {
return map(moduleNames, moduleName => {
let moduleResolution = resolveModuleName(moduleName, containingFile, options, host);
return moduleResolution.resolvedFileName;
});
}
}
}
const resolveModuleNamesWorker =
host.resolveModuleNames ||
((moduleNames, containingFile) => map(moduleNames, moduleName => resolveModuleName(moduleName, containingFile, options, host).resolvedFileName));

let filesByName = createFileMap<SourceFile>(fileName => host.getCanonicalFileName(fileName));

Expand Down Expand Up @@ -340,7 +330,7 @@ namespace ts {
}

// check imports
collectExternalModuleReferences(newSourceFile);
collectExternalModuleReferences(newSourceFile);
if (!arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
// imports has changed
return false;
Expand Down Expand Up @@ -670,12 +660,15 @@ namespace ts {

// Set the source file for normalized absolute path
filesByName.set(canonicalAbsolutePath, file);


let basePath = getDirectoryPath(fileName);
if (!options.noResolve) {
let basePath = getDirectoryPath(fileName);
processReferencedFiles(file, basePath);
processImportedModules(file, basePath);
}

// always process imported modules to record module name resolutions
processImportedModules(file, basePath);

if (isDefaultLib) {
file.isDefaultLib = true;
files.unshift(file);
Expand Down Expand Up @@ -713,21 +706,19 @@ namespace ts {
});
}

function processImportedModules(file: SourceFile, basePath: string) {
collectExternalModuleReferences(file);
if (file.imports.length) {
function processImportedModules(file: SourceFile, basePath: string) {
collectExternalModuleReferences(file);
if (file.imports.length) {
file.resolvedModules = {};
let oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);

let moduleNames = map(file.imports, name => name.text);
let resolutions = resolveModuleNamesWorker(moduleNames, file.fileName);
for (let i = 0; i < file.imports.length; ++i) {
let resolution = resolutions[i];
setResolvedModuleName(file, moduleNames[i], resolution);
if (resolution) {
if (resolution && !options.noResolve) {
findModuleSourceFile(resolution, file.imports[i]);
}
}
}
}
else {
// no imports - drop cached module resolutions
Expand Down
5 changes: 2 additions & 3 deletions src/services/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1842,9 +1842,8 @@ namespace ts {
getCanonicalFileName: fileName => fileName,
getCurrentDirectory: () => "",
getNewLine: () => newLine,
// these two methods should never be called in transpile scenarios since 'noResolve' is set to 'true'
fileExists: (fileName): boolean => { throw new Error("Should never be called."); },
readFile: (fileName): string => { throw new Error("Should never be called."); }
fileExists: (fileName): boolean => fileName === inputFileName,
readFile: (fileName): string => ""
};

let program = createProgram([inputFileName], options, compilerHost);
Expand Down
13 changes: 13 additions & 0 deletions tests/baselines/reference/moduleResolutionNoResolve.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//// [tests/cases/compiler/moduleResolutionNoResolve.ts] ////

//// [a.ts]

import a = require('./b');

//// [b.ts]
export var c = '';


//// [a.js]
//// [b.js]
exports.c = '';
9 changes: 9 additions & 0 deletions tests/baselines/reference/moduleResolutionNoResolve.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
=== tests/cases/compiler/a.ts ===

import a = require('./b');
>a : Symbol(a, Decl(a.ts, 0, 0))

=== tests/cases/compiler/b.ts ===
export var c = '';
>c : Symbol(c, Decl(b.ts, 0, 10))

10 changes: 10 additions & 0 deletions tests/baselines/reference/moduleResolutionNoResolve.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
=== tests/cases/compiler/a.ts ===

import a = require('./b');
>a : typeof a

=== tests/cases/compiler/b.ts ===
export var c = '';
>c : string
>'' : string

8 changes: 8 additions & 0 deletions tests/cases/compiler/moduleResolutionNoResolve.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @module:commonjs
// @noResolve: true

// @filename: a.ts
import a = require('./b');

// @filename: b.ts
export var c = '';