From f4486a263c9b64b562939ff111aa125e2d3f18cb Mon Sep 17 00:00:00 2001
From: herr kaste <herr.kaste@googlemail.com>
Date: Wed, 3 Feb 2016 23:02:25 +0100
Subject: [PATCH] Generalized approach supporting compute and observers

---
 src/lib/bind/effects.html       | 34 ++++++++++++++-----
 src/standard/annotations.html   |  4 ---
 src/standard/effectBuilder.html | 35 ++++++++++++++++++--
 test/unit/bind.html             | 58 +++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/src/lib/bind/effects.html b/src/lib/bind/effects.html
index 06be143364..be9b38936d 100644
--- a/src/lib/bind/effects.html
+++ b/src/lib/bind/effects.html
@@ -67,6 +67,10 @@
         if (args) {
           fn.apply(this, args);
         }
+      } else if (effect.dynamicFn) {
+        // dynamic functions can be just like every other property `undefined`
+        // so we MUST ignore an undefined value here. (That's totally the
+        // same guard we use within `_marshalArgs` and part of the spec.)
       } else {
         this._warn(this._logf('_complexObserverEffect', 'observer method `' +
           effect.method + '` not defined'));
@@ -74,15 +78,20 @@
     },
 
     _computeEffect: function(source, value, effect) {
-      var args = Polymer.Bind._marshalArgs(this.__data__, effect, source, value);
-      if (args) {
-        var fn = this[effect.method];
-        if (fn) {
-          this.__setProperty(effect.name, fn.apply(this, args));
-        } else {
-          this._warn(this._logf('_computeEffect', 'compute method `' +
-            effect.method + '` not defined'));
+      var fn = this[effect.method];
+      if (fn) {
+        var args = Polymer.Bind._marshalArgs(this.__data__, effect, source, value);
+        if (args) {
+          var computedvalue = fn.apply(this, args);
+          this.__setProperty(effect.name, computedvalue);
         }
+      } else if (effect.dynamicFn) {
+        // dynamic functions can be just like every other property `undefined`
+        // so we MUST ignore an undefined value here. (That's totally the
+        // same guard we use within `_marshalArgs` and part of the spec.)
+      } else {
+        this._warn(this._logf('_computeEffect', 'compute method `' +
+          effect.method + '` not defined'));
       }
     },
 
@@ -98,6 +107,10 @@
           }
           this._applyEffectValue(effect, computedvalue);
         }
