as-model 0.1.23 → 0.1.24

package/dist/index.js

@@ -369,8 +369,11 @@
         type: null,
         method: null
       };
-      temporaryDispatches.forEach(function(call) {
-        call(initializedAction);
+      temporaryDispatches.forEach(function(d) {
+        if (!d.accessible) {
+          return;
+        }
+        d.dispatch(initializedAction);
       });
     }
     var dispatch = function dispatch2(action) {
@@ -392,7 +395,15 @@
       }
       var notifyAction = function notifyAction2(act) {
         var errors = [];
-        var dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+        var dispatchWrap = simpleErrorProcess(errors);
+        var dispatchCallbacks = dispatches.map(function(d) {
+          return dispatchWrap(function dispatchCallback(ac) {
+            if (!d.accessible) {
+              return;
+            }
+            d.dispatch(ac);
+          });
+        });
         defaultNotifyImplement(dispatchCallbacks, act);
         if (!errors.length) {
           return {
@@ -511,7 +522,9 @@
     function subscribe(dispatchFn) {
       var dispatches = updater.dispatches, temporaryDispatches = updater.temporaryDispatches, isControlled = updater.controlled;
       var copied = _to_consumable_array(dispatches).concat(_to_consumable_array(temporaryDispatches));
-      var exist = copied.indexOf(dispatchFn) >= 0;
+      var exist = copied.some(function(d) {
+        return d.dispatch === dispatchFn;
+      });
       if (exist) {
         return updater.mutate(function(u) {
           return _object_spread_props(_object_spread({}, u), {
@@ -519,11 +532,15 @@
           });
         });
       }
+      var dispatcher = {
+        dispatch: dispatchFn,
+        accessible: true
+      };
       if (isControlled) {
         return updater.mutate(function(u) {
           return _object_spread_props(_object_spread({}, u), {
             dispatches: [
-              dispatchFn
+              dispatcher
             ],
             isDestroyed: false
           });
@@ -532,7 +549,7 @@
       return updater.mutate(function(u, effect) {
         var tds = u.temporaryDispatches, ds = u.dispatches;
         var nextTds = _to_consumable_array(tds).concat([
-          dispatchFn
+          dispatcher
         ]);
         if (u.dispatching) {
           return _object_spread_props(_object_spread({}, u), {
@@ -550,7 +567,7 @@
             method: null
           };
           nextTds.forEach(function(td) {
-            td(initializedAction);
+            td.dispatch(initializedAction);
           });
         });
         return _object_spread_props(_object_spread({}, u), {
@@ -560,19 +577,23 @@
         });
       });
     }
-    return function tunnel(dispatcher) {
+    return function tunnel(dispatchFn) {
       function disconnect() {
         updater.mutate(function(u) {
           var ds = u.dispatches, tds = u.temporaryDispatches;
+          var found = _to_consumable_array(ds).concat(_to_consumable_array(tds)).find(function(d) {
+            return d.dispatch === dispatchFn;
+          });
+          if (!found) {
+            return u;
+          }
+          found.accessible = false;
           var nextDs = ds.filter(function(d) {
-            return d !== dispatcher;
+            return d !== found;
           });
           var nextTds = tds.filter(function(d) {
-            return d !== dispatcher;
+            return d !== found;
           });
-          if (ds.length === nextDs.length && tds.length === nextTds.length) {
-            return u;
-          }
           return _object_spread_props(_object_spread({}, u), {
             dispatches: nextDs,
             temporaryDispatches: nextTds
@@ -581,7 +602,7 @@
       }
       return {
         connect: function connect() {
-          subscribe(dispatcher);
+          subscribe(dispatchFn);
         },
         disconnect: function disconnect1() {
           disconnect();

package/esm/updater/notifier.js

@@ -76,8 +76,11 @@ function generateNotifier(updater, middleWare) {
       type: null,
       method: null
     };
-    temporaryDispatches.forEach((call) => {
-      call(initializedAction);
+    temporaryDispatches.forEach((d) => {
+      if (!d.accessible) {
+        return;
+      }
+      d.dispatch(initializedAction);
     });
   }
   const dispatch = function dispatch2(action) {
@@ -95,7 +98,15 @@ function generateNotifier(updater, middleWare) {
     }
     const notifyAction = function notifyAction2(act) {
       const errors = [];
-      const dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+      const dispatchWrap = simpleErrorProcess(errors);
+      const dispatchCallbacks = dispatches.map((d) => {
+        return dispatchWrap(function dispatchCallback(ac) {
+          if (!d.accessible) {
+            return;
+          }
+          d.dispatch(ac);
+        });
+      });
       defaultNotifyImplement(dispatchCallbacks, act);
       if (!errors.length) {
         return { errors: void 0 };

package/esm/updater/tunnel.js

@@ -65,19 +65,20 @@ function generateTunnelCreator(updater) {
       controlled: isControlled
     } = updater;
     const copied = [...dispatches, ...temporaryDispatches];
-    const exist = copied.indexOf(dispatchFn) >= 0;
+    const exist = copied.some((d) => d.dispatch === dispatchFn);
     if (exist) {
       return updater.mutate((u) => __spreadProps(__spreadValues({}, u), { isDestroyed: false }));
     }
+    const dispatcher = { dispatch: dispatchFn, accessible: true };
     if (isControlled) {
       return updater.mutate((u) => __spreadProps(__spreadValues({}, u), {
-        dispatches: [dispatchFn],
+        dispatches: [dispatcher],
         isDestroyed: false
       }));
     }
     return updater.mutate((u, effect) => {
       const { temporaryDispatches: tds, dispatches: ds } = u;
-      const nextTds = [...tds, dispatchFn];
+      const nextTds = [...tds, dispatcher];
       if (u.dispatching) {
         return __spreadProps(__spreadValues({}, u), {
           temporaryDispatches: nextTds,
@@ -94,7 +95,7 @@ function generateTunnelCreator(updater) {
           method: null
         };
         nextTds.forEach((td) => {
-          td(initializedAction);
+          td.dispatch(initializedAction);
         });
       });
       return __spreadProps(__spreadValues({}, u), {
@@ -104,15 +105,17 @@ function generateTunnelCreator(updater) {
       });
     });
   }
-  return function tunnel(dispatcher) {
+  return function tunnel(dispatchFn) {
     function disconnect() {
       updater.mutate((u) => {
         const { dispatches: ds, temporaryDispatches: tds } = u;
-        const nextDs = ds.filter((d) => d !== dispatcher);
-        const nextTds = tds.filter((d) => d !== dispatcher);
-        if (ds.length === nextDs.length && tds.length === nextTds.length) {
+        const found = [...ds, ...tds].find((d) => d.dispatch === dispatchFn);
+        if (!found) {
           return u;
         }
+        found.accessible = false;
+        const nextDs = ds.filter((d) => d !== found);
+        const nextTds = tds.filter((d) => d !== found);
         return __spreadProps(__spreadValues({}, u), {
           dispatches: nextDs,
           temporaryDispatches: nextTds
@@ -121,7 +124,7 @@ function generateTunnelCreator(updater) {
     }
     return {
       connect() {
-        subscribe(dispatcher);
+        subscribe(dispatchFn);
       },
       disconnect() {
         disconnect();