@expressive/mvc 0.43.2 → 0.44.0

package/dist/index.d.ts

@@ -1,15 +1,15 @@
 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;
-    /** A type of Model which may be created without constructor arguments. */
-    type New<T extends Model = Model> = (new (arg?: Argument) => T) & typeof Model;
+    type Type<T extends Model = Model> = (abstract new (...args: any[]) => T) & typeof 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;
     /** Model constructor argument */
-    type Argument<T extends Model = Model> = string | Callback<T> | Assign<T> | undefined;
+    type Argument<T extends Model = Model> = string | Callback<T> | Assign<T> | 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>. */
@@ -84,7 +84,7 @@ interface Model {
     is: this;
 }
 declare class Model {
-    constructor(arg?: Model.Argument);
+    constructor(...args: Model.Args);
     /** Pull current values from state. Flattens all models and exotic values recursively. */
     get(): Model.State<this>;
     /**
@@ -185,7 +185,7 @@ declare class Model {
      *
      * @param args - arguments sent to constructor
      */
-    static new<T extends Model>(this: Model.New<T>, arg?: Model.Argument<T>): T;
+    static new<T extends Model>(this: Model.Type<T>, ...args: Model.Args<T>): T;
     /**
      * Static equivalent of `x instanceof this`.
      * Determines if provided class is a subtype of this one.
@@ -345,13 +345,10 @@ 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 namespace use {
-    type Object<T extends {}> = T;
-}
 /** Create a placeholder for specified Model type. */
 declare function use<T extends Model>(): T | undefined;
 /** Create a new child instance of model. */
-declare function use<T extends Model>(Type: Model.New<T>, ready?: (i: T) => void): T;
+declare function use<T extends Model>(Type: Model.Type<T>, ready?: (i: T) => void): T;
 /**
  * Use existing model as a child of model assigned to.
  *
@@ -361,8 +358,6 @@ declare function use<T extends Model>(Type: Model.New<T>, ready?: (i: T) => void
  * already active.
  **/
 declare function use<T extends Model>(model: T, ready?: (i: T) => void): T;
-/** Create a managed object with observable entries. */
-declare function use<T extends {}, O = use.Object<T>>(data: T, ready?: (object: O) => void): O;
 
 declare namespace has {
     type Callback<T = any> = (model: T) => void | boolean | (() => void);
@@ -372,7 +367,7 @@ declare function has<T extends Model>(type: Model.Type<T>, required: boolean): T
 declare function has<T extends Model>(type: Model.Type<T>, arg?: has.Callback<T>): Set<T>;
 
 declare namespace Context {
-    type Input = Model | Model.New<Model> | Record<string | number, Model | Model.New<Model>>;
+    type Input = Model | Model.Type<Model> | Record<string | number, Model | Model.Type<Model>>;
 }
 declare class Context {
     static request<T extends Model>(type: Model.Type<T>, from: Model, callback: (got: T) => void): void;
@@ -385,8 +380,8 @@ declare class Context {
     has(model: Model): (() => void) | undefined;
     get<T extends Model>(Type: Model.Type<T>): T | undefined;
     include(inputs: Context.Input): Map<Model, boolean>;
-    put<T extends Model>(T: Model.New<T>, I: T | ((model: T) => void), implicit?: boolean, writable?: boolean): void;
-    add<T extends Model>(input: T | Model.New<T>, implicit?: boolean): T;
+    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;
     pop(): void;
 }

package/dist/index.js

@@ -157,13 +157,16 @@ var PARENT = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
-  constructor(arg) {
+  constructor(...args) {
     const state = {};
     let Type = this.constructor;
     bindMethods(Type);
     define(this, "is", { value: this });
     STATE.set(this, state);
-    NAMES.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    NAMES.set(this, `${Type}-${uid()}`);
+    for (const arg of args)
+      if (typeof arg == "string")
+        NAMES.set(this, arg);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
@@ -171,14 +174,19 @@ var Model = class _Model {
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      const apply = typeof arg == "function" ? arg.call(this, this) : arg;
-      if (apply instanceof Promise)
-        apply.catch((err) => {
-          console.error(`Async error in constructor for ${this}:`);
-          console.error(err);
-        });
-      else if (typeof apply == "object")
-        assign(this, apply);
+      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);
+      }
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -196,8 +204,7 @@ var Model = class _Model {
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
             value.set(null);
-        if (typeof apply == "function")
-          apply();
+        cleanup.forEach((x) => x());
         Object.freeze(state);
       }, null);
       return null;
@@ -281,8 +288,8 @@ var Model = class _Model {
    * 
    * @param args - arguments sent to constructor
    */
-  static new(arg) {
-    const instance = new this(arg);
+  static new(...args) {
+    const instance = new this(...args);
     event(instance, true);
     return instance;
   }
@@ -664,36 +671,21 @@ function attempt(fn) {
 
 // src/instruction/use.ts
 function use(value, argument) {
-  if (typeof value === "function")
-    value = new value();
   return add((property, subject) => {
+    if (typeof value === "function")
+      value = new value();
     function set2(next) {
       if (value instanceof Model && !(next instanceof value.constructor))
         throw new Error(`${subject}.${property} expected Model of type ${value.constructor} but got ${next}.`);
       if (next instanceof Model) {
         PARENT.set(next, subject);
         event(next, true);
-      } else if (next) {
-        const proxy = Object.create(next);
-        for (const key in proxy)
-          Object.defineProperty(proxy, key, {
-            enumerable: true,
-            get: () => next[key],
-            set(value2) {
-              if (value2 != next[key]) {
-                next[key] = value2;
-                subject.set(property);
-              }
-            }
-          });
-        output.get = () => proxy;
       }
       if (typeof argument == "function")
         argument(next);
     }
-    const output = { set: set2, value };
     set2(value);
-    return output;
+    return { set: set2, value };
   });
 }
 

package/dist/index.mjs

@@ -123,13 +123,16 @@ var PARENT = /* @__PURE__ */ new WeakMap();
 var METHOD = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
-  constructor(arg) {
+  constructor(...args) {
     const state = {};
     let Type = this.constructor;
     bindMethods(Type);
     define(this, "is", { value: this });
     STATE.set(this, state);
-    NAMES.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
+    NAMES.set(this, `${Type}-${uid()}`);
+    for (const arg of args)
+      if (typeof arg == "string")
+        NAMES.set(this, arg);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
@@ -137,14 +140,19 @@ var Model = class _Model {
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
-      const apply = typeof arg == "function" ? arg.call(this, this) : arg;
-      if (apply instanceof Promise)
-        apply.catch((err) => {
-          console.error(`Async error in constructor for ${this}:`);
-          console.error(err);
-        });
-      else if (typeof apply == "object")
-        assign(this, apply);
+      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);
+      }
       for (const key in this) {
         const desc = Object.getOwnPropertyDescriptor(this, key);
         if ("value" in desc) {
@@ -162,8 +170,7 @@ var Model = class _Model {
         for (const [_, value] of this)
           if (value instanceof _Model && PARENT.get(value) === this)
             value.set(null);
-        if (typeof apply == "function")
-          apply();
+        cleanup.forEach((x) => x());
         Object.freeze(state);
       }, null);
       return null;
@@ -247,8 +254,8 @@ var Model = class _Model {
    * 
    * @param args - arguments sent to constructor
    */
-  static new(arg) {
-    const instance = new this(arg);
+  static new(...args) {
+    const instance = new this(...args);
     event(instance, true);
     return instance;
   }
@@ -630,36 +637,21 @@ function attempt(fn) {
 
 // src/instruction/use.ts
 function use(value, argument) {
-  if (typeof value === "function")
-    value = new value();
   return add((property, subject) => {
+    if (typeof value === "function")
+      value = new value();
     function set2(next) {
       if (value instanceof Model && !(next instanceof value.constructor))
         throw new Error(`${subject}.${property} expected Model of type ${value.constructor} but got ${next}.`);
       if (next instanceof Model) {
         PARENT.set(next, subject);
         event(next, true);
-      } else if (next) {
-        const proxy = Object.create(next);
-        for (const key in proxy)
-          Object.defineProperty(proxy, key, {
-            enumerable: true,
-            get: () => next[key],
-            set(value2) {
-              if (value2 != next[key]) {
-                next[key] = value2;
-                subject.set(property);
-              }
-            }
-          });
-        output.get = () => proxy;
       }
       if (typeof argument == "function")
         argument(next);
     }
-    const output = { set: set2, value };
     set2(value);
-    return output;
+    return { set: set2, value };
   });
 }
 

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.43.2",
-  "gitHead": "42ef497ab04cb9921fd76e8b70b5bf9072176c82"
+  "version": "0.44.0",
+  "gitHead": "b9a450ae7d25a8845d344faed39495bbdfc69b47"
 }