@expressive/mvc 0.5.0 → 0.6.0

package/lib/index.d.ts

@@ -232,6 +232,7 @@ declare namespace get {
     type Function<T, O = any> = (this: O, on: O) => T;
     type Factory<T, O = any> = (key: string) => Function<T, O>;
     type Getter = (controller: Controller, key: string) => any;
+    type Factory2<T, S = unknown> = (this: S, key: string, thisArg: S) => T;
 }
 /**
  * Implement a computed value; output will be generated by provided function.
@@ -250,6 +251,46 @@ declare function get<R, T>(source: T, compute: (this: T, on: T) => R, suspend?:
  */
 declare function get<R, T>(compute: (property: string) => (this: T, state: T) => R, suspend: true): Exclude<R, undefined>;
 declare function get<R, T>(compute: (property: string) => (this: T, state: T) => R, suspend?: boolean): R;
+/**
+  * Set property with an async function.
+  *
+  * Property cannot be accessed until factory resolves, yeilding a result.
+  * If accessed while processing, React Suspense will be thrown.
+  *
+  * - `required: true` (default) -
+  *      Run factory immediately upon creation of model instance.
+  * - `required: false` -
+  *      Run factory only if/when accessed.
+  *      Value will always throw suspense at least once - use with caution.
+  *
+  * @param factory - Callback run to derrive property value.
+  * @param required - (default: true) Run factory immediately on creation, otherwise on access.
+  */
+declare function get<T>(factory: get.Factory2<Promise<T>>, required: false): T | undefined;
+declare function get<T, S>(factory: get.Factory2<Promise<T>, S>, required: false): T | undefined;
+declare function get<T>(factory: get.Factory2<Promise<T>>, required?: boolean): T;
+declare function get<T, S>(factory: get.Factory2<Promise<T>, S>, required?: boolean): T;
+/**
+  * Set property with a factory function.
+  *
+  * - `required: true` (default) -
+  *      Run factory immediately upon creation of model instance.
+  * - `required: false` -
+  *      Run factory only if/when accessed.
+  *      Value will always throw suspense at least once - use with caution.
+  *
+  * @param factory - Callback run to derrive property value.
+  * @param required - (default: true) Run factory immediately on creation, otherwise on access.
+  */
+declare function get<T>(factory: get.Factory2<T>, required: false): T | undefined;
+declare function get<T, S>(factory: get.Factory2<T, S>, required: false): T | undefined;
+declare function get<T>(factory: get.Factory2<T>, required?: boolean): T;
+declare function get<T, S>(factory: get.Factory2<T, S>, required?: boolean): T;
+/**
+ * Assign a property with result of a promise.
+ */
+declare function get<T>(factory: Promise<T>, required: false): T | undefined;
+declare function get<T>(factory: Promise<T>, required?: boolean): T;
 
 declare namespace ref {
     type Callback<T, S = any> = (this: S, argument: T) => ((next: T) => void) | Promise<void> | void | boolean;
@@ -273,62 +314,6 @@ declare namespace ref {
 declare function ref<T = HTMLElement>(callback?: ref.Callback<T>): ref.Object<T>;
 declare function ref<T, S>(callback?: ref.Callback<T, S>): ref.Object<T>;
 
-declare namespace set$1 {
-    type Factory<T, S = unknown> = (this: S, key: string, subject: S) => T;
-    type Callback<T, S = any> = (this: S, argument: T) => ((next: T) => void) | Promise<any> | void | boolean;
-}
-/**
- * Set property with an async function.
- *
- * Property cannot be accessed until factory resolves, yeilding a result.
- * If accessed while processing, React Suspense will be thrown.
- *
- * - `required: true` (default) -
- *      Run factory immediately upon creation of model instance.
- * - `required: false` -
- *      Run factory only if/when accessed.
- *      Value will always throw suspense at least once - use with caution.
- *
- * @param factory - Callback run to derrive property value.
- * @param required - (default: true) Run factory immediately on creation, otherwise on access.
- */
-declare function put<T>(factory: set$1.Factory<Promise<T>>, required: false): T | undefined;
-declare function put<T, S>(factory: set$1.Factory<Promise<T>, S>, required: false): T | undefined;
-declare function put<T>(factory: set$1.Factory<Promise<T>>, required?: boolean): T;
-declare function put<T, S>(factory: set$1.Factory<Promise<T>, S>, required?: boolean): T;
-declare function put<T>(value: set$1.Factory<Promise<T>>, onUpdate: set$1.Callback<T>): T;
-declare function put<T, S>(value: set$1.Factory<Promise<T>, S>, onUpdate: set$1.Callback<T, S>): T;
-/**
- * Set property with a factory function.
- *
- * - `required: true` (default) -
- *      Run factory immediately upon creation of model instance.
- * - `required: false` -
- *      Run factory only if/when accessed.
- *      Value will always throw suspense at least once - use with caution.
- *
- * @param factory - Callback run to derrive property value.
- * @param required - (default: true) Run factory immediately on creation, otherwise on access.
- */
-declare function put<T>(factory: set$1.Factory<T>, required: false): T | undefined;
-declare function put<T, S>(factory: set$1.Factory<T, S>, required: false): T | undefined;
-declare function put<T>(factory: set$1.Factory<T>, required?: boolean): T;
-declare function put<T, S>(factory: set$1.Factory<T, S>, required?: boolean): T;
-declare function put<T>(value: set$1.Factory<T>, onUpdate: set$1.Callback<T>): T;
-declare function put<T, S>(value: set$1.Factory<T, S>, onUpdate: set$1.Callback<T, S>): T;
-/**
- * Assign a property with result of a promise.
- */
-declare function put<T>(factory: Promise<T>, required: false): T | undefined;
-declare function put<T>(factory: Promise<T>, required?: boolean): T;
-declare function put<T>(value: Promise<T>, onUpdate: set$1.Callback<T>): T;
-/**
- * Assign a property.
- */
-declare function put<T>(factory: T, required: false): T | undefined;
-declare function put<T>(factory: T, required?: boolean): T;
-declare function put<T>(value: T, onUpdate: set$1.Callback<T>): T;
-
 declare namespace set {
     type Callback<T, S = any> = (this: S, argument: T) => ((next: T) => void) | Promise<any> | void | boolean;
 }
@@ -347,10 +332,11 @@ declare function set<T>(value: T, onUpdate: set.Callback<T>): T;
 declare function set<T, S>(value: T, onUpdate: set.Callback<T, S>): T;
 
 declare type MapFunction<T, R> = T extends Map<infer K, infer V> ? (value: V, key: K, map: T) => R | void : T extends Set<infer K> ? (value: K, key: K, set: T) => R | void : never;
-declare type Managed<T> = T & {
+declare type Managed<T> = Exclude<T, "forEach"> & {
     from?: T;
     forEach<R>(mapFunction: MapFunction<T, R>, thisArg?: any): Exclude<R, undefined>[] | void;
 };
+
 declare function use<K = any>(initial: SetConstructor): Managed<Set<K>>;
 declare function use<K = any, V = any>(initial: MapConstructor): Managed<Map<K, V>>;
 declare function use(initial: Set<unknown>): Managed<Set<any>>;
@@ -363,6 +349,8 @@ declare function use<T extends Set<any> | Map<any, any>>(from: () => T): Managed
  * Create a placeholder for specified Model type.
  */
 declare function use<T extends Model>(): T | undefined;
+declare function use<T extends Model>(from: () => T, required: false): T | undefined;
+declare function use<T extends Model>(from: () => T, required: boolean): T;
 /**
  * Create a new child instance of model.
  */
@@ -370,6 +358,9 @@ declare function use<T extends Class>(Type: T, callback?: (i: InstanceOf<T>) =>
 /**
  * Create a managed child from factory function.
  */
+declare function use<T extends {}>(from: () => Promise<T>, required: false): T | undefined;
+declare function use<T extends {}>(from: () => Promise<T>, required: boolean): T;
+declare function use<T extends {}>(from: () => Promise<T>, callback?: (i: T) => void): T;
 declare function use<T extends {}>(from: () => T, callback?: (i: T) => void): T;
 /**
  * Create child-instance relationship with provided model.
@@ -625,4 +616,4 @@ declare function useTap<T extends Stateful, K extends Model.Field<T>>(source: T
 declare function useTap<T extends Stateful, R>(source: T | (() => T) | useTap.Tappable, compute: (this: T, from: T) => R, expect: true): Exclude<R, undefined>;
 declare function useTap<T extends Stateful, R>(source: T | (() => T) | useTap.Tappable, compute: (this: T, from: T) => R, expect?: boolean): R;
 
-export { CONTROL, Consumer, Global, LOCAL, MVC as Model, Provider, STATE, Stateful, WHY, act, apply, MVC as default, get, has, put, ref, set, tap, use, useFrom, useLocal, useModel, useTap };
+export { CONTROL, Consumer, Global, LOCAL, MVC as Model, Provider, STATE, Stateful, WHY, act, apply, MVC as default, get, has, ref, set, tap, use, useFrom, useLocal, useModel, useTap };