as-model 0.1.0 → 0.1.1

package/esm/updater/index.js

@@ -3,14 +3,14 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { createNoStateModel } from "../validation";
 import { generateNotifier } from "./notifier";
 import { generateTunnelCreator, createUnInitializedUpdater, destroy } from "./tunnel";
-function createInitializedUpdater(updater) {
+function createInitializedUpdater(updater, middleWare) {
   var createTunnel = generateTunnelCreator(updater);
   return {
-    notify: generateNotifier(updater),
+    notify: generateNotifier(updater, middleWare),
     createTunnel
   };
 }
-function createUpdateFn(updater) {
+function createUpdateFn(updater, middleWare) {
   return function update() {
     var args = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     updater.mutate(function(u, effect) {
@@ -34,7 +34,7 @@ function createUpdateFn(updater) {
       }
       if (!u.initialized) {
         var instance1 = model(initialState);
-        var initializedUpdater = createInitializedUpdater(u);
+        var initializedUpdater = createInitializedUpdater(u, middleWare);
         return _object_spread(_object_spread_props(_object_spread({}, u), {
           model,
           state: initialState,
@@ -66,8 +66,8 @@ function createUpdateFn(updater) {
   };
 }
 var lazyModel = createNoStateModel();
-function createUpdater(model) {
-  var config = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+function createUpdater(model, middleWare) {
+  var config = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
   var hasDefaultState = "state" in config;
   var controlled = config.controlled, defaultState = config.state;
   var defaultInstance = hasDefaultState ? model(defaultState) : lazyModel(void 0);
@@ -118,9 +118,9 @@ function createUpdater(model) {
       destroy(updater);
     }
   }, unInitializedUpdater);
-  var initialized = createInitializedUpdater(updater);
+  var initialized = createInitializedUpdater(updater, middleWare);
   Object.assign(updater, initialized, {
-    update: createUpdateFn(updater)
+    update: createUpdateFn(updater, middleWare)
   });
   return updater;
 }

package/esm/updater/notifier.js

@@ -6,7 +6,7 @@ function defaultNotifyImplement(dispatches, action) {
     callback(action);
   });
 }
-function generateNotifier(updater) {
+function generateNotifier(updater, middleWare) {
   function pendAction(value) {
     updater.mutate(function(u) {
       var dispatching = u.dispatching;
@@ -75,9 +75,37 @@ function generateNotifier(updater) {
       call(initializedAction);
     });
   }
-  var config = updater.config;
+  var config = updater.config, model = updater.model;
+  var dispatch = function dispatch2(action) {
+    var dispatches = updater.dispatches, controlled = updater.controlled;
+    var dispatchCallbacks = _to_consumable_array(dispatches);
+    var state = action.state;
+    if (!controlled) {
+      updater.mutate(function(u) {
+        return _object_spread_props(_object_spread({}, u), {
+          state,
+          instance: model(state),
+          version: u.version + 1
+        });
+      });
+    }
+    try {
+      if (typeof config.batchNotify === "function") {
+        config.batchNotify(dispatchCallbacks, action);
+      } else {
+        defaultNotifyImplement(dispatchCallbacks, action);
+      }
+    } catch (e) {
+      updater.mutate(function(u) {
+        return _object_spread_props(_object_spread({}, u), {
+          dispatching: void 0
+        });
+      });
+      throw e;
+    }
+  };
   return function notify(action) {
-    if (action == null) {
+    if (action == null || updater.isDestroyed) {
       return;
     }
     var dispatching = updater.dispatching;
@@ -88,22 +116,15 @@ function generateNotifier(updater) {
     while (updater.dispatching) {
       var wrap = updater.dispatching;
       if (wrap) {
-        var dispatches = updater.dispatches;
-        var dispatchCallbacks = _to_consumable_array(dispatches);
-        try {
-          if (typeof config.batchNotify === "function" && dispatchCallbacks.length) {
-            config.batchNotify(dispatchCallbacks, wrap.value);
-          } else {
-            defaultNotifyImplement(dispatchCallbacks, wrap.value);
-          }
-        } catch (e) {
-          updater.mutate(function(u) {
-            return _object_spread_props(_object_spread({}, u), {
-              dispatching: void 0
-            });
-          });
-          throw e;
-        }
+        middleWare({
+          getState: function getState() {
+            return {
+              state: updater.state,
+              instance: updater.instance
+            };
+          },
+          dispatch: notify
+        })(dispatch)(wrap.value);
         unshiftAction();
       } else {
         updater.mutate(function(u) {

package/esm/validation/index.js

@@ -1,5 +1,6 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
+import { modelKeyIdentifier, modelUsageIdentifier } from "../identifiers";
 var noStateAModelKey = "no-state-a-model-key";
 function createNoStateModel() {
   return function noStateModel(state) {
@@ -19,7 +20,21 @@ function isInstanceFromNoStateModel(instance) {
 var validations = {
   isInstanceFromNoStateModel
 };
+function isModelKey(data) {
+  if (!data) {
+    return false;
+  }
+  return data.modelKeyIdentifier === modelKeyIdentifier && data.modelKeyIdentifier();
+}
+function isModelUsage(data) {
+  if (!data) {
+    return false;
+  }
+  return data.modelUsageIdentifier === modelUsageIdentifier && data.modelUsageIdentifier();
+}
 export {
   createNoStateModel,
+  isModelKey,
+  isModelUsage,
   validations
 };

package/package.json

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