ccstate 4.13.0 → 5.2.0

package/core/index.js

@@ -53,14 +53,8 @@ function _arrayWithHoles(r) {
 function _classCallCheck(a, n) {
   if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
 }
-function _defineProperties(e, r) {
-  for (var t = 0; t < r.length; t++) {
-    var o = r[t];
-    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
-  }
-}
 function _createClass(e, r, t) {
-  return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+  return Object.defineProperty(e, "prototype", {
     writable: !1
   }), e;
 }
@@ -157,11 +151,11 @@ function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
   if (void 0 !== e) {
-    var i = e.call(t, r);
+    var i = e.call(t, r || "default");
     if ("object" != typeof i) return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return (String )(t);
+  return ("string" === r ? String : Number)(t);
 }
 function _toPropertyKey(t) {
   var i = _toPrimitive(t, "string");
@@ -259,63 +253,6 @@ function withGeValInterceptor(fn, signal, interceptor) {
   }
   return result.data;
 }
-function withSubInterceptor(fn, signal, callback$, interceptor) {
-  if (!interceptor) {
-    fn();
-    return;
-  }
-  var result = {
-    called: false
-  };
-  interceptor(signal, callback$, function () {
-    result = {
-      called: true,
-      data: undefined
-    };
-    fn();
-  });
-  if (!result.called) {
-    throw new Error('interceptor must call fn sync');
-  }
-}
-function withUnsubInterceptor(fn, signal, callback$, interceptor) {
-  if (!interceptor) {
-    fn();
-    return;
-  }
-  var result = {
-    called: false
-  };
-  interceptor(signal, callback$, function () {
-    result = {
-      called: true,
-      data: undefined
-    };
-    fn();
-  });
-  if (!result.called) {
-    throw new Error('interceptor must call fn sync');
-  }
-}
-function withNotifyInterceptor(fn, callback$, interceptor) {
-  if (!interceptor) {
-    return fn();
-  }
-  var result = {
-    called: false
-  };
-  interceptor(callback$, function () {
-    result = {
-      called: true,
-      data: fn()
-    };
-    return result.data;
-  });
-  if (!result.called) {
-    throw new Error('interceptor must call fn sync');
-  }
-  return result.data;
-}
 
 function canReadAsCompute(atom) {
   return 'read' in atom;
@@ -513,30 +450,18 @@ function pushDirtyMarkers(signalState, context, mutation) {
   }
 }
 function pullEvaluate(readComputed, signalState, context, mutation) {
-  var _signalState$mounted$2, _signalState$mounted2, _signalState$mounted$3, _signalState$mounted3, _signalState$mounted$4, _signalState$mounted4;
+  var _signalState$mounted$2, _signalState$mounted2, _signalState$mounted$3, _signalState$mounted3;
   var queue = Array.from((_signalState$mounted$2 = (_signalState$mounted2 = signalState.mounted) === null || _signalState$mounted2 === void 0 ? void 0 : _signalState$mounted2.readDepts) !== null && _signalState$mounted$2 !== void 0 ? _signalState$mounted$2 : []);
-  var _iterator3 = _createForOfIteratorHelper((_signalState$mounted$4 = (_signalState$mounted4 = signalState.mounted) === null || _signalState$mounted4 === void 0 ? void 0 : _signalState$mounted4.listeners) !== null && _signalState$mounted$4 !== void 0 ? _signalState$mounted$4 : []),
-    _step3;
-  try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _listener = _step3.value;
-      mutation.pendingListeners.add(_listener);
-    }
-  } catch (err) {
-    _iterator3.e(err);
-  } finally {
-    _iterator3.f();
-  }
   var oldValues = new Map();
   var oldErrors = new Map();
   while (queue.length > 0) {
     var nextQueue = [];
-    var _iterator4 = _createForOfIteratorHelper(queue),
-      _step4;
+    var _iterator3 = _createForOfIteratorHelper(queue),
+      _step3;
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var _context$stateMap$get;
-        var computed$ = _step4.value;
+        var computed$ = _step3.value;
         var oldState = context.stateMap.get(computed$);
         oldValues.set(computed$, oldState === null || oldState === void 0 ? void 0 : oldState.val);
         oldErrors.set(computed$, oldState === null || oldState === void 0 ? void 0 : oldState.error);
@@ -549,42 +474,28 @@ function pullEvaluate(readComputed, signalState, context, mutation) {
         }
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator3.e(err);
     } finally {
-      _iterator4.f();
+      _iterator3.f();
     }
     queue = nextQueue;
   }
   queue = Array.from((_signalState$mounted$3 = (_signalState$mounted3 = signalState.mounted) === null || _signalState$mounted3 === void 0 ? void 0 : _signalState$mounted3.readDepts) !== null && _signalState$mounted$3 !== void 0 ? _signalState$mounted$3 : []);
   while (queue.length > 0) {
     var _nextQueue = [];
-    var _iterator5 = _createForOfIteratorHelper(queue),
-      _step5;
+    var _iterator4 = _createForOfIteratorHelper(queue),
+      _step4;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var _computedState$mounte, _computedState$mounte2;
-        var _computed$ = _step5.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var _computedState$mounte;
+        var _computed$ = _step4.value;
         var computedState = readComputed(_computed$, context, mutation);
         var isSameWithOldValue = !computedState.error && oldValues.has(_computed$) && oldValues.get(_computed$) === computedState.val;
         var isSameError = computedState.error && Boolean(oldErrors.get(_computed$));
         if (isSameWithOldValue || isSameError) {
           continue;
         }
-        if ((_computedState$mounte = computedState.mounted) !== null && _computedState$mounte !== void 0 && _computedState$mounte.listeners) {
-          var _iterator6 = _createForOfIteratorHelper(computedState.mounted.listeners),
-            _step6;
-          try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var listener = _step6.value;
-              mutation.pendingListeners.add(listener);
-            }
-          } catch (err) {
-            _iterator6.e(err);
-          } finally {
-            _iterator6.f();
-          }
-        }
-        var _readDepts = (_computedState$mounte2 = computedState.mounted) === null || _computedState$mounte2 === void 0 ? void 0 : _computedState$mounte2.readDepts;
+        var _readDepts = (_computedState$mounte = computedState.mounted) === null || _computedState$mounte === void 0 ? void 0 : _computedState$mounte.readDepts;
         if (_readDepts) {
           for (var _i2 = 0, _Array$from2 = Array.from(_readDepts); _i2 < _Array$from2.length; _i2++) {
             var _dep = _Array$from2[_i2];
@@ -593,9 +504,9 @@ function pullEvaluate(readComputed, signalState, context, mutation) {
         }
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator5.f();
+      _iterator4.f();
     }
     queue = _nextQueue;
   }
