refactor(core): move NodeType and ProviderType into NodeFlags

Also removes `ng-reflect` attributes for element properties.

Author: tbosch

modules/@angular/compiler/src/view_compiler_next/view_compiler.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, ViewEncapsulation, ɵArgumentType as ArgumentType, ɵBindingType as BindingType, ɵDepFlags as DepFlags, ɵLifecycleHooks as LifecycleHooks, ɵNodeFlags as NodeFlags, ɵProviderType as ProviderType, ɵQueryBindingType as QueryBindingType, ɵQueryValueType as QueryValueType, ɵViewFlags as ViewFlags, ɵelementEventFullName as elementEventFullName} from '@angular/core';
+import {ChangeDetectionStrategy, ViewEncapsulation, ɵArgumentType as ArgumentType, ɵBindingType as BindingType, ɵDepFlags as DepFlags, ɵLifecycleHooks as LifecycleHooks, ɵNodeFlags as NodeFlags, ɵQueryBindingType as QueryBindingType, ɵQueryValueType as QueryValueType, ɵViewFlags as ViewFlags, ɵelementEventFullName as elementEventFullName} from '@angular/core';
 
 import {AnimationEntryCompileResult} from '../animation/animation_compiler';
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeSummary, CompileProviderMetadata, CompileTokenMetadata, CompileTypeMetadata, identifierModuleUrl, identifierName, rendererTypeName, tokenReference, viewClassName} from '../compile_metadata';
@@ -136,11 +136,11 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
         // Note: queries start with id 1 so we can use the number in a Bloom filter!
         const queryId = queryIndex + 1;
         const bindingType = query.first ? QueryBindingType.First : QueryBindingType.All;
