This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082

Closed
IgorMinar wants to merge 4 commits into from
Closed

Expression caching #9082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e17a233
chore(largetable-bp): fix typo in main.html
IgorMinar Sep 14, 2014
91fa2e6
perf($parse): execute watched expressions only when the inputs change
jbedard Sep 10, 2014
b4063f7
refactor($parse): name anonymous fns for easier debugging and profiling
IgorMinar Sep 15, 2014
aaa8e7d
refactor($parse): merge ternary and ternaryFn methods
IgorMinar Sep 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/largetable-bp/main.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
<div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
<div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
<div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
<div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
<div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

<ng-switch on="benchmarkType">
<baseline-binding-table ng-switch-when="baselineBinding">
Expand Down
16 changes: 16 additions & 0 deletions benchmarks/parsed-expressions-bp/main.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
<label for="operators">Binary/Unary operators</label>
</li>

<li>
<input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
<label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
</li>

<li>
<input type="radio" ng-model="expressionType" value="filters" id="filters">
<label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
<span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
</li>

<li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
<span bm-pe-watch="rowIdx && row.odd"></span>
<span bm-pe-watch="row.odd && row.even"></span>
<span bm-pe-watch="row.odd && !row.even"></span>
<span bm-pe-watch="row.odd || row.even"></span>
<span bm-pe-watch="row.odd || row.even || row.index"></span>
<span bm-pe-watch="row.index === 1 || row.index === 2"></span>
<span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
<span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
</li>

<li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
<span bm-pe-watch="rowIdx | noop"></span>
<span bm-pe-watch="rowIdx | noop"></span>
Expand Down
6 changes: 4 additions & 2 deletions src/ng/compile.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
attrs[attrName], newIsolateScopeDirective.name);
};
lastValue = isolateBindingContext[scopeName] = parentGet(scope);
var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
var parentValueWatch = function parentValueWatch(parentValue) {
if (!compare(parentValue, isolateBindingContext[scopeName])) {
// we are out of sync and need to copy
if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}
}
return lastValue = parentValue;
}), null, parentGet.literal);
};
parentValueWatch.$stateful = true;
var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
isolateScope.$on('$destroy', unwatch);
break;

Expand Down
167 changes: 134 additions & 33 deletions src/ng/parse.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
return exp.constant;
}

/**
* @constructor
*/
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
},

unaryFn: function(fn, right) {
return extend(function(self, locals) {
return extend(function $parseUnaryFn(self, locals) {
return fn(self, locals, right);
}, {
constant:right.constant
constant:right.constant,
inputs: [right]
});
},

ternaryFn: function(left, middle, right){
return extend(function(self, locals){
return left(self, locals) ? middle(self, locals) : right(self, locals);
}, {
constant: left.constant && middle.constant && right.constant
});
},

binaryFn: function(left, fn, right) {
return extend(function(self, locals) {
binaryFn: function(left, fn, right, isBranching) {
return extend(function $parseBinaryFn(self, locals) {
return fn(self, locals, left, right);
}, {
constant:left.constant && right.constant
constant: left.constant && right.constant,
inputs: !isBranching && [left, right]
});
},

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
}
}

return function $parseFilter(self, locals) {
var inputs = [inputFn].concat(argsFn || []);

return extend(function $parseFilter(self, locals) {
var input = inputFn(self, locals);
if (args) {
args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
}

return fn(input);
};
}, {
constant: !fn.$stateful && inputs.every(isConstant),
inputs: !fn.$stateful && inputs
});
},

expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
this.text.substring(0, token.index) + '] can not be assigned to', token);
}
right = this.ternary();
return function $parseAssignment(scope, locals) {
return extend(function $parseAssignment(scope, locals) {
return left.assign(scope, right(scope, locals), locals);
};
}, {
inputs: [left, right]
});
}
return left;
},
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
if ((token = this.expect('?'))) {
middle = this.assignment();
if ((token = this.expect(':'))) {
return this.ternaryFn(left, middle, this.assignment());
var right = this.assignment();

return extend(function $parseTernary(self, locals){
return left(self, locals) ? middle(self, locals) : right(self, locals);
}, {
constant: left.constant && middle.constant && right.constant
});

} else {
this.throwError('expected :', token);
}
} else {
return left;
}

