@expressive/mvc 0.4.0 → 0.4.1

package/lib/index.js

@@ -940,8 +940,9 @@ function parent(Expects, required) {
 
 const ANY$1 = Symbol("any");
 function managedMap(control, property, initial) {
-    const context = new WeakMap();
     const lastUpdate = new Set();
+    const context = new WeakMap();
+    const assoc = new WeakMap();
     let managed;
     let value;
     function reset() {
@@ -958,6 +959,11 @@ function managedMap(control, property, initial) {
         control.state.set(property, next);
         if (!initial)
             emit(ANY$1);
+        const watch = (key, on) => {
+            const local = assoc.get(on);
+            if (local)
+                local(key);
+        };
         managed.set = (k, v) => {
             emit(k);
             return value.set(k, v);
@@ -970,56 +976,56 @@ function managedMap(control, property, initial) {
             emit(ANY$1);
             value.clear();
         };
-    }
-    function getValue(local) {
-        if (!local)
-            return managed;
-        if (context.has(local))
-            return context.get(local);
-        const proxy = Object.create(managed);
-        const using = new Set();
-        context.set(local, proxy);
-        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;
-        });
-        const watch = (key) => {
-            if (!local.active)
-                using.add(key);
-        };
-        proxy.get = (key) => {
-            watch(key);
+        managed.get = function (key) {
+            watch(key, this);
             return value.get(key);
         };
-        proxy.has = (key) => {
-            watch(key);
+        managed.has = function (key) {
+            watch(key, this);
             return value.has(key);
         };
-        proxy.values = () => {
-            watch(ANY$1);
+        managed.values = function () {
+            watch(ANY$1, this);
             return value.values();
         };
-        proxy.keys = () => {
-            watch(ANY$1);
+        managed.keys = function () {
+            watch(ANY$1, this);
             return value.keys();
         };
-        proxy.entries = () => {
-            watch(ANY$1);
+        managed.entries = function () {
+            watch(ANY$1, this);
             return value.entries();
         };
-        proxy[Symbol.iterator] = () => {
-            watch(ANY$1);
+        managed[Symbol.iterator] = function () {
+            watch(ANY$1, this);
             return value[Symbol.iterator]();
         };
-        defineProperty(proxy, "size", {
+        defineProperty(managed, "size", {
             get() {
-                watch(ANY$1);
+                watch(ANY$1, this);
                 return value.size;
             }
         });
+    }
+    function getValue(local) {
+        if (!local)
+            return managed;
+        if (context.has(local))
+            return context.get(local);
+        const proxy = Object.create(managed);
+        const using = new Set();
+        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;
+        });
         return proxy;
     }
     setValue(initial, true);
@@ -1031,8 +1037,9 @@ function managedMap(control, property, initial) {
 
 const ANY = Symbol("any");
 function managedSet(control, property, initial) {
-    const context = new WeakMap();
     const lastUpdate = new Set();
+    const context = new WeakMap();
+    const assoc = new WeakMap();
     let managed;
     let value;
     function reset() {
@@ -1049,6 +1056,11 @@ function managedSet(control, property, initial) {
         control.state.set(property, next);
         if (!initial)
             emit(ANY);
+        const watch = (key, on) => {
+            const local = assoc.get(on);
+            if (local)
+                local(key);
+        };
         managed.add = (k) => {
             emit(k);
             return value.add(k);
@@ -1061,6 +1073,32 @@ function managedSet(control, property, initial) {
             emit(ANY);
             value.clear();
         };
+        managed.has = function (key) {
+            watch(key, this);
+            return value.has(key);
+        };
+        managed.values = function () {
+            watch(ANY, this);
+            return value.values();
+        };
+        managed.keys = function () {
+            watch(ANY, this);
+            return value.keys();
+        };
+        managed.entries = function () {
+            watch(ANY, this);
+            return value.entries();
+        };
+        managed[Symbol.iterator] = function () {
+            watch(ANY, this);
+            return value[Symbol.iterator]();
+        };
+        defineProperty(managed, "size", {
+            get() {
+                watch(ANY, this);
+                return value.size;
+            }
+        });
     }
     function getValue(local) {
         if (!local)
@@ -1070,6 +1108,10 @@ function managedSet(control, property, initial) {
         const proxy = Object.create(managed);
         const using = new Set();
         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;
@@ -1077,36 +1119,6 @@ function managedSet(control, property, initial) {
                 if (using.has(key))
                     return true;
         });
-        const watch = (key) => {
-            if (!local.active)
-                using.add(key);
-        };
-        proxy.has = (key) => {
-            watch(key);
-            return value.has(key);
-        };
-        proxy.values = () => {
-            watch(ANY);
-            return value.values();
-        };
-        proxy.keys = () => {
-            watch(ANY);
-            return value.keys();
-        };
-        proxy.entries = () => {
-            watch(ANY);
-            return value.entries();
-        };
-        proxy[Symbol.iterator] = () => {
-            watch(ANY);
-            return value[Symbol.iterator]();
-        };
-        defineProperty(proxy, "size", {
-            get() {
-                watch(ANY);
-                return value.size;
-            }
-        });
         return proxy;
     }
     setValue(initial, true);