as-model 0.1.17 → 0.1.18

package/dist/index.js

@@ -184,6 +184,96 @@
     isModelUsage
   };
 
+  // src/tools/proxy.ts
+  function getDescriptors(target, receiver, ownOrPrototype, handler) {
+    var it = Object.keys(ownOrPrototype);
+    var result = {};
+    it.forEach(function(key) {
+      result[key] = {
+        get: function() {
+          if (!handler.get) {
+            return target[key];
+          }
+          return handler.get(target, key, receiver);
+        },
+        set: function(v) {
+          if (!handler.set) {
+            target[key] = v;
+            return;
+          }
+          var valid = handler.set(target, key, v, receiver);
+          if (!valid) {
+            throw new Error("".concat(key, " in proxy target is not mutable"));
+          }
+        }
+      };
+    });
+    return result;
+  }
+  var createSimpleProxy = function(target, handler) {
+    var proxy = {};
+    var own = getDescriptors(target, proxy, target, handler);
+    var prototype = getDescriptors(target, proxy, Object.getPrototypeOf(target), handler);
+    Object.defineProperties(proxy, _object_spread({}, prototype, own));
+    return proxy;
+  };
+  var createProxy = function(target, handler) {
+    if (typeof Proxy !== "function") {
+      return createSimpleProxy(target, handler);
+    }
+    return new Proxy(target, handler);
+  };
+
+  // src/tools/shallowEqual.ts
+  function isObject(data) {
+    return data && (typeof data === "undefined" ? "undefined" : _type_of(data)) === "object";
+  }
+  function shallowEqual(prev, current) {
+    if (Object.is(prev, current)) {
+      return true;
+    }
+    if (!isObject(prev) || !isObject(current)) {
+      return false;
+    }
+    var prevKeys = Object.keys(prev);
+    var currentKeys = Object.keys(current);
+    if (prevKeys.length !== currentKeys.length) {
+      return false;
+    }
+    var pre = prev;
+    var curr = current;
+    var hasDiffKey = prevKeys.some(function(key) {
+      return !Object.prototype.hasOwnProperty.call(curr, key);
+    });
+    if (hasDiffKey) {
+      return false;
+    }
+    var hasDiffValue = currentKeys.some(function(key) {
+      var currentValue = curr[key];
+      var prevValue = pre[key];
+      return !Object.is(currentValue, prevValue);
+    });
+    return !hasDiffValue;
+  }
+
+  // src/tools/index.ts
+  function noop() {
+  }
+  function simpleErrorProcess(errors) {
+    return function wrap(callback) {
+      return function replaced() {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+        try {
+          return callback.apply(void 0, _to_consumable_array(args));
+        } catch (e) {
+          errors.push(e);
+        }
+      };
+    };
+  }
+
   // src/updater/notifier.ts
   function defaultNotifyImplement(dispatches, action) {
     dispatches.forEach(function(callback) {
@@ -261,7 +351,6 @@
     }
     var dispatch = function dispatch2(action) {
       var dispatches = updater.dispatches, controlled = updater.controlled, model2 = updater.model, config2 = updater.config;
-      var dispatchCallbacks = _to_consumable_array(dispatches);
       var state = action.state;
       var nextInstance = model2(state);
       var nextAction = _object_spread_props(_object_spread({}, action), {
@@ -276,11 +365,31 @@
           });
         });
       }
