@expressive/mvc 0.20.0 → 0.21.0

package/lib/index.d.ts

@@ -91,7 +91,6 @@ declare class Control<T extends Model = any> {
     static for: typeof control;
     static apply: typeof apply;
     static watch: typeof watch;
-    parent?: Model;
     state: {
         [key: string]: any;
     };
@@ -242,8 +241,8 @@ declare class Model {
     get is(): this;
     on(): Promise<Model.Event<this>[]>;
     on(timeout?: number): Promise<Model.Event<this>[] | false>;
-    on<P extends Model.Event<this>>(keys?: P | Iterable<P>, timeout?: number): Promise<P[] | false>;
-    on<P extends Model.Event<this>>(keys: P | Iterable<P>, listener: Model.OnCallback<this>, once?: boolean): Callback;
+    on<P extends Model.Event<this>>(keys?: P | P[], timeout?: number): Promise<P[] | false>;
+    on<P extends Model.Event<this>>(keys: P | P[], listener: Model.OnCallback<this>, once?: boolean): Callback;
     on(effect: Model.Effect<this>): Callback;
     get(): Model.Export<this>;
     get<P extends Model.Key<this>>(select: P): this[P];
@@ -251,7 +250,7 @@ declare class Model {
     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<K extends Model.Event<this>>(key: K, value?: Model.ValueOf<this, K>): Promise<readonly Model.Event<this>[]>;
+    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;
     static get: typeof get$1;
@@ -398,12 +397,18 @@ declare function use<T extends Model>(from: () => Promise<T> | T, callback?: (i:
   */
 declare function use<T extends Model>(peer: T, callback?: (i: T) => void): T;
 
+declare namespace Context {
+    type Inputs = {
+        [key: string | number]: Model | Model.New;
+    };
+}
 declare class Context {
     private table;
     private input;
     private has;
     get<T extends Model>(Type: Model.Type<T>): T | undefined;
-    add<T extends Model>(input: T | Model.New<T>, key?: number | string): T;
+    include(inputs: Context.Inputs): Map<Model, boolean>;
+    add<T extends Model>(input: T | Model.New<T>, implicit?: boolean): T;
     push(): this;
     pop(): void;
 }

package/lib/index.esm.js

@@ -379,7 +379,7 @@ class Model {
                     state[key] = arg1[key];
                     controller.update(key);
                 }
-        return awaitUpdate(this, undefined, 0);
+        return this.on(0);
     }
     /** Mark this instance for garbage collection. */
     null() {
@@ -427,6 +427,7 @@ const Oops$5 = issues({
 const INSTRUCTION = new Map();
 const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
+const PARENTS = new WeakMap();
 class Control {
     constructor(subject, id = random()) {
         this.subject = subject;
@@ -573,7 +574,7 @@ function setRecursive(on, key, value) {
     const set = (next) => {
         if (next instanceof value.constructor) {
             on.state[key] = next;
-            control(next).parent = on.subject;
+            parent(next, on.subject);
             control(next, true);
             return true;
         }
@@ -582,6 +583,11 @@ function setRecursive(on, key, value) {
     on.watch(key, { set });
     set(value);
 }
+function parent(child, register) {
+    if (!register)
+        return PARENTS.get(child);
+    PARENTS.set(child, register);
+}
 function watch(on, cb) {
     if (!on.hasOwnProperty("is"))
         on = defineProperty(create(on), "is", { value: on });
@@ -649,8 +655,8 @@ function get(arg0, arg1) {
         if (arg0 instanceof Model)
             subject = arg0;
         else if (Model.isTypeof(arg0)) {
-            const { parent } = control;
-            if (!parent) {
+            const hasParent = parent(subject);
+            if (!hasParent) {
                 if (arg1 === true)
                     throw Oops$3.Required(arg0, subject);
                 source = callback => Control.has(arg0, subject, got => {
@@ -660,10 +666,10 @@ function get(arg0, arg1) {
                         throw Oops$3.AmbientRequired(arg0, subject);
                 });
             }
-            else if (!arg0 || parent instanceof arg0)
-                subject = parent;
+            else if (!arg0 || hasParent instanceof arg0)
+                subject = hasParent;
             else
-                throw Oops$3.Unexpected(arg0, subject, parent);
+                throw Oops$3.Unexpected(arg0, subject, hasParent);
         }
         else if (typeof arg0 == "function")
             arg1 = arg0.call(subject, key, subject);
@@ -891,7 +897,7 @@ function use(input, argument) {
         const onUpdate = (next) => {
             state[key] = next;
             if (next) {
-                control(next).parent = subject;
+                parent(next, subject);
                 control(next, true);
             }
             if (typeof argument == "function")
@@ -947,7 +953,8 @@ function use(input, argument) {
 }
 
 const Oops = issues({
-    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`,
+    NewValue: (name) => `Provider already has already defined '${name}' but got new value. This is not yet supported.`
 });
 class Context {
     constructor() {
@@ -968,11 +975,32 @@ class Context {
             throw Oops.MultipleExist(Type);
         return result;
     }
-    add(input, key) {
-        if (key && this.input.get(key) === input)
-            return typeof input == "object"
-                ? input
-                : this[this.has(input)];
+    include(inputs) {
+        const init = new Map();
+        for (const key in inputs) {
+            const input = inputs[key];
+            const exists = this.input.get(key);
+            if (exists)
+                if (exists !== input)
+                    throw Oops.NewValue(key);
+                else
+                    continue;
+            const instance = this.add(input);
+            this.input.set(key, input);
+            init.set(instance, true);
+        }
+        for (const [model] of init) {
+            const { state } = control(model, true);
+            Object.values(state).forEach(value => {
+                if (parent(value) === model) {
+                    this.add(value, true);
+                    init.set(value, false);
+                }
+            });
+        }
+        return init;
+    }
+    add(input, implicit) {
         let writable = true;
         let T;
         let I;
@@ -987,15 +1015,15 @@ class Context {
         }
         do {
             const key = this.has(T);
-            defineProperty(this, key, {
-                configurable: true,
-                value: this.hasOwnProperty(key) && I !== this[key] ? null : I,
-                writable
-            });
+            const value = this.hasOwnProperty(key) ? null : I;
+            if (value || I !== this[key] && !implicit)
+                defineProperty(this, key, {
+                    configurable: true,
+                    value,
+                    writable
+                });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        if (key !== undefined)
-            this.input.set(key, input);
         return I;
     }
     push() {
@@ -1039,7 +1067,7 @@ defineProperties(Model.prototype, {
     },
     [PARENT]: {
         get() {
-            return control(this).parent;
+            return parent(this);
         }
     }
 });

package/lib/index.js

@@ -383,7 +383,7 @@ class Model {
                     state[key] = arg1[key];
                     controller.update(key);
                 }
-        return awaitUpdate(this, undefined, 0);
+        return this.on(0);
     }
     /** Mark this instance for garbage collection. */
     null() {
@@ -431,6 +431,7 @@ const Oops$5 = issues({
 const INSTRUCTION = new Map();
 const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
+const PARENTS = new WeakMap();
 class Control {
     constructor(subject, id = random()) {
         this.subject = subject;
@@ -577,7 +578,7 @@ function setRecursive(on, key, value) {
     const set = (next) => {
         if (next instanceof value.constructor) {
             on.state[key] = next;
-            control(next).parent = on.subject;
+            parent(next, on.subject);
             control(next, true);
             return true;
         }
@@ -586,6 +587,11 @@ function setRecursive(on, key, value) {
     on.watch(key, { set });
     set(value);
 }
+function parent(child, register) {
+    if (!register)
+        return PARENTS.get(child);
+    PARENTS.set(child, register);
+}
 function watch(on, cb) {
     if (!on.hasOwnProperty("is"))
         on = defineProperty(create(on), "is", { value: on });
@@ -653,8 +659,8 @@ function get(arg0, arg1) {
         if (arg0 instanceof Model)
             subject = arg0;
         else if (Model.isTypeof(arg0)) {
-            const { parent } = control;
-            if (!parent) {
+            const hasParent = parent(subject);
+            if (!hasParent) {
                 if (arg1 === true)
                     throw Oops$3.Required(arg0, subject);
                 source = callback => Control.has(arg0, subject, got => {
@@ -664,10 +670,10 @@ function get(arg0, arg1) {
                         throw Oops$3.AmbientRequired(arg0, subject);
                 });
             }
-            else if (!arg0 || parent instanceof arg0)
-                subject = parent;
+            else if (!arg0 || hasParent instanceof arg0)
+                subject = hasParent;
             else
-                throw Oops$3.Unexpected(arg0, subject, parent);
+                throw Oops$3.Unexpected(arg0, subject, hasParent);
         }
         else if (typeof arg0 == "function")
             arg1 = arg0.call(subject, key, subject);
@@ -895,7 +901,7 @@ function use(input, argument) {
         const onUpdate = (next) => {
             state[key] = next;
             if (next) {
-                control(next).parent = subject;
+                parent(next, subject);
                 control(next, true);
             }
             if (typeof argument == "function")
@@ -951,7 +957,8 @@ function use(input, argument) {
 }
 
 const Oops = issues({
-    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`,
+    NewValue: (name) => `Provider already has already defined '${name}' but got new value. This is not yet supported.`
 });
 class Context {
     constructor() {
@@ -972,11 +979,32 @@ class Context {
             throw Oops.MultipleExist(Type);
         return result;
     }
-    add(input, key) {
-        if (key && this.input.get(key) === input)
-            return typeof input == "object"
-                ? input
-                : this[this.has(input)];
+    include(inputs) {
+        const init = new Map();
+        for (const key in inputs) {
+            const input = inputs[key];
+            const exists = this.input.get(key);
+            if (exists)
+                if (exists !== input)
+                    throw Oops.NewValue(key);
+                else
+                    continue;
+            const instance = this.add(input);
+            this.input.set(key, input);
+            init.set(instance, true);
+        }
+        for (const [model] of init) {
+            const { state } = control(model, true);
+            Object.values(state).forEach(value => {
+                if (parent(value) === model) {
+                    this.add(value, true);
+                    init.set(value, false);
+                }
+            });
+        }
+        return init;
+    }
+    add(input, implicit) {
         let writable = true;
         let T;
         let I;
@@ -991,15 +1019,15 @@ class Context {
         }
         do {
             const key = this.has(T);
-            defineProperty(this, key, {
-                configurable: true,
-                value: this.hasOwnProperty(key) && I !== this[key] ? null : I,
-                writable
-            });
+            const value = this.hasOwnProperty(key) ? null : I;
+            if (value || I !== this[key] && !implicit)
+                defineProperty(this, key, {
+                    configurable: true,
+                    value,
+                    writable
+                });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        if (key !== undefined)
-            this.input.set(key, input);
         return I;
     }
     push() {
@@ -1043,7 +1071,7 @@ defineProperties(Model.prototype, {
     },
     [PARENT]: {
         get() {
-            return control(this).parent;
+            return parent(this);
         }
     }
 });

package/package.json

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