@expressive/mvc 0.51.2 → 0.52.1

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-type MaybeAsync<T> = T | Promise<T>;
 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) & typeof Model;
@@ -6,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) => MaybeAsync<(() => void) | Assign<T> | void>;
+    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> = {
@@ -25,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.
      */
@@ -49,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.
@@ -60,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);
     /**
@@ -86,15 +85,18 @@ interface Model {
 }
 declare abstract class Model {
     constructor(...args: Model.Args);
-    /** Pull current values from state. Flattens all models and exotic values recursively. */
+    /**
+     * Pull current values from state. Flattens all models and exotic values recursively.
+     *
+     * @returns Object with all values from this model.
+     **/
     get(): Model.State<this>;
     /**
      * Run a function which will run automatically when accessed values change.
      *
-     * @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.
-     *
+     * @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 model is destroyed.
      * @returns Function to cancel listener.
      */
     get(effect: Model.Effect<this>): () => void;
@@ -103,6 +105,7 @@ declare abstract class Model {
      *
      * @param key - Property to get value of.
      * @param required - If true, will throw an error if property is not available.
+     * @returns Value of property.
      */
     get<T extends Model.Event<this>>(key: T, required?: boolean): Model.Value<this, T>;
     /**
@@ -110,11 +113,13 @@ declare abstract class Model {
      *
      * @param key - Property to watch for updates.
      * @param callback - Function to call when property is updated.
+     * @returns Function to cancel listener.
      */
     get<T extends Model.Event<this>>(key: T, callback: Model.OnUpdate<this, T>): () => void;
     /**
      * Check if model is expired.
      *
+     * @param status - `null` to check if model is expired.
      * @returns `true` if model is expired, `false` otherwise.
      */
     get(status: null): boolean;
@@ -147,6 +152,8 @@ declare abstract class Model {
     /**
      * Declare an end to updates. This event is final and will freeze state.
      * This event can be watched for as well, to run cleanup logic and internally will remove all listeners.
+     *
+     * @param status - `null` to end updates.
      */
     set(status: null): void;
     /**
@@ -161,12 +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 resolving an array of keys updated, `undefined` (immediately) if a noop.
      */
     set(assign: Model.Assign<this>): PromiseLike<Model.Event<this>[]> | undefined;
     /**
@@ -175,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.
      *
@@ -390,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);
@@ -79,19 +79,19 @@ function emit(source, key2) {
   });
   PENDING.delete(source);
 }
-function queue(event) {
+function queue(event2) {
   if (!DISPATCH.size)
     setTimeout(() => {
-      DISPATCH.forEach((event2) => {
+      DISPATCH.forEach((event3) => {
         try {
-          event2();
+          event3();
         } catch (err) {
           console.error(err);
         }
       });
       DISPATCH.clear();
     }, 0);
-  DISPATCH.add(event);
+  DISPATCH.add(event2);
 }
 function effect(target, callback, requireValues) {
   const listeners = LISTENER.get(target);
@@ -155,78 +155,27 @@ function effect(target, callback, requireValues) {
 }
 
 // src/model.ts
-var NAMES = /* @__PURE__ */ new WeakMap();
+var define = Object.defineProperty;
+var ID = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
+var METHODS = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
 var EXPORT;
-var define = Object.defineProperty;
 var Model = class _Model {
   constructor(...args) {
-    const state = {};
-    let Type = this.constructor;
-    bindMethods(Type);
     define(this, "is", { value: this });
-    STATE.set(this, state);
-    NAMES.set(this, `${Type}-${uid()}`);
-    for (const arg of args)
-      if (typeof arg == "string")
-        NAMES.set(this, arg);
-    while (true) {
-      new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
-      if (Type === _Model)
-        break;
-      Type = Object.getPrototypeOf(Type);
-    }
-    addListener(this, () => {
-      let done;
-      (async () => {
-        const cleanup = /* @__PURE__ */ new Set();
-        for (const arg of args) {
-          let use2 = typeof arg == "function" ? arg.call(this, this) : arg;
-          if (use2 instanceof Promise)
-            use2 = await use2.catch((err) => {
-              console.error(`Async error in constructor for ${this}:`);
-              console.error(err);
-            });
-          if (typeof use2 == "object")
-            assign(this, use2);
-          else if (typeof use2 == "function")
-            cleanup.add(use2);
-        }
-        done = cleanup;
-      })();
-      for (const key2 in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key2);
-        if ("value" in desc) {
-          update(this, key2, desc.value, true);
-          define(this, key2, {
-            configurable: false,
-            set: (x) => update(this, key2, x),
-            get() {
-              return watch(this, key2, state[key2]);
-            }
-          });
-        }
-      }
-      if (!PARENT.has(this))
-        PARENT.set(this, null);
-      addListener(this, () => {
-        if (!done)
-          throw new Error(`Tried to destroy ${this} but not fully initialized.`);
-        for (const [_, value] of this)
-          if (value instanceof _Model && PARENT.get(value) === this)
-            value.set(null);
-        done.forEach((x) => x());
-        Object.freeze(state);
-      }, null);
-      return null;
-    });
+    ID.set(this, `${this.constructor}-${uid()}`);
+    STATE.set(this, {});
+    prepare(this);
+    init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
+    if (arg1 === void 0)
+      return values(self);
     if (typeof arg1 == "function") {
       let pending = /* @__PURE__ */ new Set();
       return effect(self, (state) => {
@@ -238,20 +187,6 @@ var Model = class _Model {
         };
       });
     }
-    if (arg1 === void 0) {
-      const values = {};
-      const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[self, values]]));
-      for (let [key2, value] of self) {
-        if (EXPORT.has(value))
-          value = EXPORT.get(value);
-        else if (value && typeof value.get === "function")
-          EXPORT.set(value, value = value.get());
-        values[key2] = value;
-      }
-      if (current)
-        EXPORT = void 0;
-      return Object.freeze(values);
-    }
     if (typeof arg2 == "function") {
       if (arg1 === null)
         return addListener(self, arg2.bind(this, this), null);
@@ -282,7 +217,7 @@ var Model = class _Model {
     else if (1 in arguments)
       update(self, arg1, arg2, arg3);
     else
-      push(self, arg1);
+      event(self, arg1);
     if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
@@ -303,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.
    * 
@@ -339,7 +274,7 @@ var Model = class _Model {
 };
 define(Model.prototype, "toString", {
   value() {
-    return NAMES.get(this.is);
+    return ID.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -347,6 +282,92 @@ define(Model, "toString", {
     return this.name;
   }
 });
+function prepare(model) {
+  const chain = [];
+  let type = model.constructor;
+  let keys2 = /* @__PURE__ */ new Set();
+  while (type.name) {
+    chain.unshift(type);
+    type = Object.getPrototypeOf(type);
+  }
+  for (const type2 of chain) {
+    for (const cb of NOTIFY.get(type2) || [])
+      addListener(model, cb);
+    if (type2 == Model)
+      continue;
+    if (METHODS.has(type2)) {
+      keys2 = METHODS.get(type2);
+      continue;
+    }
+    METHODS.set(type2, keys2 = new Set(keys2));
+    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);
+        define(this.is, key2, { value: value2, writable: true });
+        return value2;
+      };
+      var set2 = set3;
+      if (!value || key2 == "constructor")
+        continue;
+      keys2.add(key2);
+      Object.defineProperty(type2.prototype, key2, {
+        set: set3,
+        get() {
+          return this.hasOwnProperty(key2) ? value : set3.call(this, value);
+        }
+      });
+    }
+  }
+}
+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, () => {
+    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 == "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]);
+          }
+        });
+      }
+    }
+    return null;
+  });
+  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);
   if (property in state || required === false) {
@@ -372,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))
@@ -392,9 +427,9 @@ function update(subject, key2, value, arg) {
   }
   state[key2] = value;
   if (arg !== true)
