@expressive/mvc 0.29.1 → 0.30.0

package/lib/index.d.ts

@@ -58,15 +58,17 @@ declare global {
   }
 }
 
-type OnValue<T, P extends Model.Key<T>> = (this: T, value: T[P], updated: Model.Event<T>[]) => void;
-type OnValues<T, P extends Model.Key<T>> = (this: T, value: Model.Export<T, P>, updated: Model.Event<T>[]) => void;
+type SelectOne<T, K extends Model.Key<T>> = K;
+type SelectFew<T, K extends Model.Key<T>> = K[];
+type Select<T, K extends Model.Key<T> = Model.Key<T>> = K | K[];
+type Export<T, S> = S extends SelectOne<T, infer P> ? T[P] : S extends SelectFew<T, infer P> ? Model.Export<T, P> : never;
+type OnUpdate<T, S> = (this: T, value: Export<T, S>, updated: Model.Event<T>[]) => void;
 interface Observable {
     get(): Model.Export<this>;
+    get<P extends Select<this>>(select: P): Export<this, P>;
+    get<P extends Select<this>>(select: P, onUpdate: OnUpdate<this, P>, once?: true): Callback;
+    get<P extends Select<this>>(select: P, onUpdate: OnUpdate<this, P>, initial?: false): Callback;
     get(effect: Model.Effect<this>): Callback;
-    get<P extends Model.Key<this>>(select: P): this[P];
-    get<P extends Model.Key<this>>(select: P, onUpdate: OnValue<this, P>, once?: boolean): Callback;
-    get<P extends Model.Key<this>>(select: P[]): Model.Export<this, P>;
-    get<P extends Model.Key<this>>(select: P[], onUpdate: OnValues<this, P>, once?: boolean): Callback;
     set(): Promise<Model.Event<this>[]>;
     set(timeout: number): Promise<Model.Event<this>[] | false>;
     set<T extends Model.Values<this>>(source: T, only?: (keyof T)[]): Promise<Model.Event<T>[] | false>;
@@ -82,34 +84,23 @@ declare namespace Model {
     type Type<T extends Model = Model> = abstract new (...args: any[]) => T;
     /** A typeof Model, specifically one which can be created without any arguments. */
     type New<T extends Model = Model> = (new () => T) & typeof Model;
-    type Effect<T> = (this: T, argument: T) => Callback | Promise<any> | void;
-    /** Exotic value, actual value is contained. */
-    type Ref<T = any> = {
-        (next: T): void;
-        current: T | null;
-    };
-    /**
-     * Subset of `keyof T` which are not methods or defined by base Model U.
-     **/
-    type Key<T, U = Model> = Extract<Exclude<keyof T, keyof U>, string>;
+    /** A callback function which is subscribed to parent and updates when values change. */
+    type Effect<T> = (this: T, argument: T) => Callback | Promise<void> | void;
+    /** Subset of `keyof T` which are not methods or defined by base Model U. **/
+    type Key<T, U = Observable> = Extract<Exclude<keyof T, keyof U>, string>;
     /** Including but not limited to `keyof T` which are not methods or defined by base Model. */
     type Event<T> = Key<T> | (string & {});
-    /** Actual value stored in state. */
-    type Value<R> = R extends Ref<infer T> ? T : R extends Observable ? Export<R> : R;
     /** Object comperable to data found in T. */
     type Values<T> = {
         [P in Key<T>]?: Value<T[P]>;
     };
     /**
      * Values from current state of given controller.
-     *
-     * Differs from `Entries` as values here will drill into "real" values held by exotics like ref.
+     * Differs from `Values` as values here will drill into "real" values held by exotics like ref.
      */
     type Export<T, K extends Key<T> = Key<T>> = {
         [P in K]: Value<T[P]>;
     };
-    /** Promise thrown by something which is not yet ready. */
-    type Suspense = Promise<void> & Error;
     /**
      * Reference to `this` without a subscription.
      * Use to obtain full reference from a destructure.
@@ -117,6 +108,13 @@ declare namespace Model {
     type Focus<T> = T & {
         is: T;
     };
+    /** Exotic value, actual value is contained. */
+    type Ref<T = any> = {
+        (next: T): void;
+        current: T | null;
+    };
+    /** Actual value stored in state. */
+    type Value<R> = R extends Ref<infer T> ? T : R extends Observable ? Export<R> : R;
 }
 interface Model extends Observable {
 }
@@ -346,7 +344,7 @@ declare class Control<T extends {} = any> {
     static for: typeof control;
     static apply: typeof apply;
     static watch: typeof watch;
-    id?: string | number;
+    id: string | number | false;
     subject: T;
     state: {
         [key: string]: any;
@@ -355,8 +353,8 @@ declare class Control<T extends {} = any> {
     frame: Set<string>;
     followers: Set<Observer<any>>;
     observers: Map<string, Set<Observer<any>>>;
-    constructor(subject: T, id?: string | number | false);
-    add(key: Extract<keyof T, string>): void;
+    constructor(subject: T, id: string | number | false);
+    add(key: string): void;
     watch(key: string, output: Control.PropertyDescriptor<any>): void;
     ref<K extends Model.Key<T>>(key: K, callback?: (this: T, value: T[K]) => boolean | void): (value: any) => void;
     update(key: string): void;

package/lib/index.esm.js

@@ -254,11 +254,13 @@ function createEffect(source, callback) {
         return () => refresh = null;
     });
 }
-function createValueEffect(callback) {
+function createValueEffect(callback, ignoreNull) {
     let unSet;
     return function (value) {
         if (typeof unSet == "function")
-            unSet(value);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
         const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
@@ -290,6 +292,7 @@ function getMethod(argument, callback, once) {
     if (typeof callback != "function")
         return extract();
     const select = typeof argument == "string" ? [argument] : argument;
+    const invoke = () => callback(extract(), self.latest || []);
     if (select)
         for (const key of select)
             try {
@@ -300,11 +303,13 @@ function getMethod(argument, callback, once) {
             catch (e) {
                 // TODO: should this be caught?
             }
+    if (once === undefined)
+        invoke();
     const remove = self.addListener(key => {
         if (!select || select.includes(key)) {
             if (once)
                 remove();
-            return () => callback(extract(), self.latest);
+            return invoke;
         }
     });
     return remove;
@@ -349,7 +354,7 @@ function setMethod(arg1, arg2) {
 
 class Model {
     constructor(id) {
-        new Control(this, id);
+        new Control(this, id === undefined ? uid() : id);
     }
     /** Mark this instance for garbage collection. */
     null() {
@@ -414,7 +419,11 @@ defineProperties(Model.prototype, {
             throw new Error("Model.on() is deprecated. Use Model.get or Model.set instead.");
         }
     }
-});
+});
+/** Random alphanumberic of length 6. Will always start with a letter. */
+function uid() {
+    return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
+}
 
 const Oops$4 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
@@ -430,12 +439,11 @@ class Control {
         this.frame = new Set();
         this.followers = new Set();
         this.observers = new Map([["", this.followers]]);
+        this.id = id;
         this.subject = subject;
         REGISTER.set(subject, this);
-        if (id !== false) {
-            this.id = id === undefined ? uid() : id;
+        if (id !== false)
             PENDING$1.set(this, new Set(Control.ready));
-        }
     }
     add(key) {
         const { value } = getOwnPropertyDescriptor(this.subject, key);
@@ -606,10 +614,6 @@ function apply(instruction) {
             onto.watch(key, typeof output == "function" ? { get: output } : output);
     });
     return placeholder;
-}
-/** Random alphanumberic of length 6; will always start with a letter. */
-function uid() {
-    return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
 const Oops$3 = issues({
@@ -775,33 +779,30 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
-function ref(arg, mapper) {
+function ref(arg, arg2) {
     return apply((key, source) => {
         let value = {};
         if (typeof arg == "object")
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, typeof mapper == "function" ? {
+            for (const key in control(arg, true).state)
+                defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
-                        const out = mapper(key);
+                        const out = arg2(key);
                         defineProperty(value, key, { value: out });
                         return out;
                     }
                 } : {
                     value: createRef(source, key)
                 });
-            }
         else
-            value = createRef(source, key, arg && mapper !== false
-                ? (x) => x !== null ? arg(x) : undefined
-                : arg);
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
     });
 }
 function createRef(src, key, cb) {
-    const refObjectFunction = src.ref(key, cb && createValueEffect(cb));
+    const refObjectFunction = src.ref(key, cb);
     defineProperty(refObjectFunction, "current", {
         set: refObjectFunction,
         get: () => src.state[key]

package/lib/index.js

@@ -258,11 +258,13 @@ function createEffect(source, callback) {
         return () => refresh = null;
     });
 }
-function createValueEffect(callback) {
+function createValueEffect(callback, ignoreNull) {
     let unSet;
     return function (value) {
         if (typeof unSet == "function")
-            unSet(value);
+            unSet = void unSet(value);
+        if (value === null && ignoreNull)
+            return;
         const out = callback.call(this, value);
         if (typeof out == "boolean")
             return out;
@@ -294,6 +296,7 @@ function getMethod(argument, callback, once) {
     if (typeof callback != "function")
         return extract();
     const select = typeof argument == "string" ? [argument] : argument;
+    const invoke = () => callback(extract(), self.latest || []);
     if (select)
         for (const key of select)
             try {
@@ -304,11 +307,13 @@ function getMethod(argument, callback, once) {
             catch (e) {
                 // TODO: should this be caught?
             }
+    if (once === undefined)
+        invoke();
     const remove = self.addListener(key => {
         if (!select || select.includes(key)) {
             if (once)
                 remove();
-            return () => callback(extract(), self.latest);
+            return invoke;
         }
     });
     return remove;
@@ -353,7 +358,7 @@ function setMethod(arg1, arg2) {
 
 class Model {
     constructor(id) {
-        new Control(this, id);
+        new Control(this, id === undefined ? uid() : id);
     }
     /** Mark this instance for garbage collection. */
     null() {
@@ -418,7 +423,11 @@ defineProperties(Model.prototype, {
             throw new Error("Model.on() is deprecated. Use Model.get or Model.set instead.");
         }
     }
-});
+});
+/** Random alphanumberic of length 6. Will always start with a letter. */
+function uid() {
+    return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
+}
 
 const Oops$4 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
@@ -434,12 +443,11 @@ class Control {
         this.frame = new Set();
         this.followers = new Set();
         this.observers = new Map([["", this.followers]]);
+        this.id = id;
         this.subject = subject;
         REGISTER.set(subject, this);
-        if (id !== false) {
-            this.id = id === undefined ? uid() : id;
+        if (id !== false)
             PENDING$1.set(this, new Set(Control.ready));
-        }
     }
     add(key) {
         const { value } = getOwnPropertyDescriptor(this.subject, key);
@@ -610,10 +618,6 @@ function apply(instruction) {
             onto.watch(key, typeof output == "function" ? { get: output } : output);
     });
     return placeholder;
-}
-/** Random alphanumberic of length 6; will always start with a letter. */
-function uid() {
-    return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
 const Oops$3 = issues({
@@ -779,33 +783,30 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
-function ref(arg, mapper) {
+function ref(arg, arg2) {
     return apply((key, source) => {
         let value = {};
         if (typeof arg == "object")
-            for (const key in control(arg, true).state) {
-                defineProperty(value, key, typeof mapper == "function" ? {
+            for (const key in control(arg, true).state)
+                defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
-                        const out = mapper(key);
+                        const out = arg2(key);
                         defineProperty(value, key, { value: out });
                         return out;
                     }
                 } : {
                     value: createRef(source, key)
                 });
-            }
         else
-            value = createRef(source, key, arg && mapper !== false
-                ? (x) => x !== null ? arg(x) : undefined
-                : arg);
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
     });
 }
 function createRef(src, key, cb) {
-    const refObjectFunction = src.ref(key, cb && createValueEffect(cb));
+    const refObjectFunction = src.ref(key, cb);
     defineProperty(refObjectFunction, "current", {
         set: refObjectFunction,
         get: () => src.state[key]

package/package.json

@@ -26,6 +26,6 @@
     "prebuild": "rm -rf lib/",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.29.1",
-  "gitHead": "bc5ef985433d6f7d198eda375cda9e8a055ca0d0"
+  "version": "0.30.0",
+  "gitHead": "8e2ed856c216a18e350494fef186adbee3c20f73"
 }