@expressive/mvc 0.44.0 → 0.45.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,9 +6,9 @@ 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. **/
@@ -16,7 +17,7 @@ declare namespace Model {
     type Event<T> = Field<T> | (string & {}) | number | symbol;
     /** Object overlay which may be used to override values and methods while creating 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 {

package/dist/index.js

@@ -174,19 +174,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 +205,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;

package/dist/index.mjs

@@ -140,19 +140,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 +171,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;

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.45.0",
+  "gitHead": "011596452831f785cc685c9124adff02176b489f"
 }