feat(change_detection): pass binding propagation config to pipe registry

Author: vsavkin

modules/angular2/change_detection.js

@@ -11,6 +11,8 @@ export {ProtoChangeDetector, DynamicProtoChangeDetector, JitProtoChangeDetector,
  from './src/change_detection/proto_change_detector';
 export {DynamicChangeDetector}
  from './src/change_detection/dynamic_change_detector';
+export {BindingPropagationConfig}
+ from './src/change_detection/binding_propagation_config';
 export * from './src/change_detection/pipes/pipe_registry';
 export {uninitialized} from './src/change_detection/change_detection_util';
 export * from './src/change_detection/pipes/pipe';

modules/angular2/core.js

@@ -9,6 +9,5 @@ export * from './src/core/compiler/compiler';
 export * from './src/core/compiler/template_loader';
 export * from './src/core/compiler/view';
 export * from './src/core/compiler/view_container';
-export * from './src/core/compiler/binding_propagation_config';
 
 export * from './src/core/dom/element';

modules/angular2/src/change_detection/abstract_change_detector.js

@@ -1,15 +1,18 @@
 import {isPresent} from 'angular2/src/facade/lang';
 import {List, ListWrapper} from 'angular2/src/facade/collection';
+import {BindingPropagationConfig} from './binding_propagation_config';
 import {ChangeDetector, CHECK_ALWAYS, CHECK_ONCE, CHECKED, DETACHED} from './interfaces';
 
 export class AbstractChangeDetector extends ChangeDetector {
  children:List;
  parent:ChangeDetector;
  mode:string;
+ bindingPropagationConfig:BindingPropagationConfig;
 
  constructor() {
  super();
  this.children = [];
+ this.bindingPropagationConfig = new BindingPropagationConfig(this);
  this.mode = CHECK_ALWAYS;
  }
 

modules/angular2/src/core/compiler/binding_propagation_config.js renamed to modules/angular2/src/change_detection/binding_propagation_config.js

@@ -1,4 +1,4 @@
-import {ChangeDetector, CHECK_ONCE, DETACHED, CHECK_ALWAYS} from 'angular2/change_detection';
+import {ChangeDetector, CHECK_ONCE, DETACHED, CHECK_ALWAYS} from './interfaces';
 
 /**
  * @publicModule angular2/angular2

modules/angular2/src/change_detection/change_detection_jit_generator.es6

@@ -15,6 +15,7 @@ import {
  RECORD_TYPE_PRIMITIVE_OP,
  RECORD_TYPE_KEYED_ACCESS,
  RECORD_TYPE_PIPE,
+ RECORD_TYPE_BINDING_PIPE,
  RECORD_TYPE_INTERPOLATE
  } from './proto_record';
 
@@ -180,14 +181,14 @@ if (${CHANGES_LOCAL} && ${CHANGES_LOCAL}.length > 0) {
 `;
 }
 
-function pipeCheckTemplate(context:string, pipe:string, pipeType:string,
+function pipeCheckTemplate(context:string, bindingPropagationConfig:string, pipe:string, pipeType:string,
  value:string, change:string, addRecord:string, notify:string):string{
  return `
 if (${pipe} === ${UTIL}.unitialized()) {
- ${pipe} = ${PIPE_REGISTRY_ACCESSOR}.get('${pipeType}', ${context});
+ ${pipe} = ${PIPE_REGISTRY_ACCESSOR}.get('${pipeType}', ${context}, ${bindingPropagationConfig});
 } else if (!${pipe}.supports(${context})) {
  ${pipe}.onDestroy();
- ${pipe} = ${PIPE_REGISTRY_ACCESSOR}.get('${pipeType}', ${context});
+ ${pipe} = ${PIPE_REGISTRY_ACCESSOR}.get('${pipeType}', ${context}, ${bindingPropagationConfig});
 }
 
 ${CHANGE_LOCAL} = ${pipe}.transform(${context});
@@ -293,20 +294,20 @@ export class ChangeDetectorJITGenerator {
 
  genHydrate():string {
  return hydrateTemplate(this.typeName, this.genFieldDefinitions(),
- pipeOnDestroyTemplate(this.getnonNullPipeNames()));
+ pipeOnDestroyTemplate(this.getNonNullPipeNames()));
  }
 
  genFieldDefinitions() {
  var fields = [];
  fields = fields.concat(this.fieldNames);
- fields = fields.concat(this.getnonNullPipeNames());
+ fields = fields.concat(this.getNonNullPipeNames());
  return fieldDefinitionsTemplate(fields);
  }
 
- getnonNullPipeNames():List<String> {
+ getNonNullPipeNames():List<String> {
  var pipes = [];
  this.records.forEach((r) => {
- if (r.mode === RECORD_TYPE_PIPE) {
+ if (r.mode === RECORD_TYPE_PIPE || r.mode === RECORD_TYPE_BINDING_PIPE) {
  pipes.push(this.pipeNames[r.selfIndex]);
  }
  });
@@ -332,7 +333,7 @@ export class ChangeDetectorJITGenerator {
  }
 
  genRecord(r:ProtoRecord):string {
- if (r.mode === RECORD_TYPE_PIPE) {
+ if (r.mode === RECORD_TYPE_PIPE || r.mode === RECORD_TYPE_BINDING_PIPE) {
  return this.genPipeCheck (r);
  } else {
  return this.genReferenceCheck(r);
@@ -345,11 +346,12 @@ export class ChangeDetectorJITGenerator {
  var newValue = this.localNames[r.selfIndex];
  var oldValue = this.fieldNames[r.selfIndex];
  var change = this.changeNames[r.selfIndex];
+ var bpc = r.mode === RECORD_TYPE_BINDING_PIPE ? "this.bindingPropagationConfig" : "null";
 
  var addRecord = addSimpleChangeRecordTemplate(r.selfIndex - 1, oldValue, newValue);
  var notify = this.genNotify(r);
 
- return pipeCheckTemplate(context, pipe, r.name, newValue, change, addRecord, notify);
+ return pipeCheckTemplate(context, bpc, pipe, r.name, newValue, change, addRecord, notify);
  }
 
  genReferenceCheck(r:ProtoRecord):string {

modules/angular2/src/change_detection/dynamic_change_detector.js

@@ -3,7 +3,7 @@ import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/faca
 
 import {AbstractChangeDetector} from './abstract_change_detector';
 import {PipeRegistry} from './pipes/pipe_registry';
-import {ChangeDetectionUtil, SimpleChange, uninitialized} from './change_detection_util';
+import {ChangeDetectionUtil, uninitialized} from './change_detection_util';
 
 
 import {
@@ -17,6 +17,7 @@ import {
  RECORD_TYPE_PRIMITIVE_OP,
  RECORD_TYPE_KEYED_ACCESS,
  RECORD_TYPE_PIPE,
+ RECORD_TYPE_BINDING_PIPE,
  RECORD_TYPE_INTERPOLATE
  } from './proto_record';
 
@@ -103,7 +104,7 @@ export class DynamicChangeDetector extends AbstractChangeDetector {
 
  _check(proto:ProtoRecord) {
  try {
- if (proto.mode == RECORD_TYPE_PIPE) {
+ if (proto.mode === RECORD_TYPE_PIPE || proto.mode === RECORD_TYPE_BINDING_PIPE) {
  return this._pipeCheck(proto);
  } else {
  return this._referenceCheck(proto);
@@ -202,7 +203,14 @@ export class DynamicChangeDetector extends AbstractChangeDetector {
  if (isPresent(storedPipe)) {
  storedPipe.onDestroy();
  }
- var pipe = this.pipeRegistry.get(proto.name, context);
+
+ // Currently, only pipes that used in bindings in the template get
+ // the bindingPropagationConfig of the encompassing component.
+ //
+ // In the future, pipes declared in the bind configuration should
+ // be able to access the bindingPropagationConfig of that component.
+ var bpc = proto.mode === RECORD_TYPE_BINDING_PIPE ? this.bindingPropagationConfig : null;
+ var pipe = this.pipeRegistry.get(proto.name, context, bpc);
  this._writePipe(proto, pipe);
  return pipe;
  }

modules/angular2/src/change_detection/parser/ast.js

@@ -168,11 +168,13 @@ export class Pipe extends AST {
  exp:AST;
  name:string;
  args:List<AST>;
- constructor(exp:AST, name:string, args:List) {
+ inBinding:boolean;
+ constructor(exp:AST, name:string, args:List, inBinding:boolean) {
  super();
  this.exp = exp;
  this.name = name;
  this.args = args;
+ this.inBinding = inBinding;
  }
 
  visit(visitor) {

modules/angular2/src/change_detection/parser/parser.js

@@ -58,7 +58,7 @@ export class Parser {
  if (ListWrapper.isEmpty(pipes)) return bindingAst;
 
  var res = ListWrapper.reduce(pipes,
- (result, currentPipeName) => new Pipe(result, currentPipeName, []),
+ (result, currentPipeName) => new Pipe(result, currentPipeName, [], false),
  bindingAst.ast);
  return new ASTWithSource(res, bindingAst.source, bindingAst.location);
  }
@@ -220,7 +220,7 @@ class _ParseAST {
  while (this.optionalCharacter($COLON)) {
  ListWrapper.push(args, this.parseExpression());
  }
- result = new Pipe(result, name, args);
+ result = new Pipe(result, name, args, true);
  }
  return result;
  }

modules/angular2/src/change_detection/pipes/iterable_changes.js

@@ -21,7 +21,7 @@ export class IterableChangesFactory {
  return IterableChanges.supportsObj(obj);
  }
 
- create():Pipe {
+ create(bpc):Pipe {
  return new IterableChanges();
  }
 }

modules/angular2/src/change_detection/pipes/keyvalue_changes.js

@@ -8,7 +8,7 @@ export class KeyValueChangesFactory {
  return KeyValueChanges.supportsObj(obj);
  }
 
- create():Pipe {
+ create(bpc):Pipe {
  return new KeyValueChanges();
  }
 }