@expressive/mvc 0.36.3 → 0.37.0

package/dist/index.d.ts

@@ -5,18 +5,20 @@ declare namespace Model {
     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 Field<T> = Exclude<keyof T, keyof Model>;
-    /** Any valid key for controller, including but not limited to keyof T. */
+    /** Any valid key for controller, including but not limited to Field<T>. */
     type Key<T> = Field<T> | (string & {}) | number | symbol;
-    /** Value for a given property managed by a controller. */
-    type Value<T extends Model, K extends Key<T>> = K extends keyof T ? T[K] extends Ref<infer V> ? V : T[K] : unknown;
-    type Event<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;
     /** Export/Import compatible value for a given property in a Model. */
-    type Export<R> = R extends Ref<infer T> ? T : R extends Model ? State<R> : R;
+    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 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;
     /**
      * Values from current state of given controller.
      * Differs from `Values` as values here will drill
-     * into "real" values held by exotics like ref.
+     * into "real" values held by exotics like ref.Object.
      */
     type State<T> = {
         [P in Field<T>]: Export<T[P]>;
@@ -30,8 +32,23 @@ declare namespace Model {
         (next: T): void;
         current: T | null;
     };
-    /** A callback function which is subscribed to parent and updates when values change. */
-    type Effect<T> = (this: T, current: T, updated: Set<Model.Key<T>>) => ((update: boolean | null) => void) | Promise<void> | null | void;
+    /**
+     * 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
+     * where accessed, and thus depended upon to stay current.
+     *
+     * @param update - Set of properties which have changed, and events fired, since last update.
+     *
+     * @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;
+    /**
+     * 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.
+     */
+    type EffectCallback = ((update: boolean | null) => void);
     namespace Instruction {
         type Getter<T> = (source: Model) => T;
         type Setter<T> = (value: T, previous: T) => boolean | void | (() => T);
@@ -59,13 +76,42 @@ declare class Model {
     constructor(arg?: string | (() => void | (() => void)));
     /** 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. */
+    /**
+     * 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.
+     *
+     * @returns Function to cancel listener.
+     */
     get(effect: Model.Effect<this>): () => void;
+    /**
+     * Get value of a property.
+     *
+     * @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>;
+    /**
+     * 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;
-    /** Check if model is expired. */
+    /**
+     * Check if model is expired.
+     *
+     * @returns `true` if model is expired, `false` otherwise.
+     */
     get(status: null): boolean;
-    /** Callback when model is to be destroyed. */
+    /**
+     * Callback when model is to be destroyed.
+     *
+     * @param callback - Function to call when model is destroyed.
+     * @returns Function to cancel listener.
+     */
     get(status: null, callback: () => void): () => void;
     /**
      * Get update in progress.
@@ -77,13 +123,15 @@ declare class Model {
      * Call a function when update occurs.
      *
      * 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.
+     *
+     * To run logic on final value only, callback may return a function. Using the same
+     * function for one or more events will ensure it is called only when events are settled.
      *
      * @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<this>): () => boolean;
+    set(callback: Model.OnEvent<this>): () => boolean;
     /**
      * 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.
@@ -95,10 +143,13 @@ declare class Model {
      * 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.
      *
-     * You can also use this to dispatch arbitrary events as well. Symbols are generally
-     * recommended as non-property events, however you can use any string. If doing so,
-     * be sure to avoid collisions with property names - an easy way to do this will be to
-     * prefix your event with "!" and/or use dash-case. e.g. `set("!event")` or `set("my-event")`.
+     * You can also use this to dispatch arbitrary events.
+     * Symbols are recommended as non-property events, however you can use any string.
+     * If doing so, be sure to avoid collisions with property names! An easy way to do this is
+     * 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.
      */
     set(key: Model.Key<this>): PromiseLike<Model.Key<this>[]>;
     /**
@@ -126,7 +177,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;
+    /**
+     * Register a callback to run when any instance of this Model is updated.
+     */
+    static on<T extends Model>(this: Model.Type<T>, listener: Model.OnEvent<T>): () => boolean;
 }
 
 declare function add<T = any>(instruction: Model.Instruction): T;
@@ -180,14 +234,22 @@ declare namespace ref {
     type Callback<T> = (argument: T) => ((next: T | null) => void) | Promise<void> | void | boolean;
     interface Object<T = any> {
         (next: T | null): void;
+        /** Current value held by this reference. */
         current: T | null;
+        /** Retrieve current value. */
+        get(): T | null;
     }
     /** Object with references to all managed values of `T`. */
+    /** Object with references to all managed values of `T`. */
     type Proxy<T extends Model> = {
-        [P in Model.Field<T>]-?: Model.Ref<T[P]>;
+        [P in Model.Field<T>]-?: Object<T[P]>;
+    } & {
+        get(): T;
     };
     type CustomProxy<T extends Model, R> = {
         [P in Model.Field<T>]-?: R;
+    } & {
+        get(): T;
     };
 }
 /**

package/dist/index.js

@@ -35,13 +35,11 @@ module.exports = __toCommonJS(src_exports);
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
 var LISTENER = /* @__PURE__ */ new WeakMap();
-function onReady() {
-  return null;
-}
+var onReady = () => null;
 function addListener(subject, callback, select) {
   let subs = LISTENER.get(subject);
   if (!subs)
-    LISTENER.set(subject, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+    LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
   const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
   if (!filter && !subs.has(onReady))
     callback(true, subject);
@@ -49,9 +47,9 @@ function addListener(subject, callback, select) {
   return () => subs.delete(callback);
 }
 function watch(from, key, value) {
-  const listeners = LISTENER.get(from);
   const observer = OBSERVER.get(from);
   if (observer) {
+    const listeners = LISTENER.get(from);
     listeners.set(
       observer,
       (listeners.get(observer) || /* @__PURE__ */ new Set()).add(key)
@@ -105,79 +103,97 @@ function queue(event2) {
 }
 function effect(target, callback) {
   const listeners = LISTENER.get(target);
-  let refresh;
-  let unSet;
+  let unset;
+  let reset;
   function invoke() {
-    let expired;
-    const local = Object.create(target);
-    const update2 = () => {
-      if (expired)
+    let stale;
+    const subscriber = Object.create(target);
+    LISTENER.set(subscriber, listeners);
+    OBSERVER.set(subscriber, () => {
+      if (stale)
         return null;
-      expired = true;
-      if (refresh && unSet) {
-        unSet(true);
-        unSet = void 0;
+      stale = true;
+      if (reset && unset) {
+        unset(true);
+        unset = void 0;
       }
-      return refresh;
-    };
-    LISTENER.set(local, listeners);
-    OBSERVER.set(local, update2);
+      return reset;
+    });
     try {
-      const out = callback.call(local, local);
-      unSet = typeof out == "function" && out;
-      refresh = out === null ? out : invoke;
+      const out = callback.call(subscriber, subscriber);
+      unset = typeof out == "function" ? out : void 0;
+      reset = out === null ? out : invoke;
     } catch (err) {
       if (err instanceof Promise) {
-        refresh = void 0;
-        err.then(invoke).catch(console.error);
-      } else if (refresh)
-        console.error(err);
-      else
+        reset = void 0;
+        err.then(invoke);
+      } else
         throw err;
     }
   }
   addListener(target, (key) => {
     if (key === true)
       invoke();
-    else if (!refresh)
-      return refresh;
-    if (key === null && unSet)
-      unSet(null);
+    else if (!reset)
+      return reset;
+    if (key === null && unset)
+      unset(null);
   });
   return () => {
-    if (unSet)
-      unSet(false);
-    refresh = null;
+    if (unset)
+      unset(false);
+    reset = null;
   };
 }
 
 // src/model.ts
-var ID = /* @__PURE__ */ new WeakMap();
-var PARENT = /* @__PURE__ */ new WeakMap();
+var FLATTEN;
+var REGISTER = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
+var PARENT = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(arg) {
+    const state = {};
     let Type = this.constructor;
     define(this, "is", { value: this });
-    STATE.set(this, {});
-    ID.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    STATE.set(this, state);
+    REGISTER.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
       Type = Object.getPrototypeOf(Type);
     }
-    addListener(this, bootstrap);
-    if (typeof arg == "function")
+    addListener(this, () => {
+      let onDone;
+      for (const key in this) {
+        const desc = Object.getOwnPropertyDescriptor(this, key);
+        if ("value" in desc) {
+          state[key] = desc.value;
+          define(this, key, {
+            configurable: false,
+            set: (x) => update(this, key, x),
+            get() {
+              return watch(this, key, state[key]);
+            }
+          });
+        }
+      }
+      if (typeof arg == "function")
+        onDone = arg();
       addListener(this, () => {
-        const cleanup = arg();
-        if (typeof cleanup == "function")
-          addListener(this, cleanup, null);
-        return null;
-      });
+        for (const [_, value] of this)
+          if (value instanceof _Model && PARENT.get(value) === this)
+            value.set(null);
+        if (typeof onDone == "function")
+          onDone();
+        Object.freeze(state);
+      }, null);
+      return null;
+    });
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -185,15 +201,27 @@ var Model = class _Model {
       let pending = /* @__PURE__ */ new Set();
       return effect(self, (state) => {
         const cb = arg1.call(state, state, pending);
-        return cb === null ? null : (update2) => {
+        return cb === null ? cb : (update2) => {
           pending = PENDING2.get(self);
           if (typeof cb == "function")
             return cb(update2);
         };
       });
     }
-    if (arg1 === void 0)
-      return extract(self);
+    if (arg1 === void 0) {
+      const values = {};
+      const current = !FLATTEN && (FLATTEN = /* @__PURE__ */ new Map([[self, values]]));
+      for (let [key, value] of self) {
+        if (FLATTEN.has(value))
+          value = FLATTEN.get(value);
+        else if (value && typeof value.get === "function")
+          FLATTEN.set(value, value = value.get());
+        values[key] = value;
+      }
+      if (current)
+        FLATTEN = void 0;
+      return Object.freeze(values);
+    }
     if (typeof arg2 == "function") {
       if (arg1 === null)
         return addListener(self, arg2.bind(this, this), null);
@@ -257,17 +285,20 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
-  static on(event2) {
+  /**
+   * Register a callback to run when any instance of this Model is updated. 
+   */
+  static on(listener) {
     let notify = NOTIFY.get(this);
     if (!notify)
       NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
-    notify.add(event2);
-    return () => notify.delete(event2);
+    notify.add(listener);
+    return () => notify.delete(listener);
   }
 };
 define(Model.prototype, "toString", {
   value() {
-    return ID.get(this.is);
+    return REGISTER.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -275,29 +306,6 @@ define(Model, "toString", {
     return this.name;
   }
 });
-function bootstrap() {
-  const state = STATE.get(this);
-  for (const key in this) {
-    const desc = Object.getOwnPropertyDescriptor(this, key);
-    if ("value" in desc) {
-      state[key] = desc.value;
-      define(this, key, {
-        configurable: false,
-        set: (x) => update(this, key, x),
-        get() {
-          return watch(this, key, state[key]);
-        }
-      });
-    }
-  }
-  addListener(this, () => {
-    for (const [_, value] of this)
-      if (value instanceof Model && PARENT.get(value) === this)
-        value.set(null);
-    Object.freeze(state);
-  }, null);
-  return null;
-}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -331,9 +339,8 @@ function update(subject, key, value, silent) {
   if (value === previous)
     return true;
   state[key] = value;
-  if (silent === true)
-    return;
-  push(subject, key);
+  if (silent !== true)
+    push(subject, key);
 }
 function push(subject, key, silent) {
   let pending = PENDING2.get(subject);
@@ -349,21 +356,6 @@ function push(subject, key, silent) {
   if (!silent)
     event(subject, key);
 }
-function extract(from) {
-  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;
-  }
-  return get2(from);
-}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
@@ -621,8 +613,10 @@ function ref(arg, arg2) {
               }
             });
           else {
+            const get2 = () => state[key2];
             const set2 = (value2) => subject.set(key2, value2);
-            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(set2, "current", { get: get2, set: set2 });
+            define2(set2, "get", { value: get2 });
             define2(value, key2, { value: set2 });
           }
       });
@@ -630,6 +624,7 @@ function ref(arg, arg2) {
       throw new Error("ref instruction does not support object which is not 'this'");
     else {
       let unSet;
+      const get2 = () => state[key];
       const set2 = (value2) => {
         if (!subject.set(key, value2) || !arg)
           return;
@@ -641,9 +636,10 @@ function ref(arg, arg2) {
             unSet = out;
         }
       };
-      value = define2(set2, "current", {
-        get: () => state[key],
-        set: set2
+      state[key] = null;
+      value = Object.defineProperties(set2, {
+        current: { get: get2, set: set2 },
+        get: { value: get2 }
       });
     }
     define2(subject, key, { value });

package/dist/index.mjs

@@ -2,13 +2,11 @@
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
 var LISTENER = /* @__PURE__ */ new WeakMap();
-function onReady() {
-  return null;
-}
+var onReady = () => null;
 function addListener(subject, callback, select) {
   let subs = LISTENER.get(subject);
   if (!subs)
-    LISTENER.set(subject, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+    LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
   const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
   if (!filter && !subs.has(onReady))
     callback(true, subject);
@@ -16,9 +14,9 @@ function addListener(subject, callback, select) {
   return () => subs.delete(callback);
 }
 function watch(from, key, value) {
-  const listeners = LISTENER.get(from);
   const observer = OBSERVER.get(from);
   if (observer) {
+    const listeners = LISTENER.get(from);
     listeners.set(
       observer,
       (listeners.get(observer) || /* @__PURE__ */ new Set()).add(key)
@@ -72,79 +70,97 @@ function queue(event2) {
 }
 function effect(target, callback) {
   const listeners = LISTENER.get(target);
-  let refresh;
-  let unSet;
+  let unset;
+  let reset;
   function invoke() {
-    let expired;
-    const local = Object.create(target);
-    const update2 = () => {
-      if (expired)
+    let stale;
+    const subscriber = Object.create(target);
+    LISTENER.set(subscriber, listeners);
+    OBSERVER.set(subscriber, () => {
+      if (stale)
         return null;
-      expired = true;
-      if (refresh && unSet) {
-        unSet(true);
-        unSet = void 0;
+      stale = true;
+      if (reset && unset) {
+        unset(true);
+        unset = void 0;
       }
-      return refresh;
-    };
-    LISTENER.set(local, listeners);
-    OBSERVER.set(local, update2);
+      return reset;
+    });
     try {
-      const out = callback.call(local, local);
-      unSet = typeof out == "function" && out;
-      refresh = out === null ? out : invoke;
+      const out = callback.call(subscriber, subscriber);
+      unset = typeof out == "function" ? out : void 0;
+      reset = out === null ? out : invoke;
     } catch (err) {
       if (err instanceof Promise) {
-        refresh = void 0;
-        err.then(invoke).catch(console.error);
-      } else if (refresh)
-        console.error(err);
-      else
+        reset = void 0;
+        err.then(invoke);
+      } else
         throw err;
     }
   }
   addListener(target, (key) => {
     if (key === true)
       invoke();
-    else if (!refresh)
-      return refresh;
-    if (key === null && unSet)
-      unSet(null);
+    else if (!reset)
+      return reset;
+    if (key === null && unset)
+      unset(null);
   });
   return () => {
-    if (unSet)
-      unSet(false);
-    refresh = null;
+    if (unset)
+      unset(false);
+    reset = null;
   };
 }
 
 // src/model.ts
-var ID = /* @__PURE__ */ new WeakMap();
-var PARENT = /* @__PURE__ */ new WeakMap();
+var FLATTEN;
+var REGISTER = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
+var PARENT = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(arg) {
+    const state = {};
     let Type = this.constructor;
     define(this, "is", { value: this });
-    STATE.set(this, {});
-    ID.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    STATE.set(this, state);
+    REGISTER.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
       Type = Object.getPrototypeOf(Type);
     }
-    addListener(this, bootstrap);
-    if (typeof arg == "function")
+    addListener(this, () => {
+      let onDone;
+      for (const key in this) {
+        const desc = Object.getOwnPropertyDescriptor(this, key);
+        if ("value" in desc) {
+          state[key] = desc.value;
+          define(this, key, {
+            configurable: false,
+            set: (x) => update(this, key, x),
+            get() {
+              return watch(this, key, state[key]);
+            }
+          });
+        }
+      }
+      if (typeof arg == "function")
+        onDone = arg();
       addListener(this, () => {
-        const cleanup = arg();
-        if (typeof cleanup == "function")
-          addListener(this, cleanup, null);
-        return null;
-      });
+        for (const [_, value] of this)
+          if (value instanceof _Model && PARENT.get(value) === this)
+            value.set(null);
+        if (typeof onDone == "function")
+          onDone();
+        Object.freeze(state);
+      }, null);
+      return null;
+    });
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -152,15 +168,27 @@ var Model = class _Model {
       let pending = /* @__PURE__ */ new Set();
       return effect(self, (state) => {
         const cb = arg1.call(state, state, pending);
-        return cb === null ? null : (update2) => {
+        return cb === null ? cb : (update2) => {
           pending = PENDING2.get(self);
           if (typeof cb == "function")
             return cb(update2);
         };
       });
     }
-    if (arg1 === void 0)
-      return extract(self);
+    if (arg1 === void 0) {
+      const values = {};
+      const current = !FLATTEN && (FLATTEN = /* @__PURE__ */ new Map([[self, values]]));
+      for (let [key, value] of self) {
+        if (FLATTEN.has(value))
+          value = FLATTEN.get(value);
+        else if (value && typeof value.get === "function")
+          FLATTEN.set(value, value = value.get());
+        values[key] = value;
+      }
+      if (current)
+        FLATTEN = void 0;
+      return Object.freeze(values);
+    }
     if (typeof arg2 == "function") {
       if (arg1 === null)
         return addListener(self, arg2.bind(this, this), null);
@@ -224,17 +252,20 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
-  static on(event2) {
+  /**
+   * Register a callback to run when any instance of this Model is updated. 
+   */
+  static on(listener) {
     let notify = NOTIFY.get(this);
     if (!notify)
       NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
-    notify.add(event2);
-    return () => notify.delete(event2);
+    notify.add(listener);
+    return () => notify.delete(listener);
   }
 };
 define(Model.prototype, "toString", {
   value() {
-    return ID.get(this.is);
+    return REGISTER.get(this.is);
   }
 });
 define(Model, "toString", {
@@ -242,29 +273,6 @@ define(Model, "toString", {
     return this.name;
   }
 });
-function bootstrap() {
-  const state = STATE.get(this);
-  for (const key in this) {
-    const desc = Object.getOwnPropertyDescriptor(this, key);
-    if ("value" in desc) {
-      state[key] = desc.value;
-      define(this, key, {
-        configurable: false,
-        set: (x) => update(this, key, x),
-        get() {
-          return watch(this, key, state[key]);
-        }
-      });
-    }
-  }
-  addListener(this, () => {
-    for (const [_, value] of this)
-      if (value instanceof Model && PARENT.get(value) === this)
-        value.set(null);
-    Object.freeze(state);
-  }, null);
-  return null;
-}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -298,9 +306,8 @@ function update(subject, key, value, silent) {
   if (value === previous)
     return true;
   state[key] = value;
-  if (silent === true)
-    return;
-  push(subject, key);
+  if (silent !== true)
+    push(subject, key);
 }
 function push(subject, key, silent) {
   let pending = PENDING2.get(subject);
@@ -316,21 +323,6 @@ function push(subject, key, silent) {
   if (!silent)
     event(subject, key);
 }
-function extract(from) {
-  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;
-  }
-  return get2(from);
-}
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
@@ -588,8 +580,10 @@ function ref(arg, arg2) {
               }
             });
           else {
+            const get2 = () => state[key2];
             const set2 = (value2) => subject.set(key2, value2);
-            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(set2, "current", { get: get2, set: set2 });
+            define2(set2, "get", { value: get2 });
             define2(value, key2, { value: set2 });
           }
       });
@@ -597,6 +591,7 @@ function ref(arg, arg2) {
       throw new Error("ref instruction does not support object which is not 'this'");
     else {
       let unSet;
+      const get2 = () => state[key];
       const set2 = (value2) => {
         if (!subject.set(key, value2) || !arg)
           return;
@@ -608,9 +603,10 @@ function ref(arg, arg2) {
             unSet = out;
         }
       };
-      value = define2(set2, "current", {
-        get: () => state[key],
-        set: set2
+      state[key] = null;
+      value = Object.defineProperties(set2, {
+        current: { get: get2, set: set2 },
+        get: { value: get2 }
       });
     }
     define2(subject, key, { value });

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.36.3",
-  "gitHead": "68142bec2c7c9bf8b9cb62e655ac9b35d6a6134f"
+  "version": "0.37.0",
+  "gitHead": "aac8ff030e577922a5fceb87d9b0b5d44bed8f54"
 }