@expressive/mvc 0.21.1 → 0.21.3

package/lib/index.d.ts

@@ -16,6 +16,26 @@ declare function run<S>(action: Async<S>): typeof action & {
     active: boolean;
 };
 
+declare namespace Context {
+    type Inputs = {
+        [key: string | number]: Model | Model.New;
+    };
+}
+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;
+}
+
 type Callback = () => void;
 
 declare global {
@@ -50,18 +70,19 @@ declare namespace Control {
      * Returned callback is forwarded.
      */
     type OnReady<T extends Model> = (control: Control<T>) => Callback | void;
-    type GetAdapter<T> = (update: () => void, source: (request: (got: Model | undefined) => void) => void) => {
+    type RequestRefresh = (update: (tick: number) => number) => void;
+    type HasHook = (type: typeof Model, relativeTo: Model, callback: (got: Model | undefined) => void) => void;
+    type GetAdapter<T> = (refresh: RequestRefresh, context: Context) => {
         mount: () => (() => void) | void;
         render: () => T;
     } | void;
-    type GetHook = <T extends Model, R>(type: Model.Type<T>, adapter: GetAdapter<R>) => R | null;
-    type UseAdapter<T extends Model> = (update: () => void) => {
+    type GetHook = <T>(adapter: GetAdapter<T>) => T | null;
+    type UseAdapter<T extends Model> = (refresh: RequestRefresh) => {
         instance: T;
         mount: () => (() => void) | void;
         render: (props: Model.Compat<T>) => T;
     };
     type UseHook = <T extends Model>(adapter: UseAdapter<T>) => (props: Model.Compat<T>) => T;
-    type HasHook = (type: typeof Model, relativeTo: Model, callback: (got: Model | undefined) => void) => void;
 }
 declare class Control<T extends Model = any> {
     subject: T;
@@ -93,7 +114,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 apply<T = any>(instruction: Control.Instruction<any>): T;
+declare function apply<T = any>(instruction: Control.Instruction<T>): T;
 
 declare const STATE = "__state";
 declare const UPDATE = "__update";
@@ -381,20 +402,4 @@ 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;
-    include(inputs: Context.Inputs): Map<Model, boolean>;
-    add<T extends Model>(input: T | Model.New<T>, implicit?: boolean): T;
-    push(): this;
-    pop(): void;
-}
-
 export { Context, Control, Debug, Model, Model as default, get, ref, run, set, use };

package/lib/index.esm.js

@@ -198,18 +198,18 @@ const Oops$6 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
 function get$1(arg1, arg2) {
-    return Control.get(this, (refresh, context) => {
+    return Control.get((dispatch, context) => {
+        const refresh = () => dispatch(x => x + 1);
         let onUpdate;
         let value;
         if (typeof arg1 !== "function") {
-            context(got => {
-                if (got)
-                    value = arg1 === undefined
-                        ? Control.watch(got, () => onUpdate)
-                        : got;
-                else if (arg1 !== false)
-                    throw Oops$6.NotFound(this);
-            });
+            const got = context.get(this);
+            if (got)
+                value = arg1 === undefined
+                    ? Control.watch(got, k => k ? onUpdate : undefined)
+                    : got;
+            else if (arg1 !== false)
+                throw Oops$6.NotFound(this);
             return {
                 mount() {
                     onUpdate = refresh;
@@ -223,23 +223,22 @@ function get$1(arg1, arg2) {
         let getValue;
         let factory;
         let proxy;
-        context(got => {
-            if (!got)
-                throw Oops$6.NotFound(this);
-            proxy = Control.watch(got, () => factory ? null : onUpdate);
-            getValue = () => compute.call(proxy, proxy, forceUpdate);
-            value = getValue();
-            function forceUpdate(action) {
-                if (typeof action == "function")
-                    action = action();
-                if (getValue)
-                    didUpdate(getValue());
-                else
-                    refresh();
-                if (action)
-                    return action.finally(refresh);
-            }
-        });
+        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();
+            if (getValue)
+                didUpdate(getValue());
+            else
+                refresh();
+            if (action)
+                return action.finally(refresh);
+        }
         if (value === null) {
             getValue = undefined;
             onUpdate = null;
@@ -295,11 +294,12 @@ const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
     a.some((x, i) => x !== b[i])));
 
 function use$1(arg1, arg2) {
-    const render = Control.use((refresh) => {
-        let onUpdate;
-        let applyProps = typeof arg1 === "object";
+    const render = Control.use(dispatch => {
         const instance = this.new();
         const proxy = Control.watch(instance, () => onUpdate);
+        const refresh = () => dispatch(x => x + 1);
+        let onUpdate;
+        let applyProps = typeof arg1 === "object";
         if (typeof arg1 == "function")
             arg1(instance);
         return {
@@ -429,7 +429,7 @@ const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
 const PARENTS = new WeakMap();
 class Control {
-    constructor(subject, id = random()) {
+    constructor(subject, id = uid()) {
         this.subject = subject;
         this.id = id;
         this.frame = new Set();
@@ -605,7 +605,7 @@ function apply(instruction) {
     return placeholder;
 }
 /** Random alphanumberic of length 6; will always start with a letter. */
-function random() {
+function uid() {
     return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
@@ -953,13 +953,12 @@ function use(input, argument) {
 }
 
 const Oops = issues({
-    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.`
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`
 });
 class Context {
     constructor() {
         this.table = new WeakMap();
-        this.input = new Map();
+        this.layer = new Map();
     }
     has(T) {
         let key = this.table.get(T);
@@ -979,15 +978,14 @@ class Context {
         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);
+            const exists = this.layer.get(key);
+            if (!exists) {
+                const instance = this.add(input);
+                this.layer.set(key, input);
+                init.set(instance, true);
+            }
+            else if (exists !== input)
+                return this.bailout(inputs);
         }
         for (const [model] of init) {
             const { state } = control(model, true);
@@ -1000,6 +998,12 @@ 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;
@@ -1028,7 +1032,7 @@ class Context {
     }
     push() {
         const next = create(this);
-        next.input = new Map();
+        next.layer = new Map();
         return next;
     }
     pop() {
@@ -1041,7 +1045,7 @@ class Context {
         }
         for (const model of items)
             model.null();
-        this.input.clear();
+        this.layer.clear();
     }
 }
 

package/lib/index.js

@@ -202,18 +202,18 @@ const Oops$6 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
 function get$1(arg1, arg2) {
-    return Control.get(this, (refresh, context) => {
+    return Control.get((dispatch, context) => {
+        const refresh = () => dispatch(x => x + 1);
         let onUpdate;
         let value;
         if (typeof arg1 !== "function") {
-            context(got => {
-                if (got)
-                    value = arg1 === undefined
-                        ? Control.watch(got, () => onUpdate)
-                        : got;
-                else if (arg1 !== false)
-                    throw Oops$6.NotFound(this);
-            });
+            const got = context.get(this);
+            if (got)
+                value = arg1 === undefined
+                    ? Control.watch(got, k => k ? onUpdate : undefined)
+                    : got;
+            else if (arg1 !== false)
+                throw Oops$6.NotFound(this);
             return {
                 mount() {
                     onUpdate = refresh;
@@ -227,23 +227,22 @@ function get$1(arg1, arg2) {
         let getValue;
         let factory;
         let proxy;
-        context(got => {
-            if (!got)
-                throw Oops$6.NotFound(this);
-            proxy = Control.watch(got, () => factory ? null : onUpdate);
-            getValue = () => compute.call(proxy, proxy, forceUpdate);
-            value = getValue();
-            function forceUpdate(action) {
-                if (typeof action == "function")
-                    action = action();
-                if (getValue)
-                    didUpdate(getValue());
-                else
-                    refresh();
-                if (action)
-                    return action.finally(refresh);
-            }
-        });
+        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();
+            if (getValue)
+                didUpdate(getValue());
+            else
+                refresh();
+            if (action)
+                return action.finally(refresh);
+        }
         if (value === null) {
             getValue = undefined;
             onUpdate = null;
@@ -299,11 +298,12 @@ const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
     a.some((x, i) => x !== b[i])));
 
 function use$1(arg1, arg2) {
-    const render = Control.use((refresh) => {
-        let onUpdate;
-        let applyProps = typeof arg1 === "object";
+    const render = Control.use(dispatch => {
         const instance = this.new();
         const proxy = Control.watch(instance, () => onUpdate);
+        const refresh = () => dispatch(x => x + 1);
+        let onUpdate;
+        let applyProps = typeof arg1 === "object";
         if (typeof arg1 == "function")
             arg1(instance);
         return {
@@ -433,7 +433,7 @@ const REGISTER = new WeakMap();
 const OBSERVER = new WeakMap();
 const PARENTS = new WeakMap();
 class Control {
-    constructor(subject, id = random()) {
+    constructor(subject, id = uid()) {
         this.subject = subject;
         this.id = id;
         this.frame = new Set();
@@ -609,7 +609,7 @@ function apply(instruction) {
     return placeholder;
 }
 /** Random alphanumberic of length 6; will always start with a letter. */
-function random() {
+function uid() {
     return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
@@ -957,13 +957,12 @@ function use(input, argument) {
 }
 
 const Oops = issues({
-    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.`
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined.`
 });
 class Context {
     constructor() {
         this.table = new WeakMap();
-        this.input = new Map();
+        this.layer = new Map();
     }
     has(T) {
         let key = this.table.get(T);
@@ -983,15 +982,14 @@ class Context {
         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);
+            const exists = this.layer.get(key);
+            if (!exists) {
+                const instance = this.add(input);
+                this.layer.set(key, input);
+                init.set(instance, true);
+            }
+            else if (exists !== input)
+                return this.bailout(inputs);
         }
         for (const [model] of init) {
             const { state } = control(model, true);
@@ -1004,6 +1002,12 @@ 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;
@@ -1032,7 +1036,7 @@ class Context {
     }
     push() {
         const next = create(this);
-        next.input = new Map();
+        next.layer = new Map();
         return next;
     }
     pop() {
@@ -1045,7 +1049,7 @@ class Context {
         }
         for (const model of items)
             model.null();
-        this.input.clear();
+        this.layer.clear();
     }
 }
 

package/package.json

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