@expressive/mvc 0.15.1 → 0.16.0

package/lib/index.d.ts

@@ -17,13 +17,14 @@ declare namespace Subscriber {
 declare class Subscriber<T extends {} = any> {
     parent: Control<T>;
     onUpdate: Subscriber.OnEvent;
+    suspend?: boolean | undefined;
     proxy: T;
     release: Callback;
     latest?: Model.Event<T>[];
     active: boolean;
     dependant: Set<Listener>;
     watch: Map<any, boolean | (() => true | void)>;
-    constructor(parent: Control<T>, onUpdate: Subscriber.OnEvent);
+    constructor(parent: Control<T>, onUpdate: Subscriber.OnEvent, suspend?: boolean | undefined);
     get using(): Model.Key<T>[];
     add(key: any, value?: boolean | Callback): void;
     commit(): () => void;
@@ -62,7 +63,7 @@ declare namespace Model {
     /** Including but not limited to T. */
     type Extends<T> = T | (string & Record<never, never>);
     /** Any typeof Model, using class constructor as the reference. */
-    export type Type<T extends Model = Model> = (new (...args: any[]) => T);
+    export type Type<T extends Model = Model> = abstract new (...args: any[]) => T;
     /** A typeof Model, specifically one which may be created without arguments. */
     export type New<T extends Model = Model> = (new () => T) & typeof Model;
     export type Effect<T> = (this: T, argument: T) => Callback | Promise<any> | void;
@@ -474,13 +475,16 @@ declare class MVC extends Model {
      * **React Hook** - Fetch and subscribe to instance of this controller within ambient component.
      */
     static tap<T extends MVC>(this: Model.Type<T>): T;
-    static tap<T extends MVC, K extends Model.Key<T>>(this: Model.Type<T>, key: K, expect: true): Exclude<T[K], undefined>;
-    static tap<T extends MVC, K extends Model.Key<T>>(this: Model.Type<T>, key: K, expect?: boolean): NoVoid<T[K]>;
-    static tap<T extends MVC, R>(this: Model.Type<T>, connect: MVC.TapCallback<T, () => R>): NoVoid<R>;
-    static tap<T extends MVC, R>(this: Model.Type<T>, connect: MVC.TapCallback<T, (() => R) | null>): NoVoid<R> | null;
+    static tap<T extends MVC, R extends readonly unknown[] | []>(this: Model.Type<T>, compute: MVC.TapCallback<T, R | (() => R)>, expect?: boolean): R;
+    static tap<T extends MVC, R extends readonly unknown[] | []>(this: Model.Type<T>, compute: MVC.TapCallback<T, Promise<R> | (() => R) | null>, expect?: boolean): R | null;
+    static tap<T extends MVC, R extends readonly unknown[] | []>(this: Model.Type<T>, compute: MVC.TapCallback<T, Promise<R> | R>, expect: true): Exclude<R, undefined>;
     static tap<T extends MVC, R>(this: Model.Type<T>, compute: MVC.TapCallback<T, Promise<R> | R>, expect: true): Exclude<R, undefined>;
     static tap<T extends MVC, R>(this: Model.Type<T>, compute: MVC.TapCallback<T, Promise<R>>, expect?: boolean): NoVoid<R> | null;
     static tap<T extends MVC, R>(this: Model.Type<T>, compute: MVC.TapCallback<T, R>, expect?: boolean): NoVoid<R>;
+    static tap<T extends MVC, R>(this: Model.Type<T>, init: MVC.TapCallback<T, () => R>): NoVoid<R>;
+    static tap<T extends MVC, R>(this: Model.Type<T>, init: MVC.TapCallback<T, (() => R) | null>): NoVoid<R> | null;
+    static tap<T extends MVC, K extends Model.Key<T>>(this: Model.Type<T>, key: K, expect: true): Exclude<T[K], undefined>;
+    static tap<T extends MVC, K extends Model.Key<T>>(this: Model.Type<T>, key: K, expect?: boolean): NoVoid<T[K]>;
     static use<I extends MVC>(this: Model.Type<I>, watch: Model.Key<I>[], callback?: (instance: I) => void): I;
     static use<I extends MVC>(this: Model.Type<I>, callback?: (instance: I) => void): I;
     static use<I extends MVC>(this: Model.Type<I>, apply: Model.Compat<I>, keys?: Model.Event<I>[]): I;
@@ -505,8 +509,12 @@ declare namespace useTap {
     type Callback<T extends Model, R> = (this: T, model: T, update: MVC.ForceUpdate) => R;
 }
 declare function useTap<T extends Model>(source: useTap.Source<T>): T;
-declare function useTap<T extends Model, K extends Model.Key<T>>(source: useTap.Source<T>, path: K, expect: true): Exclude<T[K], undefined>;
-declare function useTap<T extends Model, K extends Model.Key<T>>(source: useTap.Source<T>, path: K, expect?: boolean): NoVoid<T[K]>;
+declare function useTap<T extends Model>(source: useTap.Source<T>, expect: true): {
+    [P in Model.Key<T>]: Exclude<T[P], undefined>;
+};
+declare function useTap<T extends Model>(source: useTap.Source<T>, expect?: boolean): {
+    [P in Model.Key<T>]: T[P] | undefined;
+};
 declare function useTap<T extends Model, R>(source: useTap.Source<T>, connect: useTap.Callback<T, () => R>): NoVoid<R>;
 declare function useTap<T extends Model, R>(source: useTap.Source<T>, connect: useTap.Callback<T, (() => R) | null>): NoVoid<R> | null;
 declare function useTap<T extends Model, R>(source: useTap.Source<T>, compute: useTap.Callback<T, Promise<R> | R>, expect: true): Exclude<R, undefined>;

package/lib/index.esm.js

@@ -314,9 +314,10 @@ function awaitUpdate(source, arg1, arg2) {
 
 const REGISTER$1 = new WeakMap();
 class Subscriber {
-    constructor(parent, onUpdate) {
+    constructor(parent, onUpdate, suspend) {
         this.parent = parent;
         this.onUpdate = onUpdate;
+        this.suspend = suspend;
         this.active = false;
         this.dependant = new Set();
         this.watch = new Map();
@@ -506,9 +507,13 @@ class Control {
             set: this.ref(key),
             get() {
                 const sub = subscriber(this);
-                if (sub)
+                const value = state.get(key);
+                if (sub) {
                     sub.add(key);
-                return state.get(key);
+                    if (value === undefined && sub.suspend)
+                        throw suspend(this, key);
+                }
+                return value;
             }
         });
     }
@@ -698,11 +703,22 @@ function add(instruction, label) {
                 if (!state.has(key) && shouldSuspend)
                     throw suspend(control, key);
                 const local = subscriber(this);
+                const required = local && local.suspend;
                 if (local)
                     local.add(key);
-                return onGet
-                    ? onGet(local)
-                    : state.get(key);
+                try {
+                    const value = onGet
+                        ? onGet(local)
+                        : state.get(key);
+                    if (value === undefined && required === true)
+                        throw suspend(control, key);
+                    return value;
+                }
+                catch (err) {
+                    if (err instanceof Promise && required === false)
+                        return;
+                    throw err;
+                }
             }
         });
     }
@@ -828,7 +844,7 @@ function get(arg0, arg1, arg2) {
             let source = this;
             let setter;
             if (typeof arg0 == "function") {
-                let result = mayRetry(arg0.bind(subject, key, subject));
+                const result = mayRetry(arg0.bind(subject, key, subject));
                 if (typeof result == "function")
                     setter = result;
                 else {
@@ -1396,7 +1412,7 @@ function useCompute(source, compute, suspend) {
             sub.commit();
             update = () => {
                 const next = make();
-                if (value != next)
+                if (notEqual(value, next))
                     reassign(next);
             };
         }
@@ -1415,7 +1431,12 @@ function useCompute(source, compute, suspend) {
         return null;
     React.useLayoutEffect(() => local.release, deps);
     return local.proxy;
-}
+}
+/** 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 useTap(source, arg1, arg2) {
     const instance = typeof source == "object"
@@ -1425,18 +1446,13 @@ function useTap(source, arg1, arg2) {
             : useContext(source);
     return typeof arg1 == "function"
         ? useCompute(instance, arg1, arg2)
-        : useSubscribe(instance, arg1, arg2);
+        : useSubscribe(instance, arg1);
 }
-function useSubscribe(source, path, expect) {
+function useSubscribe(source, expect) {
     const deps = [uid(source)];
-    const local = use(refresh => (control(source).subscribe(() => refresh)), deps);
+    const local = use(refresh => (new Subscriber(control(source), () => refresh, expect)), deps);
     React.useLayoutEffect(() => local.commit(), deps);
-    if (path === undefined)
-        return local.proxy;
-    const value = local.proxy[path];
-    if (value === undefined && expect)
-        throw suspend(local.parent, path);
-    return value;
+    return local.proxy;
 }
 
 const Global$1 = new WeakMap();
@@ -1497,7 +1513,7 @@ class MVC extends Model {
         const instance = this.get();
         return typeof arg1 == "function"
             ? useCompute(instance, arg1, arg2)
-            : useSubscribe(instance, arg1, arg2);
+            : useSubscribe(instance, arg1);
     }
     static use(a, b) {
         return useNew(this, a, b);
@@ -1505,7 +1521,7 @@ class MVC extends Model {
     static meta(arg1, arg2) {
         return typeof arg1 == "function"
             ? useCompute(this, arg1, arg2)
-            : useSubscribe(this, arg1, arg2);
+            : useSubscribe(this, arg1);
     }
 }
 

package/lib/index.js

@@ -322,9 +322,10 @@ function awaitUpdate(source, arg1, arg2) {
 
 const REGISTER$1 = new WeakMap();
 class Subscriber {
-    constructor(parent, onUpdate) {
+    constructor(parent, onUpdate, suspend) {
         this.parent = parent;
         this.onUpdate = onUpdate;
+        this.suspend = suspend;
         this.active = false;
         this.dependant = new Set();
         this.watch = new Map();
@@ -514,9 +515,13 @@ class Control {
             set: this.ref(key),
             get() {
                 const sub = subscriber(this);
-                if (sub)
+                const value = state.get(key);
+                if (sub) {
                     sub.add(key);
-                return state.get(key);
+                    if (value === undefined && sub.suspend)
+                        throw suspend(this, key);
+                }
+                return value;
             }
         });
     }
@@ -706,11 +711,22 @@ function add(instruction, label) {
                 if (!state.has(key) && shouldSuspend)
                     throw suspend(control, key);
                 const local = subscriber(this);
+                const required = local && local.suspend;
                 if (local)
                     local.add(key);
-                return onGet
-                    ? onGet(local)
-                    : state.get(key);
+                try {
+                    const value = onGet
+                        ? onGet(local)
+                        : state.get(key);
+                    if (value === undefined && required === true)
+                        throw suspend(control, key);
+                    return value;
+                }
+                catch (err) {
+                    if (err instanceof Promise && required === false)
+                        return;
+                    throw err;
+                }
             }
         });
     }
@@ -836,7 +852,7 @@ function get(arg0, arg1, arg2) {
             let source = this;
             let setter;
             if (typeof arg0 == "function") {
-                let result = mayRetry(arg0.bind(subject, key, subject));
+                const result = mayRetry(arg0.bind(subject, key, subject));
                 if (typeof result == "function")
                     setter = result;
                 else {
@@ -1404,7 +1420,7 @@ function useCompute(source, compute, suspend) {
             sub.commit();
             update = () => {
                 const next = make();
-                if (value != next)
+                if (notEqual(value, next))
                     reassign(next);
             };
         }
@@ -1423,7 +1439,12 @@ function useCompute(source, compute, suspend) {
         return null;
     React__default["default"].useLayoutEffect(() => local.release, deps);
     return local.proxy;
-}
+}
+/** 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 useTap(source, arg1, arg2) {
     const instance = typeof source == "object"
@@ -1433,18 +1454,13 @@ function useTap(source, arg1, arg2) {
             : useContext(source);
     return typeof arg1 == "function"
         ? useCompute(instance, arg1, arg2)
-        : useSubscribe(instance, arg1, arg2);
+        : useSubscribe(instance, arg1);
 }
-function useSubscribe(source, path, expect) {
+function useSubscribe(source, expect) {
     const deps = [uid(source)];
-    const local = use(refresh => (control(source).subscribe(() => refresh)), deps);
+    const local = use(refresh => (new Subscriber(control(source), () => refresh, expect)), deps);
     React__default["default"].useLayoutEffect(() => local.commit(), deps);
-    if (path === undefined)
-        return local.proxy;
-    const value = local.proxy[path];
-    if (value === undefined && expect)
-        throw suspend(local.parent, path);
-    return value;
+    return local.proxy;
 }
 
 const Global$1 = new WeakMap();
@@ -1505,7 +1521,7 @@ class MVC extends Model {
         const instance = this.get();
         return typeof arg1 == "function"
             ? useCompute(instance, arg1, arg2)
-            : useSubscribe(instance, arg1, arg2);
+            : useSubscribe(instance, arg1);
     }
     static use(a, b) {
         return useNew(this, a, b);
@@ -1513,7 +1529,7 @@ class MVC extends Model {
     static meta(arg1, arg2) {
         return typeof arg1 == "function"
             ? useCompute(this, arg1, arg2)
-            : useSubscribe(this, arg1, arg2);
+            : useSubscribe(this, arg1);
     }
 }
 

package/package.json

@@ -49,5 +49,5 @@
     "tslib": "^2.3.0",
     "typescript": "4.6.3"
   },
-  "version": "0.15.1"
+  "version": "0.16.0"
 }