@expressive/mvc 0.41.0 → 0.42.0

package/dist/index.d.ts

@@ -2,19 +2,26 @@ declare namespace Model {
     /** Any type of Model, using own class constructor as its identifier. */
     type Type<T extends Model = Model> = abstract new (...args: any[]) => T;
     /** A type of Model which may be created without constructor arguments. */
-    type New<T extends Model = Model> = (new () => T) & typeof Model;
+    type New<T extends Model = Model> = (new (arg?: Model.Argument) => T) & typeof Model;
+    /**
+     * Model constructor callback - is called when Model finishes intializing.
+     * Returned function will call when model is destroyed.
+     */
+    type Callback = (() => (() => void) | void);
+    /** Model constructor argument */
+    type Argument = string | Callback | undefined;
     /** Subset of `keyof T` which are not methods or defined by base Model U. **/
     type Field<T> = Exclude<keyof T, keyof Model>;
     /** Any valid key for controller, including but not limited to Field<T>. */
-    type Key<T> = Field<T> | (string & {}) | number | symbol;
+    type Event<T> = Field<T> | (string & {}) | number | symbol;
     /** Export/Import compatible value for a given property in a Model. */
     type Export<R> = R extends {
         get(): infer T;
     } ? T : R;
     /** Value for a property managed by a controller. */
-    type Value<T extends Model, K extends Key<T>> = K extends keyof T ? Export<T[K]> : unknown;
+    type Value<T extends Model, K extends Event<T>> = K extends keyof T ? Export<T[K]> : unknown;
     type OnEvent<T extends Model> = (this: T, key: unknown, source: T) => (() => void) | void | null;
-    type OnUpdate<T extends Model, K extends Key<T>> = (this: T, value: Value<T, K>, key: K, thisArg: K) => void;
+    type OnUpdate<T extends Model, K extends Event<T>> = (this: T, value: Value<T, K>, key: K, thisArg: K) => void;
     /**
      * Values from current state of given controller.
      * Differs from `Values` as values here will drill
@@ -42,7 +49,7 @@ declare namespace Model {
      *
      * @returns A callback function which will be called when this effect is stale.
      */
-    type Effect<T> = (this: T, current: T, update: Set<Model.Key<T>>) => EffectCallback | Promise<void> | null | void;
+    type Effect<T> = (this: T, current: T, update: Set<Model.Event<T>>) => EffectCallback | Promise<void> | null | void;
     /**
      * A callback function returned by effect. Will be called when effect is stale.
      *
@@ -64,13 +71,6 @@ declare namespace Model {
      * Optional returned callback will run when once upon first access.
      */
     type Instruction<T = any, M extends Model = any> = (this: M, key: Model.Field<M> & string, thisArg: M, state: Model.State<M>) => Instruction.Descriptor<T> | Instruction.Getter<T> | void;
-    /**
-     * Model constructor callback - is called when Model finishes intializing.
-     * Returned function will call when model is destroyed.
-     */
-    type Callback = (() => void | (() => void));
-    /** Model constructor argument */
-    type Argument = string | Callback;
 }
 interface Model {
     /**
@@ -99,14 +99,14 @@ declare class Model {
      * @param key - Property to get value of.
      * @param required - If true, will throw an error if property is not available.
      */
-    get<T extends Model.Key<this>>(key: T, required?: boolean): Model.Value<this, T>;
+    get<T extends Model.Event<this>>(key: T, required?: boolean): Model.Value<this, T>;
     /**
      * Run a function when a property is updated.
      *
      * @param key - Property to watch for updates.
      * @param callback - Function to call when property is updated.
      */
-    get<T extends Model.Key<this>>(key: T, callback: Model.OnUpdate<this, T>): () => void;
+    get<T extends Model.Event<this>>(key: T, callback: Model.OnUpdate<this, T>): () => void;
     /**
      * Check if model is expired.
      *
@@ -125,7 +125,7 @@ declare class Model {
      *
      * @returns Promise which resolves object with updated values. Is `undefined` if there is no update.
      **/
-    set(): PromiseLike<Model.Key<this>[]> | undefined;
+    set(): PromiseLike<Model.Event<this>[]> | undefined;
     /**
      * Call a function when update occurs.
      *
@@ -158,7 +158,7 @@ declare class Model {
      * @param key - Property or event to dispatch.
      * @returns Promise which resolves an array of keys which were updated.
      */
-    set(key: Model.Key<this>): PromiseLike<Model.Key<this>[]>;
+    set(key: Model.Event<this>): PromiseLike<Model.Event<this>[]>;
     /**
      * Update a property with value.
      *
@@ -166,7 +166,7 @@ declare class Model {
      * @param value - value to update property with (if the same as current, no update will occur)
      * @param silent - if true, will not notify listeners of an update
      */
-    set<K extends string>(key: K, value?: Model.Value<this, K>, silent?: boolean): PromiseLike<Model.Key<this>[]> | undefined;
+    set<K extends string>(key: K, value?: Model.Value<this, K>, silent?: boolean): PromiseLike<Model.Event<this>[]> | undefined;
     /** Iterate over managed properties in this instance of Model. */
     [Symbol.iterator](): Iterator<[string, unknown]>;
     /**
@@ -176,7 +176,7 @@ declare class Model {
      *
      * @param args - arguments sent to constructor
      */
-    static new<T extends typeof Model>(this: T, ...args: ConstructorParameters<T>): InstanceType<T>;
+    static new<T extends Model>(this: Model.New<T>, arg?: Model.Argument): T;
     /**
      * Static equivalent of `x instanceof this`.
      * Determines if provided class is a subtype of this one.

package/dist/index.js

@@ -170,23 +170,28 @@ var Model = class _Model {
       const desc = Object.getOwnPropertyDescriptors(Type.prototype);
       for (const key in desc) {
         let { value } = desc[key];
-        if (typeof value == "function" && key !== "constructor")
+        if (typeof value == "function" && key !== "constructor") {
+          const bind = (value2) => {
+            const method = value2.bind(this);
+            METHOD.set(method, value2);
+            define(this, key, {
+              value: method,
+              configurable: false
+            });
+            return method;
+          };
           Object.defineProperty(Type.prototype, key, {
-            get() {
-              const method = value.bind(this.is);
-              METHOD.set(method, value);
-              define(this.is, key, {
-                value: method,
-                configurable: false
-              });
-              return method;
-            }
+            get: () => this.hasOwnProperty(key) ? value : bind(value),
+            set: bind
           });
+        }
       }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
       let onDone;
+      if (typeof arg == "function")
+        onDone = arg.call(this);
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -200,8 +205,6 @@ var Model = class _Model {
           });
         }
       }
-      if (typeof arg == "function")
-        onDone = arg();
       addListener(this, () => {
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
@@ -289,8 +292,8 @@ var Model = class _Model {
    * 
    * @param args - arguments sent to constructor
    */
-  static new(...args) {
-    const instance = new this(...args);
+  static new(arg) {
+    const instance = new this(arg);
     event(instance, true);
     return instance;
   }

package/dist/index.mjs

@@ -136,23 +136,28 @@ var Model = class _Model {
       const desc = Object.getOwnPropertyDescriptors(Type.prototype);
       for (const key in desc) {
         let { value } = desc[key];
-        if (typeof value == "function" && key !== "constructor")
+        if (typeof value == "function" && key !== "constructor") {
+          const bind = (value2) => {
+            const method = value2.bind(this);
+            METHOD.set(method, value2);
+            define(this, key, {
+              value: method,
+              configurable: false
+            });
+            return method;
+          };
           Object.defineProperty(Type.prototype, key, {
-            get() {
-              const method = value.bind(this.is);
-              METHOD.set(method, value);
-              define(this.is, key, {
-                value: method,
-                configurable: false
-              });
-              return method;
-            }
+            get: () => this.hasOwnProperty(key) ? value : bind(value),
+            set: bind
           });
+        }
       }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
       let onDone;
+      if (typeof arg == "function")
+        onDone = arg.call(this);
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -166,8 +171,6 @@ var Model = class _Model {
           });
         }
       }
-      if (typeof arg == "function")
-        onDone = arg();
       addListener(this, () => {
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
@@ -255,8 +258,8 @@ var Model = class _Model {
    * 
    * @param args - arguments sent to constructor
    */
-  static new(...args) {
-    const instance = new this(...args);
+  static new(arg) {
+    const instance = new this(arg);
     event(instance, true);
     return instance;
   }

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.41.0",
-  "gitHead": "1c7d28301f4abc428c3bfdea891c34d31fc1e9d0"
+  "version": "0.42.0",
+  "gitHead": "a49c69c9d8cfec956664046510d4e862505cdd1e"
 }