@expressive/mvc 0.21.3 → 0.21.8

package/lib/index.d.ts

@@ -71,7 +71,7 @@ declare namespace Control {
      */
     type OnReady<T extends Model> = (control: Control<T>) => Callback | void;
     type RequestRefresh = (update: (tick: number) => number) => void;
-    type HasHook = (type: typeof Model, relativeTo: Model, callback: (got: Model | undefined) => void) => void;
+    type GetContext = (target: Model) => (callback: (got: Context) => void) => void;
     type GetAdapter<T> = (refresh: RequestRefresh, context: Context) => {
         mount: () => (() => void) | void;
         render: () => T;
@@ -92,7 +92,7 @@ declare class Control<T extends Model = any> {
     static pending: Set<Callback>;
     static get: Control.GetHook;
     static use: Control.UseHook;
-    static has: Control.HasHook;
+    static has: Control.GetContext;
     static for: typeof control;
     static apply: typeof apply;
     static watch: typeof watch;

package/lib/index.esm.js

@@ -659,12 +659,16 @@ function get(arg0, arg1) {
             if (!hasParent) {
                 if (arg1 === true)
                     throw Oops$3.Required(arg0, subject);
-                source = callback => Control.has(arg0, subject, got => {
-                    if (got)
-                        callback(got);
-                    else if (arg1 !== false)
-                        throw Oops$3.AmbientRequired(arg0, subject);
-                });
+                const fetch = Control.has(subject);
+                source = got => {
+                    fetch(context => {
+                        const model = context.get(arg0);
+                        if (model)
+                            got(model);
+                        else if (arg1 !== false)
+                            throw Oops$3.AmbientRequired(arg0, subject);
+                    });
+                };
             }
             else if (!arg0 || hasParent instanceof arg0)
                 subject = hasParent;
@@ -862,18 +866,26 @@ function set(value, argument) {
                 return getter();
             };
         }
+        let setter = typeof argument == "function"
+            ? createValueEffect(argument)
+            : undefined;
         if (value !== undefined)
             state[key] = value;
+        else if (setter) {
+            const effect = setter;
+            setter = function (value) {
+                if (!(key in state))
+                    state[key] = undefined;
+                return effect.call(this, value);
+            };
+        }
         return {
             get: () => {
                 if (key in state)
                     return state[key];
-                else
-                    throw suspense(control, key);
+                throw suspense(control, key);
             },
-            set: typeof argument == "function"
-                ? createValueEffect(argument)
-                : undefined
+            set: setter
         };
     });
 }

package/lib/index.js

@@ -663,12 +663,16 @@ function get(arg0, arg1) {
             if (!hasParent) {
                 if (arg1 === true)
                     throw Oops$3.Required(arg0, subject);
-                source = callback => Control.has(arg0, subject, got => {
-                    if (got)
-                        callback(got);
-                    else if (arg1 !== false)
-                        throw Oops$3.AmbientRequired(arg0, subject);
-                });
+                const fetch = Control.has(subject);
+                source = got => {
+                    fetch(context => {
+                        const model = context.get(arg0);
+                        if (model)
+                            got(model);
+                        else if (arg1 !== false)
+                            throw Oops$3.AmbientRequired(arg0, subject);
+                    });
+                };
             }
             else if (!arg0 || hasParent instanceof arg0)
                 subject = hasParent;
@@ -866,18 +870,26 @@ function set(value, argument) {
                 return getter();
             };
         }
+        let setter = typeof argument == "function"
+            ? createValueEffect(argument)
+            : undefined;
         if (value !== undefined)
             state[key] = value;
+        else if (setter) {
+            const effect = setter;
+            setter = function (value) {
+                if (!(key in state))
+                    state[key] = undefined;
+                return effect.call(this, value);
+            };
+        }
         return {
             get: () => {
                 if (key in state)
                     return state[key];
-                else
-                    throw suspense(control, key);
+                throw suspense(control, key);
             },
-            set: typeof argument == "function"
-                ? createValueEffect(argument)
-                : undefined
+            set: setter
         };
     });
 }

package/package.json

@@ -27,5 +27,5 @@
     "preversion": "npm run test && npm run build",
     "postversion": "git push & npm publish"
   },
-  "version": "0.21.3"
+  "version": "0.21.8"
 }