@expressive/mvc 0.6.3 → 0.7.2

package/lib/index.js

@@ -204,22 +204,6 @@ class Model {
         defineProperty(this, "is", {
             value: this
         });
-        defineProperty(this, "set", {
-            configurable: true,
-            get: () => {
-                const controller = ensure(this);
-                const value = (key, value) => {
-                    controller.state.set(key, value);
-                    controller.update(key);
-                };
-                for (const key of controller.state.keys())
-                    defineProperty(value, key, {
-                        value: controller.ref(key)
-                    });
-                defineProperty(this, "set", { value });
-                return value;
-            }
-        });
     }
     get [STATE]() {
         return this.export();
@@ -482,8 +466,11 @@ class Controller {
             return;
         if (typeof value == "symbol") {
             const instruction = PENDING.get(value);
-            if (instruction)
+            if (instruction) {
+                delete subject[key];
+                PENDING.delete(value);
                 instruction.call(this, key, this);
+            }
             return;
         }
         state.set(key, value);
@@ -587,9 +574,6 @@ function apply(fn, label) {
     const placeholder = Symbol(`${name} instruction`);
     function setup(key) {
         const { subject, state } = this;
-        const control = this;
-        PENDING.delete(placeholder);
-        delete subject[key];
         let output = fn.call(this, key, this);
         if (typeof output == "function")
             output = { get: output };
@@ -612,6 +596,7 @@ function apply(fn, label) {
                         destroy();
                 });
         }
+        const control = this;
         defineProperty(subject, key, {
             enumerable: output.enumerable,
             set: onSet !== false
@@ -805,7 +790,7 @@ function get(arg0, arg1, arg2) {
                 throw new Error(`Factory argument cannot be ${arg1}`);
             getter = computeMode(this, source, setter, key, computeRequired);
         };
-        if (typeof arg0 == "function" && factoryRequired)
+        if (typeof arg0 == "function" && computeRequired)
             try {
                 init();
             }
@@ -821,18 +806,34 @@ function get(arg0, arg1, arg2) {
     });
 }
 
-function ref(callback) {
+function ref(arg, mapper) {
     return apply(function ref(key) {
-        const value = this.ref(key, callback && createValueEffect(callback));
-        defineProperty(value, "current", {
-            set: value,
-            get: () => this.state.get(key)
-        });
-        return {
-            value,
-            explicit: true
-        };
+        let value = {};
+        if (typeof arg != "object")
+            value = createRef(this, key, arg);
+        else
+            ensure(arg).state.forEach((_val, key) => {
+                defineProperty(value, key, mapper ? {
+                    configurable: true,
+                    get() {
+                        const out = mapper(key);
+                        defineProperty(value, key, { value: out });
+                        return out;
+                    }
+                } : {
+                    value: createRef(this, key)
+                });
+            });
+        return { value, explicit: true };
     });
+}
+function createRef(src, key, cb) {
+    const refObjectFunction = src.ref(key, cb && createValueEffect(cb));
+    defineProperty(refObjectFunction, "current", {
+        set: refObjectFunction,
+        get: () => src.state.get(key)
+    });
+    return refObjectFunction;
 }
 
 function set(value, argument) {
@@ -929,12 +930,15 @@ function createProxy(emit, watch) {
         assign(proxy, {
             from,
             delete(key) {
+                // TODO: this commit's fix needs tests.
+                // Was not cause by coverage.
+                const out = from.delete(key);
                 emit(key);
-                return from.delete(key);
+                return out;
             },
             clear() {
-                emit(ANY);
                 from.clear();
+                emit(ANY);
             },
             has(key) {
                 watch(this, key);
@@ -1114,26 +1118,10 @@ class Lookup {
     get(T) {
         return this[this.key(T)];
     }
-    push(I) {
-        const next = create(this);
-        if (I instanceof Model || typeof I == "function")
-            next.register(I);
-        else
-            for (const i of values(I))
-                next.register(i);
-        return next;
+    push() {
+        return create(this);
     }
-    register(I) {
-        let writable = true;
-        let T;
-        if (I instanceof Model) {
-            T = I.constructor;
-            writable = false;
-        }
-        else {
-            T = I;
-            I = I.create();
-        }
+    inject(T, I, writable) {
         do {
             const key = this.key(T);
             const conflict = this.hasOwnProperty(key);
@@ -1144,7 +1132,6 @@ class Lookup {
             });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        return I;
     }
     pop() {
         for (const key of getOwnPropertySymbols(this)) {
@@ -1427,7 +1414,28 @@ const Oops$1 = issues({
 function Provider(props) {
     if ("of" in props)
         throw Oops$1.PropDeprecated();
-    const context = useNewContext(props.for);
+    const from = useLookup();
+    const context = React__default["default"].useMemo(() => {
+        const I = props.for;
+        if (!I)
+            throw Oops$1.NoType();
+        const layer = from.push();
+        function register(I) {
+            if (I instanceof Model)
+                layer.inject(I.constructor, I, false);
+            else
+                layer.inject(I, I.create(), true);
+        }
+        if (I instanceof Model || typeof I == "function")
+            register(I);
+        else
+            values(I).forEach(register);
+        for (const instance of layer.local)
+            if (instance)
+                for (const apply of getPending(instance))
+                    apply(layer);
+        return layer;
+    }, []);
     const render = props.children;
     useAppliedProps(context, props);
     React__default["default"].useLayoutEffect(() => () => context.pop(), []);
@@ -1435,19 +1443,6 @@ function Provider(props) {
         ? React__default["default"].createElement(RenderFunction, { context, render })
         : render);
 }
-function useNewContext(inject) {
-    const from = useLookup();
-    return React__default["default"].useMemo(() => {
-        if (!inject)
-            throw Oops$1.NoType();
-        const context = from.push(inject);
-        for (const instance of context.local)
-            if (instance)
-                for (const apply of getPending(instance))
-                    apply(context);
-        return context;
-    }, []);
-}
 function useAppliedProps(within, props) {
     const update = React__default["default"].useMemo(() => {
         const targets = within.local;
@@ -1480,11 +1475,11 @@ const Oops = issues({
 const Active = new WeakMap();
 class Global extends MVC {
     static create(...args) {
-        const Type = this;
-        if (Active.has(Type))
+        if (Active.has(this))
             throw Oops.AlreadyExists(this.name);
-        const instance = super.create(...args);
-        Active.set(Type, instance);
+        const instance = new this(...args);
+        ensure(instance);
+        Active.set(this, instance);
         return instance;
     }
     /**