@expressive/mvc 0.9.5 → 0.9.6

package/lib/index.d.ts

@@ -22,7 +22,7 @@ declare class Subscriber<T extends {} = any> {
     dependant: Set<Listener>;
     watch: Map<any, boolean | (() => true | void)>;
     constructor(parent: Control<T>, onUpdate: Subscriber.OnEvent);
-    get using(): Model.Values<T>[];
+    get using(): Model.Field<T>[];
     assign(apply: Model.Compat<T>, keys?: any): void;
     add(key: any, value?: boolean | Callback): void;
     commit: () => () => void;
@@ -45,7 +45,7 @@ declare type Debug<T extends {}> = T & {
     /** Current subscriber (if present) while used in a live context (e.g. hook or effect). */
     [LOCAL]?: Subscriber<T>;
     /** Current state of this instance. */
-    [STATE]?: Model.Values<T>;
+    [STATE]?: Model.Export<T>;
     /**
      * Last update causing a refresh to subscribers.
      *
@@ -78,18 +78,18 @@ declare namespace Model {
      *
      * TODO: Should exclude methods
      **/
-    export type Field<T, U extends Model = Model> = Exclude<keyof T, keyof U | keyof Debug<{}>> & string;
+    export type Field<T, E extends Model = Model> = Exclude<keyof T, keyof E | keyof Debug<{}>> & string;
     /**
      * Including but not limited to `keyof T` which are not methods or defined by base Model.
      **/
-    export type Event<T, U extends Model = Model> = Extends<Field<T, U>>;
+    export type Event<T, E extends Model = Model> = Extends<Field<T, E>>;
     /** Object containing managed entries found in T. */
-    export type Entries<T, U extends Model = Model> = {
-        [K in Field<T, U>]: T[K];
+    export type Entries<T, E extends Model = Model> = {
+        [K in Field<T, E>]: T[K];
     };
     /** Object comperable to data found in T. */
-    export type Compat<T, U extends Model = Model> = {
-        [K in Field<T, U>]?: T[K];
+    export type Compat<T, E extends Model = Model> = {
+        [K in Field<T, E>]?: T[K];
     };
     /** Actual value stored in state. */
     export type Value<R> = R extends Ref<infer T> ? T : R;
@@ -103,6 +103,9 @@ declare namespace Model {
     export type Values<T, K extends Field<T> = Field<T>> = {
         [P in K]: Value<T[P]>;
     };
+    export type Export<T, E extends Model = Model> = {
+        [P in Field<T, E>]: Value<T[P]>;
+    };
 }
 declare class Model {
     /**
@@ -124,7 +127,7 @@ declare class Model {
     on(current?: boolean): Promise<Model.Event<this>[] | null>;
     on(current: true): Promise<Model.Event<this>[]>;
     on(current: null): Promise<null>;
-    export(): Model.Values<this>;
+    export(): Model.Export<this>;
     export<P extends Model.Field<this>>(select: Iterable<P>): Model.Values<this, P>;
     update(key: Model.Event<this>): PromiseLike<readonly Model.Event<this>[]>;
     update(key: Model.Event<this>, callMethod: boolean): PromiseLike<readonly Model.Event<this>[]>;