@expressive/mvc 0.44.0 → 0.46.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+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;
@@ -5,18 +6,18 @@ declare namespace Model {
      * Model constructor callback - is called when Model finishes intializing.
      * Returned function will call when model is destroyed.
      */
-    type Callback<T extends Model = Model> = (this: T, thisArg: T) => (() => void) | Assign<T> | Promise<void> | void;
+    type Callback<T extends Model = Model> = (this: T, thisArg: T) => MaybeAsync<(() => void) | Assign<T> | void>;
     /** Model constructor argument */
-    type Argument<T extends Model = Model> = string | Callback<T> | Assign<T> | void;
+    type Argument<T extends Model = Model> = string | Assign<T> | Callback<T> | Promise<Assign<T> | (() => void) | void> | void;
     /** Model constructor arguments */
     type Args<T extends Model = any> = Argument<T>[];
     /** Subset of `keyof T` which are not methods or defined by base Model U. **/
     type Field<T> = Exclude<keyof T, keyof Model>;
     /** Any valid key for controller, including but not limited to Field<T>. */
     type Event<T> = Field<T> | (string & {}) | number | symbol;
-    /** Object overlay which may be used to override values and methods while creating model. */
+    /** Object overlay which may be used to override values and methods on a model. */
     type Assign<T> = {
-        [K in Exclude<keyof T, keyof Model>]?: T[K] extends (...args: any[]) => infer R ? (this: T, ...args: Parameters<T[K]>) => ReturnType<T[K]> : T[K];
+        [K in Exclude<keyof T, keyof Model>]?: T[K] extends (...args: infer A) => infer R ? (this: T, ...args: A) => R : T[K];
     } & Record<string, unknown>;
     /** Export/Import compatible value for a given property in a Model. */
     type Export<R> = R extends {
@@ -379,7 +380,7 @@ declare class Context {
     key(T: Model.Type, upstream?: boolean): keyof this;
     has(model: Model): (() => void) | undefined;
     get<T extends Model>(Type: Model.Type<T>): T | undefined;
-    include(inputs: Context.Input): Map<Model, boolean>;
+    include(inputs: Context.Input, forEach?: (added: Model, explicit: boolean) => void): void;
     put<T extends Model>(T: Model.Type<T>, I: T | ((model: T) => void), implicit?: boolean, writable?: boolean): void;
     add<T extends Model>(input: T | Model.Type<T>, implicit?: boolean): T;
     push(inputs?: Context.Input): this;

package/dist/index.js

@@ -66,13 +66,16 @@ function watch(from, key, value) {
 var PENDING = /* @__PURE__ */ new WeakMap();
 function event(source, key) {
   const subs = LISTENER.get(source);
+  const ready = !subs.has(onReady);
+  if (key === true && ready)
+    return;
   let pending = PENDING.get(source);
   if (pending) {
     pending.add(key);
     return;
   }
   PENDING.set(source, pending = new Set(
-    key !== true && subs.has(onReady) ? [true, key] : [key]
+    key !== true && ready ? [key] : [true, key]
   ));
   pending.forEach((key2) => {
     pending.delete(key2);
@@ -174,19 +177,23 @@ var Model = class _Model {
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      const cleanup = /* @__PURE__ */ new Set();
-      for (const arg of args) {
-        const use2 = typeof arg == "function" ? arg.call(this, this) : arg;
-        if (use2 instanceof Promise)
-          use2.catch((err) => {
-            console.error(`Async error in constructor for ${this}:`);
-            console.error(err);
-          });
-        else if (typeof use2 == "object")
-          assign(this, use2);
-        else if (typeof use2 == "function")
-          cleanup.add(use2);
-      }
+      let done;
+      (async () => {
+        const cleanup = /* @__PURE__ */ new Set();
+        for (const arg of args) {
+          let use2 = typeof arg == "function" ? arg.call(this, this) : arg;
+          if (use2 instanceof Promise)
+            use2 = await use2.catch((err) => {
+              console.error(`Async error in constructor for ${this}:`);
+              console.error(err);
+            });
+          if (typeof use2 == "object")
+            assign(this, use2);
+          else if (typeof use2 == "function")
+            cleanup.add(use2);
+        }
+        done = cleanup;
+      })();
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -201,10 +208,12 @@ var Model = class _Model {
         }
       }
       addListener(this, () => {
+        if (!done)
+          throw new Error(`Tried to destroy ${this} but not fully initialized.`);
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
             value.set(null);
-        cleanup.forEach((x) => x());
+        done.forEach((x) => x());
         Object.freeze(state);
       }, null);
       return null;
@@ -260,11 +269,12 @@ var Model = class _Model {
       return event(this, null);
     if (typeof arg1 == "object")
       assign(self, arg1);
-    else if (arg1 !== void 0)
-      if (1 in arguments)
-        update(self, arg1, arg2, arg3);
-      else
-        push(self, arg1);
+    else if (arg1 == void 0)
+      event(this, true);
+    else if (1 in arguments)
+      update(self, arg1, arg2, arg3);
+    else
+      push(self, arg1);
     if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
@@ -726,7 +736,7 @@ var Context = class {
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
     return result;
   }
-  include(inputs) {
+  include(inputs, forEach) {
     const init = /* @__PURE__ */ new Map();
     if (typeof inputs == "function" || inputs instanceof Model)
       inputs = { [0]: inputs };
@@ -746,10 +756,13 @@ var Context = class {
       } else if (exists !== input) {
         this.pop();
         this.id = uid();
-        return this.include(inputs);
+        this.include(inputs);
       }
     }
-    for (const [model] of init) {
+    for (const [model, explicit] of init) {
+      if (forEach)
+        forEach(model, explicit);
+      model.set();
       this.has(model);
       const expects = Expects.get(model);
       if (expects)
@@ -761,7 +774,6 @@ var Context = class {
           init.set(value, false);
         }
     }
-    return init;
   }
   put(T, I, implicit, writable) {
     do {
@@ -782,7 +794,7 @@ var Context = class {
     let I;
     if (typeof input == "function") {
       T = input;
-      I = input.new();
+      I = new input();
     } else {
       I = input;
       T = I.constructor;

package/dist/index.mjs

@@ -32,13 +32,16 @@ function watch(from, key, value) {
 var PENDING = /* @__PURE__ */ new WeakMap();
 function event(source, key) {
   const subs = LISTENER.get(source);
+  const ready = !subs.has(onReady);
+  if (key === true && ready)
+    return;
   let pending = PENDING.get(source);
   if (pending) {
     pending.add(key);
     return;
   }
   PENDING.set(source, pending = new Set(
-    key !== true && subs.has(onReady) ? [true, key] : [key]
+    key !== true && ready ? [key] : [true, key]
   ));
   pending.forEach((key2) => {
     pending.delete(key2);
@@ -140,19 +143,23 @@ var Model = class _Model {
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      const cleanup = /* @__PURE__ */ new Set();
-      for (const arg of args) {
-        const use2 = typeof arg == "function" ? arg.call(this, this) : arg;
-        if (use2 instanceof Promise)
-          use2.catch((err) => {
-            console.error(`Async error in constructor for ${this}:`);
-            console.error(err);
-          });
-        else if (typeof use2 == "object")
-          assign(this, use2);
-        else if (typeof use2 == "function")
-          cleanup.add(use2);
-      }
+      let done;
+      (async () => {
+        const cleanup = /* @__PURE__ */ new Set();
+        for (const arg of args) {
+          let use2 = typeof arg == "function" ? arg.call(this, this) : arg;
+          if (use2 instanceof Promise)
+            use2 = await use2.catch((err) => {
+              console.error(`Async error in constructor for ${this}:`);
+              console.error(err);
+            });
+          if (typeof use2 == "object")
+            assign(this, use2);
+          else if (typeof use2 == "function")
+            cleanup.add(use2);
+        }
+        done = cleanup;
+      })();
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -167,10 +174,12 @@ var Model = class _Model {
         }
       }
       addListener(this, () => {
+        if (!done)
+          throw new Error(`Tried to destroy ${this} but not fully initialized.`);
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
             value.set(null);
-        cleanup.forEach((x) => x());
+        done.forEach((x) => x());
         Object.freeze(state);
       }, null);
       return null;
@@ -226,11 +235,12 @@ var Model = class _Model {
       return event(this, null);
     if (typeof arg1 == "object")
       assign(self, arg1);
-    else if (arg1 !== void 0)
-      if (1 in arguments)
-        update(self, arg1, arg2, arg3);
-      else
-        push(self, arg1);
+    else if (arg1 == void 0)
+      event(this, true);
+    else if (1 in arguments)
+      update(self, arg1, arg2, arg3);
+    else
+      push(self, arg1);
     if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
@@ -692,7 +702,7 @@ var Context = class {
       throw new Error(`Did find ${Type} in context, but multiple were defined.`);
     return result;
   }
-  include(inputs) {
+  include(inputs, forEach) {
     const init = /* @__PURE__ */ new Map();
     if (typeof inputs == "function" || inputs instanceof Model)
       inputs = { [0]: inputs };
@@ -712,10 +722,13 @@ var Context = class {
       } else if (exists !== input) {
         this.pop();
         this.id = uid();
-        return this.include(inputs);
+        this.include(inputs);
       }
     }
-    for (const [model] of init) {
+    for (const [model, explicit] of init) {
+      if (forEach)
+        forEach(model, explicit);
+      model.set();
       this.has(model);
       const expects = Expects.get(model);
       if (expects)
@@ -727,7 +740,6 @@ var Context = class {
           init.set(value, false);
         }
     }
-    return init;
   }
   put(T, I, implicit, writable) {
     do {
@@ -748,7 +760,7 @@ var Context = class {
     let I;
     if (typeof input == "function") {
       T = input;
-      I = input.new();
+      I = new input();
     } else {
       I = input;
       T = I.constructor;

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.44.0",
-  "gitHead": "b9a450ae7d25a8845d344faed39495bbdfc69b47"
+  "version": "0.46.0",
+  "gitHead": "22ffbbadad0ab45f73c71e178183941e78ed2a56"
 }