@expressive/mvc 0.52.1 → 0.52.2-alpha.74

package/dist/index.d.ts

@@ -133,29 +133,17 @@ declare abstract class Model {
     /**
      * Get update in progress.
      *
-     * @returns Promise which resolves object with updated values. Is `undefined` if there is no update.
+     * @returns Promise which resolves object with updated values, `undefined` if there no update is pending.
      **/
     set(): PromiseLike<Model.Event<this>[]> | undefined;
     /**
-     * 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 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.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.
+     * Update mulitple properties at once. Merges argument with current state.
+     * Properties which are not managed by this model will be ignored.
      *
-     * @param status - `null` to end updates.
+     * @param assign - Object with properties to update.
+     * @returns Promise resolving an array of keys updated, `undefined` (immediately) if a noop.
      */
-    set(status: null): void;
+    set(assign: Model.Assign<this>): PromiseLike<Model.Event<this>[]> | undefined;
     /**
      * Push an update. This will not change the value of associated property.
      *
@@ -171,14 +159,6 @@ declare abstract class Model {
      * @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 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;
     /**
      * Update a property with value.
      *
@@ -188,6 +168,26 @@ declare abstract class Model {
      * @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;
+    /**
+     * 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 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.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.
+     *
+     * @param status - `null` to end updates.
+     */
+    set(status: null): void;
     /**
      * Iterate over managed properties in this instance of Model.
      * Yeilds the key and underlying value for each property.
@@ -326,10 +326,10 @@ declare namespace set {
     type Factory<T, S = any> = (this: S, key: string) => Promise<T> | T;
 }
 /**
- * Set property with a placeholder.
+ * Set property as `undefined` but required.
  *
  * Property cannot be accessed until it is defined. If accessed while undefined, a hybrid
- * `Promise`/`Error` (ala: [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html)) will be thrown.
+ * `Promise`/`Error` (aka: [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html)) will be thrown.
  */
 declare function set<T = any>(): T;
 /**
@@ -367,6 +367,21 @@ declare namespace has {
 declare function has<T extends Model>(type: Model.Type<T>, callback?: has.Callback<T>): readonly T[];
 declare function has(callback?: has.Callback): readonly Model[];
 
+/**
+ * Update callback function.
+ *
+ * @param key -
+ *   - `string` - property which has updated.
+ *   - `false` - a normal update has completed.
+ *   - `true` - initial event; instance is ready.
+ *   - `null` - terminal event; instance is expired.
+ * @param source - Instance of Model for which update has occured.
+ */
+type OnUpdate<T = any> = (this: T, key: unknown, source: T) => (() => void) | null | void;
+type OnAccess<T, R = unknown> = (from: T, key: string | number, value: R) => unknown;
+type Event = number | string | null | boolean | symbol;
+declare function addListener(subject: {}, callback: OnUpdate, select?: Event): () => boolean;
+declare function createProxy<T extends {}>(from: T, observer: OnAccess<T>): any;
 type Effect<T extends {}> = (this: T, argument: T) => ((update: boolean | null) => void) | Promise<void> | null | void;
 /**
  * Create a side-effect which will update whenever values accessed change.
@@ -376,11 +391,15 @@ type Effect<T extends {}> = (this: T, argument: T) => ((update: boolean | null)
  * @param callback - Function to invoke when values change.
  * @param requireValues - If `true` will throw if accessing a value which is `undefined`.
  */
-declare function effect<T extends {}>(target: T, callback: Effect<Required<T>>, requireValues: true): () => void;
-declare function effect<T extends {}>(target: T, callback: Effect<T>, requireValues?: boolean): () => void;
+declare function createEffect<T extends {}>(target: T, callback: Effect<Required<T>>, requireValues: true): () => void;
+declare function createEffect<T extends {}>(target: T, callback: Effect<T>, requireValues?: boolean): () => void;
 
 declare namespace Context {
-    type Input = Record<string | number, Model | Model.Init>;
+    type Multiple<T extends Model> = {
+        [key: string | number]: Model.Init<T> | T;
+    };
+    type Accept<T extends Model = Model> = T | Model.Init<T> | Multiple<T>;
+    type ForEach = (added: Model, explicit: boolean) => void;
     type Expect = (model: Model) => (() => void) | void;
 }
 interface Context {
@@ -392,13 +411,15 @@ declare class Context {
     id: string;
     protected layer: Map<string | number, Model | Model.Type<Model>>;
     protected cleanup: Set<() => void>;
-    constructor(inputs?: Context.Input);
+    constructor(inputs?: Context.Accept);
+    /** Run callback when a specified type is registered to a **child** context. */
+    has<T extends Model>(Type: Model.Type<T>, callback: (model: T) => void): void;
+    /** Find specified type registered to a parent context. Returns undefined if none are found. */
     get<T extends Model>(Type: Model.Type<T>): T | undefined;
-    get<T extends Model>(Type: Model.Type<T>, callback: (model: T) => void): void;
-    push(inputs?: Context.Input): this;
+    push(inputs?: Context.Accept): this;
     pop(): void;
-    include(inputs: Context.Input, forEach?: (added: Model, explicit: boolean) => void): void;
+    include<T extends Model>(inputs: Context.Accept<T>, forEach?: Context.ForEach | Model.Assign<T>): void;
     protected add<T extends Model>(input: T | Model.Init<T>, implicit?: boolean): T;
 }
 
-export { Context, Model, Model as default, effect, get, has, ref, set, use };
+export { Context, Model, addListener, createEffect, createProxy, Model as default, get, has, ref, set, use };

package/dist/index.js

@@ -22,8 +22,10 @@ var src_exports = {};
 __export(src_exports, {
   Context: () => Context,
   Model: () => Model,
+  addListener: () => addListener,
+  createEffect: () => createEffect,
+  createProxy: () => createProxy,
   default: () => Model,
-  effect: () => effect,
   get: () => get,
   has: () => has,
   ref: () => ref,
@@ -35,25 +37,30 @@ module.exports = __toCommonJS(src_exports);
 // src/control.ts
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
-var LISTENER = /* @__PURE__ */ new WeakMap();
+var LISTENERS = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var onReady = () => null;
 function addListener(subject, callback, select) {
-  let subs = LISTENER.get(subject);
+  let subs = LISTENERS.get(subject);
   if (!subs)
-    LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
-  const filter = select !== void 0 && /* @__PURE__ */ new Set([select]);
+    LISTENERS.set(subject, subs = /* @__PURE__ */ new Map([[onReady, void 0]]));
+  const filter = select === void 0 ? void 0 : /* @__PURE__ */ new Set([select]);
   if (!subs.has(onReady) && !filter)
     callback(true, subject);
   subs.set(callback, filter);
   return () => subs.delete(callback);
 }
+function createProxy(from, observer) {
+  const proxy = Object.create(from);
+  OBSERVER.set(proxy, observer);
+  return proxy;
+}
 function watch(from, key2, value) {
   const access = OBSERVER.get(from);
   return access ? access(from, key2, value) : value;
 }
-var PENDING = /* @__PURE__ */ new WeakMap();
 function emit(source, key2) {
-  const subs = LISTENER.get(source);
+  const subs = LISTENERS.get(source);
   const ready = !subs.has(onReady);
   if (key2 === true && ready)
     return;
@@ -79,27 +86,28 @@ function emit(source, key2) {
   });
   PENDING.delete(source);
 }
-function queue(event2) {
+function queue(eventHandler) {
   if (!DISPATCH.size)
     setTimeout(() => {
-      DISPATCH.forEach((event3) => {
+      DISPATCH.forEach((event2) => {
         try {
-          event3();
+          event2();
         } catch (err) {
           console.error(err);
         }
       });
       DISPATCH.clear();
     }, 0);
-  DISPATCH.add(event2);
+  DISPATCH.add(eventHandler);
 }
-function effect(target, callback, requireValues) {
-  const listeners = LISTENER.get(target);
+function createEffect(target, callback, requireValues) {
+  const listeners = LISTENERS.get(target);
   let unset;
   let reset;
   function invoke() {
     let stale;
-    const subscriber = Object.create(target);
+    const subscriber = createProxy(target, access);
+    LISTENERS.set(subscriber, listeners);
     function onUpdate() {
       if (stale)
         return null;
@@ -113,20 +121,19 @@ function effect(target, callback, requireValues) {
     function access(from, key2, value) {
       if (value === void 0 && requireValues)
         throw new Error(`${from}.${key2} is required in this context.`);
-      const listeners2 = LISTENER.get(from);
+      const listeners2 = LISTENERS.get(from);
       let listener = listeners2.get(onUpdate);
       if (!listener)
         listeners2.set(onUpdate, listener = /* @__PURE__ */ new Set());
       listener.add(key2);
-      const nested = LISTENER.get(value);
-      if (nested) {
-        LISTENER.set(value = Object.create(value), nested);
-        OBSERVER.set(value, access);
-      }
+      const nested = LISTENERS.get(value);
+      if (nested)
+        LISTENERS.set(
+          value = createProxy(value, access),
+          nested
+        );
       return value;
     }
-    LISTENER.set(subscriber, listeners);
-    OBSERVER.set(subscriber, access);
     try {
       const out = callback.call(subscriber, subscriber);
       unset = typeof out == "function" ? out : void 0;
@@ -163,27 +170,24 @@ var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
 var METHODS = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
-var EXPORT;
-var Model = class _Model {
+var Model = class {
   constructor(...args) {
-    define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${uid()}`);
-    STATE.set(this, {});
     prepare(this);
+    define(this, "is", { value: this });
     init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
     if (arg1 === void 0)
-      return values(self);
+      return snapshot(self);
     if (typeof arg1 == "function") {
       let pending = /* @__PURE__ */ new Set();
-      return effect(self, (state) => {
+      return createEffect(self, (state) => {
         const cb = arg1.call(state, state, pending);
         return cb === null ? cb : (update2) => {
           pending = PENDING2.get(self);
           if (typeof cb == "function")
-            return cb(update2);
+            cb(update2);
         };
       });
     }
@@ -245,7 +249,6 @@ var Model = class _Model {
    * @param args - arguments sent to constructor
    */
   static new(...args) {
-    _Model.is(this);
     const instance = new this(...args);
     emit(instance, true);
     return instance;
@@ -257,9 +260,7 @@ var Model = class _Model {
    * methods and properties of this class.
    */
   static is(maybe) {
-    if (maybe === _Model)
-      throw new Error("Model is abstract and not a valid type.");
-    return typeof maybe == "function" && maybe.prototype instanceof this;
+    return maybe === this || typeof maybe == "function" && maybe.prototype instanceof this;
   }
   /**
    * Register a callback to run when any instance of this Model is updated. 
@@ -283,48 +284,50 @@ define(Model, "toString", {
   }
 });
 function prepare(model) {
+  let T = model.constructor;
+  if (T === Model)
+    throw new Error("Cannot create base 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) || [])
+  ID.set(model, `${T}-${uid()}`);
+  while (T.name) {
+    for (const cb of NOTIFY.get(T) || [])
       addListener(model, cb);
-    if (type2 == Model)
-      continue;
-    if (METHODS.has(type2)) {
-      keys2 = METHODS.get(type2);
+    if (T === Model)
+      break;
+    else
+      chain.unshift(T);
+    T = Object.getPrototypeOf(T);
+  }
+  for (const type of chain) {
+    if (METHODS.has(type)) {
+      keys2 = METHODS.get(type);
       continue;
     }
-    METHODS.set(type2, keys2 = new Set(keys2));
+    METHODS.set(type, keys2 = new Set(keys2));
     for (const [key2, { value }] of Object.entries(
-      Object.getOwnPropertyDescriptors(type2.prototype)
+      Object.getOwnPropertyDescriptors(type.prototype)
     )) {
-      let set3 = function(method) {
+      let get3 = function() {
+        return this.hasOwnProperty(key2) ? value : set3.call(this, value);
+      }, 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;
+      var get2 = get3, 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);
-        }
-      });
+      define(type.prototype, key2, { get: get3, set: set3 });
     }
   }
 }
 function init(model, args) {
-  const done = /* @__PURE__ */ new Set();
-  const state = STATE.get(model);
+  const state = {};
+  const clean = /* @__PURE__ */ new Set();
+  STATE.set(model, state);
   args = args.flat().filter((arg) => {
     if (typeof arg != "string")
       return true;
@@ -340,10 +343,10 @@ function init(model, args) {
           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);
+      else if (typeof use2 == "function")
+        clean.add(use2);
     });
     for (const key2 in model) {
       const desc = Object.getOwnPropertyDescriptor(model, key2);
@@ -361,7 +364,7 @@ function init(model, args) {
     return null;
   });
   addListener(model, () => {
-    done.forEach((x) => x());
+    clean.forEach((x) => x());
     for (const [_, value] of model)
       if (value instanceof Model && PARENT.get(value) === model)
         value.set(null);
@@ -393,19 +396,24 @@ function fetch(subject, property, required) {
     stack: error.stack
   });
 }
-function values(model) {
-  const values2 = {};
-  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
+var EXPORT;
+function snapshot(model) {
+  const values = {};
+  let isNotRecursive;
+  if (!EXPORT) {
+    isNotRecursive = true;
+    EXPORT = /* @__PURE__ */ new Map([[model, values]]);
+  }
   for (let [key2, value] of model) {
     if (EXPORT.has(value))
       value = EXPORT.get(value);
-    else if (value && typeof value.get === "function")
+    else if (value && typeof value == "object" && "get" in value && typeof value.get === "function")
       EXPORT.set(value, value = value.get());
-    values2[key2] = value;
+    values[key2] = value;
   }
-  if (current)
+  if (isNotRecursive)
     EXPORT = void 0;
-  return Object.freeze(values2);
+  return Object.freeze(values);
 }
 function update(subject, key2, value, arg) {
   const state = STATE.get(subject);
@@ -443,23 +451,23 @@ function event(subject, key2, silent) {
   if (!silent)
     emit(subject, key2);
 }
-function assign(to, values2) {
+function assign(to, values) {
   const methods = METHODS.get(to.constructor);
-  for (const key2 in values2)
+  for (const key2 in values)
     if (key2 in to || methods.has(key2))
-      to[key2] = values2[key2];
+      to[key2] = values[key2];
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
 // src/context.ts
-var Register = /* @__PURE__ */ new WeakMap();
-var Table = /* @__PURE__ */ new Map();
+var LOOKUP = /* @__PURE__ */ new WeakMap();
+var KEYS = /* @__PURE__ */ new Map();
 function key(T, upstream) {
-  let K = Table.get(T);
+  let K = KEYS.get(T);
   if (!K)
-    Table.set(T, K = Symbol(
+    KEYS.set(T, K = Symbol(
       typeof T == "symbol" ? "get " + T.description : String(T)
     ));
   return upstream ? key(K) : K;
@@ -479,7 +487,7 @@ var Context = class _Context {
       this.include(inputs);
   }
   static get(from, callback) {
-    const waiting = Register.get(from);
+    const waiting = LOOKUP.get(from);
     if (waiting instanceof _Context) {
       if (callback)
         callback(waiting);
@@ -489,11 +497,14 @@ var Context = class _Context {
       if (waiting)
         waiting.push(callback);
       else
-        Register.set(from, [callback]);
+        LOOKUP.set(from, [callback]);
   }
-  get(Type, callback) {
-    if (callback)
-      Object.defineProperty(this, key(Type, true), { value: callback });
+  /** Run callback when a specified type is registered to a **child** context. */
+  has(Type, callback) {
+    define(this, key(Type, true), { value: callback });
+  }
+  /** Find specified type registered to a parent context. Returns undefined if none are found. */
+  get(Type) {
     const result = this[key(Type)];
     if (result === null)
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
@@ -515,9 +526,16 @@ var Context = class _Context {
   }
   include(inputs, forEach) {
     const init2 = /* @__PURE__ */ new Map();
+    if (typeof inputs == "function" || inputs instanceof Model)
+      inputs = { 0: inputs };
     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}.`);
+      if (Model.is(V) || V instanceof Model)
+        return;
+      if (K && K != V)
+        V = `${V} (as '${K}')`;
+      throw new Error(
+        `Context may only include instance or class \`extends Model\` but got ${V}.`
+      );
     });
     for (const key2 in inputs) {
       const input = inputs[key2];
@@ -533,9 +551,11 @@ var Context = class _Context {
       }
     }
     for (const [model, explicit] of init2) {
-      model.set();
-      if (forEach)
+      emit(model, true);
+      if (typeof forEach == "function")
         forEach(model, explicit);
+      else if (forEach && explicit)
+        assign(model, forEach);
       for (const [_key, value] of model)
         if (PARENT.get(value) === model) {
           this.add(value, true);
@@ -566,15 +586,15 @@ var Context = class _Context {
     keys(T).forEach((K) => {
       const value = this.hasOwnProperty(K) ? null : I;
       if (value || this[K] !== I && !implicit)
-        Object.defineProperty(this, K, {
+        define(this, K, {
           configurable: true,
           value
         });
     });
-    const waiting = Register.get(I);
+    const waiting = LOOKUP.get(I);
     if (waiting instanceof Array)
       waiting.forEach((cb) => cb(this));
-    Register.set(I, this);
+    LOOKUP.set(I, this);
     return I;
   }
 };
@@ -622,7 +642,7 @@ Model.on((_, model) => {
     const desc = typeof output == "object" ? output : { get: output };
     if ("value" in desc)
       state[key2] = desc.value;
-    Object.defineProperty(model, key2, {
+    define(model, key2, {
       enumerable: desc.enumerable !== false,
       get() {
         return watch(
@@ -675,7 +695,7 @@ function get(arg0, arg1) {
     }
     if (typeof arg1 == "function") {
       let connect2 = function(model) {
-        reset = effect(model, (current) => {
+        reset = createEffect(model, (current) => {
           proxy = current;
           if (!(key2 in state) || STALE.delete(compute2))
             compute2(!reset);
@@ -719,7 +739,6 @@ function get(arg0, arg1) {
 }
 
 // src/instruction/ref.ts
-var define2 = Object.defineProperty;
 function ref(arg, arg2) {
   return use((key2, subject, state) => {
     let value = {};
@@ -727,20 +746,20 @@ function ref(arg, arg2) {
       subject.get(() => {
         for (const key3 in state)
           if (typeof arg2 == "function")
-            define2(value, key3, {
+            define(value, key3, {
               configurable: true,
               get() {
                 const out = arg2(key3);
-                define2(value, key3, { value: out });
+                define(value, key3, { value: out });
                 return out;
               }
             });
           else {
             const get2 = () => state[key3];
             const set2 = (value2) => subject.set(key3, value2);
-            define2(set2, "current", { get: get2, set: set2 });
-            define2(set2, "get", { value: get2 });
-            define2(value, key3, { value: set2 });
+            define(set2, "current", { get: get2, set: set2 });
+            define(set2, "get", { value: get2 });
+            define(value, key3, { value: set2 });
           }
       });
     else if (typeof arg == "object")
@@ -765,7 +784,7 @@ function ref(arg, arg2) {
         get: { value: get2 }
       });
     }
-    define2(subject, key2, { value });
+    define(subject, key2, { value });
   });
 }
 
@@ -852,7 +871,7 @@ function has(arg1, arg2) {
     };
     if (Model.is(arg1))
       Context.get(subject, (context) => {
-        context.get(arg1, (got) => {
+        context.has(arg1, (got) => {
           let remove;
           let disconnect;
           if (applied.has(got))
@@ -916,7 +935,9 @@ function has(arg1, arg2) {
 0 && (module.exports = {
   Context,
   Model,
-  effect,
+  addListener,
+  createEffect,
+  createProxy,
   get,
   has,
   ref,

package/dist/index.mjs

@@ -1,25 +1,30 @@
 // src/control.ts
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
-var LISTENER = /* @__PURE__ */ new WeakMap();
+var LISTENERS = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var onReady = () => null;
 function addListener(subject, callback, select) {
-  let subs = LISTENER.get(subject);
+  let subs = LISTENERS.get(subject);
   if (!subs)
-    LISTENER.set(subject, subs = /* @__PURE__ */ new Map([[onReady, false]]));
-  const filter = select !== void 0 && /* @__PURE__ */ new Set([select]);
+    LISTENERS.set(subject, subs = /* @__PURE__ */ new Map([[onReady, void 0]]));
+  const filter = select === void 0 ? void 0 : /* @__PURE__ */ new Set([select]);
   if (!subs.has(onReady) && !filter)
     callback(true, subject);
   subs.set(callback, filter);
   return () => subs.delete(callback);
 }
+function createProxy(from, observer) {
+  const proxy = Object.create(from);
+  OBSERVER.set(proxy, observer);
+  return proxy;
+}
 function watch(from, key2, value) {
   const access = OBSERVER.get(from);
   return access ? access(from, key2, value) : value;
 }
-var PENDING = /* @__PURE__ */ new WeakMap();
 function emit(source, key2) {
-  const subs = LISTENER.get(source);
+  const subs = LISTENERS.get(source);
   const ready = !subs.has(onReady);
   if (key2 === true && ready)
     return;
@@ -45,27 +50,28 @@ function emit(source, key2) {
   });
   PENDING.delete(source);
 }
-function queue(event2) {
+function queue(eventHandler) {
   if (!DISPATCH.size)
     setTimeout(() => {
-      DISPATCH.forEach((event3) => {
+      DISPATCH.forEach((event2) => {
         try {
-          event3();
+          event2();
         } catch (err) {
           console.error(err);
         }
       });
       DISPATCH.clear();
     }, 0);
-  DISPATCH.add(event2);
+  DISPATCH.add(eventHandler);
 }
-function effect(target, callback, requireValues) {
-  const listeners = LISTENER.get(target);
+function createEffect(target, callback, requireValues) {
+  const listeners = LISTENERS.get(target);
   let unset;
   let reset;
   function invoke() {
     let stale;
-    const subscriber = Object.create(target);
+    const subscriber = createProxy(target, access);
+    LISTENERS.set(subscriber, listeners);
     function onUpdate() {
       if (stale)
         return null;
@@ -79,20 +85,19 @@ function effect(target, callback, requireValues) {
     function access(from, key2, value) {
       if (value === void 0 && requireValues)
         throw new Error(`${from}.${key2} is required in this context.`);
-      const listeners2 = LISTENER.get(from);
+      const listeners2 = LISTENERS.get(from);
       let listener = listeners2.get(onUpdate);
       if (!listener)
         listeners2.set(onUpdate, listener = /* @__PURE__ */ new Set());
       listener.add(key2);
-      const nested = LISTENER.get(value);
-      if (nested) {
-        LISTENER.set(value = Object.create(value), nested);
-        OBSERVER.set(value, access);
-      }
+      const nested = LISTENERS.get(value);
+      if (nested)
+        LISTENERS.set(
+          value = createProxy(value, access),
+          nested
+        );
       return value;
     }
-    LISTENER.set(subscriber, listeners);
-    OBSERVER.set(subscriber, access);
     try {
       const out = callback.call(subscriber, subscriber);
       unset = typeof out == "function" ? out : void 0;
@@ -129,27 +134,24 @@ var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
 var METHODS = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
-var EXPORT;
-var Model = class _Model {
+var Model = class {
   constructor(...args) {
-    define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${uid()}`);
-    STATE.set(this, {});
     prepare(this);
+    define(this, "is", { value: this });
     init(this, args);
   }
   get(arg1, arg2) {
     const self = this.is;
     if (arg1 === void 0)
-      return values(self);
+      return snapshot(self);
     if (typeof arg1 == "function") {
       let pending = /* @__PURE__ */ new Set();
-      return effect(self, (state) => {
+      return createEffect(self, (state) => {
         const cb = arg1.call(state, state, pending);
         return cb === null ? cb : (update2) => {
           pending = PENDING2.get(self);
           if (typeof cb == "function")
-            return cb(update2);
+            cb(update2);
         };
       });
     }
@@ -211,7 +213,6 @@ var Model = class _Model {
    * @param args - arguments sent to constructor
    */
   static new(...args) {
-    _Model.is(this);
     const instance = new this(...args);
     emit(instance, true);
     return instance;
@@ -223,9 +224,7 @@ var Model = class _Model {
    * methods and properties of this class.
    */
   static is(maybe) {
-    if (maybe === _Model)
-      throw new Error("Model is abstract and not a valid type.");
-    return typeof maybe == "function" && maybe.prototype instanceof this;
+    return maybe === this || typeof maybe == "function" && maybe.prototype instanceof this;
   }
   /**
    * Register a callback to run when any instance of this Model is updated. 
@@ -249,48 +248,50 @@ define(Model, "toString", {
   }
 });
 function prepare(model) {
+  let T = model.constructor;
+  if (T === Model)
+    throw new Error("Cannot create base 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) || [])
+  ID.set(model, `${T}-${uid()}`);
+  while (T.name) {
+    for (const cb of NOTIFY.get(T) || [])
       addListener(model, cb);
-    if (type2 == Model)
-      continue;
-    if (METHODS.has(type2)) {
-      keys2 = METHODS.get(type2);
+    if (T === Model)
+      break;
+    else
+      chain.unshift(T);
+    T = Object.getPrototypeOf(T);
+  }
+  for (const type of chain) {
+    if (METHODS.has(type)) {
+      keys2 = METHODS.get(type);
       continue;
     }
-    METHODS.set(type2, keys2 = new Set(keys2));
+    METHODS.set(type, keys2 = new Set(keys2));
     for (const [key2, { value }] of Object.entries(
-      Object.getOwnPropertyDescriptors(type2.prototype)
+      Object.getOwnPropertyDescriptors(type.prototype)
     )) {
-      let set3 = function(method) {
+      let get3 = function() {
+        return this.hasOwnProperty(key2) ? value : set3.call(this, value);
+      }, 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;
+      var get2 = get3, 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);
-        }
-      });
+      define(type.prototype, key2, { get: get3, set: set3 });
     }
   }
 }
 function init(model, args) {
-  const done = /* @__PURE__ */ new Set();
-  const state = STATE.get(model);
+  const state = {};
+  const clean = /* @__PURE__ */ new Set();
+  STATE.set(model, state);
   args = args.flat().filter((arg) => {
     if (typeof arg != "string")
       return true;
@@ -306,10 +307,10 @@ function init(model, args) {
           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);
+      else if (typeof use2 == "function")
+        clean.add(use2);
     });
     for (const key2 in model) {
       const desc = Object.getOwnPropertyDescriptor(model, key2);
@@ -327,7 +328,7 @@ function init(model, args) {
     return null;
   });
   addListener(model, () => {
-    done.forEach((x) => x());
+    clean.forEach((x) => x());
     for (const [_, value] of model)
       if (value instanceof Model && PARENT.get(value) === model)
         value.set(null);
@@ -359,19 +360,24 @@ function fetch(subject, property, required) {
     stack: error.stack
   });
 }
-function values(model) {
-  const values2 = {};
-  const current = !EXPORT && (EXPORT = /* @__PURE__ */ new Map([[model, values2]]));
+var EXPORT;
+function snapshot(model) {
+  const values = {};
+  let isNotRecursive;
+  if (!EXPORT) {
+    isNotRecursive = true;
+    EXPORT = /* @__PURE__ */ new Map([[model, values]]);
+  }
   for (let [key2, value] of model) {
     if (EXPORT.has(value))
       value = EXPORT.get(value);
-    else if (value && typeof value.get === "function")
+    else if (value && typeof value == "object" && "get" in value && typeof value.get === "function")
       EXPORT.set(value, value = value.get());
-    values2[key2] = value;
+    values[key2] = value;
   }
-  if (current)
+  if (isNotRecursive)
     EXPORT = void 0;
-  return Object.freeze(values2);
+  return Object.freeze(values);
 }
 function update(subject, key2, value, arg) {
   const state = STATE.get(subject);
@@ -409,23 +415,23 @@ function event(subject, key2, silent) {
   if (!silent)
     emit(subject, key2);
 }
-function assign(to, values2) {
+function assign(to, values) {
   const methods = METHODS.get(to.constructor);
-  for (const key2 in values2)
+  for (const key2 in values)
     if (key2 in to || methods.has(key2))
-      to[key2] = values2[key2];
+      to[key2] = values[key2];
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
 // src/context.ts
-var Register = /* @__PURE__ */ new WeakMap();
-var Table = /* @__PURE__ */ new Map();
+var LOOKUP = /* @__PURE__ */ new WeakMap();
+var KEYS = /* @__PURE__ */ new Map();
 function key(T, upstream) {
-  let K = Table.get(T);
+  let K = KEYS.get(T);
   if (!K)
-    Table.set(T, K = Symbol(
+    KEYS.set(T, K = Symbol(
       typeof T == "symbol" ? "get " + T.description : String(T)
     ));
   return upstream ? key(K) : K;
@@ -445,7 +451,7 @@ var Context = class _Context {
       this.include(inputs);
   }
   static get(from, callback) {
-    const waiting = Register.get(from);
+    const waiting = LOOKUP.get(from);
     if (waiting instanceof _Context) {
       if (callback)
         callback(waiting);
@@ -455,11 +461,14 @@ var Context = class _Context {
       if (waiting)
         waiting.push(callback);
       else
-        Register.set(from, [callback]);
+        LOOKUP.set(from, [callback]);
   }
-  get(Type, callback) {
-    if (callback)
-      Object.defineProperty(this, key(Type, true), { value: callback });
+  /** Run callback when a specified type is registered to a **child** context. */
+  has(Type, callback) {
+    define(this, key(Type, true), { value: callback });
+  }
+  /** Find specified type registered to a parent context. Returns undefined if none are found. */
+  get(Type) {
     const result = this[key(Type)];
     if (result === null)
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
@@ -481,9 +490,16 @@ var Context = class _Context {
   }
   include(inputs, forEach) {
     const init2 = /* @__PURE__ */ new Map();
+    if (typeof inputs == "function" || inputs instanceof Model)
+      inputs = { 0: inputs };
     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}.`);
+      if (Model.is(V) || V instanceof Model)
+        return;
+      if (K && K != V)
+        V = `${V} (as '${K}')`;
+      throw new Error(
+        `Context may only include instance or class \`extends Model\` but got ${V}.`
+      );
     });
     for (const key2 in inputs) {
       const input = inputs[key2];
@@ -499,9 +515,11 @@ var Context = class _Context {
       }
     }
     for (const [model, explicit] of init2) {
-      model.set();
-      if (forEach)
+      emit(model, true);
+      if (typeof forEach == "function")
         forEach(model, explicit);
+      else if (forEach && explicit)
+        assign(model, forEach);
       for (const [_key, value] of model)
         if (PARENT.get(value) === model) {
           this.add(value, true);
@@ -532,15 +550,15 @@ var Context = class _Context {
     keys(T).forEach((K) => {
       const value = this.hasOwnProperty(K) ? null : I;
       if (value || this[K] !== I && !implicit)
-        Object.defineProperty(this, K, {
+        define(this, K, {
           configurable: true,
           value
         });
     });
-    const waiting = Register.get(I);
+    const waiting = LOOKUP.get(I);
     if (waiting instanceof Array)
       waiting.forEach((cb) => cb(this));
-    Register.set(I, this);
+    LOOKUP.set(I, this);
     return I;
   }
 };
@@ -588,7 +606,7 @@ Model.on((_, model) => {
     const desc = typeof output == "object" ? output : { get: output };
     if ("value" in desc)
       state[key2] = desc.value;
-    Object.defineProperty(model, key2, {
+    define(model, key2, {
       enumerable: desc.enumerable !== false,
       get() {
         return watch(
@@ -641,7 +659,7 @@ function get(arg0, arg1) {
     }
     if (typeof arg1 == "function") {
       let connect2 = function(model) {
-        reset = effect(model, (current) => {
+        reset = createEffect(model, (current) => {
           proxy = current;
           if (!(key2 in state) || STALE.delete(compute2))
             compute2(!reset);
@@ -685,7 +703,6 @@ function get(arg0, arg1) {
 }
 
 // src/instruction/ref.ts
-var define2 = Object.defineProperty;
 function ref(arg, arg2) {
   return use((key2, subject, state) => {
     let value = {};
@@ -693,20 +710,20 @@ function ref(arg, arg2) {
       subject.get(() => {
         for (const key3 in state)
           if (typeof arg2 == "function")
-            define2(value, key3, {
+            define(value, key3, {
               configurable: true,
               get() {
                 const out = arg2(key3);
-                define2(value, key3, { value: out });
+                define(value, key3, { value: out });
                 return out;
               }
             });
           else {
             const get2 = () => state[key3];
             const set2 = (value2) => subject.set(key3, value2);
-            define2(set2, "current", { get: get2, set: set2 });
-            define2(set2, "get", { value: get2 });
-            define2(value, key3, { value: set2 });
+            define(set2, "current", { get: get2, set: set2 });
+            define(set2, "get", { value: get2 });
+            define(value, key3, { value: set2 });
           }
       });
     else if (typeof arg == "object")
@@ -731,7 +748,7 @@ function ref(arg, arg2) {
         get: { value: get2 }
       });
     }
-    define2(subject, key2, { value });
+    define(subject, key2, { value });
   });
 }
 
@@ -818,7 +835,7 @@ function has(arg1, arg2) {
     };
     if (Model.is(arg1))
       Context.get(subject, (context) => {
-        context.get(arg1, (got) => {
+        context.has(arg1, (got) => {
           let remove;
           let disconnect;
           if (applied.has(got))
@@ -881,8 +898,10 @@ function has(arg1, arg2) {
 export {
   Context,
   Model,
+  addListener,
+  createEffect,
+  createProxy,
   Model as default,
-  effect,
   get,
   has,
   ref,

package/package.json

@@ -32,6 +32,6 @@
     "jest": "^27.0.6",
     "tsup": "^8.0.2"
   },
-  "version": "0.52.1",
-  "gitHead": "71f17a90b44bd4b969a56b38d629f32b289c77b7"
+  "version": "0.52.2-alpha.74+088f4ba5",
+  "gitHead": "088f4ba53762f0b185871570c58f349084eb29af"
 }