as-model 0.1.7 → 0.1.9

package/dist/index.js

@@ -233,20 +233,24 @@
       var dispatches = updater.dispatches, controlled = updater.controlled;
       var dispatchCallbacks = _to_consumable_array(dispatches);
       var state = action.state;
+      var nextInstance = model2(state);
+      var nextAction = _object_spread_props(_object_spread({}, action), {
+        instance: nextInstance
+      });
       if (!controlled) {
         updater.mutate(function(u) {
           return _object_spread_props(_object_spread({}, u), {
             state,
-            instance: model2(state),
+            instance: nextInstance,
             version: u.version + 1
           });
         });
       }
       try {
         if (typeof config2.batchNotify === "function") {
-          config2.batchNotify(dispatchCallbacks, action);
+          config2.batchNotify(dispatchCallbacks, nextAction);
         } else {
-          defaultNotifyImplement(dispatchCallbacks, action);
+          defaultNotifyImplement(dispatchCallbacks, nextAction);
         }
       } catch (e) {
         updater.mutate(function(u) {
@@ -687,7 +691,7 @@
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      var instance = updater.instance, model2 = updater.model;
+      var instance = updater.instance;
       var method2 = instance[methodName];
       if (typeof method2 !== "function") {
         throw new Error("Can not change methods in runtime.");
@@ -1105,6 +1109,9 @@
       isDestroyed: function isDestroyed() {
         return updater.isDestroyed;
       },
+      extends: function _extends(e) {
+        return Object.assign(store, e);
+      },
       updater,
       modelStoreIdentifier
     };
@@ -1121,6 +1128,9 @@
       var storeConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
       return createStore(wrapModel, _object_spread({}, config2, storeConfig));
     };
+    wrapModel.extends = function extendsKey(e) {
+      return Object.assign(wrapModel, e);
+    };
     return wrapModel;
   }
   createKey.isModelKey = isModelKey;
@@ -1216,6 +1226,9 @@
           selector: currentSelector
         }));
       };
+      modelWrapper.extends = function extendsModelUsage(e) {
+        return Object.assign(modelWrapper, e);
+      };
       modelWrapper.selector = currentSelector;
       modelWrapper.modelUsageIdentifier = modelUsageIdentifier;
       return modelWrapper;

package/esm/key/index.js

@@ -9,6 +9,9 @@ function createKey(model) {
     var storeConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return createStore(wrapModel, _object_spread({}, config, storeConfig));
   };
+  wrapModel.extends = function extendsKey(e) {
+    return Object.assign(wrapModel, e);
+  };
   return wrapModel;
 }
 createKey.isModelKey = isModelKey;

package/esm/model/index.js

@@ -30,6 +30,9 @@ function configModel(config) {
         selector: currentSelector
       }));
     };
+    modelWrapper.extends = function extendsModelUsage(e) {
+      return Object.assign(modelWrapper, e);
+    };
     modelWrapper.selector = currentSelector;
     modelWrapper.modelUsageIdentifier = modelUsageIdentifier;
     return modelWrapper;

package/esm/store/index.js

@@ -82,6 +82,9 @@ function createStore(modelLike) {
     isDestroyed: function isDestroyed() {
       return updater.isDestroyed;
     },
+    extends: function _extends(e) {
+      return Object.assign(store, e);
+    },
     updater,
     modelStoreIdentifier
   };

package/esm/store/instance.js

@@ -66,7 +66,7 @@ function wrapToActionMethod(updater, methodName) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var instance = updater.instance, model = updater.model;
+    var instance = updater.instance;
     var method2 = instance[methodName];
     if (typeof method2 !== "function") {
       throw new Error("Can not change methods in runtime.");

package/esm/updater/notifier.js

@@ -80,20 +80,24 @@ function generateNotifier(updater, middleWare) {
     var dispatches = updater.dispatches, controlled = updater.controlled;
     var dispatchCallbacks = _to_consumable_array(dispatches);
     var state = action.state;
+    var nextInstance = model(state);
+    var nextAction = _object_spread_props(_object_spread({}, action), {
+      instance: nextInstance
+    });
     if (!controlled) {
       updater.mutate(function(u) {
         return _object_spread_props(_object_spread({}, u), {
           state,
-          instance: model(state),
+          instance: nextInstance,
           version: u.version + 1
         });
       });
     }
     try {
       if (typeof config.batchNotify === "function") {
-        config.batchNotify(dispatchCallbacks, action);
+        config.batchNotify(dispatchCallbacks, nextAction);
       } else {
-        defaultNotifyImplement(dispatchCallbacks, action);
+        defaultNotifyImplement(dispatchCallbacks, nextAction);
       }
     } catch (e) {
       updater.mutate(function(u) {

package/index.d.ts

@@ -84,6 +84,7 @@ export declare interface Store<
     callback?: (payload: P | undefined) => P | undefined
   ) => P | undefined;
   isDestroyed: () => boolean;
+  extends: <E extends Record<string, any>>(e: E) => Store<S, T, R> & E;
 }
 
 export declare function createStore<
@@ -105,6 +106,7 @@ export declare interface ModelKey<
 > extends Key<S, T, R> {
   (s: S): T;
   createStore: <D extends S>(state?: D) => Store<S, T, R>;
+  extends: <E extends Record<string, any>>(e: E) => ModelKey<S, T, R> & E;
 }
 
 export declare function createKey<
@@ -147,6 +149,7 @@ export declare interface ModelUsage<
     s: C
   ) => ModelUsage<S, T, C>;
   selector: R;
+  extends: <E extends Record<string, any>>(e: E) => ModelUsage<S, T, R> & E;
 }
 
 declare type FieldStructure<R = any> = {

package/package.json

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