@expressive/mvc 0.50.0 → 0.50.1

package/dist/index.d.ts

@@ -2,6 +2,8 @@ type MaybeAsync<T> = T | Promise<T>;
 declare namespace Model {
     /** Any type of Model, using own class constructor as its identifier. */
     type Type<T extends Model = Model> = (abstract new (...args: any[]) => T) & typeof Model;
+    /** A Model constructor, but which is not abstract. */
+    type Init<T extends Model = Model> = (new (...args: Model.Args<T>) => T) & Omit<typeof Model, never>;
     /**
      * Model constructor callback - is called when Model finishes intializing.
      * Returned function will call when model is destroyed.
@@ -82,7 +84,7 @@ interface Model {
      **/
     is: this;
 }
-declare class Model {
+declare abstract class Model {
     constructor(...args: Model.Args);
     /** Pull current values from state. Flattens all models and exotic values recursively. */
     get(): Model.State<this>;
@@ -184,14 +186,14 @@ declare class Model {
      *
      * @param args - arguments sent to constructor
      */
-    static new<T extends Model>(this: Model.Type<T>, ...args: Model.Args<T>): T;
+    static new<T extends Model>(this: Model.Init<T>, ...args: Model.Args<T>): T;
     /**
      * Static equivalent of `x instanceof this`.
      * Determines if provided class is a subtype of this one.
      * If so, language server will make available all static
      * methods and properties of this class.
      */
-    static is<T extends Model.Type>(this: T, maybe: any): maybe is T;
+    static is<T extends Model.Type>(this: T, maybe: unknown): maybe is T;
     /**
      * Register a callback to run when any instance of this Model is updated.
      */
@@ -293,7 +295,7 @@ declare function ref<O extends Model, R>(target: O, mapper: (key: Model.Field<O>
  *
  * @param callback - Optional callback to synchronously fire when reference is first set or does update.
  */
-declare function ref<T = HTMLElement>(callback?: ref.Callback<T>): ref.Object<T>;
+declare function ref<T>(callback?: ref.Callback<T>): ref.Object<T>;
 /**
  * Creates a ref-compatible property.
  * Will persist value, and updates to this are made part of controller event-stream.
@@ -303,7 +305,7 @@ declare function ref<T = HTMLElement>(callback?: ref.Callback<T>): ref.Object<T>
  * @param callback - Optional callback to synchronously fire when reference is first set or does update.
  * @param ignoreNull - Default `true`. If `false`, will still callback with `null`.
  */
-declare function ref<T = HTMLElement>(callback: ref.Callback<T | null>, ignoreNull: boolean): ref.Object<T>;
+declare function ref<T>(callback: ref.Callback<T | null>, ignoreNull: boolean): ref.Object<T>;
 
 declare namespace set {
     type Callback<T, S = any> = (this: S, next: T, previous: T) => ((next: T) => void) | Promise<any> | void | boolean;
@@ -342,8 +344,8 @@ declare function set<T>(factory: set.Factory<T> | Promise<T>, required?: boolean
 declare function set<T>(value: T | undefined, onUpdate: set.Callback<T>): T;
 
 declare function use<T = any>(instruction: Model.Instruction): T;
-declare function use<T extends Model>(Type: Model.Type<T>, required: false): T | undefined;
-declare function use<T extends Model>(Type: Model.Type<T>, ready?: (i: T) => void): T;
+declare function use<T extends Model>(Type: Model.Init<T>, required: false): T | undefined;
+declare function use<T extends Model>(Type: Model.Init<T>, ready?: (i: T) => void): T;
 
 declare namespace has {
     type Callback<T = any> = (model: T, recipient: Model) => void | boolean | (() => void);
@@ -364,9 +366,12 @@ declare function effect<T extends {}>(target: T, callback: Effect<Required<T>>,
 declare function effect<T extends {}>(target: T, callback: Effect<T>, requireValues?: boolean): () => void;
 
 declare namespace Context {
-    type Input = Record<string | number, Model | Model.Type<Model>>;
+    type Input = Record<string | number, Model | Model.Init>;
     type Expect = (model: Model) => (() => void) | void;
 }
+interface Context {
+    [key: symbol]: Model | Context.Expect | null | undefined;
+}
 declare class Context {
     static get<T extends Model>(on: Model, callback: ((got: Context) => void)): void;
     static get<T extends Model>(on: Model): Context | undefined;
@@ -379,9 +384,7 @@ declare class Context {
     push(inputs?: Context.Input): this;
     pop(): void;
     include(inputs: Context.Input, forEach?: (added: Model, explicit: boolean) => void): void;
-    protected add<T extends Model>(input: T | Model.Type<T>, implicit?: boolean): T;
-    protected has<T extends Model>(type: Model.Type<T>, model: T): void;
-    protected put<T extends Model>(T: Model.Type<T>, I: T | ((model: T) => void), implicit?: boolean): void;
+    protected add<T extends Model>(input: T | Model.Init<T>, implicit?: boolean): T;
 }
 
 declare global {

package/dist/index.js

@@ -305,6 +305,7 @@ 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;
@@ -316,6 +317,8 @@ 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;
   }
   /**
@@ -409,9 +412,9 @@ function assign(to, values) {
       to[key2] = values[key2];
 }
 function bindMethods(type) {
-  let keys = METHODS.get(type);
-  if (!keys) {
-    METHODS.set(type, keys = bindMethods(Object.getPrototypeOf(type)).slice());
+  let keys2 = METHODS.get(type);
+  if (!keys2) {
+    METHODS.set(type, keys2 = bindMethods(Object.getPrototypeOf(type)).slice());
     const desc = Object.getOwnPropertyDescriptors(type.prototype);
     for (const key2 in desc)
       if (key2 != "constructor" && "value" in desc[key2]) {
@@ -423,7 +426,7 @@ function bindMethods(type) {
         };
         var bind = bind2;
         let { value } = desc[key2];
-        keys.push(key2);
+        keys2.push(key2);
         Object.defineProperty(type.prototype, key2, {
           set: bind2,
           get() {
@@ -432,7 +435,7 @@ function bindMethods(type) {
         });
       }
   }
-  return keys;
+  return keys2;
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
@@ -440,16 +443,21 @@ function uid() {
 
 // src/context.ts
 var Register = /* @__PURE__ */ new WeakMap();
-var Upstream = /* @__PURE__ */ new WeakMap();
-var Downstream = /* @__PURE__ */ new WeakMap();
+var Table = /* @__PURE__ */ new Map();
 function key(T, upstream) {
-  const table = upstream ? Upstream : Downstream;
-  let key2 = table.get(T);
-  if (!key2) {
-    key2 = Symbol(T.name + (upstream ? " request" : ""));
-    table.set(T, key2);
-  }
-  return key2;
+  let K = Table.get(T);
+  if (!K)
+    Table.set(T, K = Symbol(
+      typeof T == "symbol" ? "get " + T.description : String(T)
+    ));
+  return upstream ? key(K) : K;
+}
+function keys(from, upstream) {
+  const keys2 = /* @__PURE__ */ new Set();
+  do {
+    keys2.add(key(from, upstream));
+  } while ((from = Object.getPrototypeOf(from)) !== Model);
+  return keys2;
 }
 var Context = class _Context {
   constructor(inputs) {
@@ -460,18 +468,20 @@ var Context = class _Context {
   }
   static get(from, callback) {
     const waiting = Register.get(from);
-    if (!callback)
-      return waiting instanceof _Context ? waiting : void 0;
-    if (waiting instanceof _Context)
-      callback(waiting);
-    else if (waiting)
-      waiting.push(callback);
-    else
-      Register.set(from, [callback]);
+    if (waiting instanceof _Context) {
+      if (callback)
+        callback(waiting);
+      return waiting;
+    }
+    if (callback)
+      if (waiting)
+        waiting.push(callback);
+      else
+        Register.set(from, [callback]);
   }
   get(Type, callback) {
     if (callback)
-      return this.put(Type, callback);
+      Object.defineProperty(this, key(Type, true), { value: callback });
     const result = this[key(Type)];
     if (result === null)
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
@@ -525,6 +535,7 @@ var Context = class _Context {
     let T;
     let I;
     if (typeof input == "function") {
+      Model.is(input);
       T = input;
       I = new input();
       this.cleanup.add(() => I.set(null));
@@ -532,32 +543,27 @@ var Context = class _Context {
       I = input;
       T = I.constructor;
     }
-    this.has(T, I);
-    this.put(T, I, implicit);
-    return I;
-  }
-  has(type, model) {
-    do {
-      const K = key(type, true);
+    keys(T, true).forEach((K) => {
       const result = this[K];
       if (!result)
-        continue;
-      const callback = result(model);
+        return;
+      const callback = result(I);
       if (callback)
         this.cleanup.add(callback);
-    } while ((type = Object.getPrototypeOf(type)) !== Model);
-    const waiting = Register.get(model);
-    if (waiting instanceof Array)
-      waiting.forEach((cb) => cb(this));
-    Register.set(model, this);
-  }
-  put(T, I, implicit) {
-    do {
-      const K = key(T, typeof I == "function");
+    });
+    keys(T).forEach((K) => {
       const value = this.hasOwnProperty(K) ? null : I;
       if (value || this[K] !== I && !implicit)
-        Object.defineProperty(this, K, { configurable: true, value });
-    } while ((T = Object.getPrototypeOf(T)) !== Model);
+        Object.defineProperty(this, K, {
+          configurable: true,
+          value
+        });
+    });
+    const waiting = Register.get(I);
+    if (waiting instanceof Array)
+      waiting.forEach((cb) => cb(this));
+    Register.set(I, this);
+    return I;
   }
 };
 
@@ -567,8 +573,8 @@ function use(arg1, arg2) {
   const token = Symbol("instruction");
   if (Model.is(arg1)) {
     const type = arg1;
-    const value = new type();
     arg1 = (key2, subject) => {
+      const desc = { set: set2, get: get2 };
       function set2(next) {
         if (next ? !(next instanceof type) : arg2 !== false)
           throw new Error(`${subject}.${key2} expected Model of type ${type} but got ${next && next.constructor}.`);
@@ -577,8 +583,12 @@ function use(arg1, arg2) {
           arg2(next);
         return false;
       }
-      set2(value);
-      return { set: set2, value };
+      function get2() {
+        set2(new type());
+        desc.get = arg2 !== false;
+        return fetch(subject, key2);
+      }
+      return desc;
     };
   }
   INSTRUCT.set(token, arg1);
@@ -831,7 +841,46 @@ function has(arg1, arg2) {
     const update2 = () => {
       subject.set(key2, Object.freeze(Array.from(applied)));
     };
-    if (!Model.is(arg1)) {
+    if (Model.is(arg1))
+      Context.get(subject, (context) => {
+        context.get(arg1, (got) => {
+          let remove;
+          let disconnect;
+          if (applied.has(got))
+            return;
+          const callback = APPLY.get(got);
+          if (callback) {
+            const after = callback(subject);
+            if (after === false)
+              return;
+            if (typeof after == "function")
+              disconnect = after;
+          }
+          if (typeof arg2 == "function") {
+            const done2 = arg2(got, subject);
+            if (done2 === false)
+              return false;
+            remove = () => {
+              if (typeof done2 == "function")
+                done2();
+            };
+          }
+          applied.add(got);
+          update2();
+          const done = () => {
+            reset();
+            applied.delete(got);
+            update2();
+            if (disconnect)
+              disconnect();
+            if (typeof remove == "function")
+              remove();
+          };
+          const reset = got.get(null, done);
+          return done;
+        });
+      });
+    else {
       if (APPLY.has(subject))
         throw new Error(`'has' callback can only be used once per model.`);
       APPLY.set(subject, (recipient) => {
@@ -850,43 +899,7 @@ function has(arg1, arg2) {
             remove();
         };
       });
-    } else
-      Context.get(subject, (ctx) => ctx.get(arg1, (got) => {
-        let remove;
-        let disconnect;
-        if (applied.has(got))
-          return;
-        const callback = APPLY.get(got);
-        if (callback) {
-          const after = callback(subject);
-          if (after === false)
-            return;
-          if (typeof after == "function")
-            disconnect = after;
-        }
-        if (typeof arg2 == "function") {
-          const done2 = arg2(got, subject);
-          if (done2 === false)
-            return false;
-          remove = () => {
-            if (typeof done2 == "function")
-              done2();
-          };
-        }
-        applied.add(got);
-        update2();
-        const done = () => {
-          reset();
-          applied.delete(got);
-          update2();
-          if (disconnect)
-            disconnect();
-          if (typeof remove == "function")
-            remove();
-        };
-        const reset = got.get(null, done);
-        return done;
-      }));
+    }
     return { value: [] };
   });
 }

package/dist/index.mjs

@@ -271,6 +271,7 @@ 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;
@@ -282,6 +283,8 @@ 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;
   }
   /**
@@ -375,9 +378,9 @@ function assign(to, values) {
       to[key2] = values[key2];
 }
 function bindMethods(type) {
-  let keys = METHODS.get(type);
-  if (!keys) {
-    METHODS.set(type, keys = bindMethods(Object.getPrototypeOf(type)).slice());
+  let keys2 = METHODS.get(type);
+  if (!keys2) {
+    METHODS.set(type, keys2 = bindMethods(Object.getPrototypeOf(type)).slice());
     const desc = Object.getOwnPropertyDescriptors(type.prototype);
     for (const key2 in desc)
       if (key2 != "constructor" && "value" in desc[key2]) {
@@ -389,7 +392,7 @@ function bindMethods(type) {
         };
         var bind = bind2;
         let { value } = desc[key2];
-        keys.push(key2);
+        keys2.push(key2);
         Object.defineProperty(type.prototype, key2, {
           set: bind2,
           get() {
@@ -398,7 +401,7 @@ function bindMethods(type) {
         });
       }
   }
-  return keys;
+  return keys2;
 }
 function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
@@ -406,16 +409,21 @@ function uid() {
 
 // src/context.ts
 var Register = /* @__PURE__ */ new WeakMap();
-var Upstream = /* @__PURE__ */ new WeakMap();
-var Downstream = /* @__PURE__ */ new WeakMap();
+var Table = /* @__PURE__ */ new Map();
 function key(T, upstream) {
-  const table = upstream ? Upstream : Downstream;
-  let key2 = table.get(T);
-  if (!key2) {
-    key2 = Symbol(T.name + (upstream ? " request" : ""));
-    table.set(T, key2);
-  }
-  return key2;
+  let K = Table.get(T);
+  if (!K)
+    Table.set(T, K = Symbol(
+      typeof T == "symbol" ? "get " + T.description : String(T)
+    ));
+  return upstream ? key(K) : K;
+}
+function keys(from, upstream) {
+  const keys2 = /* @__PURE__ */ new Set();
+  do {
+    keys2.add(key(from, upstream));
+  } while ((from = Object.getPrototypeOf(from)) !== Model);
+  return keys2;
 }
 var Context = class _Context {
   constructor(inputs) {
@@ -426,18 +434,20 @@ var Context = class _Context {
   }
   static get(from, callback) {
     const waiting = Register.get(from);
-    if (!callback)
-      return waiting instanceof _Context ? waiting : void 0;
-    if (waiting instanceof _Context)
-      callback(waiting);
-    else if (waiting)
-      waiting.push(callback);
-    else
-      Register.set(from, [callback]);
+    if (waiting instanceof _Context) {
+      if (callback)
+        callback(waiting);
+      return waiting;
+    }
+    if (callback)
+      if (waiting)
+        waiting.push(callback);
+      else
+        Register.set(from, [callback]);
   }
   get(Type, callback) {
     if (callback)
-      return this.put(Type, callback);
+      Object.defineProperty(this, key(Type, true), { value: callback });
     const result = this[key(Type)];
     if (result === null)
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
@@ -491,6 +501,7 @@ var Context = class _Context {
     let T;
     let I;
     if (typeof input == "function") {
+      Model.is(input);
       T = input;
       I = new input();
       this.cleanup.add(() => I.set(null));
@@ -498,32 +509,27 @@ var Context = class _Context {
       I = input;
       T = I.constructor;
     }
-    this.has(T, I);
-    this.put(T, I, implicit);
-    return I;
-  }
-  has(type, model) {
-    do {
-      const K = key(type, true);
+    keys(T, true).forEach((K) => {
       const result = this[K];
       if (!result)
-        continue;
-      const callback = result(model);
+        return;
+      const callback = result(I);
       if (callback)
         this.cleanup.add(callback);
-    } while ((type = Object.getPrototypeOf(type)) !== Model);
-    const waiting = Register.get(model);
-    if (waiting instanceof Array)
-      waiting.forEach((cb) => cb(this));
-    Register.set(model, this);
-  }
-  put(T, I, implicit) {
-    do {
-      const K = key(T, typeof I == "function");
+    });
+    keys(T).forEach((K) => {
       const value = this.hasOwnProperty(K) ? null : I;
       if (value || this[K] !== I && !implicit)
-        Object.defineProperty(this, K, { configurable: true, value });
-    } while ((T = Object.getPrototypeOf(T)) !== Model);
+        Object.defineProperty(this, K, {
+          configurable: true,
+          value
+        });
+    });
+    const waiting = Register.get(I);
+    if (waiting instanceof Array)
+      waiting.forEach((cb) => cb(this));
+    Register.set(I, this);
+    return I;
   }
 };
 
@@ -533,8 +539,8 @@ function use(arg1, arg2) {
   const token = Symbol("instruction");
   if (Model.is(arg1)) {
     const type = arg1;
-    const value = new type();
     arg1 = (key2, subject) => {
+      const desc = { set: set2, get: get2 };
       function set2(next) {
         if (next ? !(next instanceof type) : arg2 !== false)
           throw new Error(`${subject}.${key2} expected Model of type ${type} but got ${next && next.constructor}.`);
@@ -543,8 +549,12 @@ function use(arg1, arg2) {
           arg2(next);
         return false;
       }
-      set2(value);
-      return { set: set2, value };
+      function get2() {
+        set2(new type());
+        desc.get = arg2 !== false;
+        return fetch(subject, key2);
+      }
+      return desc;
     };
   }
   INSTRUCT.set(token, arg1);
@@ -797,7 +807,46 @@ function has(arg1, arg2) {
     const update2 = () => {
       subject.set(key2, Object.freeze(Array.from(applied)));
     };
-    if (!Model.is(arg1)) {
+    if (Model.is(arg1))
+      Context.get(subject, (context) => {
+        context.get(arg1, (got) => {
+          let remove;
+          let disconnect;
+          if (applied.has(got))
+            return;
+          const callback = APPLY.get(got);
+          if (callback) {
+            const after = callback(subject);
+            if (after === false)
+              return;
+            if (typeof after == "function")
+              disconnect = after;
+          }
+          if (typeof arg2 == "function") {
+            const done2 = arg2(got, subject);
+            if (done2 === false)
+              return false;
+            remove = () => {
+              if (typeof done2 == "function")
+                done2();
+            };
+          }
+          applied.add(got);
+          update2();
+          const done = () => {
+            reset();
+            applied.delete(got);
+            update2();
+            if (disconnect)
+              disconnect();
+            if (typeof remove == "function")
+              remove();
+          };
+          const reset = got.get(null, done);
+          return done;
+        });
+      });
+    else {
       if (APPLY.has(subject))
         throw new Error(`'has' callback can only be used once per model.`);
       APPLY.set(subject, (recipient) => {
@@ -816,43 +865,7 @@ function has(arg1, arg2) {
             remove();
         };
       });
-    } else
-      Context.get(subject, (ctx) => ctx.get(arg1, (got) => {
-        let remove;
-        let disconnect;
-        if (applied.has(got))
-          return;
-        const callback = APPLY.get(got);
-        if (callback) {
-          const after = callback(subject);
-          if (after === false)
-            return;
-          if (typeof after == "function")
-            disconnect = after;
-        }
-        if (typeof arg2 == "function") {
-          const done2 = arg2(got, subject);
-          if (done2 === false)
-            return false;
-          remove = () => {
-            if (typeof done2 == "function")
-              done2();
-          };
-        }
-        applied.add(got);
-        update2();
-        const done = () => {
-          reset();
-          applied.delete(got);
-          update2();
-          if (disconnect)
-            disconnect();
-          if (typeof remove == "function")
-            remove();
-        };
-        const reset = got.get(null, done);
-        return done;
-      }));
+    }
     return { value: [] };
   });
 }

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.50.0",
-  "gitHead": "d645cd2a453bbe41af16acdc4349e259540ebf67"
+  "version": "0.50.1",
+  "gitHead": "c74ee393d29e18ae4c4bc59bf73834ac21fb2b6b"
 }