-        let flags = NodeFlags.HasViewQuery;
+        let flags = NodeFlags.TypeViewQuery;
         if (queryIds.staticQueryIds.has(queryId)) {
-          flags |= NodeFlags.HasStaticQuery;
+          flags |= NodeFlags.StaticQuery;
         } else {
-          flags |= NodeFlags.HasDynamicQuery;
+          flags |= NodeFlags.DynamicQuery;
         }
         this.nodeDefs.push(() => o.importExpr(createIdentifier(Identifiers.queryDef)).callFn([
           o.literal(flags), o.literal(queryId),
@@ -359,7 +359,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
   } {
     let flags = NodeFlags.None;
     if (ast.hasViewContainer) {
-      flags |= NodeFlags.HasEmbeddedViews;
+      flags |= NodeFlags.EmbeddedViews;
     }
     const usedEvents = new Map<string, [string, string]>();
     ast.outputs.forEach((event) => {
@@ -450,14 +450,14 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     this.nodeDefs.push(null);
 
     dirAst.directive.queries.forEach((query, queryIndex) => {
-      let flags = NodeFlags.HasContentQuery;
+      let flags = NodeFlags.TypeContentQuery;
       const queryId = dirAst.contentQueryStartId + queryIndex;
       // Note: We only make queries static that query for a single item.
       // This is because of backwards compatibility with the old view compiler...
       if (queryIds.staticQueryIds.has(queryId) && query.first) {
-        flags |= NodeFlags.HasStaticQuery;
+        flags |= NodeFlags.StaticQuery;
       } else {
-        flags |= NodeFlags.HasDynamicQuery;
+        flags |= NodeFlags.DynamicQuery;
       }
       const bindingType = query.first ? QueryBindingType.First : QueryBindingType.All;
       this.nodeDefs.push(() => o.importExpr(createIdentifier(Identifiers.queryDef)).callFn([
@@ -472,7 +472,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     // I.e. we only allow queries as children of directives nodes.
     const childCount = this.nodeDefs.length - nodeIndex - 1;
 
-    let {flags, queryMatchExprs, providerExpr, providerType, depsExpr} =
+    let {flags, queryMatchExprs, providerExpr, depsExpr} =
         this._visitProviderOrDirective(providerAst, queryMatches);
 
     refs.forEach((ref) => {
@@ -484,7 +484,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     });
 
     if (dirAst.directive.isComponent) {
-      flags |= NodeFlags.IsComponent;
+      flags |= NodeFlags.Component;
     }
 
     const inputDefs = dirAst.inputs.map((inputAst, inputIndex) => {
@@ -543,16 +543,15 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     // reserve the space in the nodeDefs array so we can add children
     this.nodeDefs.push(null);
 
-    const {flags, queryMatchExprs, providerExpr, providerType, depsExpr} =
+    const {flags, queryMatchExprs, providerExpr, depsExpr} =
         this._visitProviderOrDirective(providerAst, queryMatches);
 
     // providerDef(
-    //   flags: NodeFlags, matchedQueries: [string, QueryValueType][], type: ProviderType, token:
-    //   any,
+    //   flags: NodeFlags, matchedQueries: [string, QueryValueType][], token:any,
     //   value: any, deps: ([DepFlags, any] | any)[]): NodeDef;
     const nodeDef = () => o.importExpr(createIdentifier(Identifiers.providerDef)).callFn([
       o.literal(flags), queryMatchExprs.length ? o.literalArr(queryMatchExprs) : o.NULL_EXPR,
-      o.literal(providerType), tokenExpr(providerAst.token), providerExpr, depsExpr
+      tokenExpr(providerAst.token), providerExpr, depsExpr
     ]);
     this.nodeDefs[nodeIndex] = nodeDef;
   }
@@ -561,7 +560,6 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     flags: NodeFlags,
     queryMatchExprs: o.Expression[],
     providerExpr: o.Expression,
-    providerType: ProviderType,
     depsExpr: o.Expression
   } {
     let flags = NodeFlags.None;
@@ -587,8 +585,8 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
             o.literalArr([o.literal(match.queryId), o.literal(QueryValueType.Provider)]));
       }
     });
-    const {providerExpr, providerType, depsExpr} = providerDef(providerAst);
-    return {flags, queryMatchExprs, providerExpr, providerType, depsExpr};
+    const {providerExpr, depsExpr, flags: providerType} = providerDef(providerAst);
+    return {flags: flags | providerType, queryMatchExprs, providerExpr, depsExpr};
   }
 
   getLocal(name: string): o.Expression {
@@ -768,13 +766,14 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
 }
 
 function providerDef(providerAst: ProviderAst):
-    {providerExpr: o.Expression, providerType: ProviderType, depsExpr: o.Expression} {
-  return providerAst.multiProvider ? multiProviderDef(providerAst.providers) :
-                                     singleProviderDef(providerAst.providers[0]);
+    {providerExpr: o.Expression, flags: NodeFlags, depsExpr: o.Expression} {
+  return providerAst.multiProvider ?
+      multiProviderDef(providerAst.providers) :
+      singleProviderDef(providerAst.providerType, providerAst.providers[0]);
 }
 
 function multiProviderDef(providers: CompileProviderMetadata[]):
-    {providerExpr: o.Expression, providerType: ProviderType, depsExpr: o.Expression} {
+    {providerExpr: o.Expression, flags: NodeFlags, depsExpr: o.Expression} {
   const allDepDefs: o.Expression[] = [];
   const allParams: o.FnParam[] = [];
   const exprs = providers.map((provider, providerIndex) => {
@@ -795,7 +794,7 @@ function multiProviderDef(providers: CompileProviderMetadata[]):
   });
   const providerExpr =
       o.fn(allParams, [new o.ReturnStatement(o.literalArr(exprs))], o.INFERRED_TYPE);
-  return {providerExpr, providerType: ProviderType.Factory, depsExpr: o.literalArr(allDepDefs)};
+  return {providerExpr, flags: NodeFlags.TypeFactoryProvider, depsExpr: o.literalArr(allDepDefs)};
 
   function convertDeps(providerIndex: number, deps: CompileDiDependencyMetadata[]) {
     return deps.map((dep, depIndex) => {
@@ -807,30 +806,36 @@ function multiProviderDef(providers: CompileProviderMetadata[]):
   }
 }
 
-function singleProviderDef(providerMeta: CompileProviderMetadata):
-    {providerExpr: o.Expression, providerType: ProviderType, depsExpr: o.Expression} {
+function singleProviderDef(providerType: ProviderAstType, providerMeta: CompileProviderMetadata):
+    {providerExpr: o.Expression, flags: NodeFlags, depsExpr: o.Expression} {
   let providerExpr: o.Expression;
-  let providerType: ProviderType;
+  let flags: NodeFlags;
   let deps: CompileDiDependencyMetadata[];
-  if (providerMeta.useClass) {
+  if (providerType === ProviderAstType.Directive || providerType === ProviderAstType.Component) {
     providerExpr = o.importExpr(providerMeta.useClass);
-    providerType = ProviderType.Class;
+    flags = NodeFlags.TypeDirective;
     deps = providerMeta.deps || providerMeta.useClass.diDeps;
-  } else if (providerMeta.useFactory) {
-    providerExpr = o.importExpr(providerMeta.useFactory);
-    providerType = ProviderType.Factory;
-    deps = providerMeta.deps || providerMeta.useFactory.diDeps;
-  } else if (providerMeta.useExisting) {
-    providerExpr = o.NULL_EXPR;
-    providerType = ProviderType.UseExisting;
-    deps = [{token: providerMeta.useExisting}];
   } else {
-    providerExpr = convertValueToOutputAst(providerMeta.useValue);
-    providerType = ProviderType.Value;
-    deps = [];
+    if (providerMeta.useClass) {
+      providerExpr = o.importExpr(providerMeta.useClass);
+      flags = NodeFlags.TypeClassProvider;
+      deps = providerMeta.deps || providerMeta.useClass.diDeps;
+    } else if (providerMeta.useFactory) {
+      providerExpr = o.importExpr(providerMeta.useFactory);
+      flags = NodeFlags.TypeFactoryProvider;
+      deps = providerMeta.deps || providerMeta.useFactory.diDeps;
+    } else if (providerMeta.useExisting) {
+      providerExpr = o.NULL_EXPR;
+      flags = NodeFlags.TypeUseExistingProvider;
+      deps = [{token: providerMeta.useExisting}];
+    } else {
+      providerExpr = convertValueToOutputAst(providerMeta.useValue);
+      flags = NodeFlags.TypeValueProvider;
+      deps = [];
+    }
   }
   const depsExpr = o.literalArr(deps.map(dep => depDef(dep)));
-  return {providerExpr, providerType, depsExpr};
+  return {providerExpr, flags, depsExpr};
 }
 
 function tokenExpr(tokenMeta: CompileTokenMetadata): o.Expression {

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

@@ -26,4 +26,4 @@ export {ViewContainer as ɵViewContainer} from './linker/view_container';
 export {ViewType as ɵViewType} from './linker/view_type';
 export {EMPTY_ARRAY as ɵEMPTY_ARRAY, EMPTY_INLINE_ARRAY as ɵEMPTY_INLINE_ARRAY, EMPTY_MAP as ɵEMPTY_MAP, InlineArray16 as ɵInlineArray16, InlineArray2 as ɵInlineArray2, InlineArray4 as ɵInlineArray4, InlineArray8 as ɵInlineArray8, InlineArrayDynamic as ɵInlineArrayDynamic, ViewUtils as ɵViewUtils, castByValue as ɵcastByValue, checkBinding as ɵcheckBinding, checkBindingChange as ɵcheckBindingChange, checkRenderAttribute as ɵcheckRenderAttribute, checkRenderClass as ɵcheckRenderClass, checkRenderProperty as ɵcheckRenderProperty, checkRenderStyle as ɵcheckRenderStyle, checkRenderText as ɵcheckRenderText, createRenderComponentType as ɵcreateRenderComponentType, createRenderElement as ɵcreateRenderElement, getComponentFactoryViewClass as ɵgetComponentFactoryViewClass, inlineInterpolate as ɵinlineInterpolate, interpolate as ɵinterpolate, noop as ɵnoop, pureProxy1 as ɵpureProxy1, pureProxy10 as ɵpureProxy10, pureProxy2 as ɵpureProxy2, pureProxy3 as ɵpureProxy3, pureProxy4 as ɵpureProxy4, pureProxy5 as ɵpureProxy5, pureProxy6 as ɵpureProxy6, pureProxy7 as ɵpureProxy7, pureProxy8 as ɵpureProxy8, pureProxy9 as ɵpureProxy9, selectOrCreateRenderHostElement as ɵselectOrCreateRenderHostElement, setBindingDebugInfo as ɵsetBindingDebugInfo, setBindingDebugInfoForChanges as ɵsetBindingDebugInfoForChanges, subscribeToRenderElement as ɵsubscribeToRenderElement} from './linker/view_utils';
 export {reflector as ɵreflector} from './reflection/reflection';
-export {ArgumentType as ɵArgumentType, BindingType as ɵBindingType, DepFlags as ɵDepFlags, NodeFlags as ɵNodeFlags, ProviderType as ɵProviderType, QueryBindingType as ɵQueryBindingType, QueryValueType as ɵQueryValueType, ViewDefinition as ɵViewDefinition, ViewFlags as ɵViewFlags, anchorDef as ɵanchorDef, createComponentFactory as ɵcreateComponentFactory, createRendererTypeV2 as ɵcreateRendererTypeV2, directiveDef as ɵdirectiveDef, elementDef as ɵelementDef, elementEventFullName as ɵelementEventFullName, ngContentDef as ɵngContentDef, nodeValue as ɵnodeValue, pipeDef as ɵpipeDef, providerDef as ɵproviderDef, pureArrayDef as ɵpureArrayDef, pureObjectDef as ɵpureObjectDef, purePipeDef as ɵpurePipeDef, queryDef as ɵqueryDef, textDef as ɵtextDef, unwrapValue as ɵunwrapValue, viewDef as ɵviewDef} from './view/index';
+export {ArgumentType as ɵArgumentType, BindingType as ɵBindingType, DepFlags as ɵDepFlags, NodeFlags as ɵNodeFlags, QueryBindingType as ɵQueryBindingType, QueryValueType as ɵQueryValueType, ViewDefinition as ɵViewDefinition, ViewFlags as ɵViewFlags, anchorDef as ɵanchorDef, createComponentFactory as ɵcreateComponentFactory, createRendererTypeV2 as ɵcreateRendererTypeV2, directiveDef as ɵdirectiveDef, elementDef as ɵelementDef, elementEventFullName as ɵelementEventFullName, ngContentDef as ɵngContentDef, nodeValue as ɵnodeValue, pipeDef as ɵpipeDef, providerDef as ɵproviderDef, pureArrayDef as ɵpureArrayDef, pureObjectDef as ɵpureObjectDef, purePipeDef as ɵpurePipeDef, queryDef as ɵqueryDef, textDef as ɵtextDef, unwrapValue as ɵunwrapValue, viewDef as ɵviewDef} from './view/index';

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

@@ -10,7 +10,7 @@ import {isDevMode} from '../application_ref';
 import {RendererTypeV2, RendererV2} from '../render/api';
 import {SecurityContext} from '../security';
 
-import {BindingDef, BindingType, DebugContext, DisposableFn, ElementData, ElementHandleEventFn, NodeData, NodeDef, NodeFlags, NodeType, OutputDef, OutputType, QueryValueType, Services, ViewData, ViewDefinition, ViewDefinitionFactory, ViewFlags, asElementData, asProviderData} from './types';
+import {BindingDef, BindingType, DebugContext, DisposableFn, ElementData, ElementHandleEventFn, NodeData, NodeDef, NodeFlags, OutputDef, OutputType, QueryValueType, Services, ViewData, ViewDefinition, ViewDefinitionFactory, ViewFlags, asElementData, asProviderData} from './types';
 import {checkAndUpdateBinding, dispatchEvent, elementEventFullName, filterQueryId, getParentRenderElement, resolveViewDefinition, sliceErrorStack, splitMatchedQueriesDsl, splitNamespace} from './util';
 
 const NOOP: any = () => {};
@@ -22,13 +22,13 @@ export function anchorDef(
   if (!handleEvent) {
     handleEvent = NOOP;
   }
+  flags |= NodeFlags.TypeElement;
   const {matchedQueries, references, matchedQueryIds} = splitMatchedQueriesDsl(matchedQueriesDsl);
   // skip the call to sliceErrorStack itself + the call to this function.
   const source = isDevMode() ? sliceErrorStack(2, 3) : '';
   const template = templateFactory ? resolveViewDefinition(templateFactory) : null;
 
   return {
-    type: NodeType.Element,
     // will bet set by the view definition
     index: undefined,
     reverseChildIndex: undefined,
@@ -54,7 +54,6 @@ export function anchorDef(
     },
     provider: undefined,
     text: undefined,
-    pureExpression: undefined,
     query: undefined,
     ngContent: undefined
   };
@@ -126,10 +125,10 @@ export function elementDef(
     componentRendererType = null;
   }
   if (componentView) {
-    flags |= NodeFlags.HasComponent;
+    flags |= NodeFlags.ComponentView;
   }
+  flags |= NodeFlags.TypeElement;
   return {
-    type: NodeType.Element,
     // will bet set by the view definition
     index: undefined,
     reverseChildIndex: undefined,
@@ -156,7 +155,6 @@ export function elementDef(
     },
     provider: undefined,
     text: undefined,
-    pureExpression: undefined,
     query: undefined,
     ngContent: undefined
   };

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

@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NodeDef, NodeType, ViewData, asElementData} from './types';
+import {NodeDef, NodeFlags, ViewData, asElementData} from './types';
 import {RenderNodeAction, getParentRenderElement, visitProjectedRenderNodes} from './util';
 
 export function ngContentDef(ngContentIndex: number, index: number): NodeDef {
   return {
-    type: NodeType.NgContent,
     // will bet set by the view definition
     index: undefined,
     reverseChildIndex: undefined,
@@ -20,7 +19,7 @@ export function ngContentDef(ngContentIndex: number, index: number): NodeDef {
     bindingIndex: undefined,
     outputIndex: undefined,
     // regular values
-    flags: 0,
+    flags: NodeFlags.TypeNgContent,
     childFlags: 0,
     childMatchedQueries: 0,
     matchedQueries: {},
@@ -32,7 +31,6 @@ export function ngContentDef(ngContentIndex: number, index: number): NodeDef {
     element: undefined,
     provider: undefined,
     text: undefined,
-    pureExpression: undefined,
     query: undefined,
     ngContent: {index}
   };