refactor(compiler): renames

- `NgHost` to `CompilerHost`
- `AotCompilerHost.resolveFileToImport` to `AotCompilerHost.fileNameToModuleName`
- `AotCompilerHoset.resolveImportToFile` to `AotCompilerHost.moduleNameToFileName`

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

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

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

@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgHostContext} from '@angular/compiler-cli/src/ng_host';
+import {CompilerHostContext} from '@angular/compiler-cli/src/compiler_host';
 import * as ts from 'typescript';
 
 export type Entry = string | Directory;
 
 export interface Directory { [name: string]: Entry; }
 
-export class MockContext implements NgHostContext {
+export class MockAotContext implements CompilerHostContext {
   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: MockContext) {}
+  constructor(private context: MockAotContext) {}
 
   fileExists(fileName: string): boolean { return this.context.fileExists(fileName); }