+      } else if (effect.dynamicFn) {
+        // dynamic functions can be just like every other property `undefined`
+        // so we MUST ignore an undefined value here. (That's totally the
+        // same guard we use within `_marshalArgs` and part of the spec.)
       } else {
         computedHost._warn(computedHost._logf('_annotatedComputationEffect',
           'compute method `' + effect.method + '` not defined'));
@@ -109,6 +122,9 @@
     _marshalArgs: function(model, effect, path, value) {
       var values = [];
       var args = effect.args;
+      // Actually we should return early as soon as we see an `undefined`,
+      // but dom-repeat relies on this behavior.
+      var bailoutEarly = (args.length > 1 || effect.dynamicFn);
       for (var i=0, l=args.length; i<l; i++) {
         var arg = args[i];
         var name = arg.name;
@@ -120,7 +136,7 @@
         } else {
           v = model[name];
         }
-        if (args.length > 1 && v === undefined) {
+        if (bailoutEarly && v === undefined) {
           return;
         }
         if (arg.wildcard) {
diff --git a/src/standard/annotations.html b/src/standard/annotations.html
index 8c14137fa9..3743c48af0 100644
--- a/src/standard/annotations.html
+++ b/src/standard/annotations.html
@@ -147,10 +147,6 @@
             if (!p.literal) {
               var signature = this._parseMethod(p.value);
               if (signature) {
-                if (this.properties[signature.method]) {
-                  signature.dynamicFn = true;
-                  signature.static = false;
-                }
                 p.signature = signature;
               } else {
                 p.model = this._modelForPath(p.value);
diff --git a/src/standard/effectBuilder.html b/src/standard/effectBuilder.html
index 0363527581..749addc0fe 100644
--- a/src/standard/effectBuilder.html
+++ b/src/standard/effectBuilder.html
@@ -79,14 +79,27 @@
 
     _addComputedEffect: function(name, expression) {
       var sig = this._parseMethod(expression);
+
+      var dynamicFn = sig.dynamicFn;
+
       for (var i=0, arg; (i<sig.args.length) && (arg=sig.args[i]); i++) {
         this._addPropertyEffect(arg.model, 'compute', {
           method: sig.method,
           args: sig.args,
           trigger: arg,
-          name: name
+          name: name,
+          dynamicFn: dynamicFn
         });
       }
+      if (dynamicFn) {
+        this._addPropertyEffect(sig.method, 'compute', {
+          method: sig.method,
+          args: sig.args,
+          trigger: null,
+          name: name,
+          dynamicFn: dynamicFn
+        })
+      }
     },
 
     _addObserverEffect: function(property, observer) {
@@ -111,11 +124,22 @@
         throw new Error("Malformed observer expression '" + observer + "'");
       }
 
+      var dynamicFn = sig.dynamicFn;
+
       for (var i=0, arg; (i<sig.args.length) && (arg=sig.args[i]); i++) {
         this._addPropertyEffect(arg.model, 'complexObserver', {
           method: sig.method,
           args: sig.args,
-          trigger: arg
+          trigger: arg,
+          dynamicFn: dynamicFn
+        });
+      }
+      if (dynamicFn) {
+        this._addPropertyEffect(sig.method, 'complexObserver', {
+          method: sig.method,
+          args: sig.args,
+          trigger: null,
+          dynamicFn: dynamicFn
         });
       }
     },
@@ -192,7 +216,8 @@
         negate: part.negate,
         method: part.signature.method,
         args: part.signature.args,
-        trigger: trigger
+        trigger: trigger,
+        dynamicFn: part.signature.dynamicFn
       });
     },
 
@@ -202,6 +227,10 @@
       var m = expression.match(/([^\s]+?)\(([\s\S]*)\)/);
       if (m) {
         var sig = { method: m[1], static: true };
+        if (this.properties[sig.method]) {
+          sig.static = false;
+          sig.dynamicFn = true;
+        }
         if (m[2].trim()) {
           // replace escaped commas with comma entity, split on un-escaped commas
           var args = m[2].replace(/\\,/g, '&comma;').split(',');
diff --git a/test/unit/bind.html b/test/unit/bind.html
index c13ed6fcda..a7f853f81b 100644
--- a/test/unit/bind.html
+++ b/test/unit/bind.html
@@ -310,6 +310,64 @@
     assert.equal(el.$.check.textContent, 'changed: Hello World.');
   });
 
+  test('observer with dynamic function', function() {
+    Polymer({
+      is: 'x-observer-with-dynamic-function',
+      properties: {
+        translate: {
+          type: Function,
+        },
+        message: {
+          type: String,
+          value: 'Hello'
+        },
+      },
+
+      observers: ['translate(message)'],
+
+    })
+
+    el = document.createElement('x-observer-with-dynamic-function');
+    document.body.appendChild(el);
+
+    var called = 0;
+    el.translate = function() {
+      called += 1;
+    };
+
+    assert.equal(called, 1);
+
+  });
+
+  test('computed property with dynamic function', function() {
+    Polymer({
+      is: 'x-computed-property-with-dynamic-function',
+      properties: {
+        computedValue: {
+          computed: "translate('Hello')"
+        },
+        translate: {
+          type: Function
+        }
+      }
+    });
+
+    el = document.createElement('x-computed-property-with-dynamic-function');
+    document.body.appendChild(el);
+
+    assert.equal(el.computedValue, undefined);
+
+    var called = 0;
+    el.translate = function(message) {
+      called += 1;
+      return 'translated: ' + message;
+    };
+
+    assert.equal(called, 1);
+    assert.equal(el.computedValue, 'translated: Hello');
+
+  });
+
 });
 
 </script>