@expressive/mvc 0.24.1 → 0.25.0

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;
@@ -60,16 +57,17 @@ declare namespace Control {
     type Getter<T> = (source: Model) => T;
     type Setter<T> = (value: T) => boolean | void;
     type PropertyDescriptor<T = any> = {
-        enumerable?: boolean;
-        value?: T;
         get?: Getter<T>;
         set?: Setter<T> | false;
+        enumerable?: boolean;
+        value?: T;
     };
+    type Callback = (control: Control) => void;
     /**
      * 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>) => (() => void) | void;
     type RequestRefresh = (update: (tick: number) => number) => void;
     type GetContext = (target: Model) => (callback: (got: Context) => void) => void;
     type GetAdapter<T> = (refresh: RequestRefresh, context: Context) => {
@@ -78,15 +76,14 @@ declare namespace Control {
     } | void;
     type GetHook = <T>(adapter: GetAdapter<T>) => T | null;
     type UseAdapter<T extends Model, R> = (refresh: RequestRefresh) => {
-        local: T;
+        instance: T;
         mount: () => (() => void) | void;
         render: R;
     };
     type UseHook = <T extends Model, R>(adapter: UseAdapter<T, R>) => R;
 }
-declare class Control<T extends Model = any> {
-    subject: T;
-    id: string | number;
+declare class Control<T extends {} = any> {
+    static ready: Set<Control.Callback>;
     static after: Set<Callback>;
     static before: Set<Callback>;
     static pending: Set<Callback>;
@@ -96,6 +93,8 @@ declare class Control<T extends Model = any> {
     static for: typeof control;
     static apply: typeof apply;
     static watch: typeof watch;
+    id: string | number;
+    subject: T;
     state: {
         [key: string]: any;
     };
@@ -113,7 +112,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,20 +155,13 @@ type Debug<T extends Model = Model> = T & {
 };
 
 /** Type may not be undefined - instead will be null.  */
-type NoVoid<T> = T extends undefined ? 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. */
+type NoVoid<T> = T extends undefined | void ? null : T;
+/** Fetch instance of this class from context. */
 declare function get$1<T extends Model>(this: Model.Type<T>, ignoreUpdates?: true): T;
 /** Fetch instance of this class optionally. May be undefined, but will never subscribe. */
 declare function get$1<T extends Model>(this: Model.Type<T>, required: boolean): T | undefined;
-declare function get$1<T extends Model, R extends []>(this: Model.Type<T>, factory: Model.GetCallback<T, R | (() => R)>, expect?: boolean): R;
-declare function get$1<T extends Model, R extends []>(this: Model.Type<T>, factory: Model.GetCallback<T, Promise<R> | (() => R) | null>, expect?: boolean): R | null;
-declare function get$1<T extends Model, R extends []>(this: Model.Type<T>, factory: Model.GetCallback<T, Promise<R> | R>, expect: true): Exclude<R, undefined>;
-declare function get$1<T extends Model, R>(this: Model.Type<T>, init: Model.GetCallback<T, () => R>): NoVoid<R>;
-declare function get$1<T extends Model, R>(this: Model.Type<T>, init: Model.GetCallback<T, (() => R) | null>): NoVoid<R> | null;
-declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.GetCallback<T, Promise<R> | R>, expect: true): Exclude<R, undefined>;
-declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.GetCallback<T, Promise<R>>, expect?: boolean): NoVoid<R> | null;
-declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.GetCallback<T, R>, expect?: boolean): NoVoid<R>;
+declare function get$1<T extends Model, R>(this: Model.Type<T>, factory: Model.GetCallback<T, (() => R) | R | Promise<R>>): NoVoid<R>;
+declare function get$1<T extends Model, R>(this: Model.Type<T>, factory: Model.GetCallback<T, (() => R) | null>): NoVoid<R> | null;
 
 declare function use$1<T extends Model>(this: Model.New<T>, callback?: (instance: T) => void, repeat?: boolean): T;
 declare function use$1<T extends Model>(this: Model.New<T>, apply?: Model.Compat<T>, repeat?: boolean): T;
