@expressive/mvc 0.35.1 → 0.35.5-alpha.0

package/dist/index.d.ts

@@ -1,26 +1,26 @@
-type Predicate = (key: string) => boolean | void;
 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;
     /** Subset of `keyof T` which are not methods or defined by base Model U. **/
-    type Key<T> = Exclude<keyof T, keyof Model> & string;
-    type Any<T> = Exclude<keyof T, keyof Model> | (string & {});
+    type Field<T> = Exclude<keyof T, keyof Model>;
+    type Key<T> = Field<T> | (string & {}) | number | symbol;
     /** Actual value stored in state. */
-    type Value<R> = R extends Ref<infer T> ? T : R extends Model ? Export<R> : R;
-    type ValueOf<T extends Model, K extends Any<T>> = K extends keyof T ? T[K] extends Ref<infer V> ? V : T[K] : unknown;
+    type Actual<R> = R extends Ref<infer T> ? T : R extends Model ? State<R> : R;
+    type Value<T extends Model, K extends Key<T>> = K extends keyof T ? T[K] extends Ref<infer V> ? V : T[K] : unknown;
+    type OnUpdate<T extends Model, K extends Key<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
      * into "real" values held by exotics like ref.
      */
-    type Export<T> = {
-        [P in Key<T>]: Value<T[P]>;
+    type State<T> = {
+        [P in Field<T>]: Actual<T[P]>;
     };
     /** Object comperable to data found in T. */
     type Values<T> = {
-        [P in Key<T>]?: Value<T[P]>;
+        [P in Field<T>]?: Actual<T[P]>;
     };
     /** Exotic value, where actual value is contained within. */
     type Ref<T = any> = {
@@ -29,7 +29,7 @@ declare namespace Model {
     };
     /** A callback function which is subscribed to parent and updates when values change. */
     type Effect<T> = (this: T, argument: T) => (() => void) | Promise<void> | null | void;
-    type Event = (this: Model, key: string, value: unknown) => (() => void) | void;
+    type Event<T extends Model> = (this: T, key: unknown, source: T) => (() => void) | void | null;
     namespace Instruction {
         type Getter<T> = (source: Model) => T;
         type Setter<T> = (value: T, previous: T) => boolean | void | (() => T);
@@ -44,7 +44,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.Key<M>, thisArg: M, state: Model.Export<M>) => Instruction.Descriptor<T> | Instruction.Getter<T> | void;
+    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;
 }
 interface Model {
     /**
@@ -55,48 +55,44 @@ interface Model {
 }
 declare class Model {
     constructor(id?: string | number);
-    /** Pull current values from state. Flattens all models and exotic values amongst properties. */
-    get(): Model.Export<this>;
+    /** Pull current values from state. Flattens all models and exotic values recursively. */
+    get(): Model.State<this>;
     /** Run a function which will run automatically when accessed values change. */
     get(effect: Model.Effect<this>): () => void;
-    get<T extends string>(key: T, required: true): Exclude<Model.ValueOf<this, T>, undefined>;
-    get<T extends string>(key: T, required?: boolean): Model.ValueOf<this, T>;
+    /** Check if model is expired. */
+    get(event: null): boolean;
+    /** Callback when model is to be destroyed. */
+    get(event: null, callback: () => void): () => void;
+    get<T extends Model.Key<this>>(key: T, required?: boolean): Model.Value<this, T>;
+    get<T extends Model.Key<this>>(key: T, callback: Model.OnUpdate<this, T>): () => void;
     /**
-     * Check if update is in progress.
-     * Returns a promise which resolves updated keys. If no update, will resolve to `false`.
-     **/
-    set(): Promise<Model.Values<this> | false>;
-    /**
-     * Expect an update to state within a set time.
+     * Get update in progress.
      *
-     * @param timeout - milliseconds to wait for update
-     * @param predicate - optional function to filter for specific updates. If returns true, update is accepted.
-     *
-     * @returns a promise to resolve when next accepted update has occured.
-     */
-    set(timeout: number, predicate?: Predicate): Promise<Model.Values<this>>;
+     * @returns Promise which resolves object with updated values. Is `undefined` if there is no update.
+     **/
+    set(): Promise<Model.Values<this>> | undefined;
     /**
-     * Call a function whenever an update occurs.
+     * Call a function when update occurs.
      *
-     * @param callback
-     *   Note: This will be called for every assignment which changes the value.
-     *   To run logic on final value only, this callback may return a function.
-     *   Returning the same function for a key will ensure it is only called once.
+     * Given function is called for every assignment (which changes value) or explicit `set`.
+     * To run logic on final value only, callback itself may return a function.
+     * Returning the same function for one or more events will ensure a side-effect is called only when settled.
      *
-     * @returns a function to remove listener. Returns true if listener isn't removed already.
+     * @param callback - Function to call when update occurs.
+     * @returns Function to remove listener. Will return `true` if removed, `false` if inactive already.
     */
-    set(callback: Model.Event): () => boolean;
+    set(callback: Model.Event<this>): () => boolean;
     /**
-     * Push an update without changing the value of associated property.
-     *
-     * This is useful where a property value internally has changed, but the object remains the same.
-     * For example: An array which has pushed a new value, or a change to nested property.
+     * Declare an end to updates. This event is final and will freeze state.
      */
-    set(key: string): void;
+    set(event: null): void;
     /**
-     * Declare an end to updates. This event will freeze state.
+     * Push an update. This will not change the value of associated property.
+     *
+     * Useful where a property value internally has changed, but the object is the same.
+     * For example: An array has pushed a new value, or a nested property is updated.
      */
-    set(key: null): void;
+    set(key: Model.Key<this>): void;
     /**
      * Update a property with value.
      *
@@ -104,13 +100,13 @@ 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.ValueOf<this, K>, silent?: boolean): void;
+    set<K extends string>(key: K, value?: Model.Value<this, K>, silent?: boolean): void;
     /** Iterate over managed properties in this instance of Model. */
     [Symbol.iterator](): Iterator<[string, unknown]>;
     /**
      * Creates a new instance of this controller.
      *
-     * Beyond `new this(...)`, method will activate managed-state.
+     * **Important** - Use instead of `new this(...)` as this method also activates state.
      *
      * @param args - arguments sent to constructor
      */
@@ -122,9 +118,10 @@ declare class Model {
      * methods and properties of this class.
      */
     static is<T extends Model.Type>(this: T, maybe: any): maybe is T;
+    static on<T extends Model>(this: Model.Type<T>, event: Model.Event<T>): () => boolean;
 }
 
-declare function add<T = any, M extends Model = any>(instruction: Model.Instruction): T;
+declare function add<T = any>(instruction: Model.Instruction): T;
 
 declare namespace get {
     type Function<T, S = any> = (this: S, on: S) => T;
@@ -179,10 +176,10 @@ declare namespace ref {
     }
     /** Object with references to all managed values of `T`. */
     type Proxy<T extends Model> = {
-        [P in Model.Key<T>]-?: Model.Ref<T[P]>;
+        [P in Model.Field<T>]-?: Model.Ref<T[P]>;
     };
     type CustomProxy<T extends Model, R> = {
-        [P in Model.Key<T>]-?: R;
+        [P in Model.Field<T>]-?: R;
     };
 }
 /**
@@ -202,7 +199,7 @@ declare function ref<T extends Model>(target: T): ref.Proxy<T>;
  * @param target - Source model from which to reference values.
  * @param mapper - Function producing the placeholder value for any given property.
  */
-declare function ref<O extends Model, R>(target: O, mapper: (key: Model.Key<O>) => R): ref.CustomProxy<O, R>;
+declare function ref<O extends Model, R>(target: O, mapper: (key: Model.Field<O>) => R): ref.CustomProxy<O, R>;
 /**
  * Creates a ref-compatible property.
  * Will persist value, and updates to this are made part of controller event-stream.

package/dist/index.js

@@ -38,13 +38,14 @@ var LISTENER = /* @__PURE__ */ new WeakMap();
 function onReady() {
   return null;
 }
-function addListener(to, fn) {
+function addListener(to, fn, select) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
-  if (!subs.has(onReady))
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+  const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
+  if (!filter && !subs.has(onReady))
     fn(true, to);
-  subs.set(fn, null);
+  subs.set(fn, filter);
   return () => subs.delete(fn);
 }
 function watch(from, key, value) {
@@ -138,28 +139,28 @@ function effect(target, callback) {
 // src/model.ts
 var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
-var INSTRUCT = /* @__PURE__ */ new Map();
-var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var NOTIFY = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
+    let Type = this.constructor;
     const state = {};
     define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
-    function onNull(key) {
-      if (key === null)
-        Object.freeze(state);
+    ID.set(this, id ? String(id) : `${Type}-${uid()}`);
+    while (true) {
+      new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
+      if (Type === _Model)
+        break;
+      Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
       for (const key in this) {
-        const property = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(property.value);
-        if (instruction)
-          instruction(this, key, state);
-        else {
-          state[key] = property.value;
+        const desc = Object.getOwnPropertyDescriptor(this, key);
+        if ("value" in desc) {
+          state[key] = desc.value;
           define(this, key, {
             enumerable: true,
             set: (x) => update(this, key, x),
@@ -169,56 +170,68 @@ var Model = class _Model {
           });
         }
       }
-      addListener(this, onNull);
+      addListener(this, () => {
+        for (const [_, value] of this)
+          if (value instanceof _Model && PARENT.get(value) === this)
+            value.set(null);
+        Object.freeze(state);
+      }, null);
       return null;
     });
   }
   get(arg1, arg2) {
     const self = this.is;
-    if (typeof arg1 == "string")
-      return fetch(self, arg1, arg2);
-    if (arg1)
+    if (typeof arg1 == "function")
       return effect(self, arg1);
-    const cache = /* @__PURE__ */ new WeakMap();
-    function get2(value) {
-      if (value instanceof _Model) {
-        if (cache.has(value))
-          return cache.get(value);
-        const model = value;
-        cache.set(value, value = {});
-        for (const [key, val] of model)
-          value[key] = get2(val);
-      }
-      return value;
+    if (arg1 === void 0) {
+      let get3 = function(value) {
+        if (value instanceof _Model) {
+          if (cache.has(value))
+            return cache.get(value);
+          const model = value;
+          cache.set(value, value = {});
+          for (const [key, val] of model)
+            value[key] = get3(val);
+        }
+        return value;
+      };
+      var get2 = get3;
+      const cache = /* @__PURE__ */ new WeakMap();
+      return get3(self);
     }
-    return get2(self);
+    if (arg1 === null)
+      if (typeof arg2 == "function")
+        return addListener(self, arg2.bind(this, this), null);
+      else
+        return Object.isFrozen(STATE.get(self));
+    if (typeof arg2 == "function") {
+      const state = STATE.get(self);
+      if (arg1 in state)
+        arg2.call(this, state[arg1], arg1, this);
+      return addListener(self, () => {
+        arg2.call(this, arg1 in state ? state[arg1] : arg1, arg1, this);
+      }, arg1);
+    } else
+      return fetch(self, arg1, arg2);
   }
   set(arg1, arg2, arg3) {
     const self = this.is;
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1.call(this, key, STATE.get(self)[key]);
+          return arg1.call(self, key, self);
       });
-    if (typeof arg1 == "string" || arg1 === null)
+    if (arg1 !== void 0)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
-    return new Promise((resolve, reject) => {
-      if (typeof arg1 != "number" && !PENDING.has(self)) {
-        resolve(false);
-        return;
-      }
+    if (!PENDING.has(self))
+      return;
+    return new Promise((resolve) => {
       const remove = addListener(this, (key) => {
-        if (key === true || typeof arg2 == "function" && typeof key == "string" && arg2(key) !== true)
-          return;
-        if (timeout)
-          clearTimeout(timeout);
-        remove();
-        return resolve.bind(null, PENDING.get(self));
+        if (key !== true) {
+          remove();
+          return resolve.bind(null, PENDING.get(self));
+        }
       });
-      const timeout = typeof arg1 == "number" && setTimeout(() => {
-        remove();
-        reject(arg1);
-      }, arg1);
     });
   }
   /** Iterate over managed properties in this instance of Model. */
@@ -228,7 +241,7 @@ var Model = class _Model {
   /**
    * Creates a new instance of this controller.
    * 
-   * Beyond `new this(...)`, method will activate managed-state.
+   * **Important** - Use instead of `new this(...)` as this method also activates state.
    * 
    * @param args - arguments sent to constructor
    */
@@ -246,6 +259,13 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
+  static on(event2) {
+    let notify = NOTIFY.get(this);
+    if (!notify)
+      NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
+    notify.add(event2);
+    return () => notify.delete(event2);
+  }
 };
 define(Model.prototype, "toString", {
   value() {
@@ -285,15 +305,15 @@ function fetch(subject, property, required) {
 function update(subject, key, value, silent) {
   const state = STATE.get(subject);
   let pending = PENDING.get(subject);
-  if (typeof key == "string") {
-    if (2 in arguments) {
-      const previous = state[key];
-      if (value === previous)
-        return true;
-      state[key] = value;
-      if (silent === true)
-        return;
-    }
+  if (typeof key == "string" && 2 in arguments) {
+    const previous = state[key];
+    if (value === previous)
+      return true;
+    state[key] = value;
+    if (silent === true)
+      return;
+  }
+  if (key !== true && key) {
     if (!pending) {
       PENDING.set(subject, pending = {});
       queue(() => {
@@ -301,7 +321,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    pending[key] = value;
+    pending[key] = key in state ? value : true;
   }
   event(subject, key);
 }
@@ -310,10 +330,20 @@ function uid() {
 }
 
 // src/instruction/add.ts
+var INSTRUCT = /* @__PURE__ */ new Map();
 function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    INSTRUCT.delete(placeholder);
+  const token = Symbol("instruction");
+  INSTRUCT.set(token, instruction);
+  return token;
+}
+Model.on((_, subject) => {
+  const state = STATE.get(subject);
+  for (const key in subject) {
+    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+    const instruction = INSTRUCT.get(value);
+    if (!instruction)
+      continue;
+    INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
     if (!output)
@@ -346,9 +376,9 @@ function add(instruction) {
         );
       }
     });
-  });
-  return placeholder;
-}
+  }
+  return null;
+});
 
 // src/context.ts
 var Context = class {
@@ -416,8 +446,8 @@ var Context = class {
       if (value || I !== this[key] && !implicit)
         Object.defineProperty(this, key, {
           configurable: true,
-          value,
-          writable
+          writable,
+          value
         });
       T = Object.getPrototypeOf(T);
     } while (T !== Model);
@@ -524,24 +554,23 @@ function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
-      for (const key2 in state)
-        if (typeof arg2 == "function")
-          define2(value, key2, {
-            configurable: true,
-            get() {
-              const out = arg2(key2);
-              define2(value, key2, { value: out });
-              return out;
-            }
-          });
-        else {
-          const ref2 = (value2) => subject.set(key2, value2);
-          define2(ref2, "current", {
-            get: () => state[key2],
-            set: ref2
-          });
-          define2(value, key2, { value: ref2 });
-        }
+      subject.get(() => {
+        for (const key2 in state)
+          if (typeof arg2 == "function")
+            define2(value, key2, {
+              configurable: true,
+              get() {
+                const out = arg2(key2);
+                define2(value, key2, { value: out });
+                return out;
+              }
+            });
+          else {
+            const set2 = (value2) => subject.set(key2, value2);
+            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(value, key2, { value: set2 });
+          }
+      });
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
     else {
@@ -641,6 +670,8 @@ function attempt(fn) {
 
 // src/instruction/use.ts
 function use(value, argument) {
+  if (typeof value === "function")
+    value = new value();
   return add((property, subject) => {
     function set2(next) {
       if (value instanceof Model && !(next instanceof value.constructor))
@@ -666,8 +697,6 @@ function use(value, argument) {
       if (typeof argument == "function")
         argument(next);
     }
-    if (typeof value === "function")
-      value = new value();
     const output = { set: set2, value };
     set2(value);
     return output;

package/dist/index.mjs

@@ -5,13 +5,14 @@ var LISTENER = /* @__PURE__ */ new WeakMap();
 function onReady() {
   return null;
 }
-function addListener(to, fn) {
+function addListener(to, fn, select) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
-  if (!subs.has(onReady))
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+  const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
+  if (!filter && !subs.has(onReady))
     fn(true, to);
-  subs.set(fn, null);
+  subs.set(fn, filter);
   return () => subs.delete(fn);
 }
 function watch(from, key, value) {
@@ -105,28 +106,28 @@ function effect(target, callback) {
 // src/model.ts
 var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
-var INSTRUCT = /* @__PURE__ */ new Map();
-var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var NOTIFY = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
+    let Type = this.constructor;
     const state = {};
     define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
-    function onNull(key) {
-      if (key === null)
-        Object.freeze(state);
+    ID.set(this, id ? String(id) : `${Type}-${uid()}`);
+    while (true) {
+      new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
+      if (Type === _Model)
+        break;
+      Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
       for (const key in this) {
-        const property = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(property.value);
-        if (instruction)
-          instruction(this, key, state);
-        else {
-          state[key] = property.value;
+        const desc = Object.getOwnPropertyDescriptor(this, key);
+        if ("value" in desc) {
+          state[key] = desc.value;
           define(this, key, {
             enumerable: true,
             set: (x) => update(this, key, x),
@@ -136,56 +137,68 @@ var Model = class _Model {
           });
         }
       }
-      addListener(this, onNull);
+      addListener(this, () => {
+        for (const [_, value] of this)
+          if (value instanceof _Model && PARENT.get(value) === this)
+            value.set(null);
+        Object.freeze(state);
+      }, null);
       return null;
     });
   }
   get(arg1, arg2) {
     const self = this.is;
-    if (typeof arg1 == "string")
-      return fetch(self, arg1, arg2);
-    if (arg1)
+    if (typeof arg1 == "function")
       return effect(self, arg1);
-    const cache = /* @__PURE__ */ new WeakMap();
-    function get2(value) {
-      if (value instanceof _Model) {
-        if (cache.has(value))
-          return cache.get(value);
-        const model = value;
-        cache.set(value, value = {});
-        for (const [key, val] of model)
-          value[key] = get2(val);
-      }
-      return value;
+    if (arg1 === void 0) {
+      let get3 = function(value) {
+        if (value instanceof _Model) {
+          if (cache.has(value))
+            return cache.get(value);
+          const model = value;
+          cache.set(value, value = {});
+          for (const [key, val] of model)
+            value[key] = get3(val);
+        }
+        return value;
+      };
+      var get2 = get3;
+      const cache = /* @__PURE__ */ new WeakMap();
+      return get3(self);
     }
-    return get2(self);
+    if (arg1 === null)
+      if (typeof arg2 == "function")
+        return addListener(self, arg2.bind(this, this), null);
+      else
+        return Object.isFrozen(STATE.get(self));
+    if (typeof arg2 == "function") {
+      const state = STATE.get(self);
+      if (arg1 in state)
+        arg2.call(this, state[arg1], arg1, this);
+      return addListener(self, () => {
+        arg2.call(this, arg1 in state ? state[arg1] : arg1, arg1, this);
+      }, arg1);
+    } else
+      return fetch(self, arg1, arg2);
   }
   set(arg1, arg2, arg3) {
     const self = this.is;
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1.call(this, key, STATE.get(self)[key]);
+          return arg1.call(self, key, self);
       });
-    if (typeof arg1 == "string" || arg1 === null)
+    if (arg1 !== void 0)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
-    return new Promise((resolve, reject) => {
-      if (typeof arg1 != "number" && !PENDING.has(self)) {
-        resolve(false);
-        return;
-      }
+    if (!PENDING.has(self))
+      return;
+    return new Promise((resolve) => {
       const remove = addListener(this, (key) => {
-        if (key === true || typeof arg2 == "function" && typeof key == "string" && arg2(key) !== true)
-          return;
-        if (timeout)
-          clearTimeout(timeout);
-        remove();
-        return resolve.bind(null, PENDING.get(self));
+        if (key !== true) {
+          remove();
+          return resolve.bind(null, PENDING.get(self));
+        }
       });
-      const timeout = typeof arg1 == "number" && setTimeout(() => {
-        remove();
-        reject(arg1);
-      }, arg1);
     });
   }
   /** Iterate over managed properties in this instance of Model. */
@@ -195,7 +208,7 @@ var Model = class _Model {
   /**
    * Creates a new instance of this controller.
    * 
-   * Beyond `new this(...)`, method will activate managed-state.
+   * **Important** - Use instead of `new this(...)` as this method also activates state.
    * 
    * @param args - arguments sent to constructor
    */
@@ -213,6 +226,13 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
+  static on(event2) {
+    let notify = NOTIFY.get(this);
+    if (!notify)
+      NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
+    notify.add(event2);
+    return () => notify.delete(event2);
+  }
 };
 define(Model.prototype, "toString", {
   value() {
@@ -252,15 +272,15 @@ function fetch(subject, property, required) {
 function update(subject, key, value, silent) {
   const state = STATE.get(subject);
   let pending = PENDING.get(subject);
-  if (typeof key == "string") {
-    if (2 in arguments) {
-      const previous = state[key];
-      if (value === previous)
-        return true;
-      state[key] = value;
-      if (silent === true)
-        return;
-    }
+  if (typeof key == "string" && 2 in arguments) {
+    const previous = state[key];
+    if (value === previous)
+      return true;
+    state[key] = value;
+    if (silent === true)
+      return;
+  }
+  if (key !== true && key) {
     if (!pending) {
       PENDING.set(subject, pending = {});
       queue(() => {
@@ -268,7 +288,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    pending[key] = value;
+    pending[key] = key in state ? value : true;
   }
   event(subject, key);
 }
@@ -277,10 +297,20 @@ function uid() {
 }
 
 // src/instruction/add.ts
+var INSTRUCT = /* @__PURE__ */ new Map();
 function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    INSTRUCT.delete(placeholder);
+  const token = Symbol("instruction");
+  INSTRUCT.set(token, instruction);
+  return token;
+}
+Model.on((_, subject) => {
+  const state = STATE.get(subject);
+  for (const key in subject) {
+    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+    const instruction = INSTRUCT.get(value);
+    if (!instruction)
+      continue;
+    INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
     if (!output)
@@ -313,9 +343,9 @@ function add(instruction) {
         );
       }
     });
-  });
-  return placeholder;
-}
+  }
+  return null;
+});
 
 // src/context.ts
 var Context = class {
@@ -383,8 +413,8 @@ var Context = class {
       if (value || I !== this[key] && !implicit)
         Object.defineProperty(this, key, {
           configurable: true,
-          value,
-          writable
+          writable,
+          value
         });
       T = Object.getPrototypeOf(T);
     } while (T !== Model);
@@ -491,24 +521,23 @@ function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
-      for (const key2 in state)
-        if (typeof arg2 == "function")
-          define2(value, key2, {
-            configurable: true,
-            get() {
-              const out = arg2(key2);
-              define2(value, key2, { value: out });
-              return out;
-            }
-          });
-        else {
-          const ref2 = (value2) => subject.set(key2, value2);
-          define2(ref2, "current", {
-            get: () => state[key2],
-            set: ref2
-          });
-          define2(value, key2, { value: ref2 });
-        }
+      subject.get(() => {
+        for (const key2 in state)
+          if (typeof arg2 == "function")
+            define2(value, key2, {
+              configurable: true,
+              get() {
+                const out = arg2(key2);
+                define2(value, key2, { value: out });
+                return out;
+              }
+            });
+          else {
+            const set2 = (value2) => subject.set(key2, value2);
+            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(value, key2, { value: set2 });
+          }
+      });
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
     else {
@@ -608,6 +637,8 @@ function attempt(fn) {
 
 // src/instruction/use.ts
 function use(value, argument) {
+  if (typeof value === "function")
+    value = new value();
   return add((property, subject) => {
     function set2(next) {
       if (value instanceof Model && !(next instanceof value.constructor))
@@ -633,8 +664,6 @@ function use(value, argument) {
       if (typeof argument == "function")
         argument(next);
     }
-    if (typeof value === "function")
-      value = new value();
     const output = { set: set2, value };
     set2(value);
     return output;

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.35.1",
-  "gitHead": "cca282d36102e4691e3d24a07f95e7652b27f5c3"
+  "version": "0.35.5-alpha.0",
+  "gitHead": "9626c3d85bd2fa7a8e5368c845ff8d889843be0b"
 }