return left;
},

logicalOR: function() {
var left = this.logicalAND();
var token;
while ((token = this.expect('||'))) {
left = this.binaryFn(left, token.fn, this.logicalAND());
left = this.binaryFn(left, token.fn, this.logicalAND(), true);
}
return left;
},
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
var left = this.equality();
var token;
if ((token = this.expect('&&'))) {
left = this.binaryFn(left, token.fn, this.logicalAND());
left = this.binaryFn(left, token.fn, this.logicalAND(), true);
}
return left;
},
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
// This is used with json array declaration
arrayDeclaration: function () {
var elementFns = [];
var allConstant = true;
if (this.peekToken().text !== ']') {
do {
if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
}
var elementFn = this.expression();
elementFns.push(elementFn);
if (!elementFn.constant) {
allConstant = false;
}
} while (this.expect(','));
}
this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
return array;
}, {
literal: true,
constant: allConstant
constant: elementFns.every(isConstant),
inputs: elementFns
});
},

object: function () {
var keys = [], valueFns = [];
var allConstant = true;
if (this.peekToken().text !== '}') {
do {
if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
this.consume(':');
var value = this.expression();
valueFns.push(value);
if (!value.constant) {
allConstant = false;
}
} while (this.expect(','));
}
this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
return object;
}, {
literal: true,
constant: allConstant
constant: valueFns.every(isConstant),
inputs: valueFns
});
}
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
parsedExpression = wrapSharedExpression(parsedExpression);
parsedExpression.$$watchDelegate = parsedExpression.literal ?
oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
} else if (parsedExpression.inputs) {
parsedExpression.$$watchDelegate = inputsWatchDelegate;
}

cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
}
};

function collectExpressionInputs(inputs, list) {
for (var i = 0, ii = inputs.length; i < ii; i++) {
var input = inputs[i];
if (!input.constant) {
if (input.inputs) {
collectExpressionInputs(input.inputs, list);
} else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
list.push(input);
}
}
}

return list;
}

function expressionInputDirtyCheck(newValue, oldValueOfValue) {

if (newValue == null || oldValueOfValue == null) { // null/undefined
return newValue === oldValueOfValue;
}

if (typeof newValue === 'object') {

// attempt to convert the value to a primitive type
// TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
// be cheaply dirty-checked
newValue = newValue.valueOf();

if (typeof newValue === 'object') {
// objects/arrays are not supported - deep-watching them would be too expensive
return false;
}

// fall-through to the primitive equality check
}

//Primitive or NaN
return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
}

function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
var inputExpressions = parsedExpression.$$inputs ||
(parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

var lastResult;

if (inputExpressions.length === 1) {
var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
inputExpressions = inputExpressions[0];
return scope.$watch(function expressionInputWatch(scope) {
var newInputValue = inputExpressions(scope);
if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
lastResult = parsedExpression(scope);
oldInputValue = newInputValue && newInputValue.valueOf();
}
return lastResult;
}, listener, objectEquality);
}

var oldInputValueOfValues = [];
for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
}

return scope.$watch(function expressionInputsWatch(scope) {
var changed = false;

for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
var newInputValue = inputExpressions[i](scope);
if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
}
}

if (changed) {
lastResult = parsedExpression(scope);
}

return lastResult;
}, listener, objectEquality);
}

function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
var unwatch, lastValue;
return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
// initial value is defined (for bind-once)
return isDefined(value) ? result : value;
};
fn.$$watchDelegate = parsedExpression.$$watchDelegate;

// Propagate $$watchDelegates other then inputsWatchDelegate
if (parsedExpression.$$watchDelegate &&
parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
fn.$$watchDelegate = parsedExpression.$$watchDelegate;
} else if (!interceptorFn.$stateful) {
// If there is an interceptor, but no watchDelegate then treat the interceptor like
// we treat filters - it is assumed to be a pure function unless flagged with $stateful
fn.$$watchDelegate = inputsWatchDelegate;
fn.inputs = [parsedExpression];
}

