Revert "refactor(compiler): renames"

This reverts commit 38be2b81c6.

modules/@angular/compiler-cli/index.ts

@@ -8,7 +8,7 @@
 
 export {AotCompilerHost, AotCompilerHost as StaticReflectorHost, StaticReflector, StaticSymbol} from '@angular/compiler';
 export {CodeGenerator} from './src/codegen';
-export {CompilerHost, CompilerHostContext, NodeCompilerHostContext} from './src/compiler_host';
 export {Extractor} from './src/extractor';
+export {NgHost, NgHostContext, NodeNgHostContext} from './src/ng_host';
 
 export * from '@angular/tsc-wrapped';

modules/@angular/compiler-cli/src/codegen.ts

@@ -17,8 +17,8 @@ import {readFileSync} from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import {CompilerHost, CompilerHostContext} from './compiler_host';
+import {NgHost, NgHostContext} from './ng_host';
-import {PathMappedCompilerHost} from './path_mapped_compiler_host';
+import {PathMappedNgHost} from './path_mapped_ng_host';
 import {Console} from './private_import_core';
 
 const GENERATED_FILES = /\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
@@ -37,7 +37,7 @@ export class CodeGenerator {
   constructor(
       private options: AngularCompilerOptions, private program: ts.Program,
       public host: ts.CompilerHost, private staticReflector: compiler.StaticReflector,
-      private compiler: compiler.AotCompiler, private ngCompilerHost: CompilerHost) {}
+      private compiler: compiler.AotCompiler, private ngHost: NgHost) {}
 
   // Write codegen in a directory structure matching the sources.
   private calculateEmitPath(filePath: string): string {
@@ -64,8 +64,8 @@ export class CodeGenerator {
 
   codegen(): Promise<any> {
     return this.compiler
-        .compileAll(this.program.getSourceFiles().map(
+        .compileAll(
-            sf => this.ngCompilerHost.getCanonicalFileName(sf.fileName)))
+            this.program.getSourceFiles().map(sf => this.ngHost.getCanonicalFileName(sf.fileName)))
         .then(generatedModules => {
           generatedModules.forEach(generatedModule => {
             const sourceFile = this.program.getSourceFile(generatedModule.fileUrl);
@@ -78,13 +78,13 @@ export class CodeGenerator {
 
   static create(
       options: AngularCompilerOptions, cliOptions: NgcCliOptions, program: ts.Program,
-      tsCompilerHost: ts.CompilerHost, compilerHostContext?: CompilerHostContext,
+      compilerHost: ts.CompilerHost, ngHostContext?: NgHostContext,
-      ngCompilerHost?: CompilerHost): CodeGenerator {
+      ngHost?: NgHost): CodeGenerator {
-    if (!ngCompilerHost) {
+    if (!ngHost) {
       const usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
-      ngCompilerHost = usePathMapping ?
+      ngHost = usePathMapping ?
-          new PathMappedCompilerHost(program, tsCompilerHost, options, compilerHostContext) :
+          new PathMappedNgHost(program, compilerHost, options, ngHostContext) :
-          new CompilerHost(program, tsCompilerHost, options, compilerHostContext);
+          new NgHost(program, compilerHost, options, ngHostContext);
     }
     const transFile = cliOptions.i18nFile;
     const locale = cliOptions.locale;
@@ -96,7 +96,7 @@ export class CodeGenerator {
       }
       transContent = readFileSync(transFile, 'utf8');
     }
-    const {compiler: aotCompiler, reflector} = compiler.createAotCompiler(ngCompilerHost, {
+    const {compiler: aotCompiler, reflector} = compiler.createAotCompiler(ngHost, {
       debug: options.debug === true,
       translations: transContent,
       i18nFormat: cliOptions.i18nFormat,
@@ -104,17 +104,16 @@ export class CodeGenerator {
       excludeFilePattern: options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES :
                                                                        GENERATED_FILES
     });
-    return new CodeGenerator(
+    return new CodeGenerator(options, program, compilerHost, reflector, aotCompiler, ngHost);
-        options, program, tsCompilerHost, reflector, aotCompiler, ngCompilerHost);
   }
 }
 
 export function extractProgramSymbols(
-    program: ts.Program, staticReflector: compiler.StaticReflector, compilerHost: CompilerHost,
+    program: ts.Program, staticReflector: compiler.StaticReflector, ngHost: NgHost,
     options: AngularCompilerOptions): compiler.StaticSymbol[] {
   return compiler.extractProgramSymbols(
-      staticReflector,
+      staticReflector, program.getSourceFiles().map(sf => ngHost.getCanonicalFileName(sf.fileName)),
-      program.getSourceFiles().map(sf => compilerHost.getCanonicalFileName(sf.fileName)), {
+      {
         excludeFilePattern: options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES :
                                                                          GENERATED_FILES
       });

modules/@angular/compiler-cli/src/extractor.ts

@@ -19,18 +19,18 @@ import * as tsc from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
 
 import {extractProgramSymbols} from './codegen';
-import {CompilerHost} from './compiler_host';
+import {NgHost} from './ng_host';
 
 export class Extractor {
   constructor(
       private options: tsc.AngularCompilerOptions, private program: ts.Program,
       public host: ts.CompilerHost, private staticReflector: compiler.StaticReflector,
-      private messageBundle: compiler.MessageBundle, private compilerHost: CompilerHost,
+      private messageBundle: compiler.MessageBundle, private ngHost: NgHost,
       private metadataResolver: compiler.CompileMetadataResolver) {}
 
   extract(): Promise<compiler.MessageBundle> {
     const programSymbols: compiler.StaticSymbol[] =
-        extractProgramSymbols(this.program, this.staticReflector, this.compilerHost, this.options);
+        extractProgramSymbols(this.program, this.staticReflector, this.ngHost, this.options);
 
     const {ngModules, files} = compiler.analyzeAndValidateNgModules(
         programSymbols, {transitiveModules: true}, this.metadataResolver);
@@ -64,13 +64,13 @@ export class Extractor {
 
   static create(
       options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program,
-      tsCompilerHost: ts.CompilerHost, resourceLoader: compiler.ResourceLoader,
+      compilerHost: ts.CompilerHost, resourceLoader: compiler.ResourceLoader,
-      ngCompilerHost?: CompilerHost): Extractor {
+      ngHost?: NgHost): Extractor {
     const htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser());
 
     const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
-    if (!ngCompilerHost) ngCompilerHost = new CompilerHost(program, tsCompilerHost, options);
+    if (!ngHost) ngHost = new NgHost(program, compilerHost, options);
-    const staticReflector = new compiler.StaticReflector(ngCompilerHost);
+    const staticReflector = new compiler.StaticReflector(ngHost);
     compiler.StaticAndDynamicReflectionCapabilities.install(staticReflector);
 
     const config = new compiler.CompilerConfig({
@@ -92,6 +92,6 @@ export class Extractor {
     const messageBundle = new compiler.MessageBundle(htmlParser, [], {});
 
     return new Extractor(
-        options, program, tsCompilerHost, staticReflector, messageBundle, ngCompilerHost, resolver);
+        options, program, compilerHost, staticReflector, messageBundle, ngHost, resolver);
   }
 }

modules/@angular/compiler-cli/src/ng_host.ts

@@ -17,7 +17,7 @@ const DTS = /\.d\.ts$/;
 const NODE_MODULES = '/node_modules/';
 const IS_GENERATED = /\.(ngfactory|css(\.shim)?)$/;
 
-export interface CompilerHostContext {
+export interface NgHostContext {
   fileExists(fileName: string): boolean;
   directoryExists(directoryName: string): boolean;
   readFile(fileName: string): string;
@@ -25,9 +25,9 @@ export interface CompilerHostContext {
   assumeFileExists(fileName: string): void;
 }
 
-export class CompilerHost implements AotCompilerHost {
+export class NgHost implements AotCompilerHost {
   protected metadataCollector = new MetadataCollector();
-  protected context: CompilerHostContext;
+  protected context: NgHostContext;
   private isGenDirChildOfRootDir: boolean;
   protected basePath: string;
   private genDir: string;
@@ -35,12 +35,12 @@ export class CompilerHost implements AotCompilerHost {
 
   constructor(
       protected program: ts.Program, protected compilerHost: ts.CompilerHost,
-      protected options: AngularCompilerOptions, context?: CompilerHostContext) {
+      protected options: AngularCompilerOptions, context?: NgHostContext) {
     // normalize the path so that it never ends with '/'.
     this.basePath = path.normalize(path.join(this.options.basePath, '.')).replace(/\\/g, '/');
     this.genDir = path.normalize(path.join(this.options.genDir, '.')).replace(/\\/g, '/');
 
-    this.context = context || new NodeCompilerHostContext(compilerHost);
+    this.context = context || new NodeNgHostContext(compilerHost);
     const genPath: string = path.relative(this.basePath, this.genDir);
     this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..');
   }
@@ -48,7 +48,7 @@ export class CompilerHost implements AotCompilerHost {
   // We use absolute paths on disk as canonical.
   getCanonicalFileName(fileName: string): string { return fileName; }
 
-  moduleNameToFileName(m: string, containingFile: string) {
+  resolveImportToFile(m: string, containingFile: string) {
     if (!containingFile || !containingFile.length) {
       if (m.indexOf('.') === 0) {
         throw new Error('Resolution of relative paths requires a containing file.');
@@ -78,7 +78,7 @@ export class CompilerHost implements AotCompilerHost {
    *
    * NOTE: (*) the relative path is computed depending on `isGenDirChildOfRootDir`.
    */
-  fileNameToModuleName(importedFile: string, containingFile: string): string {
+  resolveFileToImport(importedFile: string, containingFile: string): string {
     // If a file does not yet exist (because we compile it later), we still need to
     // assume it exists it so that the `resolve` method works!
     if (!this.compilerHost.fileExists(importedFile)) {
@@ -149,7 +149,6 @@ export class CompilerHost implements AotCompilerHost {
       }
       throw new Error(`Source file ${filePath} not present in program.`);
     }
-    return sf;
   }
 
   getMetadataFor(filePath: string): ModuleMetadata[] {
@@ -216,7 +215,7 @@ export class CompilerHost implements AotCompilerHost {
   loadResource(filePath: string): Promise<string> { return this.context.readResource(filePath); }
 }
 
-export class NodeCompilerHostContext implements CompilerHostContext {
+export class NodeNgHostContext implements NgHostContext {
   constructor(private host: ts.CompilerHost) {}
 
   private assumedExists: {[fileName: string]: boolean} = {};

modules/@angular/compiler-cli/src/path_mapped_ng_host.ts

@@ -12,7 +12,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import {CompilerHost, CompilerHostContext} from './compiler_host';
+import {NgHost, NgHostContext} from './ng_host';
 
 const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 const DTS = /\.d\.ts$/;
@@ -24,10 +24,10 @@ const DTS = /\.d\.ts$/;
  * import. This requires using TS `rootDirs` option and also teaching the module
  * loader what to do.
  */
-export class PathMappedCompilerHost extends CompilerHost {
+export class PathMappedNgHost extends NgHost {
   constructor(
       program: ts.Program, compilerHost: ts.CompilerHost, options: AngularCompilerOptions,
-      context?: CompilerHostContext) {
+      context?: NgHostContext) {
     super(program, compilerHost, options, context);
   }
 
@@ -42,7 +42,7 @@ export class PathMappedCompilerHost extends CompilerHost {
     return fileName;
   }
 
-  moduleNameToFileName(m: string, containingFile: string) {
+  resolveImportToFile(m: string, containingFile: string) {
     if (!containingFile || !containingFile.length) {
       if (m.indexOf('.') === 0) {
         throw new Error('Resolution of relative paths requires a containing file.');
@@ -69,7 +69,7 @@ export class PathMappedCompilerHost extends CompilerHost {
    * Relativize the paths by checking candidate prefixes of the absolute path, to see if
    * they are resolvable by the moduleResolution strategy from the CompilerHost.
    */
-  fileNameToModuleName(importedFile: string, containingFile: string): string {
+  resolveFileToImport(importedFile: string, containingFile: string): string {
     if (this.options.traceResolution) {
       console.log(
           'getImportPath from containingFile', containingFile, 'to importedFile', importedFile);
@@ -86,8 +86,7 @@ export class PathMappedCompilerHost extends CompilerHost {
     }
 
     const resolvable = (candidate: string) => {
-      const resolved =
+      const resolved = this.getCanonicalFileName(this.resolveImportToFile(candidate, importedFile));
-          this.getCanonicalFileName(this.moduleNameToFileName(candidate, importedFile));
       return resolved && resolved.replace(EXT, '') === importedFile.replace(EXT, '');
     };
 

modules/@angular/compiler-cli/test/mocks.ts

@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompilerHostContext} from '@angular/compiler-cli/src/compiler_host';
+import {NgHostContext} from '@angular/compiler-cli/src/ng_host';
 import * as ts from 'typescript';
 
 export type Entry = string | Directory;
 
 export interface Directory { [name: string]: Entry; }
 
-export class MockAotContext implements CompilerHostContext {
+export class MockContext implements NgHostContext {
   constructor(public currentDirectory: string, private files: Entry) {}
 
   fileExists(fileName: string): boolean { return typeof this.getEntry(fileName) === 'string'; }
@@ -97,7 +97,7 @@ function normalize(parts: string[]): string[] {
 }
 
 export class MockCompilerHost implements ts.CompilerHost {
-  constructor(private context: MockAotContext) {}
+  constructor(private context: MockContext) {}
 
   fileExists(fileName: string): boolean { return this.context.fileExists(fileName); }
 

modules/@angular/compiler-cli/test/ng_host_spec.ts

@@ -8,19 +8,19 @@
 
 import * as ts from 'typescript';
 
-import {CompilerHost} from '../src/compiler_host';
+import {NgHost} from '../src/ng_host';
 
-import {Directory, Entry, MockAotContext, MockCompilerHost} from './mocks';
+import {Directory, Entry, MockCompilerHost, MockContext} from './mocks';
 
-describe('CompilerHost', () => {
+describe('NgHost', () => {
-  let context: MockAotContext;
+  let context: MockContext;
   let host: ts.CompilerHost;
   let program: ts.Program;
-  let hostNestedGenDir: CompilerHost;
+  let hostNestedGenDir: NgHost;
-  let hostSiblingGenDir: CompilerHost;
+  let hostSiblingGenDir: NgHost;
 
   beforeEach(() => {
-    context = new MockAotContext('/tmp/src', clone(FILES));
+    context = new MockContext('/tmp/src', clone(FILES));
     host = new MockCompilerHost(context);
     program = ts.createProgram(
         ['main.ts'], {
@@ -32,7 +32,7 @@ describe('CompilerHost', () => {
     if (errors && errors.length) {
       throw new Error('Expected no errors');
     }
-    hostNestedGenDir = new CompilerHost(
+    hostNestedGenDir = new NgHost(
         program, host, {
           genDir: '/tmp/project/src/gen/',
           basePath: '/tmp/project/src',
@@ -42,7 +42,7 @@ describe('CompilerHost', () => {
           trace: false
         },
         context);
-    hostSiblingGenDir = new CompilerHost(
+    hostSiblingGenDir = new NgHost(
         program, host, {
           genDir: '/tmp/project/gen',
           basePath: '/tmp/project/src/',
@@ -56,32 +56,32 @@ describe('CompilerHost', () => {
 
   describe('nestedGenDir', () => {
     it('should import node_module from factory', () => {
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/node_modules/@angular/core.d.ts',
                  '/tmp/project/src/gen/my.ngfactory.ts', ))
           .toEqual('@angular/core');
     });
 
     it('should import factory from factory', () => {
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ngfactory.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./my.other.ngfactory');
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.css.ts', '/tmp/project/src/a/my.ngfactory.ts'))
           .toEqual('../my.other.css');
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/a/my.other.css.shim.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./a/my.other.css.shim');
     });
 
     it('should import application from factory', () => {
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('../my.other');
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ts', '/tmp/project/src/a/my.ngfactory.ts'))
           .toEqual('../../my.other');
-      expect(hostNestedGenDir.fileNameToModuleName(
+      expect(hostNestedGenDir.resolveFileToImport(
                  '/tmp/project/src/a/my.other.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('../a/my.other');
     });
@@ -89,54 +89,54 @@ describe('CompilerHost', () => {
 
   describe('siblingGenDir', () => {
     it('should import node_module from factory', () => {
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/node_modules/@angular/core.d.ts',
                  '/tmp/project/src/gen/my.ngfactory.ts'))
           .toEqual('@angular/core');
     });
 
     it('should import factory from factory', () => {
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ngfactory.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./my.other.ngfactory');
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.css.ts', '/tmp/project/src/a/my.ngfactory.ts'))
           .toEqual('../my.other.css');
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/a/my.other.css.shim.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./a/my.other.css.shim');
     });
 
     it('should import application from factory', () => {
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./my.other');
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/my.other.ts', '/tmp/project/src/a/my.ngfactory.ts'))
           .toEqual('../my.other');
-      expect(hostSiblingGenDir.fileNameToModuleName(
+      expect(hostSiblingGenDir.resolveFileToImport(
                  '/tmp/project/src/a/my.other.ts', '/tmp/project/src/my.ngfactory.ts'))
           .toEqual('./a/my.other');
     });
   });
 
   it('should be able to produce an import from main @angular/core', () => {
-    expect(hostNestedGenDir.fileNameToModuleName(
+    expect(hostNestedGenDir.resolveFileToImport(
                '/tmp/project/node_modules/@angular/core.d.ts', '/tmp/project/src/main.ts'))
         .toEqual('@angular/core');
   });
 
   it('should be able to produce an import from main to a sub-directory', () => {
-    expect(hostNestedGenDir.fileNameToModuleName('lib/utils.ts', 'main.ts')).toEqual('./lib/utils');
+    expect(hostNestedGenDir.resolveFileToImport('lib/utils.ts', 'main.ts')).toEqual('./lib/utils');
   });
 
   it('should be able to produce an import from to a peer file', () => {
-    expect(hostNestedGenDir.fileNameToModuleName('lib/collections.ts', 'lib/utils.ts'))
+    expect(hostNestedGenDir.resolveFileToImport('lib/collections.ts', 'lib/utils.ts'))
         .toEqual('./collections');
   });
 
   it('should be able to produce an import from to a sibling directory', () => {
-    expect(hostNestedGenDir.fileNameToModuleName('lib/utils.ts', 'lib2/utils2.ts'))
+    expect(hostNestedGenDir.resolveFileToImport('lib/utils.ts', 'lib2/utils2.ts'))
         .toEqual('../lib/utils');
   });
 

modules/@angular/compiler/src/aot/compiler_factory.ts

@@ -40,12 +40,12 @@ import {StaticReflector} from './static_reflector';
 /**
  * Creates a new AotCompiler based on options and a host.
  */
-export function createAotCompiler(compilerHost: AotCompilerHost, options: AotCompilerOptions):
+export function createAotCompiler(ngHost: AotCompilerHost, options: AotCompilerOptions):
     {compiler: AotCompiler, reflector: StaticReflector} {
   let translations: string = options.translations || '';
 
   const urlResolver = createOfflineCompileUrlResolver();
-  const staticReflector = new StaticReflector(compilerHost);
+  const staticReflector = new StaticReflector(ngHost);
   StaticAndDynamicReflectionCapabilities.install(staticReflector);
   const htmlParser = new I18NHtmlParser(new HtmlParser(), translations, options.i18nFormat);
   const config = new CompilerConfig({
@@ -55,7 +55,7 @@ export function createAotCompiler(compilerHost: AotCompilerHost, options: AotCom
     useJit: false
   });
   const normalizer = new DirectiveNormalizer(
-      {get: (url: string) => compilerHost.loadResource(url)}, urlResolver, htmlParser, config);
+      {get: (url: string) => ngHost.loadResource(url)}, urlResolver, htmlParser, config);
   const expressionParser = new Parser(new Lexer());
   const elementSchemaRegistry = new DomElementSchemaRegistry();
   const console = new Console();
@@ -69,7 +69,7 @@ export function createAotCompiler(compilerHost: AotCompilerHost, options: AotCom
       resolver, tmplParser, new StyleCompiler(urlResolver),
       new ViewCompiler(config, elementSchemaRegistry),
       new DirectiveWrapperCompiler(config, expressionParser, elementSchemaRegistry, console),
-      new NgModuleCompiler(), new TypeScriptEmitter(compilerHost), options.locale,
+      new NgModuleCompiler(), new TypeScriptEmitter(ngHost), options.locale, options.i18nFormat,
-      options.i18nFormat, new AnimationParser(elementSchemaRegistry), staticReflector, options);
+      new AnimationParser(elementSchemaRegistry), staticReflector, options);
   return {compiler, reflector: staticReflector};
 }

modules/@angular/compiler/src/aot/compiler_host.ts

@@ -25,17 +25,14 @@ export interface AotCompilerHost {
   getMetadataFor(modulePath: string): {[key: string]: any}[];
 
   /**
-   * Converts a module name that is used in an `import` to a file path.
+   * Converts an import into a file path.
-   * I.e.
-   * `path/to/containingFile.ts` containing `import {...} from 'module-name'`.
    */
-  moduleNameToFileName(moduleName: string, containingFile: string): string;
+  resolveImportToFile(moduleName: string, containingFile: string): string;
 
   /**
-   * Converts a file path to a module name that can be used as an `import.
+   * Converts a file path to an import
-   * I.e. `path/to/importedFile.ts` should be imported by `path/to/containingFile.ts`.
    */
-  fileNameToModuleName(importedFile: string, containingFile: string): string;
+  resolveFileToImport(importedFilePath: string, containingFilePath: string): string;
 
   /**
    * Loads a resource (e.g. html / css)

modules/@angular/compiler/src/aot/static_reflector.ts

@@ -214,7 +214,7 @@ export class StaticReflector implements ReflectorReader {
 
   private resolveExportedSymbol(filePath: string, symbolName: string): StaticSymbol {
     const resolveModule = (moduleName: string): string => {
-      const resolvedModulePath = this.host.moduleNameToFileName(moduleName, filePath);
+      const resolvedModulePath = this.host.resolveImportToFile(moduleName, filePath);
       if (!resolvedModulePath) {
         throw new Error(`Could not resolve module '${moduleName}' relative to file ${filePath}`);
       }
@@ -269,7 +269,7 @@ export class StaticReflector implements ReflectorReader {
       return symbol;
     }
     try {
-      const filePath = this.host.moduleNameToFileName(module, containingFile);
+      const filePath = this.host.resolveImportToFile(module, containingFile);
 
       if (!filePath) {
         // If the file cannot be found the module is probably referencing a declared module

modules/@angular/compiler/src/output/js_emitter.ts

@@ -25,7 +25,7 @@ export class JavaScriptEmitter implements OutputEmitter {
       // Note: can't write the real word for import as it screws up system.js auto detection...
       srcParts.push(
           `var ${prefix} = req` +
-          `uire('${this._importGenerator.fileNameToModuleName(importedModuleUrl, moduleUrl)}');`);
+          `uire('${this._importGenerator.resolveFileToImport(importedModuleUrl, moduleUrl)}');`);
     });
     srcParts.push(ctx.toSource());
     return srcParts.join('\n');

modules/@angular/compiler/src/output/path_util.ts

@@ -10,5 +10,5 @@
  * Interface that defines how import statements should be generated.
  */
 export abstract class ImportResolver {
-  abstract fileNameToModuleName(importedFilePath: string, containingFilePath: string): string;
+  abstract resolveFileToImport(importedFilePath: string, containingFilePath: string): string;
 }

modules/@angular/compiler/src/output/ts_emitter.ts

@@ -47,7 +47,7 @@ export class TypeScriptEmitter implements OutputEmitter {
       // Note: can't write the real word for import as it screws up system.js auto detection...
       srcParts.push(
           `imp` +
-          `ort * as ${prefix} from '${this._importGenerator.fileNameToModuleName(importedModuleUrl, moduleUrl)}';`);
+          `ort * as ${prefix} from '${this._importGenerator.resolveFileToImport(importedModuleUrl, moduleUrl)}';`);
     });
     srcParts.push(ctx.toSource());
     return srcParts.join('\n');

modules/@angular/compiler/test/aot/static_reflector_spec.ts

@@ -511,12 +511,12 @@ class MockAotCompilerHost implements AotCompilerHost {
 
   loadResource(filePath: string): Promise<string> { throw new Error('Should not be called!'); }
 
-  fileNameToModuleName(importedFilePath: string, containingFilePath: string): string {
+  resolveFileToImport(importedFilePath: string, containingFilePath: string): string {
     throw new Error('Should not be called!');
   }
 
   // In tests, assume that symbols are not re-exported
-  moduleNameToFileName(modulePath: string, containingFile?: string): string {
+  resolveImportToFile(modulePath: string, containingFile?: string): string {
     function splitPath(path: string): string[] { return path.split(/\/|\\/g); }
 
     function resolvePath(pathParts: string[]): string {

modules/@angular/compiler/test/output/output_emitter_util.ts

@@ -253,7 +253,7 @@ function createOperatorFn(op: o.BinaryOperator) {
 }
 
 export class SimpleJsImportGenerator implements ImportResolver {
-  fileNameToModuleName(importedUrlStr: string, moduleUrlStr: string): string {
+  resolveFileToImport(importedUrlStr: string, moduleUrlStr: string): string {
     return importedUrlStr;
   }
 }