@legendapp/state 3.0.0-beta.44 → 3.0.0-beta.46

package/index.js

@@ -918,16 +918,30 @@ function processQueuedEvents() {
       continue;
     const nodeListeners = node.listeners;
     const nodeListenersImmediate = node.listenersImmediate;
-    if (!nodeListeners && !nodeListenersImmediate) {
+    if (!nodeListeners && !nodeListenersImmediate && node.numListenersRecursive && !(type === "listener-added" && !listener)) {
       continue;
     }
     let isValid = false;
     if (type === "listener-added") {
-      isValid = !!(nodeListeners == null ? void 0 : nodeListeners.has(listener)) || !!(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
+      if (listener) {
+        isValid = !!(nodeListeners == null ? void 0 : nodeListeners.has(listener)) || !!(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
+      } else {
+        const hasNoLocalListeners = !(nodeListeners == null ? void 0 : nodeListeners.size) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.size);
+        if (hasNoLocalListeners && typeof node.numListenersRecursive === "number") {
+          isValid = node.numListenersRecursive > 0;
+        } else {
+          isValid = false;
+        }
+      }
     } else if (type === "listener-removed") {
       isValid = !(nodeListeners == null ? void 0 : nodeListeners.has(listener)) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
     } else {
-      isValid = !(nodeListeners == null ? void 0 : nodeListeners.size) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.size);
+      const hasAnyLocal = nodeListeners && nodeListeners.size > 0 || nodeListenersImmediate && nodeListenersImmediate.size > 0;
+      if (typeof node.numListenersRecursive === "number") {
+        isValid = !hasAnyLocal && node.numListenersRecursive === 0;
+      } else {
+        isValid = !hasAnyLocal;
+      }
     }
     if (isValid) {
       eventObj.type = type;
@@ -947,6 +961,14 @@ function processQueuedEvents() {
 }
 
 // src/onChange.ts
+function isSyncedObservable(node) {
+  var _a;
+  return ((_a = node.activationState) == null ? void 0 : _a.synced) || false;
+}
+function shouldDispatchParentMiddlewareEvent(node) {
+  var _a, _b;
+  return !((_a = node.listeners) == null ? void 0 : _a.size) && !((_b = node.listenersImmediate) == null ? void 0 : _b.size) && isSyncedObservable(node);
+}
 function onChange(node, callback, options = {}, fromLinks) {
   var _a;
   const { initial, immediate, noArgs } = options;
@@ -1013,6 +1035,9 @@ function onChange(node, callback, options = {}, fromLinks) {
       }
     }
     parent.numListenersRecursive++;
+    if (shouldDispatchParentMiddlewareEvent(parent)) {
+      dispatchMiddlewareEvent(parent, void 0, "listener-added");
+    }
     pathParent = [parent.key, ...pathParent];
     parent = parent.parent;
   }
@@ -1020,15 +1045,24 @@ function onChange(node, callback, options = {}, fromLinks) {
   return () => {
     listeners.delete(listener);
     extraDisposes == null ? void 0 : extraDisposes.forEach((fn) => fn());
+    const clearedRecursive = [];
     let parent2 = node;
     while (parent2) {
       parent2.numListenersRecursive--;
+      if (parent2.numListenersRecursive === 0) {
+        clearedRecursive.push(parent2);
+      }
       parent2 = parent2.parent;
     }
     dispatchMiddlewareEvent(node, listener, "listener-removed");
     if (listeners.size === 0) {
       dispatchMiddlewareEvent(node, void 0, "listeners-cleared");
     }
+    for (const clearedNode of clearedRecursive) {
+      if (clearedNode !== node && shouldDispatchParentMiddlewareEvent(clearedNode)) {
+        dispatchMiddlewareEvent(clearedNode, void 0, "listeners-cleared");
+      }
+    }
   };
 }
 function createCb(linkedFromNode, path, callback) {
@@ -1195,6 +1229,16 @@ function observe(selectorOrRun, reactionOrOptions, options) {
   };
 }
 
+// src/toPrimitive.ts
+function toPrimitive(node, hint) {
+  const value = peek(node);
+  if (value === null || value === void 0 || isPrimitive(value)) {
+    return value;
+  }
+  const method = hint === "string" ? isFunction(value.toString) ? value.toString : value.valueOf : isFunction(value.valueOf) ? value.valueOf : value.toString;
+  return isFunction(method) ? method.call(value) : value;
+}
+
 // src/when.ts
 function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
@@ -1512,9 +1556,7 @@ var proxyHandler = {
   get(node, p, receiver) {
     var _a, _b, _c;
     if (p === symbolToPrimitive) {
-      throw new Error(
-        process.env.NODE_ENV === "development" ? "[legend-state] observable should not be used as a primitive. You may have forgotten to use .get() or .peek() to get the value of the observable." : "[legend-state] observable is not a primitive."
-      );
+      return (hint) => toPrimitive(node, hint);
     }
     if (p === symbolGetNode) {
       return node;
@@ -2398,6 +2440,12 @@ Object.defineProperty(ObservablePrimitiveClass.prototype, symbolGetNode, {
     return this._node;
   }
 });
+Object.defineProperty(ObservablePrimitiveClass.prototype, symbolToPrimitive, {
+  configurable: true,
+  value(hint) {
+    return toPrimitive(this._node, hint);
+  }
+});
 ObservablePrimitiveClass.prototype.toggle = function() {
   const value = this.peek();
   if (value === void 0 || value === null || isBoolean(value)) {

package/index.mjs

@@ -916,16 +916,30 @@ function processQueuedEvents() {
       continue;
     const nodeListeners = node.listeners;
     const nodeListenersImmediate = node.listenersImmediate;
-    if (!nodeListeners && !nodeListenersImmediate) {
+    if (!nodeListeners && !nodeListenersImmediate && node.numListenersRecursive && !(type === "listener-added" && !listener)) {
       continue;
     }
     let isValid = false;
     if (type === "listener-added") {
-      isValid = !!(nodeListeners == null ? void 0 : nodeListeners.has(listener)) || !!(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
+      if (listener) {
+        isValid = !!(nodeListeners == null ? void 0 : nodeListeners.has(listener)) || !!(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
+      } else {
+        const hasNoLocalListeners = !(nodeListeners == null ? void 0 : nodeListeners.size) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.size);
+        if (hasNoLocalListeners && typeof node.numListenersRecursive === "number") {
+          isValid = node.numListenersRecursive > 0;
+        } else {
+          isValid = false;
+        }
+      }
     } else if (type === "listener-removed") {
       isValid = !(nodeListeners == null ? void 0 : nodeListeners.has(listener)) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.has(listener));
     } else {
-      isValid = !(nodeListeners == null ? void 0 : nodeListeners.size) && !(nodeListenersImmediate == null ? void 0 : nodeListenersImmediate.size);
+      const hasAnyLocal = nodeListeners && nodeListeners.size > 0 || nodeListenersImmediate && nodeListenersImmediate.size > 0;
+      if (typeof node.numListenersRecursive === "number") {
+        isValid = !hasAnyLocal && node.numListenersRecursive === 0;
+      } else {
+        isValid = !hasAnyLocal;
+      }
     }
     if (isValid) {
       eventObj.type = type;
@@ -945,6 +959,14 @@ function processQueuedEvents() {
 }
 
 // src/onChange.ts
+function isSyncedObservable(node) {
+  var _a;
+  return ((_a = node.activationState) == null ? void 0 : _a.synced) || false;
+}
+function shouldDispatchParentMiddlewareEvent(node) {
+  var _a, _b;
+  return !((_a = node.listeners) == null ? void 0 : _a.size) && !((_b = node.listenersImmediate) == null ? void 0 : _b.size) && isSyncedObservable(node);
+}
 function onChange(node, callback, options = {}, fromLinks) {
   var _a;
   const { initial, immediate, noArgs } = options;
@@ -1011,6 +1033,9 @@ function onChange(node, callback, options = {}, fromLinks) {
       }
     }
     parent.numListenersRecursive++;
+    if (shouldDispatchParentMiddlewareEvent(parent)) {
+      dispatchMiddlewareEvent(parent, void 0, "listener-added");
+    }
     pathParent = [parent.key, ...pathParent];
     parent = parent.parent;
   }
@@ -1018,15 +1043,24 @@ function onChange(node, callback, options = {}, fromLinks) {
   return () => {
     listeners.delete(listener);
     extraDisposes == null ? void 0 : extraDisposes.forEach((fn) => fn());
+    const clearedRecursive = [];
     let parent2 = node;
     while (parent2) {
       parent2.numListenersRecursive--;
+      if (parent2.numListenersRecursive === 0) {
+        clearedRecursive.push(parent2);
+      }
       parent2 = parent2.parent;
     }
     dispatchMiddlewareEvent(node, listener, "listener-removed");
     if (listeners.size === 0) {
       dispatchMiddlewareEvent(node, void 0, "listeners-cleared");
     }
+    for (const clearedNode of clearedRecursive) {
+      if (clearedNode !== node && shouldDispatchParentMiddlewareEvent(clearedNode)) {
+        dispatchMiddlewareEvent(clearedNode, void 0, "listeners-cleared");
+      }
+    }
   };
 }
 function createCb(linkedFromNode, path, callback) {
@@ -1193,6 +1227,16 @@ function observe(selectorOrRun, reactionOrOptions, options) {
   };
 }
 
+// src/toPrimitive.ts
+function toPrimitive(node, hint) {
+  const value = peek(node);
+  if (value === null || value === void 0 || isPrimitive(value)) {
+    return value;
+  }
+  const method = hint === "string" ? isFunction(value.toString) ? value.toString : value.valueOf : isFunction(value.valueOf) ? value.valueOf : value.toString;
+  return isFunction(method) ? method.call(value) : value;
+}
+
 // src/when.ts
 function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
@@ -1510,9 +1554,7 @@ var proxyHandler = {
   get(node, p, receiver) {
     var _a, _b, _c;
     if (p === symbolToPrimitive) {
-      throw new Error(
-        process.env.NODE_ENV === "development" ? "[legend-state] observable should not be used as a primitive. You may have forgotten to use .get() or .peek() to get the value of the observable." : "[legend-state] observable is not a primitive."
-      );
+      return (hint) => toPrimitive(node, hint);
     }
     if (p === symbolGetNode) {
       return node;
@@ -2396,6 +2438,12 @@ Object.defineProperty(ObservablePrimitiveClass.prototype, symbolGetNode, {
     return this._node;
   }
 });
+Object.defineProperty(ObservablePrimitiveClass.prototype, symbolToPrimitive, {
+  configurable: true,
+  value(hint) {
+    return toPrimitive(this._node, hint);
+  }
+});
 ObservablePrimitiveClass.prototype.toggle = function() {
   const value = this.peek();
   if (value === void 0 || value === null || isBoolean(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.44",
+  "version": "3.0.0-beta.46",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,