@expressive/mvc 0.4.2 → 0.4.3

package/lib/index.js

@@ -946,11 +946,9 @@ function parent(Expects, required) {
 
 const ANY$1 = Symbol("any");
 function managedMap(control, property, initial) {
-    const lastUpdate = new Set();
+    const managed = new ManagedMap(initial, emit);
     const context = new WeakMap();
-    const assoc = new WeakMap();
-    let managed;
-    let value;
+    const lastUpdate = new Set();
     function reset() {
         lastUpdate.clear();
     }
@@ -959,59 +957,10 @@ function managedMap(control, property, initial) {
         control.update(property);
         control.waiting.add(reset);
     }
-    function setValue(next, initial) {
-        value = next;
-        managed = create(next);
+    function setValue(next) {
         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);
-        };
-        managed.delete = (k) => {
-            emit(k);
-            return value.delete(k);
-        };
-        managed.clear = () => {
-            emit(ANY$1);
-            value.clear();
-        };
-        managed.get = function (key) {
-            watch(key, this);
-            return value.get(key);
-        };
-        managed.has = function (key) {
-            watch(key, this);
-            return value.has(key);
-        };
-        managed.values = function () {
-            watch(ANY$1, this);
-            return value.values();
-        };
-        managed.keys = function () {
-            watch(ANY$1, this);
-            return value.keys();
-        };
-        managed.entries = function () {
-            watch(ANY$1, this);
-            return value.entries();
-        };
-        managed[Symbol.iterator] = function () {
-            watch(ANY$1, this);
-            return value[Symbol.iterator]();
-        };
-        defineProperty(managed, "size", {
-            get() {
-                watch(ANY$1, this);
-                return value.size;
-            }
-        });
+        managed.source = next;
+        emit(ANY$1);
     }
     function getValue(local) {
         if (!local)
@@ -1019,7 +968,7 @@ function managedMap(control, property, initial) {
         if (context.has(local))
             return context.get(local);
         const refresh = local.onUpdate(property, control);
-        const proxy = Object.create(managed);
+        const proxy = create(managed);
         const using = new Set();
         const update = () => {
             if (using.has(ANY$1) || lastUpdate.has(ANY$1) && using.size)
@@ -1031,28 +980,80 @@ function managedMap(control, property, initial) {
                         break;
                     }
         };
+        local.add(property, () => update);
         context.set(local, proxy);
-        assoc.set(proxy, (key) => {
+        proxy.watch = (key) => {
             if (!local.active)
                 using.add(key);
-        });
-        local.add(property, () => update);
+        };
         return proxy;
     }
-    setValue(initial, true);
     return {
+        value: initial,
         set: setValue,
         get: getValue
     };
+}
+class ManagedMap {
+    constructor(source, emit) {
+        this.source = source;
+        this.emit = emit;
+    }
+    watch(_key) { }
+    set(key, value) {
+        this.source.set(key, value);
+        this.emit(key);
+        return this;
+    }
+    ;
+    delete(key) {
+        this.emit(key);
+        return this.source.delete(key);
+    }
+    ;
+    clear() {
+        this.emit(ANY$1);
+        this.source.clear();
+    }
+    get(key) {
+        this.watch(key);
+        return this.source.get(key);
+    }
+    ;
+    has(key) {
+        this.watch(key);
+        return this.source.has(key);
+    }
+    ;
+    values() {
+        this.watch(ANY$1);
+        return this.source.values();
+    }
+    keys() {
+        this.watch(ANY$1);
+        return this.source.keys();
+    }
+    entries() {
+        this.watch(ANY$1);
+        return this.source.entries();
+    }
+    ;
+    [Symbol.iterator]() {
+        this.watch(ANY$1);
+        return this.source[Symbol.iterator]();
+    }
+    ;
+    get size() {
+        this.watch(ANY$1);
+        return this.source.size;
+    }
 }
 
 const ANY = Symbol("any");
 function managedSet(control, property, initial) {
-    const lastUpdate = new Set();
+    const managed = new ManagedSet(initial, emit);
     const context = new WeakMap();
-    const assoc = new WeakMap();
-    let managed;
-    let value;
+    const lastUpdate = new Set();
     function reset() {
         lastUpdate.clear();
     }
@@ -1061,55 +1062,10 @@ function managedSet(control, property, initial) {
         control.update(property);
         control.waiting.add(reset);
     }
-    function setValue(next, initial) {
-        value = next;
-        managed = create(next);
+    function setValue(next) {
+        managed.source = next;
         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);
-        };
-        managed.delete = (k) => {
-            emit(k);
-            return value.delete(k);
-        };
-        managed.clear = () => {
-            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;
-            }
-        });
+        emit(ANY);
     }
     function getValue(local) {
         if (!local)
@@ -1117,7 +1073,7 @@ function managedSet(control, property, initial) {
         if (context.has(local))
             return context.get(local);
         const refresh = local.onUpdate(property, control);
-        const proxy = Object.create(managed);
+        const proxy = create(managed);
         const using = new Set();
         const update = () => {
             if (using.has(ANY) || lastUpdate.has(ANY) && using.size)
@@ -1129,19 +1085,67 @@ function managedSet(control, property, initial) {
                         break;
                     }
         };
+        local.add(property, () => update);
         context.set(local, proxy);
-        assoc.set(proxy, (key) => {
+        proxy.watch = (key) => {
             if (!local.active)
                 using.add(key);
-        });
-        local.add(property, () => update);
+        };
         return proxy;
     }
-    setValue(initial, true);
     return {
+        value: initial,
         set: setValue,
         get: getValue
     };
+}
+class ManagedSet {
+    constructor(source, emit) {
+        this.source = source;
+        this.emit = emit;
+    }
+    watch(_key) { }
+    add(key) {
+        this.emit(key);
+        return this.source.add(key);
+    }
+    ;
+    delete(key) {
+        this.emit(key);
+        return this.source.delete(key);
+    }
+    ;
+    clear() {
+        this.emit(ANY);
+        this.source.clear();
+    }
+    has(key) {
+        this.watch(key);
+        return this.source.has(key);
+    }
+    ;
+    values() {
+        this.watch(ANY);
+        return this.source.values();
+    }
+    keys() {
+        this.watch(ANY);
+        return this.source.keys();
+    }
+    entries() {
+        this.watch(ANY);
+        return this.source.entries();
+    }
+    ;
+    [Symbol.iterator]() {
+        this.watch(ANY);
+        return this.source[Symbol.iterator]();
+    }
+    ;
+    get size() {
+        this.watch(ANY);
+        return this.source.size;
+    }
 }
 
 const Oops$5 = issues({