@expressive/mvc 0.52.0 → 0.52.1

package/dist/index.d.ts

@@ -5,16 +5,16 @@ declare namespace Model {
     type Init<T extends Model = Model> = (new (...args: Model.Args<T>) => T) & Omit<typeof Model, never>;
     /**
      * Model constructor callback - is called when Model finishes intializing.
-     * Returned function will call when model is destroyed.
+     * Returned function will run when model is destroyed.
      */
     type Callback<T extends Model = Model> = (this: T, thisArg: T) => Promise<void> | (() => void) | Assign<T> | void;
     /** Model constructor argument */
     type Argument<T extends Model = Model> = Assign<T> | Callback<T> | string | void;
     /** Model constructor arguments */
-    type Args<T extends Model = any> = Argument<T>[];
+    type Args<T extends Model = any> = (Argument<T> | Args<T>)[];
     /** 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>. */
+    /** Any valid key for model, including but not limited to Field<T>. */
     type Event<T> = Field<T> | (string & {}) | number | symbol;
     /** Object overlay to override values and methods on a model. */
     type Assign<T> = {
@@ -24,12 +24,12 @@ declare namespace Model {
     type Export<R> = R extends {
         get(): infer T;
     } ? T : R;
-    /** Value for a property managed by a controller. */
+    /** Value for a property managed by a model. */
     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 Event<T>> = (this: T, value: Value<T, K>, key: K, thisArg: K) => void;
     /**
-     * Values from current state of given controller.
+     * Values from current state of given model.
      * Differs from `Values` as values here will drill
      * into "real" values held by exotics like ref.Object.
      */
@@ -48,7 +48,7 @@ declare namespace Model {
     /**
      * A callback function which is subscribed to parent and updates when accessed properties change.
      *
-     * @param current - Current state of this controller. This is a proxy which detects properties which
+     * @param current - Current state of this model. This is a proxy which detects properties which
      * where accessed, and thus depended upon to stay current.
      *
      * @param update - Set of properties which have changed, and events fired, since last update.
@@ -59,7 +59,7 @@ declare namespace Model {
     /**
      * A callback function returned by effect. Will be called when effect is stale.
      *
-     * @param update - `true` if update is pending, `false` effect has been cancelled, `null` if controller is destroyed.
+     * @param update - `true` if update is pending, `false` effect has been cancelled, `null` if model is destroyed.
      */
     type EffectCallback = ((update: boolean | null) => void);
     /**
@@ -88,7 +88,7 @@ declare abstract class Model {
     /**
      * Pull current values from state. Flattens all models and exotic values recursively.
      *
-     * @returns Object with all values from this controller.
+     * @returns Object with all values from this model.
      **/
     get(): Model.State<this>;
     /**
@@ -96,7 +96,7 @@ declare abstract class Model {
      *
      * @param effect Function to run, and again whenever accessed values change.
      *               If effect returns a function, it will be called when a change occurs (syncronously),
-     *               effect is cancelled, or parent controller is destroyed.
+     *               effect is cancelled, or parent model is destroyed.
      * @returns Function to cancel listener.
      */
     get(effect: Model.Effect<this>): () => void;
@@ -168,15 +168,15 @@ declare abstract class Model {
      * to prefix an event with "!" and/or use dash-case. e.g. `set("!event")` or `set("my-event")`.
      *
      * @param key - Property or event to dispatch.
-     * @returns Promise which resolves an array of keys which were updated.
+     * @returns Promise resolves an array of keys updated.
      */
     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.
+     * Properties which are not managed by this model will be ignored.
      *
      * @param assign - Object with properties to update.
-     * @returns Promise which resolves an array of keys which were updated.
+     * @returns Promise resolving an array of keys updated, `undefined` (immediately) if a noop.
      */
     set(assign: Model.Assign<this>): PromiseLike<Model.Event<this>[]> | undefined;
     /**
@@ -185,15 +185,16 @@ declare abstract class Model {
      * @param key - property to update
      * @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
+     * @returns Promise resolving an array of keys updated, `undefined` (immediately) if a noop.
      */
-    set<K extends string>(key: K, value?: Model.Value<this, K>, silent?: boolean): PromiseLike<Model.Event<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.
      * Yeilds the key and underlying value for each property.
      */
     [Symbol.iterator](): Iterator<[string, unknown]>;
     /**
-     * Create and activate a new instance of this controller.
+     * Create and activate a new instance of this model.
      *
      * **Important** - Unlike `new this(...)` - this method also activates state.
      *
@@ -400,21 +401,4 @@ declare class Context {
     protected add<T extends Model>(input: T | Model.Init<T>, implicit?: boolean): T;
 }
 
-declare global {
-    /**
-     * Defines MVC specific matchers for [Jest](https://jestjs.io/) test suites.
-     *
-     * For these to work you will need to add `@expressive/mvc/jest`
-     * under `setupFilesAfterEnv` in your Jest configuration.
-     */
-    namespace jest {
-        interface Matchers<R> {
-            /** Assert model does have one or more updates pending. */
-            toUpdate(timeout?: number): Promise<R>;
-            /** Assert model did update with keys specified. */
-            toHaveUpdated<R>(...keys: (string | symbol | number)[]): Promise<R>;
-        }
-    }
-}
-
 export { Context, Model, Model as default, effect, get, has, ref, set, use };

package/dist/index.js

@@ -42,7 +42,7 @@ function addListener(subject, callback, select) {
   if (!subs)
     LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
   const filter = select !== void 0 && /* @__PURE__ */ new Set([select]);
-  if (!filter && !subs.has(onReady))
+  if (!subs.has(onReady) && !filter)
     callback(true, subject);
   subs.set(callback, filter);
   return () => subs.delete(callback);
@@ -166,11 +166,11 @@ var METHOD = /* @__PURE__ */ new WeakMap();
 var EXPORT;
 var Model = class _Model {
   constructor(...args) {
+    define(this, "is", { value: this });
     ID.set(this, `${this.constructor}-${uid()}`);
     STATE.set(this, {});
     prepare(this);
-    define(this, "is", { value: this });
-    apply(this, [...args, init]);
+    init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -238,7 +238,7 @@ var Model = class _Model {
     return Object.entries(STATE.get(this.is))[Symbol.iterator]();
   }
   /**
-   * Create and activate a new instance of this controller.
+   * Create and activate a new instance of this model.
    * 
    * **Important** - Unlike `new this(...)` - this method also activates state.
    * 
@@ -300,7 +300,9 @@ function prepare(model) {
       continue;
     }
     METHODS.set(type2, keys2 = new Set(keys2));
-    for (const { key: key2, value } of entries(type2.prototype)) {
+    for (const [key2, { value }] of Object.entries(
+      Object.getOwnPropertyDescriptors(type2.prototype)
+    )) {
       let set3 = function(method) {
         const value2 = method.bind(this.is);
         METHOD.set(value2, method);
@@ -320,53 +322,51 @@ function prepare(model) {
     }
   }
 }
-function apply(model, args) {
-  for (const arg of args)
-    if (typeof arg == "string")
-      ID.set(model, arg);
+function init(model, args) {
+  const done = /* @__PURE__ */ new Set();
+  const state = STATE.get(model);
+  args = args.flat().filter((arg) => {
+    if (typeof arg != "string")
+      return true;
+    ID.set(model, arg);
+  });
   addListener(model, () => {
-    const done = /* @__PURE__ */ new Set();
-    for (const arg of args) {
+    if (!PARENT.has(model))
+      PARENT.set(model, null);
+    args.forEach((arg) => {
       const use2 = typeof arg == "function" ? arg.call(model, model) : arg;
       if (use2 instanceof Promise)
         use2.catch((err) => {
           console.error(`Async error in constructor for ${model}:`);
           console.error(err);
         });
-      else if (typeof use2 == "object")
-        assign(model, use2);
       else if (typeof use2 == "function")
         done.add(use2);
+      else if (typeof use2 == "object")
+        assign(model, use2);
+    });
+    for (const key2 in model) {
+      const desc = Object.getOwnPropertyDescriptor(model, key2);
+      if ("value" in desc) {
+        update(model, key2, desc.value, true);
+        define(model, key2, {
+          configurable: false,
+          set: (x) => update(model, key2, x),
+          get() {
+            return watch(this, key2, state[key2]);
+          }
+        });
+      }
     }
-    addListener(model, () => {
-      done.forEach((x) => x());
-    }, null);
     return null;
   });
-}
-function init(model) {
-  const state = STATE.get(model);
-  if (!PARENT.has(model))
-    PARENT.set(model, null);
-  for (const key2 in model) {
-    const desc = Object.getOwnPropertyDescriptor(model, key2);
-    if ("value" in desc) {
-      update(model, key2, desc.value, true);
-      define(model, key2, {
-        configurable: false,
-        set: (x) => update(model, key2, x),
-        get() {
-          return watch(this, key2, state[key2]);
-        }
-      });
-    }
-  }
-  return () => {
+  addListener(model, () => {
+    done.forEach((x) => x());
     for (const [_, value] of model)
       if (value instanceof Model && PARENT.get(value) === model)
         value.set(null);
     Object.freeze(state);
-  };
+  }, null);
 }
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
@@ -393,6 +393,20 @@ function fetch(subject, property, required) {
     stack: error.stack
   });
 }
+function values(model) {
+  const values2 = {};
+  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
+  for (let [key2, value] of model) {
+    if (EXPORT.has(value))
+      value = EXPORT.get(value);
+    else if (value && typeof value.get === "function")
+      EXPORT.set(value, value = value.get());
+    values2[key2] = value;
+  }
+  if (current)
+    EXPORT = void 0;
+  return Object.freeze(values2);
+}
 function update(subject, key2, value, arg) {
   const state = STATE.get(subject);
   if (Object.isFrozen(state))
@@ -435,28 +449,9 @@ function assign(to, values2) {
     if (key2 in to || methods.has(key2))
       to[key2] = values2[key2];
 }
-function values(model) {
-  const values2 = {};
-  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
-  for (let [key2, value] of model) {
-    if (EXPORT.has(value))
-      value = EXPORT.get(value);
-    else if (value && typeof value.get === "function")
-      EXPORT.set(value, value = value.get());
-    values2[key2] = value;
-  }
-  if (current)
-    EXPORT = void 0;
-  return Object.freeze(values2);
-}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
-function entries(object) {
-  return Object.entries(
-    Object.getOwnPropertyDescriptors(object)
-  ).map(([key2, desc]) => ({ key: key2, ...desc }));
-}
 
 // src/context.ts
 var Register = /* @__PURE__ */ new WeakMap();
@@ -611,7 +606,8 @@ function use(arg1, arg2) {
 }
 Model.on((_, model) => {
   const state = STATE.get(model);
-  for (const { key: key2, value } of entries(model)) {
+  for (const key2 in model) {
+    const { value } = Object.getOwnPropertyDescriptor(model, key2);
     const instruction = INSTRUCT.get(value);
     if (!instruction) {
       if (value instanceof Model && key2 !== "is")

package/dist/index.mjs

@@ -8,7 +8,7 @@ function addListener(subject, callback, select) {
   if (!subs)
     LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
   const filter = select !== void 0 && /* @__PURE__ */ new Set([select]);
-  if (!filter && !subs.has(onReady))
+  if (!subs.has(onReady) && !filter)
     callback(true, subject);
   subs.set(callback, filter);
   return () => subs.delete(callback);
@@ -132,11 +132,11 @@ var METHOD = /* @__PURE__ */ new WeakMap();
 var EXPORT;
 var Model = class _Model {
   constructor(...args) {
+    define(this, "is", { value: this });
     ID.set(this, `${this.constructor}-${uid()}`);
     STATE.set(this, {});
     prepare(this);
-    define(this, "is", { value: this });
-    apply(this, [...args, init]);
+    init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -204,7 +204,7 @@ var Model = class _Model {
     return Object.entries(STATE.get(this.is))[Symbol.iterator]();
   }
   /**
-   * Create and activate a new instance of this controller.
+   * Create and activate a new instance of this model.
    * 
    * **Important** - Unlike `new this(...)` - this method also activates state.
    * 
@@ -266,7 +266,9 @@ function prepare(model) {
       continue;
     }
     METHODS.set(type2, keys2 = new Set(keys2));
-    for (const { key: key2, value } of entries(type2.prototype)) {
+    for (const [key2, { value }] of Object.entries(
+      Object.getOwnPropertyDescriptors(type2.prototype)
+    )) {
       let set3 = function(method) {
         const value2 = method.bind(this.is);
         METHOD.set(value2, method);
@@ -286,53 +288,51 @@ function prepare(model) {
     }
   }
 }
-function apply(model, args) {
-  for (const arg of args)
-    if (typeof arg == "string")
-      ID.set(model, arg);
+function init(model, args) {
+  const done = /* @__PURE__ */ new Set();
+  const state = STATE.get(model);
+  args = args.flat().filter((arg) => {
+    if (typeof arg != "string")
+      return true;
+    ID.set(model, arg);
+  });
   addListener(model, () => {
-    const done = /* @__PURE__ */ new Set();
-    for (const arg of args) {
+    if (!PARENT.has(model))
+      PARENT.set(model, null);
+    args.forEach((arg) => {
       const use2 = typeof arg == "function" ? arg.call(model, model) : arg;
       if (use2 instanceof Promise)
         use2.catch((err) => {
           console.error(`Async error in constructor for ${model}:`);
           console.error(err);
         });
-      else if (typeof use2 == "object")
-        assign(model, use2);
       else if (typeof use2 == "function")
         done.add(use2);
+      else if (typeof use2 == "object")
+        assign(model, use2);
+    });
+    for (const key2 in model) {
+      const desc = Object.getOwnPropertyDescriptor(model, key2);
+      if ("value" in desc) {
+        update(model, key2, desc.value, true);
+        define(model, key2, {
+          configurable: false,
+          set: (x) => update(model, key2, x),
+          get() {
+            return watch(this, key2, state[key2]);
+          }
+        });
+      }
     }
-    addListener(model, () => {
-      done.forEach((x) => x());
-    }, null);
     return null;
   });
-}
-function init(model) {
-  const state = STATE.get(model);
-  if (!PARENT.has(model))
-    PARENT.set(model, null);
-  for (const key2 in model) {
-    const desc = Object.getOwnPropertyDescriptor(model, key2);
-    if ("value" in desc) {
-      update(model, key2, desc.value, true);
-      define(model, key2, {
-        configurable: false,
-        set: (x) => update(model, key2, x),
-        get() {
-          return watch(this, key2, state[key2]);
-        }
-      });
-    }
-  }
-  return () => {
+  addListener(model, () => {
+    done.forEach((x) => x());
     for (const [_, value] of model)
       if (value instanceof Model && PARENT.get(value) === model)
         value.set(null);
     Object.freeze(state);
-  };
+  }, null);
 }
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
@@ -359,6 +359,20 @@ function fetch(subject, property, required) {
     stack: error.stack
   });
 }
+function values(model) {
+  const values2 = {};
+  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
+  for (let [key2, value] of model) {
+    if (EXPORT.has(value))
+      value = EXPORT.get(value);
+    else if (value && typeof value.get === "function")
+      EXPORT.set(value, value = value.get());
+    values2[key2] = value;
+  }
+  if (current)
+    EXPORT = void 0;
+  return Object.freeze(values2);
+}
 function update(subject, key2, value, arg) {
   const state = STATE.get(subject);
   if (Object.isFrozen(state))
@@ -401,28 +415,9 @@ function assign(to, values2) {
     if (key2 in to || methods.has(key2))
       to[key2] = values2[key2];
 }
-function values(model) {
-  const values2 = {};
-  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
-  for (let [key2, value] of model) {
-    if (EXPORT.has(value))
-      value = EXPORT.get(value);
-    else if (value && typeof value.get === "function")
-      EXPORT.set(value, value = value.get());
-    values2[key2] = value;
-  }
-  if (current)
-    EXPORT = void 0;
-  return Object.freeze(values2);
-}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
-function entries(object) {
-  return Object.entries(
-    Object.getOwnPropertyDescriptors(object)
-  ).map(([key2, desc]) => ({ key: key2, ...desc }));
-}
 
 // src/context.ts
 var Register = /* @__PURE__ */ new WeakMap();
@@ -577,7 +572,8 @@ function use(arg1, arg2) {
 }
 Model.on((_, model) => {
   const state = STATE.get(model);
-  for (const { key: key2, value } of entries(model)) {
+  for (const key2 in model) {
+    const { value } = Object.getOwnPropertyDescriptor(model, key2);
     const instruction = INSTRUCT.get(value);
     if (!instruction) {
       if (value instanceof Model && key2 !== "is")

package/package.json

@@ -32,6 +32,6 @@
     "jest": "^27.0.6",
     "tsup": "^8.0.2"
   },
-  "version": "0.52.0",
-  "gitHead": "b6b92114b8b0c69f1a36eae8c03fec2e068d03c4"
+  "version": "0.52.1",
+  "gitHead": "71f17a90b44bd4b969a56b38d629f32b289c77b7"
 }