@expressive/mvc 0.4.1 → 0.4.2

package/lib/index.js

@@ -302,10 +302,16 @@ class Subscriber {
             if (!this.active || !using.has(key))
                 return;
             const handler = using.get(key);
-            if (typeof handler == "function")
-                if (handler() !== true)
-                    return;
-            const notify = this.onUpdate(key, parent);
+            let notify;
+            if (typeof handler == "function") {
+                const callback = handler();
+                if (typeof callback == "function")
+                    notify = callback;
+                else if (callback === true)
+                    notify = this.onUpdate(key, parent);
+            }
+            else
+                notify = this.onUpdate(key, parent);
             const getWhy = () => {
                 const update = getUpdate(parent.subject);
                 const applicable = update.filter(k => using.has(k));
@@ -1012,20 +1018,25 @@ function managedMap(control, property, initial) {
             return managed;
         if (context.has(local))
             return context.get(local);
+        const refresh = local.onUpdate(property, control);
         const proxy = Object.create(managed);
         const using = new Set();
+        const update = () => {
+            if (using.has(ANY$1) || lastUpdate.has(ANY$1) && using.size)
+                refresh();
+            else
+                for (const key of lastUpdate)
+                    if (using.has(key)) {
+                        refresh();
+                        break;
+                    }
+        };
         context.set(local, proxy);
         assoc.set(proxy, (key) => {
             if (!local.active)
                 using.add(key);
         });
-        local.add(property, () => {
-            if (using.has(ANY$1) || lastUpdate.has(ANY$1) && using.size)
-                return true;
-            for (const key of lastUpdate)
-                if (using.has(key))
-                    return true;
-        });
+        local.add(property, () => update);
         return proxy;
     }
     setValue(initial, true);
@@ -1105,20 +1116,25 @@ function managedSet(control, property, initial) {
             return managed;
         if (context.has(local))
             return context.get(local);
+        const refresh = local.onUpdate(property, control);
         const proxy = Object.create(managed);
         const using = new Set();
+        const update = () => {
+            if (using.has(ANY) || lastUpdate.has(ANY) && using.size)
+                refresh();
+            else
+                for (const key of lastUpdate)
+                    if (using.has(key)) {
+                        refresh();
+                        break;
+                    }
+        };
         context.set(local, proxy);
         assoc.set(proxy, (key) => {
             if (!local.active)
                 using.add(key);
         });
-        local.add(property, () => {
-            if (using.has(ANY) || lastUpdate.has(ANY) && using.size)
-                return true;
-            for (const key of lastUpdate)
-                if (using.has(key))
-                    return true;
-        });
+        local.add(property, () => update);
         return proxy;
     }
     setValue(initial, true);