return fn;
}
}];
Expand Down
2 changes: 2 additions & 0 deletions src/ng/rootScope.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
* de-registration function is executed, the internal watch operation is terminated.
*/
$watchCollection: function(obj, listener) {
$watchCollectionInterceptor.$stateful = true;

var self = this;
// the current value, updated on each dirty-check run
var newValue;
Expand Down
10 changes: 8 additions & 2 deletions test/ng/directive/ngRepeatSpec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
// This creates one item, but it has no parent so we can't get to it
$rootScope.items = [1, 2];
$rootScope.$apply();
expect(logs).toContain(1);
expect(logs).toContain(2);
logs.length = 0;

// This cleans up to prevent memory leak
$rootScope.items = [];
$rootScope.$apply();
expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
expect(logs).toEqual([1, 2, 1, 2]);
expect(logs.length).toBe(0);
}));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
// This creates one item, but it has no parent so we can't get to it
$rootScope.items = [1, 2];
$rootScope.$apply();
expect(logs).toContain(1);
expect(logs).toContain(2);
logs.length = 0;

// This cleans up to prevent memory leak
$rootScope.items = [];
$rootScope.$apply();
expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
expect(logs).toEqual([1, 2, 1, 2]);
expect(logs.length).toBe(0);
}));


Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Expression caching#9082
 Closed

IgorMinar
wants to merge
4
commits into

from

 Closed


Expression caching
#9082
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
e17a233

chore(largetable-bp): fix typo in main.html


IgorMinar Sep 14, 2014
91fa2e6

perf($parse): execute watched expressions only when the inputs change


jbedard Sep 10, 2014
b4063f7

refactor($parse): name anonymous fns for easier debugging and profiling


IgorMinar Sep 15, 2014
aaa8e7d

refactor($parse): merge ternary and ternaryFn methods


IgorMinar Sep 14, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
benchmarks/largetable-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
 <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
 <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
 <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>

 <ng-switch on="benchmarkType">
 <baseline-binding-table ng-switch-when="baselineBinding">
Expand Down

16 changes: 16 additions & 0 deletions
benchmarks/parsed-expressions-bp/main.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,11 @@
 <label for="operators">Binary/Unary operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
 <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
 </li>

 <li>
 <input type="radio" ng-model="expressionType" value="filters" id="filters">
 <label for="filters">Filters</label>
Expand DownExpand Up@@ -134,6 +139,17 @@
 <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
 </li>

 <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx && row.odd"></span>
 <span bm-pe-watch="row.odd && row.even"></span>
 <span bm-pe-watch="row.odd && !row.even"></span>
 <span bm-pe-watch="row.odd || row.even"></span>
 <span bm-pe-watch="row.odd || row.even || row.index"></span>
 <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
 <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
 <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
 </li>

 <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
 <span bm-pe-watch="rowIdx | noop"></span>
 <span bm-pe-watch="rowIdx | noop"></span>
Expand Down

6 changes: 4 additions & 2 deletions
src/ng/compile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1725,7 +1725,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 attrs[attrName], newIsolateScopeDirective.name);
 };
 lastValue = isolateBindingContext[scopeName] = parentGet(scope);
 var unwatch = scope.$watch($parse(attrs[attrName], function parentValueWatch(parentValue) {
 var parentValueWatch = function parentValueWatch(parentValue) {
 if (!compare(parentValue, isolateBindingContext[scopeName])) {
 // we are out of sync and need to copy
 if (!compare(parentValue, lastValue)) {
Expand All@@ -1737,7 +1737,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 }
 }
 return lastValue = parentValue;
 }), null, parentGet.literal);
 };
 parentValueWatch.$stateful = true;
 var unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
 isolateScope.$on('$destroy', unwatch);
 break;

Expand Down

167 changes: 134 additions & 33 deletions
src/ng/parse.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,10 @@ Lexer.prototype = {
};


function isConstant(exp) {
 return exp.constant;
}

/**
 * @constructor
 */
