@expressive/mvc 0.0.4 → 0.1.0

package/lib/index.js

@@ -156,9 +156,18 @@ const LOCAL = Symbol("LOCAL");
 const STATE = Symbol("STATE");
 class Model {
     constructor() {
-        define(this, CONTROL, new Controller(this));
+        const control = new Controller(this);
+        define(this, CONTROL, control);
         define(this, "get", this);
-        define(this, "set", this);
+        defineLazy(this, "set", () => {
+            const assign = (key, value) => {
+                control.update(key, value);
+            };
+            ready(control);
+            for (const key of getOwnPropertyNames(control.proxy))
+                define(assign, key, control.ref(key));
+            return assign;
+        });
     }
     get [STATE]() {
         return this[CONTROL].state;
@@ -295,10 +304,7 @@ class Model {
         return (typeof maybe == "function" &&
             maybe.prototype instanceof this);
     }
-}
-defineLazy(Model, CONTROL, function () {
-    return new Controller(this);
-});
+}
 
 class Subscriber {
     constructor(target, onUpdate) {
@@ -500,26 +506,28 @@ class Controller {
         this.proxy = Object.create(subject);
     }
     start() {
-        for (const key in this.subject)
-            this.manage(key);
+        READY.add(this);
+        for (const key in this.subject) {
+            const { value: entry } = getOwnPropertyDescriptor(this.subject, key);
+            if (typeof entry == "function")
+                continue;
+            if (typeof entry == "symbol") {
+                const instruction = PENDING.get(entry);
+                if (instruction)
+                    instruction.call(this, key, this);
+                continue;
+            }
+            this.manage(key, entry);
+        }
         this.emit([]);
     }
     stop() {
         this.followers.clear();
         this.onDestroy.forEach(x => x());
     }
-    manage(key) {
+    manage(key, value) {
         const { proxy, state, subject } = this;
-        const { value: entry } = getOwnPropertyDescriptor(subject, key);
-        if (typeof entry == "function")
-            return;
-        if (typeof entry == "symbol") {
-            const instruction = PENDING.get(entry);
-            if (instruction)
-                instruction.call(this, key, this);
-            return;
-        }
-        state[key] = entry;
+        state[key] = value;
         const set = this.ref(key);
         defineProperty(subject, key, {
             enumerable: false,
@@ -611,26 +619,23 @@ class Controller {
 }
 function control(subject, cb) {
     let control = subject[CONTROL];
-    const ready = READY.has(control);
     if (!control) {
         control = new Controller(subject);
         define(subject, CONTROL, control);
     }
-    if (!cb) {
-        if (!ready) {
-            READY.add(control);
-            control.start();
-        }
-        return control;
-    }
+    return ready(control, cb);
+}
+function ready(control, cb) {
+    const ready = READY.has(control);
     if (!ready) {
-        let done;
-        control.requestUpdate(() => {
-            done = cb(control);
-        });
-        return () => done && done();
+        if (cb) {
+            let done;
+            control.requestUpdate(() => done = cb(control));
+            return () => done && done();
+        }
+        control.start();
     }
-    return cb(control);
+    return cb ? cb(control) : control;
 }
 
 function apply(fn, label) {