Skip to content

Commit

Permalink
feat(Parser): associate pipes right to left
Browse files Browse the repository at this point in the history
closes #4605

BREAKING CHANGE:

Before:

`1 + 1 | pipe:a | pipe:b` was parsed as `(1 + 1) | pipe:(a | pipe:b)`

After:

`1 + 1 | pipe:a | pipe:b` is parsed as `((1 + 1) | pipe:a) | pipe:b`

Closes #4716
  • Loading branch information
vicb committed Oct 21, 2015
1 parent 77604b8 commit 4639f44
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
18 changes: 9 additions & 9 deletions modules/angular2/src/core/change_detection/parser/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ export class _ParseAST {
return n.toString();
}

parseSimpleBinding(): AST {
var ast = this.parseChain();
if (!SimpleExpressionChecker.check(ast)) {
this.error(`Simple binding expression can only contain field access and constants'`);
}
return ast;
}

parseChain(): AST {
var exprs = [];
while (this.index < this.tokens.length) {
Expand All @@ -237,14 +245,6 @@ export class _ParseAST {
return new Chain(exprs);
}

parseSimpleBinding(): AST {
var ast = this.parseChain();
if (!SimpleExpressionChecker.check(ast)) {
this.error(`Simple binding expression can only contain field access and constants'`);
}
return ast;
}

parsePipe(): AST {
var result = this.parseExpression();
if (this.optionalOperator("|")) {
Expand All @@ -256,7 +256,7 @@ export class _ParseAST {
var name = this.expectIdentifierOrKeyword();
var args = [];
while (this.optionalCharacter($COLON)) {
args.push(this.parsePipe());
args.push(this.parseExpression());
}
result = new BindingPipe(result, name, args);
} while (this.optionalOperator("|"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ var _availableDefinitions = [
'name | pipe',
'(name | pipe).length',
"name | pipe:'one':address.city",
"name | pipe:'a':'b' | pipe:0:1:2",
'value',
'a',
'address.city',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,14 @@ export function main() {
expect(val.dispatcher.loggedValues).toEqual(['value one two default']);
});

it('should associate pipes right-to-left', () => {
var registry = new FakePipes('pipe', () => new MultiArgPipe());
var person = new Person('value');
var val = _createChangeDetector("name | pipe:'a':'b' | pipe:0:1:2", person, registry);
val.changeDetector.detectChanges();
expect(val.dispatcher.loggedValues).toEqual(['value a b default 0 1 2']);
});

it('should not reevaluate pure pipes unless its context or arg changes', () => {
var pipe = new CountingPipe();
var registry = new FakePipes('pipe', () => pipe, {pure: true});
Expand Down
12 changes: 2 additions & 10 deletions modules/angular2/test/core/change_detection/parser/parser_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ import {Unparser} from './unparser';
import {Lexer} from 'angular2/src/core/change_detection/parser/lexer';
import {BindingPipe, LiteralPrimitive, AST} from 'angular2/src/core/change_detection/parser/ast';

class TestData {
constructor(public a?: any, public b?: any, public fnReturnValue?: any) {}

fn() { return this.fnReturnValue; }

add(a, b) { return a + b; }
}

export function main() {
function createParser() { return new Parser(new Lexer(), reflector); }

Expand Down Expand Up @@ -229,8 +221,8 @@ export function main() {
checkBinding('a[b] | c', '(a[b] | c)');
checkBinding('a?.b | c', '(a?.b | c)');
checkBinding('true | a', '(true | a)');
checkBinding('a | b:c | d', '(a | b:(c | d))');
checkBinding('(a | b:c) | d', '((a | b:c) | d)');
checkBinding('a | b:c | d', '((a | b:c) | d)');
checkBinding('a | b:(c | d)', '(a | b:(c | d))');
});

it('should only allow identifier or keyword as formatter names', () => {
Expand Down

0 comments on commit 4639f44

Please sign in to comment.