Expand DownExpand Up@@ -490,26 +494,20 @@ Parser.prototype = {
 },

 unaryFn: function(fn, right) {
 return extend(function(self, locals) {
 return extend(function $parseUnaryFn(self, locals) {
 return fn(self, locals, right);
 }, {
 constant:right.constant
 constant:right.constant,
 inputs: [right]
 });
 },

 ternaryFn: function(left, middle, right){
 return extend(function(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });
 },

 binaryFn: function(left, fn, right) {
 return extend(function(self, locals) {
 binaryFn: function(left, fn, right, isBranching) {
 return extend(function $parseBinaryFn(self, locals) {
 return fn(self, locals, left, right);
 }, {
 constant:left.constant && right.constant
 constant: left.constant && right.constant,
 inputs: !isBranching && [left, right]
 });
 },

Expand DownExpand Up@@ -557,7 +555,9 @@ Parser.prototype = {
 }
 }

 return function $parseFilter(self, locals) {
 var inputs = [inputFn].concat(argsFn || []);

 return extend(function $parseFilter(self, locals) {
 var input = inputFn(self, locals);
 if (args) {
 args[0] = input;
Expand All@@ -571,7 +571,10 @@ Parser.prototype = {
 }

 return fn(input);
 };
 }, {
 constant: !fn.$stateful && inputs.every(isConstant),
 inputs: !fn.$stateful && inputs
 });
 },

 expression: function() {
Expand All@@ -588,9 +591,11 @@ Parser.prototype = {
 this.text.substring(0, token.index) + '] can not be assigned to', token);
 }
 right = this.ternary();
 return function $parseAssignment(scope, locals) {
 return extend(function $parseAssignment(scope, locals) {
 return left.assign(scope, right(scope, locals), locals);
 };
 }, {
 inputs: [left, right]
 });
 }
 return left;
 },
Expand All@@ -602,20 +607,27 @@ Parser.prototype = {
 if ((token = this.expect('?'))) {
 middle = this.assignment();
 if ((token = this.expect(':'))) {
 return this.ternaryFn(left, middle, this.assignment());
 var right = this.assignment();

 return extend(function $parseTernary(self, locals){
 return left(self, locals) ? middle(self, locals) : right(self, locals);
 }, {
 constant: left.constant && middle.constant && right.constant
 });

 } else {
 this.throwError('expected :', token);
 }
 } else {
 return left;
 }

 return left;
 },

 logicalOR: function() {
 var left = this.logicalAND();
 var token;
 while ((token = this.expect('||'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand All@@ -624,7 +636,7 @@ Parser.prototype = {
 var left = this.equality();
 var token;
 if ((token = this.expect('&&'))) {
 left = this.binaryFn(left, token.fn, this.logicalAND());
 left = this.binaryFn(left, token.fn, this.logicalAND(), true);
 }
 return left;
 },
Expand DownExpand Up@@ -759,7 +771,6 @@ Parser.prototype = {
 // This is used with json array declaration
 arrayDeclaration: function () {
 var elementFns = [];
 var allConstant = true;
 if (this.peekToken().text !== ']') {
 do {
 if (this.peek(']')) {
Expand All@@ -768,9 +779,6 @@ Parser.prototype = {
 }
 var elementFn = this.expression();
 elementFns.push(elementFn);
 if (!elementFn.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume(']');
Expand All@@ -783,13 +791,13 @@ Parser.prototype = {
 return array;
 }, {
 literal: true,
 constant: allConstant
 constant: elementFns.every(isConstant),
 inputs: elementFns
 });
 },

 object: function () {
 var keys = [], valueFns = [];
 var allConstant = true;
 if (this.peekToken().text !== '}') {
 do {
 if (this.peek('}')) {
Expand All@@ -801,9 +809,6 @@ Parser.prototype = {
 this.consume(':');
 var value = this.expression();
 valueFns.push(value);
 if (!value.constant) {
 allConstant = false;
 }
 } while (this.expect(','));
 }
 this.consume('}');
Expand All@@ -816,7 +821,8 @@ Parser.prototype = {
 return object;
 }, {
 literal: true,
 constant: allConstant
 constant: valueFns.every(isConstant),
 inputs: valueFns
 });
 }
};
Expand DownExpand Up@@ -1043,6 +1049,8 @@ function $ParseProvider() {
 parsedExpression = wrapSharedExpression(parsedExpression);
 parsedExpression.$$watchDelegate = parsedExpression.literal ?
 oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
 } else if (parsedExpression.inputs) {
 parsedExpression.$$watchDelegate = inputsWatchDelegate;
 }

 cache[cacheKey] = parsedExpression;
Expand All@@ -1057,6 +1065,88 @@ function $ParseProvider() {
 }
 };

 function collectExpressionInputs(inputs, list) {
 for (var i = 0, ii = inputs.length; i < ii; i++) {
 var input = inputs[i];
 if (!input.constant) {
 if (input.inputs) {
 collectExpressionInputs(input.inputs, list);
 } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better?
 list.push(input);
 }
 }
 }

 return list;
 }

 function expressionInputDirtyCheck(newValue, oldValueOfValue) {

 if (newValue == null || oldValueOfValue == null) { // null/undefined
 return newValue === oldValueOfValue;
 }

 if (typeof newValue === 'object') {

 // attempt to convert the value to a primitive type
 // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
 // be cheaply dirty-checked
 newValue = newValue.valueOf();

 if (typeof newValue === 'object') {
 // objects/arrays are not supported - deep-watching them would be too expensive
 return false;
 }

 // fall-through to the primitive equality check
 }

 //Primitive or NaN
 return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
 }

 function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var inputExpressions = parsedExpression.$$inputs ||
 (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, []));

 var lastResult;

 if (inputExpressions.length === 1) {
 var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails
 inputExpressions = inputExpressions[0];
 return scope.$watch(function expressionInputWatch(scope) {
 var newInputValue = inputExpressions(scope);
 if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) {
 lastResult = parsedExpression(scope);
 oldInputValue = newInputValue && newInputValue.valueOf();
 }
 return lastResult;
 }, listener, objectEquality);
 }

 var oldInputValueOfValues = [];
 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
 }

 return scope.$watch(function expressionInputsWatch(scope) {
 var changed = false;

 for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
 var newInputValue = inputExpressions[i](scope);
 if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
 oldInputValueOfValues[i] = newInputValue && newInputValue.valueOf();
 }
 }

 if (changed) {
 lastResult = parsedExpression(scope);
 }

 return lastResult;
 }, listener, objectEquality);
 }

 function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
 var unwatch, lastValue;
 return unwatch = scope.$watch(function oneTimeWatch(scope) {
Expand DownExpand Up@@ -1122,7 +1212,18 @@ function $ParseProvider() {
 // initial value is defined (for bind-once)
 return isDefined(value) ? result : value;
 };
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;

 // Propagate $$watchDelegates other then inputsWatchDelegate
 if (parsedExpression.$$watchDelegate &&
 parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
 fn.$$watchDelegate = parsedExpression.$$watchDelegate;
 } else if (!interceptorFn.$stateful) {
 // If there is an interceptor, but no watchDelegate then treat the interceptor like
 // we treat filters - it is assumed to be a pure function unless flagged with $stateful
 fn.$$watchDelegate = inputsWatchDelegate;
 fn.inputs = [parsedExpression];
 }

 return fn;
 }
 }];
Expand Down

2 changes: 2 additions & 0 deletions
src/ng/rootScope.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,6 +515,8 @@ function $RootScopeProvider(){
 * de-registration function is executed, the internal watch operation is terminated.
 */
 $watchCollection: function(obj, listener) {
 $watchCollectionInterceptor.$stateful = true;

 var self = this;
 // the current value, updated on each dirty-check run
 var newValue;
Expand Down

10 changes: 8 additions & 2 deletions
test/ng/directive/ngRepeatSpec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand All@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
 // This creates one item, but it has no parent so we can't get to it
 $rootScope.items = [1, 2];
 $rootScope.$apply();
 expect(logs).toContain(1);
 expect(logs).toContain(2);
 logs.length = 0;

 // This cleans up to prevent memory leak
 $rootScope.items = [];
 $rootScope.$apply();
 expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
 expect(logs).toEqual([1, 2, 1, 2]);
 expect(logs.length).toBe(0);
 }));


Expand Down
Loading