refactor(view): moved the logic from ProtoView to ProtoViewFactory

modules/angular2/src/change_detection/change_detection.js

@@ -4,9 +4,13 @@ import {IterableChangesFactory} from './pipes/iterable_changes';
 import {KeyValueChangesFactory} from './pipes/keyvalue_changes';
 import {AsyncPipeFactory} from './pipes/async_pipe';
 import {NullPipeFactory} from './pipes/null_pipe';
+import {BindingRecord} from './binding_record';
+import {DirectiveRecord} from './directive_record';
 import {DEFAULT} from './constants';
 import {ChangeDetection, ProtoChangeDetector} from './interfaces';
 import {Injectable} from 'angular2/di';
+import {List} from 'angular2/src/facade/collection';
+
 
 /**
  * Structural diffing for `Object`s and `Map`s.
@@ -61,8 +65,9 @@ export class DynamicChangeDetection extends ChangeDetection {
     this.registry = registry;
   }
 
-  createProtoChangeDetector(name:string, changeControlStrategy:string = DEFAULT):ProtoChangeDetector{
-    return new DynamicProtoChangeDetector(this.registry, changeControlStrategy);
+  createProtoChangeDetector(name:string, bindingRecords:List<BindingRecord>, variableBindings:List<string>,
+                            directiveRecords:List<DirectiveRecord>, changeControlStrategy:string = DEFAULT):ProtoChangeDetector{
+    return new DynamicProtoChangeDetector(this.registry, bindingRecords, variableBindings, directiveRecords, changeControlStrategy);
   }
 }
 
@@ -82,8 +87,9 @@ export class JitChangeDetection extends ChangeDetection {
     this.registry = registry;
   }
 
-  createProtoChangeDetector(name:string, changeControlStrategy:string = DEFAULT):ProtoChangeDetector{
-    return new JitProtoChangeDetector(this.registry, changeControlStrategy);
+  createProtoChangeDetector(name:string, bindingRecords:List<BindingRecord>, variableBindings:List<string>,
+                            directiveRecords:List<DirectiveRecord>, changeControlStrategy:string = DEFAULT):ProtoChangeDetector{
+    return new JitProtoChangeDetector(this.registry, bindingRecords, variableBindings, directiveRecords, changeControlStrategy);
   }
 }
 

modules/angular2/src/change_detection/interfaces.js

@@ -4,7 +4,7 @@ import {DEFAULT} from './constants';
 import {BindingRecord} from './binding_record';
 
 export class ProtoChangeDetector  {
-  instantiate(dispatcher:any, bindingRecords:List, variableBindings:List, directiveRecords:List):ChangeDetector{
+  instantiate(dispatcher:any):ChangeDetector{
     return null;
   }
 }
@@ -33,7 +33,8 @@ export class ProtoChangeDetector  {
  * @exportedAs angular2/change_detection
  */
 export class ChangeDetection {
-  createProtoChangeDetector(name:string, changeControlStrategy:string=DEFAULT):ProtoChangeDetector{
+  createProtoChangeDetector(name:string, bindingRecords:List, variableBindings:List, directiveRecords:List,
+                            changeControlStrategy:string=DEFAULT):ProtoChangeDetector{
     return null;
   }
 }

modules/angular2/src/change_detection/proto_change_detector.js

@@ -28,7 +28,7 @@ import {DynamicChangeDetector} from './dynamic_change_detector';
 import {ChangeDetectorJITGenerator} from './change_detection_jit_generator';
 import {PipeRegistry} from './pipes/pipe_registry';
 import {BindingRecord} from './binding_record';
-import {DirectiveIndex} from './directive_record';
+import {DirectiveRecord, DirectiveIndex} from './directive_record';
 
 import {coalesce} from './coalesce';
 
@@ -50,25 +50,31 @@ import {
 export class DynamicProtoChangeDetector extends ProtoChangeDetector {
   _pipeRegistry:PipeRegistry;
   _records:List<ProtoRecord>;
+  _bindingRecords:List<BindingRecord>;
+  _variableBindings:List<string>;
+  _directiveRecords:List<DirectiveRecord>;
   _changeControlStrategy:string;
 
-  constructor(pipeRegistry:PipeRegistry, changeControlStrategy:string) {
+  constructor(pipeRegistry:PipeRegistry, bindingRecords:List, variableBindings:List, directiveRecords:List, changeControlStrategy:string) {
     super();
     this._pipeRegistry = pipeRegistry;
+    this._bindingRecords = bindingRecords;
+    this._variableBindings = variableBindings;
+    this._directiveRecords = directiveRecords;
     this._changeControlStrategy = changeControlStrategy;
   }
 
-  instantiate(dispatcher:any, bindingRecords:List, variableBindings:List, directiveRecords:List) {
-    this._createRecordsIfNecessary(bindingRecords, variableBindings);
+  instantiate(dispatcher:any) {
+    this._createRecordsIfNecessary();
     return new DynamicChangeDetector(this._changeControlStrategy, dispatcher,
-      this._pipeRegistry, this._records, directiveRecords);
+      this._pipeRegistry, this._records, this._directiveRecords);
   }
 
-  _createRecordsIfNecessary(bindingRecords:List, variableBindings:List) {
+  _createRecordsIfNecessary() {
     if (isBlank(this._records)) {
       var recordBuilder = new ProtoRecordBuilder();
-      ListWrapper.forEach(bindingRecords, (b) => {
-        recordBuilder.addAst(b, variableBindings);
+      ListWrapper.forEach(this._bindingRecords, (b) => {
+        recordBuilder.addAst(b, this._variableBindings);
       });
       this._records = coalesce(recordBuilder.records);
     }
@@ -79,31 +85,37 @@ var _jitProtoChangeDetectorClassCounter:number = 0;
 export class JitProtoChangeDetector extends ProtoChangeDetector {
   _factory:Function;
   _pipeRegistry;
+  _bindingRecords:List<BindingRecord>;
+  _variableBindings:List<string>;
+  _directiveRecords:List<DirectiveRecord>;
   _changeControlStrategy:string;
 
-  constructor(pipeRegistry, changeControlStrategy:string) {
+  constructor(pipeRegistry, bindingRecords:List, variableBindings:List, directiveRecords:List, changeControlStrategy:string) {
     super();
     this._pipeRegistry = pipeRegistry;
     this._factory = null;
+    this._bindingRecords = bindingRecords;
+    this._variableBindings = variableBindings;
+    this._directiveRecords = directiveRecords;
     this._changeControlStrategy = changeControlStrategy;
   }
 
-  instantiate(dispatcher:any, bindingRecords:List, variableBindings:List, directiveRecords:List) {
-    this._createFactoryIfNecessary(bindingRecords, variableBindings, directiveRecords);
+  instantiate(dispatcher:any) {
+    this._createFactoryIfNecessary();
     return this._factory(dispatcher, this._pipeRegistry);
   }
 
-  _createFactoryIfNecessary(bindingRecords:List, variableBindings:List, directiveRecords:List) {
+  _createFactoryIfNecessary() {
     if (isBlank(this._factory)) {
       var recordBuilder = new ProtoRecordBuilder();
-      ListWrapper.forEach(bindingRecords, (b) => {
-        recordBuilder.addAst(b, variableBindings);
+      ListWrapper.forEach(this._bindingRecords, (b) => {
+        recordBuilder.addAst(b, this._variableBindings);
       });
       var c = _jitProtoChangeDetectorClassCounter++;
       var records = coalesce(recordBuilder.records);
       var typeName = `ChangeDetector${c}`;
       this._factory = new ChangeDetectorJITGenerator(typeName, this._changeControlStrategy, records,
-        directiveRecords).generate();
+        this._directiveRecords).generate();
     }
   }
 }