@expressive/mvc 0.41.0 → 0.43.0

package/dist/index.d.ts

@@ -2,19 +2,30 @@ 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?: Argument) => T) & typeof Model;
+    /**
+     * Model constructor callback - is called when Model finishes intializing.
+     * Returned function will call when model is destroyed.
+     */
+    type Callback<T extends Model = Model> = (this: T, thisArg: T) => (() => void) | Assign<T> | void;
+    /** Model constructor argument */
+    type Argument<T extends Model = Model> = string | Callback<T> | Assign<T> | 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;
+    /** Object overlay which may be used to override values and methods while creating model. */
+    type Assign<T> = {
+        [K in Exclude<keyof T, keyof Model>]?: T[K] extends (...args: any[]) => infer R ? (this: T, ...args: Parameters<T[K]>) => ReturnType<T[K]> : T[K];
+    } & Record<string, unknown>;
     /** 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 +53,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<Event<T>>) => EffectCallback | Promise<void> | null | void;
     /**
      * A callback function returned by effect. Will be called when effect is stale.
      *
@@ -63,14 +74,7 @@ declare namespace Model {
      * Property initializer, will run upon instance creation.
      * 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;
+    type Instruction<T = any, M extends Model = any> = (this: M, key: Field<M> & string, thisArg: M, state: State<M>) => Instruction.Descriptor<T> | Instruction.Getter<T> | void;
 }
 interface Model {
     /**
@@ -99,14 +103,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 +129,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 +162,12 @@ 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 mulitple properties at once. Merges argument with current state.
+     * Properties which are not managed by this controller will be ignored.
+     */
+    set(assign: Model.Assign<this>): PromiseLike<Model.Event<this>[]> | undefined;
     /**
      * Update a property with value.
      *
@@ -166,7 +175,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 +185,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>): T;
     /**
      * Static equivalent of `x instanceof this`.
      * Determines if provided class is a subtype of this one.

package/dist/index.js

@@ -149,7 +149,7 @@ function effect(target, callback) {
 
 // src/model.ts
 var FLATTEN;
-var REGISTER = /* @__PURE__ */ new WeakMap();
+var NAMES = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
@@ -160,33 +160,20 @@ var Model = class _Model {
   constructor(arg) {
     const state = {};
     let Type = this.constructor;
+    bind(Type);
     define(this, "is", { value: this });
     STATE.set(this, state);
-    REGISTER.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    NAMES.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
-      const desc = Object.getOwnPropertyDescriptors(Type.prototype);
-      for (const key in desc) {
-        let { value } = desc[key];
-        if (typeof value == "function" && key !== "constructor")
-          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;
-            }
-          });
-      }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      let onDone;
+      const apply = typeof arg == "function" ? arg.call(this, this) : arg;
+      if (typeof apply == "object")
+        assign(this, apply);
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -200,14 +187,12 @@ 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)
             value.set(null);
-        if (typeof onDone == "function")
-          onDone();
+        if (typeof apply == "function")
+          apply();
         Object.freeze(state);
       }, null);
       return null;
@@ -261,7 +246,9 @@ var Model = class _Model {
       });
     if (arg1 === null)
       return event(this, null);
-    if (arg1 !== void 0)
+    if (typeof arg1 == "object")
+      assign(self, arg1);
+    else if (arg1 !== void 0)
       if (1 in arguments)
         update(self, arg1, arg2, arg3);
       else
@@ -289,8 +276,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;
   }
