WIP: Filter cache

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {

src/Angular.js

@@ -573,6 +573,12 @@ function isPromiseLike(obj) {
 }
 
 
+function isPrimitive(value) {
+ var valueType;
+ return (value == null || (valueType = typeof value) === 'string' || valueType === 'number');
+}
+
+
 var trim = function(value) {
  return isString(value) ? value.trim() : value;
 };

src/ng/parse.js

@@ -559,7 +559,11 @@ Parser.prototype = {
 
  filter: function() {
  var token = this.expect();
- var fn = this.$filter(token.text);
+ var filterName = token.text;
+ var expression = this.text;
+ var filterCacheKeyInput = filterName + '_i_' + expression;
+ var filterCacheKeyResult = filterName + '_r_' + expression;
+ var fn = this.$filter(filterName);
  var argsFn;
  var args;
 
@@ -572,6 +576,9 @@ Parser.prototype = {
  }
 
  return valueFn(function $parseFilter(self, locals, input) {
+ var result;
+ var filterCache = self.$$filterCache;
+
  if (args) {
  args[0] = input;
 
@@ -580,10 +587,41 @@ Parser.prototype = {
  args[i + 1] = argsFn[i](self, locals);
  }
 
- return fn.apply(undefined, args);
+ var primitiveInputs = true;
+ i = args.length;
+ while (primitiveInputs && i--) {
+ primitiveInputs = primitiveInputs && isPrimitive(args[i]);
+ }
+
+ if (primitiveInputs) {
+ if (filterCacheKeyInput in filterCache &&
+ equals(filterCache[filterCacheKeyInput], args)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn.apply(undefined, args);
+ filterCache[filterCacheKeyInput] = shallowCopy(args, []);
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn.apply(undefined, args);
+ }
+
+ return result;
+ }
+
+ if (isPrimitive(input)) {
+ if (filterCache[filterCacheKeyInput] === input && (input === undefined || filterCacheKeyInput in filterCache)) {
+ result = filterCache[filterCacheKeyResult];
+ } else {
+ result = fn(input);
+ filterCache[filterCacheKeyInput] = input;
+ filterCache[filterCacheKeyResult] = result;
+ }
+ } else {
+ result = fn(input);
  }
 
- return fn(input);
+ return result;
  });
  },
 

src/ng/rootScope.js

@@ -136,6 +136,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$$isolateBindings = {};
  this.$$applyAsyncQueue = [];
+ this.$$filterCache = createMap();
  }
 
  /**
@@ -207,6 +208,7 @@ function $RootScopeProvider(){
  this.$$listenerCount = {};
  this.$id = nextUid();
  this.$$ChildScope = null;
+ this.$$filterCache = createMap();
  };
  this.$$ChildScope.prototype = this;
  }

test/ng/parseSpec.js

@@ -334,20 +334,6 @@ describe('parser', function() {
  expect(scope.$eval("'a' + 'b c'")).toEqual("ab c");
  });
 
- it('should parse filters', function() {
- $filterProvider.register('substring', valueFn(function(input, start, end) {
- return input.substring(start, end);
- }));
-
- expect(function() {
- scope.$eval("1|nonexistent");
- }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
-
- scope.offset = 3;
- expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
- expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
- });
-
  it('should access scope', function() {
  scope.a = 123;
  scope.b = {c: 456};
@@ -585,15 +571,8 @@ describe('parser', function() {
 
  expect(scope.$eval('items[1] = "abc"')).toEqual("abc");
  expect(scope.$eval('items[1]')).toEqual("abc");
- // Dont know how to make this work....
- // expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
- // expect(scope.$eval('books[1]')).toEqual("moby");
- });
-
- it('should evaluate grouped filters', function() {
- scope.name = 'MISKO';
- expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
- expect(scope.$eval('n')).toEqual('misko');
+ expect(scope.$eval('books[1] = "moby"')).toEqual("moby");
+ expect(scope.$eval('books[1]')).toEqual("moby");
  });
 
  it('should evaluate remainder', function() {
@@ -677,6 +656,196 @@ describe('parser', function() {
  expect(scope.$eval('a + \n b.c + \r "\td" + \t \r\n\r "\r\n\n"')).toEqual("abc\td\r\n\n");
  });
 
+
+ describe('filters', function() {
+
+ var log;
+
+ beforeEach(inject(function (_log_) {
+ log = _log_;
+ }));
+
+
+ it('should parse filters', function() {
+ registerFilter(substring);
+
+ expect(function() {
+ scope.$eval("1|nonexistent");
+ }).toThrowMinErr('$injector', 'unpr', 'Unknown provider: nonexistentFilterProvider <- nonexistentFilter');
+
+ scope.offset = 3;
+ expect(scope.$eval("'abcd'|substring:1:offset")).toEqual("bc");
+ expect(scope.$eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
+ });
+
+
+ it('should evaluate grouped filters', function() {
+ scope.name = 'MISKO';
+ expect(scope.$eval('n = (name|lowercase)')).toEqual('misko');
+ expect(scope.$eval('n')).toEqual('misko');
+ });
+
+
+ describe('caching', function() {
+
+ it("should cache the last value and not re-execute filters if inputs don't change", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual([]);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+ });
+
+
+ it("should associate the cache with the evaluation scope", function() {
+ registerFilter(starlog);
+
+ var childScope1 = scope.$new();
+ var childScope2 = scope.$new();
+
+ childScope1.message = 'harder';
+ childScope2.message = 'harder';
+
+ expect(childScope1.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ expect(childScope2.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should cache just the last value", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+
+ scope.message = 'better';
+ expect(scope.$eval('message | starlog')).toBe('*better*');
+ expect(log.empty()).toEqual(['*better*']);
+
+ scope.message = 'harder';
+ expect(scope.$eval('message | starlog')).toBe('*harder*');
+ expect(log.empty()).toEqual(['*harder*']);
+ });
+
+
+ it("should not cache results for object inputs", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+
+ expect(scope.$eval('obj | starlog')).toBe('*{}*');
+ expect(log.empty()).toEqual(['*{}*']);
+ });
+
+
+ it("should not cache results for array inputs", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+
+ expect(scope.$eval('array | starlog')).toBe('*[]*');
+ expect(log.empty()).toEqual(['*[]*']);
+ });
+
+
+ it("should cache filters with extra params", function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it('should recalc the result if extra param changes', function() {
+ registerFilter(starlog);
+
+ scope.message = 'harder';
+ scope.stardate = '333';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [333] *');
+ expect(log.empty()).toEqual(['*harder [333] *']);
+
+ scope.stardate = '111';
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual(['*harder [111] *']);
+
+ expect(scope.$eval('message | starlog:stardate')).toBe('*harder [111] *');
+ expect(log.empty()).toEqual([]);
+ });
+
+
+ it("should not cache results for object params", function() {
+ registerFilter(starlog);
+
+ scope.obj = {};
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+
+ expect(scope.$eval('1 | starlog:obj')).toBe('*1 [{}] *');
+ expect(log.empty()).toEqual(['*1 [{}] *']);
+ });
+
+
+ it("should not cache results for array params", function() {
+ registerFilter(starlog);
+
+ scope.array = [];
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+
+ expect(scope.$eval('1 | starlog:array')).toBe('*1 [[]] *');
+ expect(log.empty()).toEqual(['*1 [[]] *']);
+ });
+ });
+
+
+ function registerFilter(filter) {
+ $filterProvider.register(filter.name, valueFn(filter));
+ }
+
+ function substring(input, start, end) {
+ return input.substring(start, end);
+ }
+
+ function starlog(input, param) {
+ input = isString(input) ? input : toJson(input);
+
+ if (param) {
+ param = ' [' + (isString(param) ? param : toJson(param)) + '] ';
+ } else {
+ param = '';
+ }
+
+ var result = '*' + input + param + '*';
+ log(result);
+ return result;
+ }
+
+ function dashlog(input) {
+ var result = '-' + input + '-';
+ log(result);
+ return result;
+ }
+ });
+
+
  describe('sandboxing', function() {
  describe('Function constructor', function() {
  it('should NOT allow access to Function constructor in getter', function() {