-    push(subject, key2);
+    event(subject, key2);
 }
-function push(subject, key2, silent) {
+function event(subject, key2, silent) {
   let pending = PENDING2.get(subject);
   if (!pending) {
     PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
@@ -408,39 +443,11 @@ function push(subject, key2, silent) {
   if (!silent)
     emit(subject, key2);
 }
-var METHODS = new WeakMap([[Model, []]]);
-function assign(to, values) {
+function assign(to, values2) {
   const methods = METHODS.get(to.constructor);
-  const applicable = new Set(Object.keys(to).concat(methods));
-  for (const key2 in values)
-    if (applicable.has(key2))
-      to[key2] = values[key2];
-}
-function bindMethods(type) {
-  let keys2 = METHODS.get(type);
-  if (!keys2) {
-    METHODS.set(type, keys2 = bindMethods(Object.getPrototypeOf(type)).slice());
-    const desc = Object.getOwnPropertyDescriptors(type.prototype);
-    for (const key2 in desc)
-      if (key2 != "constructor" && "value" in desc[key2]) {
-        let bind2 = function(method) {
-          const value2 = method.bind(this.is);
-          METHOD.set(value2, method);
-          define(this.is, key2, { value: value2, writable: true });
-          return value2;
-        };
-        var bind = bind2;
-        let { value } = desc[key2];
-        keys2.push(key2);
-        Object.defineProperty(type.prototype, key2, {
-          set: bind2,
-          get() {
-            return this.hasOwnProperty(key2) ? value : bind2.call(this, value);
-          }
-        });
-      }
-  }
-  return keys2;
+  for (const key2 in values2)
+    if (key2 in to || methods.has(key2))
+      to[key2] = values2[key2];
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
@@ -507,7 +514,7 @@ var Context = class _Context {
     this.layer.clear();
   }
   include(inputs, forEach) {
-    const init = /* @__PURE__ */ new Map();
+    const init2 = /* @__PURE__ */ new Map();
     Object.entries(inputs).forEach(([K, V]) => {
       if (!(Model.is(V) || V instanceof Model))
         throw new Error(`Context can only include Model or instance but got ${V}${K && " as " + K}.`);
@@ -518,21 +525,21 @@ var Context = class _Context {
       if (!exists) {
         const instance = this.add(input);
         this.layer.set(key2, input);
-        init.set(instance, true);
+        init2.set(instance, true);
       } else if (exists !== input) {
         this.pop();
         this.id = uid();
         this.include(inputs);
       }
     }
-    for (const [model, explicit] of init) {
+    for (const [model, explicit] of init2) {
       model.set();
       if (forEach)
         forEach(model, explicit);
       for (const [_key, value] of model)
         if (PARENT.get(value) === model) {
           this.add(value, true);
-          init.set(value, false);
+          init2.set(value, false);
         }
     }
   }
@@ -597,38 +604,37 @@ function use(arg1, arg2) {
   INSTRUCT.set(token, arg1);
   return token;
 }
-Model.on((_, subject) => {
-  const state = STATE.get(subject);
-  const props = Object.getOwnPropertyDescriptors(subject);
-  for (const key2 in props) {
-    const { value } = props[key2];
+Model.on((_, model) => {
+  const state = STATE.get(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")
-        update(subject, key2, value);
+        update(model, key2, value);
       continue;
     }
     INSTRUCT.delete(value);
-    delete subject[key2];
-    const output = instruction.call(subject, key2, subject, state);
+    delete model[key2];
+    const output = instruction.call(model, key2, model, state);
     if (!output)
       continue;
     const desc = typeof output == "object" ? output : { get: output };
     if ("value" in desc)
       state[key2] = desc.value;
-    Object.defineProperty(subject, key2, {
+    Object.defineProperty(model, key2, {
       enumerable: desc.enumerable !== false,
       get() {
         return watch(
           this,
           key2,
-          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key2, desc.get)
+          typeof desc.get == "function" ? desc.get(this) : fetch(model, key2, desc.get)
         );
       },
       set(next) {
         if (desc.set === false)
-          throw new Error(`${subject}.${key2} is read-only.`);
-        update(subject, key2, next, desc.set);
+          throw new Error(`${model}.${key2} is read-only.`);
+        update(model, key2, next, desc.set);
       }
     });
   }
@@ -676,7 +682,7 @@ function get(arg0, arg1) {
           return (didUpdate) => {
             if (didUpdate) {
               STALE.add(compute2);
-              push(subject, key2, true);
+              event(subject, key2, true);
             }
           };
         });
@@ -768,7 +774,7 @@ function set(value, argument) {
   return use((key2, subject) => {
     const output = {};
     if (typeof value == "function" || value instanceof Promise) {
-      let init2 = function() {
+      let init3 = function() {
         if (typeof value == "function")
           try {
             value = attempt(value.bind(subject, key2));
@@ -792,11 +798,11 @@ function set(value, argument) {
         if (0 in arguments)
           return subject[key2];
       };
-      var init = init2;
+      var init2 = init3;
       if (argument)
-        init2();
+        init3();
       else
-        output.get = init2;
+        output.get = init3;
     } else if (value !== void 0)
       output.value = value;
     if (typeof argument == "function") {

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);
@@ -45,19 +45,19 @@ function emit(source, key2) {
   });
   PENDING.delete(source);
 }
-function queue(event) {
+function queue(event2) {
   if (!DISPATCH.size)
     setTimeout(() => {
-      DISPATCH.forEach((event2) => {
+      DISPATCH.forEach((event3) => {
         try {
-          event2();
+          event3();
         } catch (err) {
           console.error(err);
         }
       });
       DISPATCH.clear();
     }, 0);
-  DISPATCH.add(event);
+  DISPATCH.add(event2);
 }
 function effect(target, callback, requireValues) {
   const listeners = LISTENER.get(target);
@@ -121,78 +121,27 @@ function effect(target, callback, requireValues) {
 }
 
 // src/model.ts
-var NAMES = /* @__PURE__ */ new WeakMap();
+var define = Object.defineProperty;
+var ID = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
+var METHODS = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
 var EXPORT;
-var define = Object.defineProperty;
 var Model = class _Model {
   constructor(...args) {
-    const state = {};
-    let Type = this.constructor;
-    bindMethods(Type);
     define(this, "is", { value: this });
-    STATE.set(this, state);
-    NAMES.set(this, `${Type}-${uid()}`);
-    for (const arg of args)
-      if (typeof arg == "string")
-        NAMES.set(this, arg);
-    while (true) {
-      new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
-      if (Type === _Model)
-        break;
-      Type = Object.getPrototypeOf(Type);
-    }
-    addListener(this, () => {
-      let done;
-      (async () => {
-        const cleanup = /* @__PURE__ */ new Set();
-        for (const arg of args) {
-          let use2 = typeof arg == "function" ? arg.call(this, this) : arg;
-          if (use2 instanceof Promise)
-            use2 = await use2.catch((err) => {
-              console.error(`Async error in constructor for ${this}:`);
-              console.error(err);
-            });
-          if (typeof use2 == "object")
-            assign(this, use2);
-          else if (typeof use2 == "function")
-            cleanup.add(use2);
-        }
-        done = cleanup;
-      })();
-      for (const key2 in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key2);
-        if ("value" in desc) {
-          update(this, key2, desc.value, true);
-          define(this, key2, {
-            configurable: false,
-            set: (x) => update(this, key2, x),
-            get() {
-              return watch(this, key2, state[key2]);
-            }
-          });
-        }
-      }
-      if (!PARENT.has(this))
-        PARENT.set(this, null);
-      addListener(this, () => {
-        if (!done)
-          throw new Error(`Tried to destroy ${this} but not fully initialized.`);
-        for (const [_, value] of this)
-          if (value instanceof _Model && PARENT.get(value) === this)
-            value.set(null);
-        done.forEach((x) => x());
-        Object.freeze(state);
-      }, null);
-      return null;
-    });
+    ID.set(this, `${this.constructor}-${uid()}`);
+    STATE.set(this, {});
+    prepare(this);
+    init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
+    if (arg1 === void 0)
+      return values(self);
     if (typeof arg1 == "function") {
       let pending = /* @__PURE__ */ new Set();
       return effect(self, (state) => {
@@ -204,20 +153,6 @@ var Model = class _Model {
         };
       });
     }
-    if (arg1 === void 0) {
-      const values = {};
-      const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[self, values]]));
-      for (let [key2, value] of self) {
-        if (EXPORT.has(value))
-          value = EXPORT.get(value);
-        else if (value && typeof value.get === "function")
-          EXPORT.set(value, value = value.get());
-        values[key2] = value;
-      }
-      if (current)
-        EXPORT = void 0;
-      return Object.freeze(values);
-    }
     if (typeof arg2 == "function") {
       if (arg1 === null)
         return addListener(self, arg2.bind(this, this), null);
@@ -248,7 +183,7 @@ var Model = class _Model {
     else if (1 in arguments)
       update(self, arg1, arg2, arg3);
     else
-      push(self, arg1);
+      event(self, arg1);
     if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
@@ -269,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.
    * 
@@ -305,7 +240,7 @@ var Model = class _Model {
 };
 define(Model.prototype, "toString", {
   value() {
-    return NAMES.get(this.is);
+    return ID.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -313,6 +248,92 @@ define(Model, "toString", {
     return this.name;
   }
 });
+function prepare(model) {
+  const chain = [];
+  let type = model.constructor;
+  let keys2 = /* @__PURE__ */ new Set();
+  while (type.name) {
+    chain.unshift(type);
+    type = Object.getPrototypeOf(type);
+  }
+  for (const type2 of chain) {
+    for (const cb of NOTIFY.get(type2) || [])
+      addListener(model, cb);
+    if (type2 == Model)
+      continue;
+    if (METHODS.has(type2)) {
+      keys2 = METHODS.get(type2);
+      continue;
+    }
+    METHODS.set(type2, keys2 = new Set(keys2));
+    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);
+        define(this.is, key2, { value: value2, writable: true });
+        return value2;
+      };
+      var set2 = set3;
+      if (!value || key2 == "constructor")
+        continue;
+      keys2.add(key2);
+      Object.defineProperty(type2.prototype, key2, {
+        set: set3,
+        get() {
+          return this.hasOwnProperty(key2) ? value : set3.call(this, value);
+        }
+      });
+    }
+  }
+}
+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, () => {
+    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 == "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]);
+          }
+        });
+      }
+    }
+    return null;
+  });
+  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);
   if (property in state || required === false) {
@@ -338,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))
@@ -358,9 +393,9 @@ function update(subject, key2, value, arg) {
   }
   state[key2] = value;
   if (arg !== true)
-    push(subject, key2);
+    event(subject, key2);
 }
-function push(subject, key2, silent) {
+function event(subject, key2, silent) {
   let pending = PENDING2.get(subject);
   if (!pending) {
     PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
@@ -374,39 +409,11 @@ function push(subject, key2, silent) {
   if (!silent)
     emit(subject, key2);
 }
-var METHODS = new WeakMap([[Model, []]]);
-function assign(to, values) {
+function assign(to, values2) {
   const methods = METHODS.get(to.constructor);
-  const applicable = new Set(Object.keys(to).concat(methods));
-  for (const key2 in values)
-    if (applicable.has(key2))
-      to[key2] = values[key2];
-}
-function bindMethods(type) {
-  let keys2 = METHODS.get(type);
-  if (!keys2) {
-    METHODS.set(type, keys2 = bindMethods(Object.getPrototypeOf(type)).slice());
-    const desc = Object.getOwnPropertyDescriptors(type.prototype);
-    for (const key2 in desc)
-      if (key2 != "constructor" && "value" in desc[key2]) {
-        let bind2 = function(method) {
-          const value2 = method.bind(this.is);
-          METHOD.set(value2, method);
-          define(this.is, key2, { value: value2, writable: true });
-          return value2;
-        };
-        var bind = bind2;
-        let { value } = desc[key2];
-        keys2.push(key2);
-        Object.defineProperty(type.prototype, key2, {
-          set: bind2,
-          get() {
-            return this.hasOwnProperty(key2) ? value : bind2.call(this, value);
-          }
-        });
-      }
-  }
-  return keys2;
+  for (const key2 in values2)
+    if (key2 in to || methods.has(key2))
+      to[key2] = values2[key2];
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
@@ -473,7 +480,7 @@ var Context = class _Context {
     this.layer.clear();
   }
   include(inputs, forEach) {
-    const init = /* @__PURE__ */ new Map();
+    const init2 = /* @__PURE__ */ new Map();
     Object.entries(inputs).forEach(([K, V]) => {
       if (!(Model.is(V) || V instanceof Model))
         throw new Error(`Context can only include Model or instance but got ${V}${K && " as " + K}.`);
@@ -484,21 +491,21 @@ var Context = class _Context {
       if (!exists) {
         const instance = this.add(input);
         this.layer.set(key2, input);
-        init.set(instance, true);
+        init2.set(instance, true);
       } else if (exists !== input) {
         this.pop();
         this.id = uid();
         this.include(inputs);
       }
     }
-    for (const [model, explicit] of init) {
+    for (const [model, explicit] of init2) {
       model.set();
       if (forEach)
         forEach(model, explicit);
       for (const [_key, value] of model)
         if (PARENT.get(value) === model) {
           this.add(value, true);
-          init.set(value, false);
+          init2.set(value, false);
         }
     }
   }
@@ -563,38 +570,37 @@ function use(arg1, arg2) {
   INSTRUCT.set(token, arg1);
   return token;
 }
-Model.on((_, subject) => {
-  const state = STATE.get(subject);
-  const props = Object.getOwnPropertyDescriptors(subject);
-  for (const key2 in props) {
-    const { value } = props[key2];
+Model.on((_, model) => {
+  const state = STATE.get(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")
-        update(subject, key2, value);
+        update(model, key2, value);
       continue;
     }
     INSTRUCT.delete(value);
-    delete subject[key2];
-    const output = instruction.call(subject, key2, subject, state);
+    delete model[key2];
+    const output = instruction.call(model, key2, model, state);
     if (!output)
       continue;
     const desc = typeof output == "object" ? output : { get: output };
     if ("value" in desc)
       state[key2] = desc.value;
-    Object.defineProperty(subject, key2, {
+    Object.defineProperty(model, key2, {
       enumerable: desc.enumerable !== false,
       get() {
         return watch(
           this,
           key2,
-          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key2, desc.get)
+          typeof desc.get == "function" ? desc.get(this) : fetch(model, key2, desc.get)
         );
       },
       set(next) {
         if (desc.set === false)
-          throw new Error(`${subject}.${key2} is read-only.`);
-        update(subject, key2, next, desc.set);
+          throw new Error(`${model}.${key2} is read-only.`);
+        update(model, key2, next, desc.set);
       }
     });
   }
@@ -642,7 +648,7 @@ function get(arg0, arg1) {
           return (didUpdate) => {
             if (didUpdate) {
               STALE.add(compute2);
-              push(subject, key2, true);
+              event(subject, key2, true);
             }
           };
         });
@@ -734,7 +740,7 @@ function set(value, argument) {
   return use((key2, subject) => {
     const output = {};
     if (typeof value == "function" || value instanceof Promise) {
-      let init2 = function() {
+      let init3 = function() {
         if (typeof value == "function")
           try {
             value = attempt(value.bind(subject, key2));
@@ -758,11 +764,11 @@ function set(value, argument) {
         if (0 in arguments)
           return subject[key2];
       };
-      var init = init2;
+      var init2 = init3;
       if (argument)
-        init2();
+        init3();
       else
-        output.get = init2;
+        output.get = init3;
     } else if (value !== void 0)
       output.value = value;
     if (typeof argument == "function") {

package/package.json

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