feat(compiler): support creating template commands

Closes angular#4142

Author: tbosch

modules/angular2/src/compiler/api.ts

@@ -134,7 +134,7 @@ export class TemplateMetadata {
     this.ngContentSelectors = ngContentSelectors;
   }
 
-  static fromJson(data: StringMap<string, any>):TemplateMetadata {
+  static fromJson(data: StringMap<string, any>): TemplateMetadata {
     return new TemplateMetadata({
       encapsulation: isPresent(data['encapsulation']) ?
                          viewEncapsulationFromJson(data['encapsulation']) :

modules/angular2/src/compiler/change_definition_factory.ts

@@ -36,47 +36,43 @@ import {
 export function createChangeDetectorDefinitions(
     componentType: TypeMetadata, componentStrategy: ChangeDetectionStrategy,
     genConfig: ChangeDetectorGenConfig, parsedTemplate: TemplateAst[]): ChangeDetectorDefinition[] {
-  var visitor = new ProtoViewVisitor(componentStrategy);
+  var pvVisitors = [];
+  var visitor = new ProtoViewVisitor(null, pvVisitors, componentStrategy);
   templateVisitAll(visitor, parsedTemplate);
-  return createChangeDefinitions(visitor.allProtoViews, componentType, genConfig);
+  return createChangeDefinitions(pvVisitors, componentType, genConfig);
 }
 
 class ProtoViewVisitor implements TemplateAstVisitor {
-  viewCount: number = 0;
-  protoViewStack: ProtoViewVisitorData[] = [];
-  allProtoViews: ProtoViewVisitorData[] = [];
-
-  constructor(componentStrategy: ChangeDetectionStrategy) {
-    this._beginProtoView(new ProtoViewVisitorData(null, componentStrategy, this.viewCount++));
-  }
-
-  private _beginProtoView(data: ProtoViewVisitorData) {
-    this.protoViewStack.push(data);
-    this.allProtoViews.push(data);
-  }
+  viewIndex: number;
+  boundTextCount: number = 0;
+  boundElementCount: number = 0;
+  variableNames: string[] = [];
+  bindingRecords: BindingRecord[] = [];
+  eventRecords: BindingRecord[] = [];
+  directiveRecords: DirectiveRecord[] = [];
 
-  get currentProtoView(): ProtoViewVisitorData {
-    return this.protoViewStack[this.protoViewStack.length - 1];
+  constructor(public parent: ProtoViewVisitor, public allVisitors: ProtoViewVisitor[],
+              public strategy: ChangeDetectionStrategy) {
+    this.viewIndex = allVisitors.length;
+    allVisitors.push(this);
   }
 
   visitEmbeddedTemplate(ast: EmbeddedTemplateAst, context: any): any {
-    this.currentProtoView.boundElementCount++;
+    this.boundElementCount++;
     templateVisitAll(this, ast.directives);
 
-    this.viewCount++;
-    this._beginProtoView(new ProtoViewVisitorData(
-        this.currentProtoView, ChangeDetectionStrategy.Default, this.viewCount - 1));
+    var childVisitor =
+        new ProtoViewVisitor(this, this.allVisitors, ChangeDetectionStrategy.Default);
     // Attention: variables present on an embedded template count towards
     // the embedded template and not the template anchor!
-    templateVisitAll(this, ast.vars);
-    templateVisitAll(this, ast.children);
-    this.protoViewStack.pop();
+    templateVisitAll(childVisitor, ast.vars);
+    templateVisitAll(childVisitor, ast.children);
     return null;
   }
 
   visitElement(ast: ElementAst, context: any): any {
     if (ast.isBound()) {
-      this.currentProtoView.boundElementCount++;
+      this.boundElementCount++;
     }
     templateVisitAll(this, ast.properties, null);
     templateVisitAll(this, ast.events);
@@ -91,22 +87,21 @@ class ProtoViewVisitor implements TemplateAstVisitor {
   visitNgContent(ast: NgContentAst, context: any): any { return null; }
 
   visitVariable(ast: VariableAst, context: any): any {
-    this.currentProtoView.variableNames.push(ast.name);
+    this.variableNames.push(ast.name);
     return null;
   }
 
   visitEvent(ast: BoundEventAst, directiveRecord: DirectiveRecord): any {
     var bindingRecord =
         isPresent(directiveRecord) ?
             BindingRecord.createForHostEvent(ast.handler, ast.name, directiveRecord) :
-            BindingRecord.createForEvent(ast.handler, ast.name,
-                                         this.currentProtoView.boundElementCount - 1);
-    this.currentProtoView.eventRecords.push(bindingRecord);
+            BindingRecord.createForEvent(ast.handler, ast.name, this.boundElementCount - 1);
+    this.eventRecords.push(bindingRecord);
     return null;
   }
 
   visitElementProperty(ast: BoundElementPropertyAst, directiveRecord: DirectiveRecord): any {
-    var boundElementIndex = this.currentProtoView.boundElementCount - 1;
+    var boundElementIndex = this.boundElementCount - 1;
     var dirIndex = isPresent(directiveRecord) ? directiveRecord.directiveIndex : null;
     var bindingRecord;
     if (ast.type === PropertyBindingType.Property) {
@@ -130,20 +125,18 @@ class ProtoViewVisitor implements TemplateAstVisitor {
               BindingRecord.createForHostStyle(dirIndex, ast.value, ast.name, ast.unit) :
               BindingRecord.createForElementStyle(ast.value, boundElementIndex, ast.name, ast.unit);
     }
-    this.currentProtoView.bindingRecords.push(bindingRecord);
+    this.bindingRecords.push(bindingRecord);
     return null;
   }
   visitAttr(ast: AttrAst, context: any): any { return null; }
   visitBoundText(ast: BoundTextAst, context: any): any {
-    var boundTextIndex = this.currentProtoView.boundTextCount++;
-    this.currentProtoView.bindingRecords.push(
-        BindingRecord.createForTextNode(ast.value, boundTextIndex));
+    var boundTextIndex = this.boundTextCount++;
+    this.bindingRecords.push(BindingRecord.createForTextNode(ast.value, boundTextIndex));
     return null;
   }
   visitText(ast: TextAst, context: any): any { return null; }
   visitDirective(ast: DirectiveAst, directiveIndexAsNumber: number): any {
-    var directiveIndex =
-        new DirectiveIndex(this.currentProtoView.boundElementCount - 1, directiveIndexAsNumber);
+    var directiveIndex = new DirectiveIndex(this.boundElementCount - 1, directiveIndexAsNumber);
     var directiveMetadata = ast.directive;
     var changeDetectionMeta = directiveMetadata.changeDetection;
     var directiveRecord = new DirectiveRecord({
@@ -157,10 +150,10 @@ class ProtoViewVisitor implements TemplateAstVisitor {
       callOnInit: changeDetectionMeta.callOnInit,
       changeDetection: changeDetectionMeta.changeDetection
     });
-    this.currentProtoView.directiveRecords.push(directiveRecord);
+    this.directiveRecords.push(directiveRecord);
 
     templateVisitAll(this, ast.properties, directiveRecord);
-    var bindingRecords = this.currentProtoView.bindingRecords;
+    var bindingRecords = this.bindingRecords;
     if (directiveRecord.callOnChanges) {
       bindingRecords.push(BindingRecord.createDirectiveOnChanges(directiveRecord));
     }
@@ -178,39 +171,29 @@ class ProtoViewVisitor implements TemplateAstVisitor {
     // TODO: these setters should eventually be created by change detection, to make
     // it monomorphic!
     var setter = reflector.setter(ast.directiveName);
-    this.currentProtoView.bindingRecords.push(
+    this.bindingRecords.push(
         BindingRecord.createForDirective(ast.value, ast.directiveName, setter, directiveRecord));
     return null;
   }
 }
 
-class ProtoViewVisitorData {
-  boundTextCount: number = 0;
-  boundElementCount: number = 0;
-  variableNames: string[] = [];
-  bindingRecords: BindingRecord[] = [];
-  eventRecords: BindingRecord[] = [];
-  directiveRecords: DirectiveRecord[] = [];
-  constructor(public parent: ProtoViewVisitorData, public strategy: ChangeDetectionStrategy,
-              public viewIndex: number) {}
-}
 
-function createChangeDefinitions(pvDatas: ProtoViewVisitorData[], componentType: TypeMetadata,
+function createChangeDefinitions(pvVisitors: ProtoViewVisitor[], componentType: TypeMetadata,
                                  genConfig: ChangeDetectorGenConfig): ChangeDetectorDefinition[] {
-  var pvVariableNames = _collectNestedProtoViewsVariableNames(pvDatas);
-  return pvDatas.map(pvData => {
-    var viewType = pvData.viewIndex === 0 ? 'component' : 'embedded';
-    var id = _protoViewId(componentType, pvData.viewIndex, viewType);
-    return new ChangeDetectorDefinition(id, pvData.strategy, pvVariableNames[pvData.viewIndex],
-                                        pvData.bindingRecords, pvData.eventRecords,
-                                        pvData.directiveRecords, genConfig);
+  var pvVariableNames = _collectNestedProtoViewsVariableNames(pvVisitors);
+  return pvVisitors.map(pvVisitor => {
+    var viewType = pvVisitor.viewIndex === 0 ? 'component' : 'embedded';
+    var id = _protoViewId(componentType, pvVisitor.viewIndex, viewType);
+    return new ChangeDetectorDefinition(
+        id, pvVisitor.strategy, pvVariableNames[pvVisitor.viewIndex], pvVisitor.bindingRecords,
+        pvVisitor.eventRecords, pvVisitor.directiveRecords, genConfig);
 
   });
 }
 
-function _collectNestedProtoViewsVariableNames(pvs: ProtoViewVisitorData[]): string[][] {
-  var nestedPvVariableNames: string[][] = ListWrapper.createFixedSize(pvs.length);
-  pvs.forEach((pv) => {
+function _collectNestedProtoViewsVariableNames(pvVisitors: ProtoViewVisitor[]): string[][] {
+  var nestedPvVariableNames: string[][] = ListWrapper.createFixedSize(pvVisitors.length);
+  pvVisitors.forEach((pv) => {
     var parentVariableNames: string[] =
         isPresent(pv.parent) ? nestedPvVariableNames[pv.parent.viewIndex] : [];
     nestedPvVariableNames[pv.viewIndex] = parentVariableNames.concat(pv.variableNames);