@@ -254,7 +246,7 @@ declare class Model {
     get<P extends Model.Key<this>>(select: Iterable<P>): Model.Get<this, P>;
     get<P extends Model.Key<this>>(select: P, listener: (this: this, value: this[P]) => void): Callback;
     get<P extends Model.Key<this>>(select: Iterable<P>, listener: (this: this, value: Model.Get<this, P>) => void): Callback;
-    set<T extends Model.Compat<this>>(source: T, select?: (keyof T)[]): Promise<Model.Key<T>[]>;
+    set<T extends Model.Compat<this>>(source: T, only?: (keyof T)[]): Promise<Model.Key<T>[]>;
     set<K extends Model.Event<this>>(key: K, value?: Model.ValueOf<this, K>): Promise<Model.Event<this>[] | false>;
     /** Mark this instance for garbage collection. */
     null(): void;
@@ -387,11 +379,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

@@ -197,18 +197,18 @@ function awaitUpdate(source, select, timeout) {
 const Oops$6 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
-function get$1(arg1, arg2) {
+function get$1(argument) {
     return Control.get((dispatch, context) => {
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
         let value;
-        if (typeof arg1 !== "function") {
+        if (typeof argument !== "function") {
             const got = context.get(this);
             if (got)
-                value = arg1 === undefined
+                value = argument === undefined
                     ? Control.watch(got, k => k ? onUpdate : undefined)
                     : got;
-            else if (arg1 !== false)
+            else if (argument !== false)
                 throw Oops$6.NotFound(this);
             return {
                 mount() {
@@ -218,7 +218,7 @@ function get$1(arg1, arg2) {
                 render: () => value
             };
         }
-        let compute = arg1;
+        let compute = argument;
         let suspense;
         let getValue;
         let factory;
@@ -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);
@@ -268,7 +268,7 @@ function get$1(arg1, arg2) {
         else
             onUpdate = () => {
                 const next = getValue();
-                if (notEqual(value, next))
+                if (value !== next)
                     didUpdate(next);
             };
         return {
@@ -278,30 +278,25 @@ function get$1(arg1, arg2) {
             render: () => {
                 if (value !== undefined)
                     return value;
-                if (arg2)
-                    throw new Promise(res => {
-                        suspense = res;
-                    });
-                return null;
+                if (onUpdate)
+                    return null;
+                throw new Promise(res => {
+                    suspense = res;
+                });
             }
         };
     });
-}
-/** Values are not equal for purposes of a refresh. */
-const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
-    !Array.isArray(b) ||
-    a.length !== b.length ||
-    a.some((x, i) => x !== b[i])));
+}
 
-function use$1(arg1, arg2) {
+function use$1(apply, repeat) {
     const render = Control.use(dispatch => {
         const instance = this.new();
         const local = Control.watch(instance, () => onUpdate);
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
-        let apply = !!arg1;
+        let shouldApply = !!apply;
         return {
-            local,
+            instance,
             mount() {
                 onUpdate = refresh;
                 return () => {
@@ -310,7 +305,7 @@ function use$1(arg1, arg2) {
                 };
             },
             render(props) {
-                if (apply) {
+                if (shouldApply) {
                     onUpdate = undefined;
                     if (typeof props == "function")
                         props(instance);
@@ -318,15 +313,15 @@ function use$1(arg1, arg2) {
                         for (const key in instance)
                             if (props.hasOwnProperty(key))
                                 instance[key] = props[key];
-                    if (!arg2)
-                        apply = false;
+                    if (!repeat)
+                        shouldApply = false;
                     instance.on(0).then(() => onUpdate = refresh);
                 }
                 return local;
             }
         };
     });
-    return render(arg1);
+    return render(apply);
 }
 
 class Model {
@@ -427,24 +422,27 @@ const Oops$5 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
 });
 const INSTRUCTION = new Map();
+const PENDING$1 = new WeakMap();
 const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
 const PARENTS = new WeakMap();
 class Control {
-    constructor(subject, id = uid()) {
-        this.subject = subject;
-        this.id = id;
+    constructor(subject, id) {
+        this.state = {};
         this.frame = new Set();
         this.followers = new Set();
         this.observers = new Map([["", this.followers]]);
+        this.id = typeof id == "undefined" ? uid() : id;
+        this.subject = subject;
         REGISTER.set(subject, this);
+        PENDING$1.set(this, new Set(Control.ready));
     }
     add(key) {
         const { value } = getOwnPropertyDescriptor(this.subject, key);
         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 +451,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 +465,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;
             }
@@ -528,31 +527,30 @@ class Control {
         this.observers.clear();
     }
 }
+Control.ready = new Set();
 Control.after = new Set();
 Control.before = new Set();
 Control.pending = new Set();
 Control.for = control;
 Control.apply = apply;
 Control.watch = watch;
-const PENDING_INIT = new WeakMap();
 function control(subject, ready) {
     const control = REGISTER.get(subject.is);
-    const onReady = typeof ready == "function" && ready;
-    if (!control.state && ready) {
-        let waiting = PENDING_INIT.get(control);
-        if (!waiting)
-            PENDING_INIT.set(control, waiting = new Set());
-        if (onReady) {
-            let callback;
-            waiting.add(() => callback = onReady(control));
-            return () => callback && callback();
-        }
-        control.state = {};
+    const pending = PENDING$1.get(control);
+    if (typeof ready == "function") {
+        if (!pending)
+            return ready(control);
+        let done;
+        pending.add(() => done = ready(control));
+        return () => done && done();
+    }
+    if (pending && ready) {
+        PENDING$1.delete(control);
         for (const key in control.subject)
             control.add(key);
-        waiting.forEach(cb => cb());
+        pending.forEach(cb => cb(control));
     }
-    return onReady ? onReady(control) : control;
+    return control;
 }
 function requestUpdateFrame(event) {
     const { after, before, pending } = Control;
@@ -585,10 +583,10 @@ function setRecursive(on, key, value) {
     on.watch(key, { set });
     set(value);
 }
-function parent(child, register) {
-    if (!register)
+function parent(child, assign) {
+    if (!assign)
         return PARENTS.get(child);
-    PARENTS.set(child, register);
+    PARENTS.set(child, assign);
 }
 function watch(on, cb) {
     if (!on.hasOwnProperty("is"))
@@ -598,7 +596,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 +898,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 +990,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 +1008,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

@@ -201,18 +201,18 @@ function awaitUpdate(source, select, timeout) {
 const Oops$6 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
-function get$1(arg1, arg2) {
+function get$1(argument) {
     return Control.get((dispatch, context) => {
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
         let value;
-        if (typeof arg1 !== "function") {
+        if (typeof argument !== "function") {
             const got = context.get(this);
             if (got)
-                value = arg1 === undefined
+                value = argument === undefined
                     ? Control.watch(got, k => k ? onUpdate : undefined)
                     : got;
-            else if (arg1 !== false)
+            else if (argument !== false)
                 throw Oops$6.NotFound(this);
             return {
                 mount() {
@@ -222,7 +222,7 @@ function get$1(arg1, arg2) {
                 render: () => value
             };
         }
-        let compute = arg1;
+        let compute = argument;
         let suspense;
         let getValue;
         let factory;
@@ -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);
@@ -272,7 +272,7 @@ function get$1(arg1, arg2) {
         else
             onUpdate = () => {
                 const next = getValue();
-                if (notEqual(value, next))
+                if (value !== next)
                     didUpdate(next);
             };
         return {
@@ -282,30 +282,25 @@ function get$1(arg1, arg2) {
             render: () => {
                 if (value !== undefined)
                     return value;
-                if (arg2)
-                    throw new Promise(res => {
-                        suspense = res;
-                    });
-                return null;
+                if (onUpdate)
+                    return null;
+                throw new Promise(res => {
+                    suspense = res;
+                });
             }
         };
     });
-}
-/** Values are not equal for purposes of a refresh. */
-const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
-    !Array.isArray(b) ||
-    a.length !== b.length ||
-    a.some((x, i) => x !== b[i])));
+}
 
-function use$1(arg1, arg2) {
+function use$1(apply, repeat) {
     const render = Control.use(dispatch => {
         const instance = this.new();
         const local = Control.watch(instance, () => onUpdate);
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
-        let apply = !!arg1;
+        let shouldApply = !!apply;
         return {
-            local,
+            instance,
             mount() {
                 onUpdate = refresh;
                 return () => {
@@ -314,7 +309,7 @@ function use$1(arg1, arg2) {
                 };
             },
             render(props) {
-                if (apply) {
+                if (shouldApply) {
                     onUpdate = undefined;
                     if (typeof props == "function")
                         props(instance);
@@ -322,15 +317,15 @@ function use$1(arg1, arg2) {
                         for (const key in instance)
                             if (props.hasOwnProperty(key))
                                 instance[key] = props[key];
-                    if (!arg2)
-                        apply = false;
+                    if (!repeat)
+                        shouldApply = false;
                     instance.on(0).then(() => onUpdate = refresh);
                 }
                 return local;
             }
         };
     });
-    return render(arg1);
+    return render(apply);
 }
 
 class Model {
@@ -431,24 +426,27 @@ const Oops$5 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
 });
 const INSTRUCTION = new Map();
+const PENDING$1 = new WeakMap();
 const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
 const PARENTS = new WeakMap();
 class Control {
-    constructor(subject, id = uid()) {
-        this.subject = subject;
-        this.id = id;
+    constructor(subject, id) {
+        this.state = {};
         this.frame = new Set();
         this.followers = new Set();
         this.observers = new Map([["", this.followers]]);
+        this.id = typeof id == "undefined" ? uid() : id;
+        this.subject = subject;
         REGISTER.set(subject, this);
+        PENDING$1.set(this, new Set(Control.ready));
     }
     add(key) {
         const { value } = getOwnPropertyDescriptor(this.subject, key);
         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 +455,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 +469,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;
             }
@@ -532,31 +531,30 @@ class Control {
         this.observers.clear();
     }
 }
+Control.ready = new Set();
 Control.after = new Set();
 Control.before = new Set();
 Control.pending = new Set();
 Control.for = control;
 Control.apply = apply;
 Control.watch = watch;
-const PENDING_INIT = new WeakMap();
 function control(subject, ready) {
     const control = REGISTER.get(subject.is);
-    const onReady = typeof ready == "function" && ready;
-    if (!control.state && ready) {
-        let waiting = PENDING_INIT.get(control);
-        if (!waiting)
-            PENDING_INIT.set(control, waiting = new Set());
-        if (onReady) {
-            let callback;
-            waiting.add(() => callback = onReady(control));
-            return () => callback && callback();
-        }
-        control.state = {};
+    const pending = PENDING$1.get(control);
+    if (typeof ready == "function") {
+        if (!pending)
+            return ready(control);
+        let done;
+        pending.add(() => done = ready(control));
+        return () => done && done();
+    }
+    if (pending && ready) {
+        PENDING$1.delete(control);
         for (const key in control.subject)
             control.add(key);
-        waiting.forEach(cb => cb());
+        pending.forEach(cb => cb(control));
     }
-    return onReady ? onReady(control) : control;
+    return control;
 }
 function requestUpdateFrame(event) {
     const { after, before, pending } = Control;
@@ -589,10 +587,10 @@ function setRecursive(on, key, value) {
     on.watch(key, { set });
     set(value);
 }
-function parent(child, register) {
-    if (!register)
+function parent(child, assign) {
+    if (!assign)
         return PARENTS.get(child);
-    PARENTS.set(child, register);
+    PARENTS.set(child, assign);
 }
 function watch(on, cb) {
     if (!on.hasOwnProperty("is"))
@@ -602,7 +600,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 +902,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 +994,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 +1012,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.25.0",
+  "gitHead": "a7c707bf59325bd4bf1388e061f7991acb726a13"
 }