@expressive/mvc 0.35.0-alpha.0 → 0.35.1

package/dist/index.d.ts

@@ -1,19 +1,3 @@
-type Async<T = any, Y extends any[] = any> = {
-    (...args: Y): Promise<T>;
-    active: boolean;
-};
-/**
- * Sets an exotic method with managed ready-state. Property accepts an async function.
- *
- * When a run-method is invoked, its `active` property to true for duration of call.
- * This is emitted as an update to property, both when called and after returns (or throws).
- *
- * **Note:** Subsequent calls will immediately throw if one is still pending.
- *
- * @param action - Action to fire when resulting property is invoked.
- */
-declare function run<T, Y extends any[]>(action: (...args: Y) => T | Promise<T>): Async<T, Y>;
-
 type Predicate = (key: string) => boolean | void;
 declare namespace Model {
     /** Any type of Model, using own class constructor as its identifier. */
@@ -44,8 +28,8 @@ declare namespace Model {
         current: T | null;
     };
     /** A callback function which is subscribed to parent and updates when values change. */
-    type Effect<T> = (this: T, argument: T) => Callback | Promise<void> | null | void;
-    type Event = (key: string) => Callback | void;
+    type Effect<T> = (this: T, argument: T) => (() => void) | Promise<void> | null | void;
+    type Event = (this: Model, key: string, value: unknown) => (() => void) | void;
     namespace Instruction {
         type Getter<T> = (source: Model) => T;
         type Setter<T> = (value: T, previous: T) => boolean | void | (() => T);
@@ -74,16 +58,16 @@ declare class Model {
     /** Pull current values from state. Flattens all models and exotic values amongst properties. */
     get(): Model.Export<this>;
     /** Run a function which will run automatically when accessed values change. */
-    get(effect: Model.Effect<this>): Callback;
+    get(effect: Model.Effect<this>): () => void;
     get<T extends string>(key: T, required: true): Exclude<Model.ValueOf<this, T>, undefined>;
     get<T extends string>(key: T, required?: boolean): Model.ValueOf<this, T>;
     /**
      * Check if update is in progress.
-     * Returns a promise which resolves updated keys. If no update, will resolve `false`.
+     * Returns a promise which resolves updated keys. If no update, will resolve to `false`.
      **/
     set(): Promise<Model.Values<this> | false>;
     /**
-     * Expect an update to state within a set timeout.
+     * Expect an update to state within a set time.
      *
      * @param timeout - milliseconds to wait for update
      * @param predicate - optional function to filter for specific updates. If returns true, update is accepted.
@@ -92,26 +76,29 @@ declare class Model {
      */
     set(timeout: number, predicate?: Predicate): Promise<Model.Values<this>>;
     /**
-     * Call a function whenever an update to state has occured.
+     * Call a function whenever an update occurs.
      *
-     * @param callback - Function to call when any update occurs.
+     * @param callback
      *   Note: This will be called for every assignment which changes the value.
      *   To run logic on final value only, this callback may return a function.
-     *   Returning the same function for the same (or multiple for that matter)
-     *   will ensure it is only called once.
+     *   Returning the same function for a key will ensure it is only called once.
      *
-     * @returns a function to remove listener. Will return true if listener did exist.
+     * @returns a function to remove listener. Returns true if listener isn't removed already.
     */
     set(callback: Model.Event): () => boolean;
     /**
      * Push an update without changing the value of associated property.
      *
      * This is useful where a property value internally has changed, but the object remains the same.
-     * For example: an array which has pushed a new value, or change to nested properties.
+     * For example: An array which has pushed a new value, or a change to nested property.
+     */
+    set(key: string): void;
+    /**
+     * Declare an end to updates. This event will freeze state.
      */
-    set(key: string | null): void;
+    set(key: null): void;
     /**
-     * Update a property programatically within state.
+     * Update a property with value.
      *
      * @param key - property to update
      * @param value - value to update property with (if the same as current, no update will occur)
@@ -136,6 +123,7 @@ declare class Model {
      */
     static is<T extends Model.Type>(this: T, maybe: any): maybe is T;
 }
+
 declare function add<T = any, M extends Model = any>(instruction: Model.Instruction): T;
 
 declare namespace get {
@@ -309,4 +297,4 @@ declare class Context {
     pop(): void;
 }
 
-export { Context, Model, add, Model as default, get, ref, run, set, use };
+export { Context, Model, add, Model as default, get, ref, set, use };

package/dist/index.js

@@ -26,7 +26,6 @@ __export(src_exports, {
   default: () => Model,
   get: () => get,
   ref: () => ref,
-  run: () => run,
   set: () => set,
   use: () => use
 });
@@ -36,14 +35,13 @@ module.exports = __toCommonJS(src_exports);
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
 var LISTENER = /* @__PURE__ */ new WeakMap();
-var EXPIRED = /* @__PURE__ */ new WeakSet();
 function onReady() {
   return null;
 }
 function addListener(to, fn) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = /* @__PURE__ */ new Map([[onReady, null]]));
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
   if (!subs.has(onReady))
     fn(true, to);
   subs.set(fn, null);
@@ -55,7 +53,7 @@ function watch(from, key, value) {
   if (observer) {
     listeners.set(
       observer,
-      new Set(listeners.get(observer)).add(key)
+      (listeners.get(observer) || /* @__PURE__ */ new Set()).add(key)
     );
     const nested = LISTENER.get(value);
     if (nested) {
@@ -66,7 +64,8 @@ function watch(from, key, value) {
   return value;
 }
 function event(source, key) {
-  LISTENER.get(source).forEach((select, callback, subs) => {
+  const subs = LISTENER.get(source);
+  subs.forEach((select, callback) => {
     let after;
     if (!select || select.has(key)) {
       if (after = callback.call(source, key, source))
@@ -95,11 +94,12 @@ function effect(target, callback) {
   let refresh;
   let unSet;
   function invoke() {
+    let expired;
     const local = Object.create(target);
     const update2 = () => {
-      if (EXPIRED.has(update2))
+      if (expired)
         return null;
-      EXPIRED.add(update2);
+      expired = true;
       if (refresh && unSet) {
         unSet();
         unSet = void 0;
@@ -141,10 +141,11 @@ var PARENT = /* @__PURE__ */ new WeakMap();
 var INSTRUCT = /* @__PURE__ */ new Map();
 var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
     const state = {};
-    Object.defineProperty(this, "is", { value: this });
+    define(this, "is", { value: this });
     ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
     function onNull(key) {
@@ -153,23 +154,20 @@ var Model = class _Model {
     }
     addListener(this, () => {
       for (const key in this) {
-        const { value } = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(value);
-        let desc = {
-          enumerable: true,
-          set: (x) => update(this, key, x),
-          get() {
-            return watch(this, key, state[key]);
-          }
-        };
-        if (instruction) {
-          INSTRUCT.delete(value);
-          delete this[key];
-          desc = instruction(this, key, state);
-        } else
-          state[key] = value;
-        if (desc)
-          Object.defineProperty(this, key, desc);
+        const property = Object.getOwnPropertyDescriptor(this, key);
+        const instruction = INSTRUCT.get(property.value);
+        if (instruction)
+          instruction(this, key, state);
+        else {
+          state[key] = property.value;
+          define(this, key, {
+            enumerable: true,
+            set: (x) => update(this, key, x),
+            get() {
+              return watch(this, key, state[key]);
+            }
+          });
+        }
       }
       addListener(this, onNull);
       return null;
@@ -200,7 +198,7 @@ var Model = class _Model {
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1(key);
+          return arg1.call(this, key, STATE.get(self)[key]);
       });
     if (typeof arg1 == "string" || arg1 === null)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
@@ -249,53 +247,16 @@ var Model = class _Model {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
 };
-Object.defineProperty(Model.prototype, "toString", {
+define(Model.prototype, "toString", {
   value() {
     return ID.get(this.is);
   }
 });
-Object.defineProperty(Model, "toString", {
+define(Model, "toString", {
   value() {
     return this.name;
   }
 });
-function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    const output = instruction.call(subject, key, subject, state);
-    if (!output)
-      return;
-    const desc = typeof output == "object" ? output : { get: output };
-    const { enumerable = true } = desc;
-    if ("value" in desc)
-      state[key] = desc.value;
-    return {
-      enumerable,
-      set(next) {
-        let { set: set2 } = desc;
-        if (set2 === false)
-          throw new Error(`${subject}.${key} is read-only.`);
-        if (typeof set2 == "function") {
-          const result = set2.call(subject, next, state[key]);
-          if (result === false)
-            return;
-          if (typeof result == "function")
-            next = result();
-          set2 = false;
-        }
-        update(subject, key, next, !!set2);
-      },
-      get() {
-        return watch(
-          this,
-          key,
-          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key, desc.get)
-        );
-      }
-    };
-  });
-  return placeholder;
-}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -340,10 +301,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    const skip = key in pending;
-    pending[key] = state[key];
-    if (skip)
-      return;
+    pending[key] = value;
   }
   event(subject, key);
 }
@@ -351,49 +309,45 @@ function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
-// src/instruction/run.ts
-function run(task) {
-  return add((key, subject) => {
-    let pending = false;
-    async function invoke(...args) {
-      if (pending)
-        return Promise.reject(
-          new Error(`Invoked action ${key} but one is already active.`)
+// src/instruction/add.ts
+function add(instruction) {
+  const placeholder = Symbol("instruction");
+  INSTRUCT.set(placeholder, (subject, key, state) => {
+    INSTRUCT.delete(placeholder);
+    delete subject[key];
+    const output = instruction.call(subject, key, subject, state);
+    if (!output)
+      return;
+    const desc = typeof output == "object" ? output : { get: output };
+    const { enumerable = true } = desc;
+    if ("value" in desc)
+      state[key] = desc.value;
+    Object.defineProperty(subject, key, {
+      enumerable,
+      set(next) {
+        let { set: set2 } = desc;
+        if (set2 === false)
+          throw new Error(`${subject}.${key} is read-only.`);
+        if (typeof set2 == "function") {
+          const result = set2.call(subject, next, state[key]);
+          if (result === false)
+            return;
+          if (typeof result == "function")
+            next = result();
+          set2 = false;
+        }
+        update(subject, key, next, !!set2);
+      },
+      get() {
+        return watch(
+          this,
+          key,
+          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key, desc.get)
         );
-      pending = true;
-      subject.set(key);
-      try {
-        return await attempt(() => task.apply(subject, args));
-      } finally {
-        pending = false;
-        subject.set(key);
       }
-    }
-    Object.defineProperty(invoke, "active", {
-      get: () => pending
     });
-    return {
-      value: invoke,
-      set: false
-    };
   });
-}
-function attempt(fn) {
-  function retry(err) {
-    if (err instanceof Promise)
-      return err.then(compute2);
-    else
-      throw err;
-  }
-  function compute2() {
-    try {
-      const output = fn();
-      return output instanceof Promise ? output.catch(retry) : output;
-    } catch (err) {
-      return retry(err);
-    }
-  }
-  return compute2();
+  return placeholder;
 }
 
 // src/context.ts
@@ -529,7 +483,7 @@ function compute(subject, key, source, setter) {
   let isAsync;
   let proxy;
   function connect(model) {
-    reset = model.get((current) => {
+    reset = effect(model, (current) => {
       proxy = current;
       if (!reset)
         compute2(true);
@@ -565,28 +519,28 @@ function compute(subject, key, source, setter) {
 }
 
 // src/instruction/ref.ts
-var define = Object.defineProperty;
+var define2 = Object.defineProperty;
 function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
       for (const key2 in state)
         if (typeof arg2 == "function")
-          define(value, key2, {
+          define2(value, key2, {
             configurable: true,
             get() {
               const out = arg2(key2);
-              define(value, key2, { value: out });
+              define2(value, key2, { value: out });
               return out;
             }
           });
         else {
           const ref2 = (value2) => subject.set(key2, value2);
-          define(ref2, "current", {
+          define2(ref2, "current", {
             get: () => state[key2],
             set: ref2
           });
-          define(value, key2, { value: ref2 });
+          define2(value, key2, { value: ref2 });
         }
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
@@ -603,12 +557,12 @@ function ref(arg, arg2) {
             unSet = out;
         }
       };
-      value = define(set2, "current", {
+      value = define2(set2, "current", {
         get: () => state[key],
         set: set2
       });
     }
-    define(subject, key, { value });
+    define2(subject, key, { value });
   });
 }
 
@@ -667,13 +621,27 @@ function set(value, argument) {
     return output;
   });
 }
+function attempt(fn) {
+  function retry(err) {
+    if (err instanceof Promise)
+      return err.then(compute2);
+    else
+      throw err;
+  }
+  function compute2() {
+    try {
+      const output = fn();
+      return output instanceof Promise ? output.catch(retry) : output;
+    } catch (err) {
+      return retry(err);
+    }
+  }
+  return compute2();
+}
 
 // src/instruction/use.ts
 function use(value, argument) {
   return add((property, subject) => {
-    if (typeof value === "function")
-      value = new value();
-    const output = { set: set2, 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}.`);
@@ -698,6 +666,9 @@ function use(value, argument) {
       if (typeof argument == "function")
         argument(next);
     }
+    if (typeof value === "function")
+      value = new value();
+    const output = { set: set2, value };
     set2(value);
     return output;
   });
@@ -709,7 +680,6 @@ function use(value, argument) {
   add,
   get,
   ref,
-  run,
   set,
   use
 });

package/dist/index.mjs

@@ -2,14 +2,13 @@
 var DISPATCH = /* @__PURE__ */ new Set();
 var OBSERVER = /* @__PURE__ */ new WeakMap();
 var LISTENER = /* @__PURE__ */ new WeakMap();
-var EXPIRED = /* @__PURE__ */ new WeakSet();
 function onReady() {
   return null;
 }
 function addListener(to, fn) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = /* @__PURE__ */ new Map([[onReady, null]]));
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
   if (!subs.has(onReady))
     fn(true, to);
   subs.set(fn, null);
@@ -21,7 +20,7 @@ function watch(from, key, value) {
   if (observer) {
     listeners.set(
       observer,
-      new Set(listeners.get(observer)).add(key)
+      (listeners.get(observer) || /* @__PURE__ */ new Set()).add(key)
     );
     const nested = LISTENER.get(value);
     if (nested) {
@@ -32,7 +31,8 @@ function watch(from, key, value) {
   return value;
 }
 function event(source, key) {
-  LISTENER.get(source).forEach((select, callback, subs) => {
+  const subs = LISTENER.get(source);
+  subs.forEach((select, callback) => {
     let after;
     if (!select || select.has(key)) {
       if (after = callback.call(source, key, source))
@@ -61,11 +61,12 @@ function effect(target, callback) {
   let refresh;
   let unSet;
   function invoke() {
+    let expired;
     const local = Object.create(target);
     const update2 = () => {
-      if (EXPIRED.has(update2))
+      if (expired)
         return null;
-      EXPIRED.add(update2);
+      expired = true;
       if (refresh && unSet) {
         unSet();
         unSet = void 0;
@@ -107,10 +108,11 @@ var PARENT = /* @__PURE__ */ new WeakMap();
 var INSTRUCT = /* @__PURE__ */ new Map();
 var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
     const state = {};
-    Object.defineProperty(this, "is", { value: this });
+    define(this, "is", { value: this });
     ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
     function onNull(key) {
@@ -119,23 +121,20 @@ var Model = class _Model {
     }
     addListener(this, () => {
       for (const key in this) {
-        const { value } = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(value);
-        let desc = {
-          enumerable: true,
-          set: (x) => update(this, key, x),
-          get() {
-            return watch(this, key, state[key]);
-          }
-        };
-        if (instruction) {
-          INSTRUCT.delete(value);
-          delete this[key];
-          desc = instruction(this, key, state);
-        } else
-          state[key] = value;
-        if (desc)
-          Object.defineProperty(this, key, desc);
+        const property = Object.getOwnPropertyDescriptor(this, key);
+        const instruction = INSTRUCT.get(property.value);
+        if (instruction)
+          instruction(this, key, state);
+        else {
+          state[key] = property.value;
+          define(this, key, {
+            enumerable: true,
+            set: (x) => update(this, key, x),
+            get() {
+              return watch(this, key, state[key]);
+            }
+          });
+        }
       }
       addListener(this, onNull);
       return null;
@@ -166,7 +165,7 @@ var Model = class _Model {
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1(key);
+          return arg1.call(this, key, STATE.get(self)[key]);
       });
     if (typeof arg1 == "string" || arg1 === null)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
@@ -215,53 +214,16 @@ var Model = class _Model {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
 };
-Object.defineProperty(Model.prototype, "toString", {
+define(Model.prototype, "toString", {
   value() {
     return ID.get(this.is);
   }
 });
-Object.defineProperty(Model, "toString", {
+define(Model, "toString", {
   value() {
     return this.name;
   }
 });
-function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    const output = instruction.call(subject, key, subject, state);
-    if (!output)
-      return;
-    const desc = typeof output == "object" ? output : { get: output };
-    const { enumerable = true } = desc;
-    if ("value" in desc)
-      state[key] = desc.value;
-    return {
-      enumerable,
-      set(next) {
-        let { set: set2 } = desc;
-        if (set2 === false)
-          throw new Error(`${subject}.${key} is read-only.`);
-        if (typeof set2 == "function") {
-          const result = set2.call(subject, next, state[key]);
-          if (result === false)
-            return;
-          if (typeof result == "function")
-            next = result();
-          set2 = false;
-        }
-        update(subject, key, next, !!set2);
-      },
-      get() {
-        return watch(
-          this,
-          key,
-          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key, desc.get)
-        );
-      }
-    };
-  });
-  return placeholder;
-}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -306,10 +268,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    const skip = key in pending;
-    pending[key] = state[key];
-    if (skip)
-      return;
+    pending[key] = value;
   }
   event(subject, key);
 }
@@ -317,49 +276,45 @@ function uid() {
   return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
-// src/instruction/run.ts
-function run(task) {
-  return add((key, subject) => {
-    let pending = false;
-    async function invoke(...args) {
-      if (pending)
-        return Promise.reject(
-          new Error(`Invoked action ${key} but one is already active.`)
+// src/instruction/add.ts
+function add(instruction) {
+  const placeholder = Symbol("instruction");
+  INSTRUCT.set(placeholder, (subject, key, state) => {
+    INSTRUCT.delete(placeholder);
+    delete subject[key];
+    const output = instruction.call(subject, key, subject, state);
+    if (!output)
+      return;
+    const desc = typeof output == "object" ? output : { get: output };
+    const { enumerable = true } = desc;
+    if ("value" in desc)
+      state[key] = desc.value;
+    Object.defineProperty(subject, key, {
+      enumerable,
+      set(next) {
+        let { set: set2 } = desc;
+        if (set2 === false)
+          throw new Error(`${subject}.${key} is read-only.`);
+        if (typeof set2 == "function") {
+          const result = set2.call(subject, next, state[key]);
+          if (result === false)
+            return;
+          if (typeof result == "function")
+            next = result();
+          set2 = false;
+        }
+        update(subject, key, next, !!set2);
+      },
+      get() {
+        return watch(
+          this,
+          key,
+          typeof desc.get == "function" ? desc.get(this) : fetch(subject, key, desc.get)
         );
-      pending = true;
-      subject.set(key);
-      try {
-        return await attempt(() => task.apply(subject, args));
-      } finally {
-        pending = false;
-        subject.set(key);
       }
-    }
-    Object.defineProperty(invoke, "active", {
-      get: () => pending
     });
-    return {
-      value: invoke,
-      set: false
-    };
   });
-}
-function attempt(fn) {
-  function retry(err) {
-    if (err instanceof Promise)
-      return err.then(compute2);
-    else
-      throw err;
-  }
-  function compute2() {
-    try {
-      const output = fn();
-      return output instanceof Promise ? output.catch(retry) : output;
-    } catch (err) {
-      return retry(err);
-    }
-  }
-  return compute2();
+  return placeholder;
 }
 
 // src/context.ts
@@ -495,7 +450,7 @@ function compute(subject, key, source, setter) {
   let isAsync;
   let proxy;
   function connect(model) {
-    reset = model.get((current) => {
+    reset = effect(model, (current) => {
       proxy = current;
       if (!reset)
         compute2(true);
@@ -531,28 +486,28 @@ function compute(subject, key, source, setter) {
 }
 
 // src/instruction/ref.ts
-var define = Object.defineProperty;
+var define2 = Object.defineProperty;
 function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
       for (const key2 in state)
         if (typeof arg2 == "function")
-          define(value, key2, {
+          define2(value, key2, {
             configurable: true,
             get() {
               const out = arg2(key2);
-              define(value, key2, { value: out });
+              define2(value, key2, { value: out });
               return out;
             }
           });
         else {
           const ref2 = (value2) => subject.set(key2, value2);
-          define(ref2, "current", {
+          define2(ref2, "current", {
             get: () => state[key2],
             set: ref2
           });
-          define(value, key2, { value: ref2 });
+          define2(value, key2, { value: ref2 });
         }
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
@@ -569,12 +524,12 @@ function ref(arg, arg2) {
             unSet = out;
         }
       };
-      value = define(set2, "current", {
+      value = define2(set2, "current", {
         get: () => state[key],
         set: set2
       });
     }
-    define(subject, key, { value });
+    define2(subject, key, { value });
   });
 }
 
@@ -633,13 +588,27 @@ function set(value, argument) {
     return output;
   });
 }
+function attempt(fn) {
+  function retry(err) {
+    if (err instanceof Promise)
+      return err.then(compute2);
+    else
+      throw err;
+  }
+  function compute2() {
+    try {
+      const output = fn();
+      return output instanceof Promise ? output.catch(retry) : output;
+    } catch (err) {
+      return retry(err);
+    }
+  }
+  return compute2();
+}
 
 // src/instruction/use.ts
 function use(value, argument) {
   return add((property, subject) => {
-    if (typeof value === "function")
-      value = new value();
-    const output = { set: set2, 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}.`);
@@ -664,6 +633,9 @@ function use(value, argument) {
       if (typeof argument == "function")
         argument(next);
     }
+    if (typeof value === "function")
+      value = new value();
+    const output = { set: set2, value };
     set2(value);
     return output;
   });
@@ -675,7 +647,6 @@ export {
   Model as default,
   get,
   ref,
-  run,
   set,
   use
 };

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.35.0-alpha.0",
-  "gitHead": "17db508f601400ac08e6f821376e7a9403525d5b"
+  "version": "0.35.1",
+  "gitHead": "cca282d36102e4691e3d24a07f95e7652b27f5c3"
 }