+      var notifyAction = function notifyAction2(act) {
+        var errors = [];
+        var dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+        defaultNotifyImplement(dispatchCallbacks, act);
+        if (!errors.length) {
+          return {
+            errors: void 0
+          };
+        }
+        return {
+          errors
+        };
+      };
+      var notifyActionWithErrorThrow = function notifyActionWithErrorThrow2(act) {
+        var errors = notifyAction(act).errors;
+        if (!errors || !errors.length) {
+          return;
+        }
+        throw errors[0];
+      };
       try {
-        if (typeof config2.batchNotify === "function") {
-          config2.batchNotify(dispatchCallbacks, nextAction);
+        if (typeof config2.notify === "function") {
+          config2.notify(notifyAction, nextAction);
         } else {
-          defaultNotifyImplement(dispatchCallbacks, nextAction);
+          notifyActionWithErrorThrow(nextAction);
         }
       } catch (e) {
         updater.mutate(function(u) {
@@ -325,82 +434,6 @@
     };
   }
 
-  // src/tools/proxy.ts
-  function getDescriptors(target, receiver, ownOrPrototype, handler) {
-    var it = Object.keys(ownOrPrototype);
-    var result = {};
-    it.forEach(function(key) {
-      result[key] = {
-        get: function() {
-          if (!handler.get) {
-            return target[key];
-          }
-          return handler.get(target, key, receiver);
-        },
-        set: function(v) {
-          if (!handler.set) {
-            target[key] = v;
-            return;
-          }
-          var valid = handler.set(target, key, v, receiver);
-          if (!valid) {
-            throw new Error("".concat(key, " in proxy target is not mutable"));
-          }
-        }
-      };
-    });
-    return result;
-  }
-  var createSimpleProxy = function(target, handler) {
-    var proxy = {};
-    var own = getDescriptors(target, proxy, target, handler);
-    var prototype = getDescriptors(target, proxy, Object.getPrototypeOf(target), handler);
-    Object.defineProperties(proxy, _object_spread({}, prototype, own));
-    return proxy;
-  };
-  var createProxy = function(target, handler) {
-    if (typeof Proxy !== "function") {
-      return createSimpleProxy(target, handler);
-    }
-    return new Proxy(target, handler);
-  };
-
-  // src/tools/shallowEqual.ts
-  function isObject(data) {
-    return data && (typeof data === "undefined" ? "undefined" : _type_of(data)) === "object";
-  }
-  function shallowEqual(prev, current) {
-    if (Object.is(prev, current)) {
-      return true;
-    }
-    if (!isObject(prev) || !isObject(current)) {
-      return false;
-    }
-    var prevKeys = Object.keys(prev);
-    var currentKeys = Object.keys(current);
-    if (prevKeys.length !== currentKeys.length) {
-      return false;
-    }
-    var pre = prev;
-    var curr = current;
-    var hasDiffKey = prevKeys.some(function(key) {
-      return !Object.prototype.hasOwnProperty.call(curr, key);
-    });
-    if (hasDiffKey) {
-      return false;
-    }
-    var hasDiffValue = currentKeys.some(function(key) {
-      var currentValue = curr[key];
-      var prevValue = pre[key];
-      return !Object.is(currentValue, prevValue);
-    });
-    return !hasDiffValue;
-  }
-
-  // src/tools/index.ts
-  function noop() {
-  }
-
   // src/updater/tunnel.ts
   function createUnInitializedUpdater() {
     return {
@@ -546,7 +579,6 @@
       updater.mutate(function(u, effect) {
         var _args_model;
         var model2 = (_args_model = args.model) !== null && _args_model !== void 0 ? _args_model : u.model;
-        var initialState = "initialState" in args ? args.initialState : u.state;
         var state = "state" in args ? args.state : u.state;
         if (u.controlled) {
           var instance = model2(state);
@@ -559,15 +591,15 @@
         if (u.isDestroyed) {
           return u;
         }
-        if (!u.initialized && !("initialState" in args)) {
-          throw new Error("Should update initialState first.");
+        if (!u.initialized && !("state" in args)) {
+          throw new Error("The updater has not been initialized, it should be updated with a state for initializing.");
         }
         if (!u.initialized) {
-          var instance1 = model2(initialState);
+          var instance1 = model2(state);
           var initializedUpdater = createInitializedUpdater(u, middleWare);
           return _object_spread(_object_spread_props(_object_spread({}, u), {
             model: model2,
-            state: initialState,
+            state,
             instance: instance1,
             initialized: true
           }), initializedUpdater);

package/esm/tools/index.js

@@ -1,10 +1,22 @@
 function noop() {
 }
+function simpleErrorProcess(errors) {
+  return function wrap(callback) {
+    return function replaced(...args) {
+      try {
+        return callback(...args);
+      } catch (e) {
+        errors.push(e);
+      }
+    };
+  };
+}
 import { createSimpleProxy, createProxy } from "./proxy";
 import { shallowEqual } from "./shallowEqual";
 export {
   createProxy,
   createSimpleProxy,
   noop,
-  shallowEqual
+  shallowEqual,
+  simpleErrorProcess
 };

package/esm/updater/index.js

@@ -36,7 +36,6 @@ function createUpdateFn(updater, middleWare) {
     updater.mutate((u, effect) => {
       var _a;
       const model = (_a = args.model) != null ? _a : u.model;
-      const initialState = "initialState" in args ? args.initialState : u.state;
       const state = "state" in args ? args.state : u.state;
       if (u.controlled) {
         const instance2 = model(state);
@@ -45,15 +44,17 @@ function createUpdateFn(updater, middleWare) {
       if (u.isDestroyed) {
         return u;
       }
-      if (!u.initialized && !("initialState" in args)) {
-        throw new Error("Should update initialState first.");
+      if (!u.initialized && !("state" in args)) {
+        throw new Error(
+          "The updater has not been initialized, it should be updated with a state for initializing."
+        );
       }
       if (!u.initialized) {
-        const instance2 = model(initialState);
+        const instance2 = model(state);
         const initializedUpdater = createInitializedUpdater(u, middleWare);
         return __spreadValues(__spreadProps(__spreadValues({}, u), {
           model,
-          state: initialState,
+          state,
           instance: instance2,
           initialized: true
         }), initializedUpdater);

package/esm/updater/notifier.js

@@ -17,6 +17,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { simpleErrorProcess } from "../tools";
 function defaultNotifyImplement(dispatches, action) {
   dispatches.forEach((callback) => {
     callback(action);
@@ -80,7 +81,6 @@ function generateNotifier(updater, middleWare) {
   }
   const dispatch = function dispatch2(action) {
     const { dispatches, controlled, model, config } = updater;
-    const dispatchCallbacks = [...dispatches];
     const { state } = action;
     const nextInstance = model(state);
     const nextAction = __spreadProps(__spreadValues({}, action), { instance: nextInstance });
@@ -91,11 +91,27 @@ function generateNotifier(updater, middleWare) {
         version: u.version + 1
       }));
     }
+    const notifyAction = function notifyAction2(act) {
+      const errors = [];
+      const dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+      defaultNotifyImplement(dispatchCallbacks, act);
+      if (!errors.length) {
+        return { errors: void 0 };
+      }
+      return { errors };
+    };
+    const notifyActionWithErrorThrow = function notifyActionWithErrorThrow2(act) {
+      const { errors } = notifyAction(act);
+      if (!errors || !errors.length) {
+        return;
+      }
+      throw errors[0];
+    };
     try {
-      if (typeof config.batchNotify === "function") {
-        config.batchNotify(dispatchCallbacks, nextAction);
+      if (typeof config.notify === "function") {
+        config.notify(notifyAction, nextAction);
       } else {
-        defaultNotifyImplement(dispatchCallbacks, nextAction);
+        notifyActionWithErrorThrow(nextAction);
       }
     } catch (e) {
       updater.mutate((u) => __spreadProps(__spreadValues({}, u), { dispatching: void 0 }));

package/index.d.ts

@@ -3,7 +3,7 @@ declare interface ModelInstance {
   [key: number]: any;
 }
 
-declare type FieldStructure<R = any> = {
+export declare type FieldStructure<R = any> = {
   callback: () => R;
   deps: any[] | undefined;
   identifier: (d: any) => d is FieldStructure<R>;
@@ -11,7 +11,7 @@ declare type FieldStructure<R = any> = {
   get: () => R;
 };
 
-declare type MethodStructure<
+export declare type MethodStructure<
   R extends (...args: any[]) => any = (...args: any[]) => any
 > = R & {
   identifier: (d: any) => d is MethodStructure;
@@ -41,7 +41,7 @@ export declare type Action<S = any, T extends ModelInstance = ModelInstance> = {
   prevInstance?: T;
 };
 
-declare type Dispatch = (action: Action) => any;
+export declare type Dispatch = (action: Action) => any;
 
 export declare interface Key<
   S = any,
@@ -71,10 +71,10 @@ export declare type MiddleWare = (
 export declare interface Config {
   middleWares?: MiddleWare[];
   controlled?: boolean;
-  batchNotify?: (
-    listeners: ((action: Action) => void)[],
+  notify?: (
+    notifier: (action: Action) => { errors: any[] | undefined },
     action: Action
-  ) => void;
+  ) => any;
 }
 
 /** createStore * */

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "as-model",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "This is a model state management tool",
   "license": "MIT",
   "author": "Jimmy.Harding",