@expressive/mvc 0.24.1 → 0.24.2

package/lib/index.d.ts

@@ -22,15 +22,12 @@ declare namespace Context {
     };
 }
 declare class Context {
-    /** Use  */
     key: string;
     private table;
     private layer;
     private has;
     get<T extends Model>(Type: Model.Type<T>): T | undefined;
     include(inputs: Context.Inputs): Map<Model, boolean>;
-    /** Context must force-reset becasue inputs are no longer safe. */
-    private bailout;
     add<T extends Model>(input: T | Model.New<T>, implicit?: boolean): T;
     push(): this;
     pop(): void;
@@ -69,7 +66,7 @@ declare namespace Control {
      * Callback for Controller.for() static method.
      * Returned callback is forwarded.
      */
-    type OnReady<T extends Model> = (control: Control<T>) => Callback | void;
+    type OnReady<T extends {}> = (control: Control<T>) => Callback | void;
     type RequestRefresh = (update: (tick: number) => number) => void;
     type GetContext = (target: Model) => (callback: (got: Context) => void) => void;
     type GetAdapter<T> = (refresh: RequestRefresh, context: Context) => {
@@ -84,7 +81,7 @@ declare namespace Control {
     };
     type UseHook = <T extends Model, R>(adapter: UseAdapter<T, R>) => R;
 }
-declare class Control<T extends Model = any> {
+declare class Control<T extends {} = any> {
     subject: T;
     id: string | number;
     static after: Set<Callback>;
@@ -113,7 +110,7 @@ declare class Control<T extends Model = any> {
 }
 declare function control<T extends Model>(subject: T, ready: Control.OnReady<T>): Callback;
 declare function control<T extends Model>(subject: T, ready?: boolean): Control<T>;
-declare function watch<T extends Model>(on: T, cb: Observer): T;
+declare function watch<T extends {}>(on: T, cb: Observer): T;
 declare function apply<T = any>(instruction: Control.Instruction<T>): T;
 
 declare const STATE = "__state";
@@ -156,7 +153,7 @@ type Debug<T extends Model = Model> = T & {
 };
 
 /** Type may not be undefined - instead will be null.  */
-type NoVoid<T> = T extends undefined ? null : T;
+type NoVoid<T> = T extends undefined | void ? null : T;
 declare function get$1<T extends Model>(this: Model.Type<T>): T;
 /** Fetch instance of this class in passive mode. Will not subscribe to events. */
 declare function get$1<T extends Model>(this: Model.Type<T>, ignoreUpdates?: true): T;
@@ -387,11 +384,12 @@ declare function use<T extends Model>(): T | undefined;
 /** Create a new child instance of model. */
 declare function use<T extends Model>(Type: Model.New<T>, callback?: (i: T) => void): T;
 /** Assign the result of a factory as a child model. */
-declare function use<T extends Model>(from: () => Promise<T> | T, required?: true): T;
+declare function use<T extends {}>(from: () => Promise<T> | T, required?: true): T;
 /** Assign the result of a factory as a child model. */
-declare function use<T extends Model>(from: () => Promise<T> | T, required: boolean): T | undefined;
+declare function use<T extends {}>(from: () => Promise<T> | T, required: boolean): T | undefined;
 /** Create a managed child from factory function. */
-declare function use<T extends Model>(from: () => Promise<T> | T, callback?: (i: T) => void): T;
+declare function use<T extends {}>(from: () => Promise<T> | T, callback?: (i: T) => void): T;
+declare function use<T extends {}>(data: T): T;
 /**
   * Create child-instance relationship with provided model.
   *

package/lib/index.esm.js

@@ -226,9 +226,6 @@ function get$1(arg1, arg2) {
         const found = context.get(this);
         if (!found)
             throw Oops$6.NotFound(this);
-        proxy = Control.watch(found, () => factory ? null : onUpdate);
-        getValue = () => compute.call(proxy, proxy, forceUpdate);
-        value = getValue();
         function forceUpdate(action) {
             if (typeof action == "function")
                 action = action();
@@ -239,6 +236,18 @@ function get$1(arg1, arg2) {
             if (action)
                 return action.finally(refresh);
         }
+        function didUpdate(got) {
+            value = got;
+            if (suspense) {
+                suspense();
+                suspense = undefined;
+            }
+            else
+                refresh();
+        }
+        proxy = Control.watch(found, () => factory ? null : onUpdate);
+        getValue = () => compute.call(proxy, proxy, forceUpdate);
+        value = getValue();
         if (value === null) {
             getValue = undefined;
             onUpdate = null;
@@ -251,15 +260,6 @@ function get$1(arg1, arg2) {
             compute = () => get();
             value = get();
         }
-        const didUpdate = (got) => {
-            value = got;
-            if (suspense) {
-                suspense();
-                suspense = undefined;
-            }
-            else
-                refresh();
-        };
         if (value instanceof Promise) {
             onUpdate = null;
             value.then(didUpdate);
@@ -444,7 +444,7 @@ class Control {
         const instruction = INSTRUCTION.get(value);
         if (typeof instruction == "function") {
             INSTRUCTION.delete(value);
-            instruction(key, this);
+            instruction(this, key);
         }
         else if (value instanceof Model)
             setRecursive(this, key, value);
@@ -453,7 +453,7 @@ class Control {
     }
     watch(key, output) {
         const { state } = this;
-        const { get, set, enumerable = true } = output;
+        const { set, enumerable = true } = output;
         const subs = new Set();
         this.observers.set(key, subs);
         if ("value" in output)
@@ -467,8 +467,9 @@ class Control {
                 const event = OBSERVER.get(this);
                 if (event)
                     subs.add(event);
-                const value = get ? get(this) : state[key];
-                return event && value instanceof Model
+                const value = output.get
+                    ? output.get(this) : state[key];
+                return event && REGISTER.has(value)
                     ? watch(value, event)
                     : value;
             }
@@ -598,7 +599,7 @@ function watch(on, cb) {
 }
 function apply(instruction) {
     const placeholder = Symbol("instruction");
-    INSTRUCTION.set(placeholder, (key, onto) => {
+    INSTRUCTION.set(placeholder, (onto, key) => {
         delete onto.subject[key];
         const output = instruction.call(onto, key, onto);
         if (output)
@@ -900,69 +901,63 @@ function use(input, argument) {
     return apply((key, source) => {
         const { state, subject } = source;
         const required = argument !== false;
-        let pending;
-        let error;
         if (typeof input === "function") {
             if ("prototype" in input && input === input.prototype.constructor)
                 input = new input();
         }
         else if (input && typeof input !== "object")
             throw Oops$1.BadArgument(typeof input);
-        const onUpdate = (next) => {
-            state[key] = next;
-            if (next) {
-                parent(next, subject);
-                control(next, true);
-            }
-            if (typeof argument == "function")
-                argument(next);
-            return true;
-        };
-        const suspend = () => {
-            if (required === false)
-                return;
-            const issue = Oops$1.NotReady(subject, key);
-            assign(pending, {
-                message: issue.message,
-                stack: issue.stack
-            });
-            throw pending;
-        };
-        const initialize = () => {
-            const output = typeof input == "function" ?
+        function init() {
+            const result = typeof input == "function" ?
                 mayRetry(() => input.call(subject, subject)) :
                 input;
-            if (output instanceof Promise) {
-                pending = output
-                    .then(val => {
-                    onUpdate(val);
-                    return val;
+            if (result instanceof Promise) {
+                const pending = result
+                    .then(value => {
+                    output.get = undefined;
+                    set(value);
+                    return value;
+                })
+                    .catch(err => {
+                    output.get = () => { throw err; };
                 })
-                    .catch(err => error = err)
                     .finally(() => {
-                    pending = undefined;
                     source.update(key);
                 });
-                return;
+                if (required !== false)
+                    output.get = () => {
+                        throw assign(pending, Oops$1.NotReady(subject, key));
+                    };
             }
-            onUpdate(output);
-        };
-        if (input !== undefined && required)
-            initialize();
-        return {
-            set: onUpdate,
-            get() {
-                if (pending)
-                    return suspend();
-                if (error)
-                    throw error;
-                if (!(key in state))
-                    initialize();
-                if (pending)
-                    return suspend();
-                return state[key];
+            else
+                set(result);
+        }
+        function set(next) {
+            if (next instanceof Model) {
+                parent(next, subject);
+                control(next, true);
             }
-        };
+            else if (next) {
+                const control = new Control(create(next));
+                control.state = next;
+                for (const key in next)
+                    control.watch(key, {});
+                next = control.subject;
+            }
+            state[key] = next;
+            if (typeof argument == "function")
+                argument(next);
+            return true;
+        }
+        const output = { set };
+        if (required)
+            init();
+        else
+            output.get = () => {
+                init();
+                return state[key];
+            };
+        return output;
     });
 }
 
@@ -998,8 +993,12 @@ class Context {
                 this.layer.set(key, input);
                 init.set(instance, true);
             }
-            else if (exists !== input)
-                return this.bailout(inputs);
+            // Context must force-reset becasue inputs are no longer safe.
+            else if (exists !== input) {
+                this.pop();
+                this.key = uid();
+                return this.include(inputs);
+            }
         }
         for (const [model] of init) {
             const { state } = control(model, true);
@@ -1012,12 +1011,6 @@ class Context {
         }
         return init;
     }
-    /** Context must force-reset becasue inputs are no longer safe. */
-    bailout(inputs) {
-        this.pop();
-        this.key = uid();
-        return this.include(inputs);
-    }
     add(input, implicit) {
         let writable = true;
         let T;

package/lib/index.js

@@ -230,9 +230,6 @@ function get$1(arg1, arg2) {
         const found = context.get(this);
         if (!found)
             throw Oops$6.NotFound(this);
-        proxy = Control.watch(found, () => factory ? null : onUpdate);
-        getValue = () => compute.call(proxy, proxy, forceUpdate);
-        value = getValue();
         function forceUpdate(action) {
             if (typeof action == "function")
                 action = action();
@@ -243,6 +240,18 @@ function get$1(arg1, arg2) {
             if (action)
                 return action.finally(refresh);
         }
+        function didUpdate(got) {
+            value = got;
+            if (suspense) {
+                suspense();
+                suspense = undefined;
+            }
+            else
+                refresh();
+        }
+        proxy = Control.watch(found, () => factory ? null : onUpdate);
+        getValue = () => compute.call(proxy, proxy, forceUpdate);
+        value = getValue();
         if (value === null) {
             getValue = undefined;
             onUpdate = null;
@@ -255,15 +264,6 @@ function get$1(arg1, arg2) {
             compute = () => get();
             value = get();
         }
-        const didUpdate = (got) => {
-            value = got;
-            if (suspense) {
-                suspense();
-                suspense = undefined;
-            }
-            else
-                refresh();
-        };
         if (value instanceof Promise) {
             onUpdate = null;
             value.then(didUpdate);
@@ -448,7 +448,7 @@ class Control {
         const instruction = INSTRUCTION.get(value);
         if (typeof instruction == "function") {
             INSTRUCTION.delete(value);
-            instruction(key, this);
+            instruction(this, key);
         }
         else if (value instanceof Model)
             setRecursive(this, key, value);
@@ -457,7 +457,7 @@ class Control {
     }
     watch(key, output) {
         const { state } = this;
-        const { get, set, enumerable = true } = output;
+        const { set, enumerable = true } = output;
         const subs = new Set();
         this.observers.set(key, subs);
         if ("value" in output)
@@ -471,8 +471,9 @@ class Control {
                 const event = OBSERVER.get(this);
                 if (event)
                     subs.add(event);
-                const value = get ? get(this) : state[key];
-                return event && value instanceof Model
+                const value = output.get
+                    ? output.get(this) : state[key];
+                return event && REGISTER.has(value)
                     ? watch(value, event)
                     : value;
             }
@@ -602,7 +603,7 @@ function watch(on, cb) {
 }
 function apply(instruction) {
     const placeholder = Symbol("instruction");
-    INSTRUCTION.set(placeholder, (key, onto) => {
+    INSTRUCTION.set(placeholder, (onto, key) => {
         delete onto.subject[key];
         const output = instruction.call(onto, key, onto);
         if (output)
@@ -904,69 +905,63 @@ function use(input, argument) {
     return apply((key, source) => {
         const { state, subject } = source;
         const required = argument !== false;
-        let pending;
-        let error;
         if (typeof input === "function") {
             if ("prototype" in input && input === input.prototype.constructor)
                 input = new input();
         }
         else if (input && typeof input !== "object")
             throw Oops$1.BadArgument(typeof input);
-        const onUpdate = (next) => {
-            state[key] = next;
-            if (next) {
-                parent(next, subject);
-                control(next, true);
-            }
-            if (typeof argument == "function")
-                argument(next);
-            return true;
-        };
-        const suspend = () => {
-            if (required === false)
-                return;
-            const issue = Oops$1.NotReady(subject, key);
-            assign(pending, {
-                message: issue.message,
-                stack: issue.stack
-            });
-            throw pending;
-        };
-        const initialize = () => {
-            const output = typeof input == "function" ?
+        function init() {
+            const result = typeof input == "function" ?
                 mayRetry(() => input.call(subject, subject)) :
                 input;
-            if (output instanceof Promise) {
-                pending = output
-                    .then(val => {
-                    onUpdate(val);
-                    return val;
+            if (result instanceof Promise) {
+                const pending = result
+                    .then(value => {
+                    output.get = undefined;
+                    set(value);
+                    return value;
+                })
+                    .catch(err => {
+                    output.get = () => { throw err; };
                 })
-                    .catch(err => error = err)
                     .finally(() => {
-                    pending = undefined;
                     source.update(key);
                 });
-                return;
+                if (required !== false)
+                    output.get = () => {
+                        throw assign(pending, Oops$1.NotReady(subject, key));
+                    };
             }
-            onUpdate(output);
-        };
-        if (input !== undefined && required)
-            initialize();
-        return {
-            set: onUpdate,
-            get() {
-                if (pending)
-                    return suspend();
-                if (error)
-                    throw error;
-                if (!(key in state))
-                    initialize();
-                if (pending)
-                    return suspend();
-                return state[key];
+            else
+                set(result);
+        }
+        function set(next) {
+            if (next instanceof Model) {
+                parent(next, subject);
+                control(next, true);
             }
-        };
+            else if (next) {
+                const control = new Control(create(next));
+                control.state = next;
+                for (const key in next)
+                    control.watch(key, {});
+                next = control.subject;
+            }
+            state[key] = next;
+            if (typeof argument == "function")
+                argument(next);
+            return true;
+        }
+        const output = { set };
+        if (required)
+            init();
+        else
+            output.get = () => {
+                init();
+                return state[key];
+            };
+        return output;
     });
 }
 
@@ -1002,8 +997,12 @@ class Context {
                 this.layer.set(key, input);
                 init.set(instance, true);
             }
-            else if (exists !== input)
-                return this.bailout(inputs);
+            // Context must force-reset becasue inputs are no longer safe.
+            else if (exists !== input) {
+                this.pop();
+                this.key = uid();
+                return this.include(inputs);
+            }
         }
         for (const [model] of init) {
             const { state } = control(model, true);
@@ -1016,12 +1015,6 @@ class Context {
         }
         return init;
     }
-    /** Context must force-reset becasue inputs are no longer safe. */
-    bailout(inputs) {
-        this.pop();
-        this.key = uid();
-        return this.include(inputs);
-    }
     add(input, implicit) {
         let writable = true;
         let T;

package/package.json

@@ -22,8 +22,10 @@
   "scripts": {
     "build": "rollup --config",
     "watch": "jest --watchAll",
-    "test": "jest --collectCoverage"
+    "test": "jest --collectCoverage",
+    "prebuild": "rm -rf lib/",
+    "preversion": "npm run test && npm run build"
   },
-  "version": "0.24.1",
-  "gitHead": "09e4f6dfecbc618f675d6f3f8e2bad15c1bebf40"
+  "version": "0.24.2",
+  "gitHead": "97e6daffcf793d8aa1152d553b4c427546e90dbc"
 }