@@ -319,7 +306,7 @@ var Model = class _Model {
 };
 define(Model.prototype, "toString", {
   value() {
-    return REGISTER.get(this.is);
+    return NAMES.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -377,6 +364,40 @@ function push(subject, key, silent) {
   if (!silent)
     event(subject, key);
 }
+var METHODS = new WeakMap([[Model, []]]);
+function assign(to, values) {
+  const methods = METHODS.get(to.constructor);
+  const applicable = new Set(Object.keys(to).concat(methods));
+  for (const key in values)
+    if (applicable.has(key))
+      to[key] = values[key];
+}
+function bind(type) {
+  let keys = METHODS.get(type);
+  if (!keys) {
+    METHODS.set(type, keys = bind2(Object.getPrototypeOf(type)).slice());
+    const desc = Object.getOwnPropertyDescriptors(type.prototype);
+    for (const key in desc)
+      if (key != "constructor" && "value" in desc[key]) {
+        let bind3 = function(method) {
+          const value2 = method.bind(this.is);
+          METHOD.set(value2, method);
+          define(this.is, key, { value: value2, writable: true });
+          return value2;
+        };
+        var bind2 = bind3;
+        let { value } = desc[key];
+        keys.push(key);
+        Object.defineProperty(type.prototype, key, {
+          set: bind3,
+          get() {
+            return this.hasOwnProperty(key) ? value : bind3.call(this, value);
+          }
+        });
+      }
+  }
+  return keys;
+}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
@@ -802,12 +823,12 @@ function has(type, argument) {
   return add((key, subject, state) => {
     if (typeof argument == "boolean") {
       Context.request(type, subject, (model) => {
+        subject.set(key, model);
         const remove = () => {
           drop();
           if (state[key] === model)
             delete state[key];
         };
-        subject.set(key, model);
         const drop = model.get(null, remove);
         return remove;
       });

package/dist/index.mjs

@@ -115,7 +115,7 @@ function effect(target, callback) {
 
 // src/model.ts
 var FLATTEN;
-var REGISTER = /* @__PURE__ */ new WeakMap();
+var NAMES = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
@@ -126,33 +126,20 @@ var Model = class _Model {
   constructor(arg) {
     const state = {};
     let Type = this.constructor;
+    bind(Type);
     define(this, "is", { value: this });
     STATE.set(this, state);
-    REGISTER.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    NAMES.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
-      const desc = Object.getOwnPropertyDescriptors(Type.prototype);
-      for (const key in desc) {
-        let { value } = desc[key];
-        if (typeof value == "function" && key !== "constructor")
-          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;
-            }
-          });
-      }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      let onDone;
+      const apply = typeof arg == "function" ? arg.call(this, this) : arg;
+      if (typeof apply == "object")
+        assign(this, apply);
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -166,14 +153,12 @@ 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)
             value.set(null);
-        if (typeof onDone == "function")
-          onDone();
+        if (typeof apply == "function")
+          apply();
         Object.freeze(state);
       }, null);
       return null;
@@ -227,7 +212,9 @@ var Model = class _Model {
       });
     if (arg1 === null)
       return event(this, null);
-    if (arg1 !== void 0)
+    if (typeof arg1 == "object")
+      assign(self, arg1);
+    else if (arg1 !== void 0)
       if (1 in arguments)
         update(self, arg1, arg2, arg3);
       else
@@ -255,8 +242,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;
   }
@@ -285,7 +272,7 @@ var Model = class _Model {
 };
 define(Model.prototype, "toString", {
   value() {
-    return REGISTER.get(this.is);
+    return NAMES.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -343,6 +330,40 @@ function push(subject, key, silent) {
   if (!silent)
     event(subject, key);
 }
+var METHODS = new WeakMap([[Model, []]]);
+function assign(to, values) {
+  const methods = METHODS.get(to.constructor);
+  const applicable = new Set(Object.keys(to).concat(methods));
+  for (const key in values)
+    if (applicable.has(key))
+      to[key] = values[key];
+}
+function bind(type) {
+  let keys = METHODS.get(type);
+  if (!keys) {
+    METHODS.set(type, keys = bind2(Object.getPrototypeOf(type)).slice());
+    const desc = Object.getOwnPropertyDescriptors(type.prototype);
+    for (const key in desc)
+      if (key != "constructor" && "value" in desc[key]) {
+        let bind3 = function(method) {
+          const value2 = method.bind(this.is);
+          METHOD.set(value2, method);
+          define(this.is, key, { value: value2, writable: true });
+          return value2;
+        };
+        var bind2 = bind3;
+        let { value } = desc[key];
+        keys.push(key);
+        Object.defineProperty(type.prototype, key, {
+          set: bind3,
+          get() {
+            return this.hasOwnProperty(key) ? value : bind3.call(this, value);
+          }
+        });
+      }
+  }
+  return keys;
+}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
@@ -768,12 +789,12 @@ function has(type, argument) {
   return add((key, subject, state) => {
     if (typeof argument == "boolean") {
       Context.request(type, subject, (model) => {
+        subject.set(key, model);
         const remove = () => {
           drop();
           if (state[key] === model)
             delete state[key];
         };
-        subject.set(key, model);
         const drop = model.get(null, remove);
         return remove;
       });

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.43.0",
+  "gitHead": "ec66b5e7a3b7d2c525c2e9503c8cd4fd81e121a6"
 }