refactor: rename ComponentRenderTypeV2 to RendererTypeV2

modules/@angular/core/src/render.ts

@@ -7,4 +7,4 @@
  */
 
 // Public API for render
-export {ComponentRenderTypeV2, RenderComponentType, Renderer, RendererFactoryV2, RendererV2, RootRenderer} from './render/api';
+export {RenderComponentType, Renderer, RendererFactoryV2, RendererTypeV2, RendererV2, RootRenderer} from './render/api';

modules/@angular/core/src/render/api.ts

@@ -111,7 +111,7 @@ export abstract class RootRenderer {
 /**
  * @experimental
  */
-export interface ComponentRenderTypeV2 {
+export interface RendererTypeV2 {
   id: string;
   encapsulation: ViewEncapsulation;
   styles: (string|any[])[];
@@ -122,7 +122,7 @@ export interface ComponentRenderTypeV2 {
  * @experimental
  */
 export abstract class RendererFactoryV2 {
-  abstract createRenderer(hostElement: any, type: ComponentRenderTypeV2): RendererV2;
+  abstract createRenderer(hostElement: any, type: RendererTypeV2): RendererV2;
 }
 
 /**

modules/@angular/core/src/view/index.ts

@@ -14,7 +14,7 @@ export {queryDef} from './query';
 export {ViewRef_, createComponentFactory, nodeValue} from './refs';
 export {initServicesIfNeeded} from './services';
 export {textDef} from './text';
-export {createComponentRenderTypeV2, elementEventFullName, rootRenderNodes, unwrapValue} from './util';
+export {createRendererTypeV2, elementEventFullName, rootRenderNodes, unwrapValue} from './util';
 export {viewDef} from './view';
 export {attachEmbeddedView, detachEmbeddedView, moveEmbeddedView} from './view_attach';
 

modules/@angular/core/src/view/provider.ts

@@ -12,7 +12,7 @@ import {ElementRef} from '../linker/element_ref';
 import {TemplateRef} from '../linker/template_ref';
 import {ViewContainerRef} from '../linker/view_container_ref';
 import {ViewEncapsulation} from '../metadata/view';
-import {ComponentRenderTypeV2, Renderer as RendererV1, RendererFactoryV2, RendererV2} from '../render/api';
+import {Renderer as RendererV1, RendererFactoryV2, RendererTypeV2, RendererV2} from '../render/api';
 
 import {createChangeDetectorRef, createInjector, createRendererV1, createTemplateRef, createViewContainerRef} from './refs';
 import {BindingDef, BindingType, DepDef, DepFlags, DirectiveOutputDef, DisposableFn, NodeData, NodeDef, NodeFlags, NodeType, ProviderData, ProviderType, QueryBindingType, QueryDef, QueryValueType, RootData, Services, ViewData, ViewDefinition, ViewFlags, ViewState, asElementData, asProviderData} from './types';
@@ -32,7 +32,7 @@ export function directiveDef(
     flags: NodeFlags, matchedQueries: [string | number, QueryValueType][], childCount: number,
     ctor: any, deps: ([DepFlags, any] | any)[], props?: {[name: string]: [number, string]},
     outputs?: {[name: string]: string}, component?: () => ViewDefinition,
-    componentRenderType?: ComponentRenderTypeV2): NodeDef {
+    rendererType?: RendererTypeV2): NodeDef {
   const bindings: BindingDef[] = [];
   if (props) {
     for (let prop in props) {
@@ -54,7 +54,7 @@ export function directiveDef(
   }
   return _def(
       NodeType.Directive, flags, matchedQueries, childCount, ProviderType.Class, ctor, ctor, deps,
-      bindings, outputDefs, component, componentRenderType);
+      bindings, outputDefs, component, rendererType);
 }
 
 export function pipeDef(flags: NodeFlags, ctor: any, deps: ([DepFlags, any] | any)[]): NodeDef {
@@ -71,12 +71,12 @@ export function _def(
     type: NodeType, flags: NodeFlags, matchedQueriesDsl: [string | number, QueryValueType][],
     childCount: number, providerType: ProviderType, token: any, value: any,
     deps: ([DepFlags, any] | any)[], bindings?: BindingDef[], outputs?: DirectiveOutputDef[],
-    component?: () => ViewDefinition, componentRenderType?: ComponentRenderTypeV2): NodeDef {
+    component?: () => ViewDefinition, rendererType?: RendererTypeV2): NodeDef {
   const {matchedQueries, references, matchedQueryIds} = splitMatchedQueriesDsl(matchedQueriesDsl);
-  // This is needed as the jit compiler always uses an empty hash as default ComponentRenderTypeV2,
+  // This is needed as the jit compiler always uses an empty hash as default RendererTypeV2,
   // which is not filled for host views.
-  if (componentRenderType && componentRenderType.encapsulation == null) {
-    componentRenderType = null;
+  if (rendererType && rendererType.encapsulation == null) {
+    rendererType = null;
   }
   if (!outputs) {
     outputs = [];
@@ -120,7 +120,7 @@ export function _def(
       type: providerType,
       token,
       tokenKey: tokenKey(token), value,
-      deps: depDefs, outputs, component, componentRenderType
+      deps: depDefs, outputs, component, rendererType
     },
     text: undefined,
     pureExpression: undefined,

modules/@angular/core/src/view/services.ts

@@ -9,7 +9,7 @@
 import {isDevMode} from '../application_ref';
 import {DebugElement, DebugNode, EventListener, getDebugNode, indexDebugNode, removeDebugNodeFromIndex} from '../debug/debug_node';
 import {Injector} from '../di';
-import {ComponentRenderTypeV2, RendererFactoryV2, RendererV2} from '../render/api';
+import {RendererFactoryV2, RendererTypeV2, RendererV2} from '../render/api';
 import {Sanitizer, SecurityContext} from '../security';
 
 import {isViewDebugError, viewDestroyedError, viewWrappedDebugError} from './errors';
@@ -399,7 +399,7 @@ export function getCurrentDebugContext(): DebugContext {
 class DebugRendererFactoryV2 implements RendererFactoryV2 {
   constructor(private delegate: RendererFactoryV2) {}
 
-  createRenderer(element: any, renderData: ComponentRenderTypeV2): RendererV2 {
+  createRenderer(element: any, renderData: RendererTypeV2): RendererV2 {
     return new DebugRendererV2(this.delegate.createRenderer(element, renderData));
   }
 }

modules/@angular/core/src/view/types.ts

@@ -14,7 +14,7 @@ import {TemplateRef} from '../linker/template_ref';
 import {ViewContainerRef} from '../linker/view_container_ref';
 import {ViewRef} from '../linker/view_ref';
 import {ViewEncapsulation} from '../metadata/view';
-import {ComponentRenderTypeV2, RendererFactoryV2, RendererV2} from '../render/api';
+import {RendererFactoryV2, RendererTypeV2, RendererV2} from '../render/api';
 import {Sanitizer, SecurityContext} from '../security';
 
 // -------------------------------------
@@ -219,7 +219,7 @@ export interface ProviderDef {
   value: any;
   deps: DepDef[];
   outputs: DirectiveOutputDef[];
-  componentRenderType: ComponentRenderTypeV2;
+  rendererType: RendererTypeV2;
   // closure to allow recursive components
   component: ViewDefinitionFactory;
 }

modules/@angular/core/src/view/util.ts

@@ -15,7 +15,7 @@ import {TemplateRef} from '../linker/template_ref';
 import {ViewContainerRef} from '../linker/view_container_ref';
 import {ViewRef} from '../linker/view_ref';
 import {ViewEncapsulation} from '../metadata/view';
-import {ComponentRenderTypeV2, Renderer} from '../render/api';
+import {Renderer, RendererTypeV2} from '../render/api';
 
 import {expressionChangedAfterItHasBeenCheckedError, isViewDebugError, viewDestroyedError, viewWrappedDebugError} from './errors';
 import {DebugContext, ElementData, NodeData, NodeDef, NodeFlags, NodeType, QueryValueType, Services, ViewData, ViewDefinition, ViewDefinitionFactory, ViewFlags, ViewState, asElementData, asProviderData, asTextData} from './types';
@@ -43,11 +43,11 @@ export function unwrapValue(value: any): any {
 
 let _renderCompCount = 0;
 
-export function createComponentRenderTypeV2(values: {
+export function createRendererTypeV2(values: {
   styles: (string | any[])[],
   encapsulation: ViewEncapsulation,
   data: {[kind: string]: any[]}
-}): ComponentRenderTypeV2 {
+}): RendererTypeV2 {
   const isFilled = values && (values.encapsulation !== ViewEncapsulation.None ||
                               values.styles.length || Object.keys(values.data).length);
   if (isFilled) {
@@ -173,8 +173,8 @@ export function getParentRenderElement(view: ViewData, renderHost: any, def: Nod
   if (renderParent) {
     const parent = def.parent;
     if (parent && (parent.type !== NodeType.Element || !parent.element.component ||
-                   (parent.element.component.provider.componentRenderType &&
-                    parent.element.component.provider.componentRenderType.encapsulation ===
+                   (parent.element.component.provider.rendererType &&
+                    parent.element.component.provider.rendererType.encapsulation ===
                         ViewEncapsulation.Native))) {
       // only children of non components, or children of components with native encapsulation should
       // be attached.

modules/@angular/core/src/view/view.ts

@@ -7,7 +7,7 @@
  */
 
 import {ViewEncapsulation} from '../metadata/view';
-import {ComponentRenderTypeV2, RendererV2} from '../render/api';
+import {RendererTypeV2, RendererV2} from '../render/api';
 
 import {checkAndUpdateElementDynamic, checkAndUpdateElementInline, createElement} from './element';
 import {expressionChangedAfterItHasBeenCheckedError} from './errors';
@@ -291,13 +291,13 @@ function createViewNodes(view: ViewData) {
           // the component view. Therefore, we create the component view first
           // and set the ProviderData in ViewData, and then instantiate the provider.
           const compViewDef = resolveViewDefinition(nodeDef.provider.component);
-          const compRenderType = nodeDef.provider.componentRenderType;
+          const rendererType = nodeDef.provider.rendererType;
           let compRenderer: RendererV2;
-          if (!compRenderType) {
+          if (!rendererType) {
             compRenderer = view.root.renderer;
           } else {
             const hostEl = asElementData(view, nodeDef.parent.index).renderElement;
-            compRenderer = view.root.rendererFactory.createRenderer(hostEl, compRenderType);
+            compRenderer = view.root.rendererFactory.createRenderer(hostEl, rendererType);
           }
           const componentView = createView(view.root, compRenderer, view, nodeDef, compViewDef);
           const providerData = <ProviderData>{componentView, instance: undefined};