@@ -659,7 +570,6 @@ function set(readComputed, writable$, context, mutation) {
 function createMutation(context, _get, _set) {
   var mutation = {
     potentialDirtyIds: new Set(),
-    pendingListeners: new Set(),
     visitor: {
       get: function get(signal$) {
         return _get(signal$, context, mutation);
@@ -706,11 +616,10 @@ function mountComputedDependencies(readSignal, computed$, computedState, context
   }
 }
 function initMount(readSignal, signal$, context, mutation) {
-  var _context$interceptor, _context$interceptor$, _signalState$mounted;
+  var _context$interceptor, _context$interceptor$;
   (_context$interceptor = context.interceptor) === null || _context$interceptor === void 0 || (_context$interceptor$ = _context$interceptor.mount) === null || _context$interceptor$ === void 0 || _context$interceptor$.call(_context$interceptor, signal$);
   var signalState = readSignal(signal$, context, mutation);
-  signalState.mounted = (_signalState$mounted = signalState.mounted) !== null && _signalState$mounted !== void 0 ? _signalState$mounted : {
-    listeners: new Set(),
+  signalState.mounted = {
     readDepts: new Set()
   };
   if (isComputedState(signalState)) {
@@ -736,52 +645,11 @@ function doUnmount(signal$, signalState, context, mutation) {
 }
 function unmount(signal$, context, mutation) {
   var signalState = context.stateMap.get(signal$);
-  if (!(signalState !== null && signalState !== void 0 && signalState.mounted) || signalState.mounted.listeners.size || signalState.mounted.readDepts.size) {
+  if (!(signalState !== null && signalState !== void 0 && signalState.mounted) || signalState.mounted.readDepts.size) {
     return;
   }
   doUnmount(signal$, signalState, context);
 }
-function subSingleSignal(readSignal, signal$, callback$, context, signal) {
-  var _context$interceptor5;
-  withSubInterceptor(function () {
-    var mounted = mount$1(readSignal, signal$, context);
-    mounted.listeners.add(callback$);
-    var unsub = function unsub() {
-      var _context$interceptor4;
-      withUnsubInterceptor(function () {
-        mounted.listeners["delete"](callback$);
-        if (mounted.readDepts.size === 0 && mounted.listeners.size === 0) {
-          unmount(signal$, context);
-        }
-      }, signal$, callback$, (_context$interceptor4 = context.interceptor) === null || _context$interceptor4 === void 0 ? void 0 : _context$interceptor4.unsub);
-    };
-    signal.addEventListener('abort', unsub, {
-      once: true
-    });
-  }, signal$, callback$, (_context$interceptor5 = context.interceptor) === null || _context$interceptor5 === void 0 ? void 0 : _context$interceptor5.sub);
-}
-function notify(context, mutation) {
-  var pendingListeners = mutation.pendingListeners;
-  mutation.pendingListeners = new Set();
-  var _iterator = _createForOfIteratorHelper(pendingListeners),
-    _step;
-  try {
-    var _loop = function _loop() {
-      var _context$interceptor6;
-      var listener = _step.value;
-      withNotifyInterceptor(function () {
-        return listener.write(mutation.visitor);
-      }, listener, (_context$interceptor6 = context.interceptor) === null || _context$interceptor6 === void 0 ? void 0 : _context$interceptor6.notify);
-    };
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      _loop();
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-}
 
 var _readComputed = function readComputed(computed$, context, mutation) {
   var _context$interceptor;
@@ -802,26 +670,7 @@ function readSignal(signal$, context, mutation) {
 function mount(signal$, context, mutation) {
   return mount$1(readSignal, signal$, context, mutation);
 }
-function _sub(signals$, callback$, context, options) {
-  if (Array.isArray(signals$) && signals$.length === 0) {
-    return function () {
-      return void 0;
-    };
-  }
-  var controller = new AbortController();
-  var signal = options !== null && options !== void 0 && options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal;
-  if (!Array.isArray(signals$)) {
-    subSingleSignal(readSignal, signals$, callback$, context, signal);
-  } else {
-    signals$.forEach(function (atom) {
-      subSingleSignal(readSignal, atom, callback$, context, signal);
-    });
-  }
-  return function () {
-    controller.abort();
-  };
-}
-var get = function get(signal, context, mutation) {
+var storeGet = function storeGet(signal, context, mutation) {
   var _context$interceptor2;
   return withGetInterceptor(function () {
     var signalState = readSignal(signal, context, mutation);
@@ -831,60 +680,66 @@ var get = function get(signal, context, mutation) {
     return signalState.val;
   }, signal, (_context$interceptor2 = context.interceptor) === null || _context$interceptor2 === void 0 ? void 0 : _context$interceptor2.get);
 };
-var _set = function set$1(atom, context) {
+var _storeSet = function storeSet(atom, context) {
   var _context$interceptor3;
   for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
     args[_key - 2] = arguments[_key];
   }
   return withSetInterceptor.apply(void 0, [function () {
-    var mutation = createMutation(context, get, _set);
-    var ret;
-    try {
-      ret = set.apply(void 0, [_readComputed, atom, context, mutation].concat(args));
-    } finally {
-      notify(context, mutation);
-    }
-    return ret;
+    var mutation = createMutation(context, storeGet, _storeSet);
+    return set.apply(void 0, [_readComputed, atom, context, mutation].concat(args));
   }, atom, (_context$interceptor3 = context.interceptor) === null || _context$interceptor3 === void 0 ? void 0 : _context$interceptor3.set].concat(args));
 };
-var StoreImpl = /*#__PURE__*/function () {
-  function StoreImpl(options) {
-    var _this = this,
-      _this$options;
-    _classCallCheck(this, StoreImpl);
-    _defineProperty(this, "stateMap", new WeakMap());
-    _defineProperty(this, "get", function (atom) {
-      return get(atom, _this.context);
-    });
-    _defineProperty(this, "set", function (atom) {
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
+var storeWatch = function storeWatch(watchFn, context, options) {
+  var _options$signal;
+  var computed$ = computed(function (get, _ref) {
+    var signal = _ref.signal;
+    var childSignal;
+    var obOptions = {
+      get signal() {
+        if (!childSignal) {
+          childSignal = options !== null && options !== void 0 && options.signal ? AbortSignal.any([options.signal, signal]) : signal;
+        }
+        return childSignal;
       }
-      return _set.apply(void 0, [atom, _this.context].concat(args));
-    });
-    this.options = options;
-    this.context = {
-      stateMap: this.stateMap,
-      interceptor: (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.interceptor
     };
-  }
-  return _createClass(StoreImpl, [{
-    key: "sub",
-    value: function sub(targets$, cb$, options) {
-      return _sub(targets$, cb$, this.context, options);
+    watchFn(get, obOptions);
+  }, {
+    debugLabel: options === null || options === void 0 ? void 0 : options.debugLabel
+  });
+  mount$1(readSignal, computed$, context);
+  options === null || options === void 0 || (_options$signal = options.signal) === null || _options$signal === void 0 || _options$signal.addEventListener('abort', function () {
+    unmount(computed$, context);
+  }, {
+    once: true
+  });
+};
+var StoreImpl = /*#__PURE__*/_createClass(function StoreImpl(_options) {
+  var _this = this,
+    _this$options;
+  _classCallCheck(this, StoreImpl);
+  _defineProperty(this, "stateMap", new WeakMap());
+  _defineProperty(this, "get", function (atom) {
+    return storeGet(atom, _this.context);
+  });
+  _defineProperty(this, "set", function (atom) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
     }
-  }]);
-}();
+    return _storeSet.apply(void 0, [atom, _this.context].concat(args));
+  });
+  _defineProperty(this, "watch", function (watchFn, options) {
+    storeWatch(watchFn, _this.context, options);
+  });
+  this.options = _options;
+  this.context = {
+    stateMap: this.stateMap,
+    interceptor: (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.interceptor
+  };
+});
 function createStore() {
   return new StoreImpl();
 }
-var defaultStore = undefined;
-function getDefaultStore() {
-  if (!defaultStore) {
-    defaultStore = createStore();
-  }
-  return defaultStore;
-}
 
-export { command, computed, createStore, getDefaultStore, state };
+export { command, computed, createStore, state };
 //# sourceMappingURL=index.js.map