@legendapp/state 3.0.0-alpha.18 → 3.0.0-alpha.19

package/index.js

@@ -572,6 +572,7 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
       const { changes } = changeInBatch;
       if (!isArraySubset(changes[0].path, change.path)) {
         changes.push(change);
+        changeInBatch.level = Math.min(changeInBatch.level, level);
       }
     } else {
       changesInBatch.set(node, {
@@ -1001,12 +1002,17 @@ function observe(selectorOrRun, reactionOrOptions, options) {
     options = reactionOrOptions;
   }
   let dispose;
+  let isRunning = false;
   const e = { num: 0 };
   const update = function() {
+    if (isRunning) {
+      return;
+    }
     if (e.onCleanup) {
       e.onCleanup();
       e.onCleanup = void 0;
     }
+    isRunning = true;
     beginBatch();
     delete e.value;
     dispose == null ? void 0 : dispose();
@@ -1020,6 +1026,7 @@ function observe(selectorOrRun, reactionOrOptions, options) {
       e.onCleanupReaction = void 0;
     }
     endBatch();
+    isRunning = false;
     if (reaction && ((options == null ? void 0 : options.fromComputed) || (e.num > 0 || !isEvent(selectorOrRun)) && (e.previous !== e.value || typeof e.value === "object"))) {
       reaction(e);
     }
@@ -1565,8 +1572,10 @@ function setKey(node, key, newValue, level) {
         parent.recursivelyAutoActivated = false;
       } while (parent = parent.parent);
     }
-    if (!equals(savedValue, prevValue)) {
-      updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level);
+    const notify2 = !equals(savedValue, prevValue);
+    const forceNotify = !notify2 && childNode.isComputing && isObject(savedValue);
+    if (notify2 || forceNotify) {
+      updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level, forceNotify);
     }
     extractFunctionOrComputed(node, key, savedValue);
   }
@@ -1679,20 +1688,20 @@ function handlerMapSet(node, p, value) {
     };
   }
 }
-function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRoot, level) {
+function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRoot, level, forceNotify) {
   if (!childNode)
     childNode = node;
   beginBatch();
   if (isPrim === void 0) {
     isPrim = isPrimitive(newValue);
   }
-  let hasADiff = isPrim;
+  let hasADiff = forceNotify || isPrim;
   let whenOptimizedOnlyIf = false;
   if (!isPrim || prevValue && !isPrimitive(prevValue)) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && typeof __devUpdateNodes !== "undefined") {
       __devUpdateNodes.clear();
     }
-    hasADiff = updateNodes(childNode, newValue, prevValue);
+    hasADiff = hasADiff || updateNodes(childNode, newValue, prevValue);
     if (isArray(newValue)) {
       whenOptimizedOnlyIf = (newValue == null ? void 0 : newValue.length) !== (prevValue == null ? void 0 : prevValue.length);
     }
@@ -1962,18 +1971,14 @@ function activateNodeFunction(node, lazyFn) {
             }
           } else {
             activatedValue = value;
-            if (node.state.isLoaded.peek()) {
+            const isLoaded = node.state.isLoaded.peek();
+            if (isLoaded || !isFunction(value)) {
               node.isComputing = true;
               set(node, value);
               node.isComputing = false;
-            } else {
-              if (!isFunction(value)) {
-                setNodeValue(node, value);
-              }
-              node.state.assign({
-                isLoaded: true,
-                error: void 0
-              });
+            }
+            if (!isLoaded) {
+              node.state.assign({ isLoaded: true, error: void 0 });
             }
           }
         }

package/index.mjs

@@ -570,6 +570,7 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
       const { changes } = changeInBatch;
       if (!isArraySubset(changes[0].path, change.path)) {
         changes.push(change);
+        changeInBatch.level = Math.min(changeInBatch.level, level);
       }
     } else {
       changesInBatch.set(node, {
@@ -999,12 +1000,17 @@ function observe(selectorOrRun, reactionOrOptions, options) {
     options = reactionOrOptions;
   }
   let dispose;
+  let isRunning = false;
   const e = { num: 0 };
   const update = function() {
+    if (isRunning) {
+      return;
+    }
     if (e.onCleanup) {
       e.onCleanup();
       e.onCleanup = void 0;
     }
+    isRunning = true;
     beginBatch();
     delete e.value;
     dispose == null ? void 0 : dispose();
@@ -1018,6 +1024,7 @@ function observe(selectorOrRun, reactionOrOptions, options) {
       e.onCleanupReaction = void 0;
     }
     endBatch();
+    isRunning = false;
     if (reaction && ((options == null ? void 0 : options.fromComputed) || (e.num > 0 || !isEvent(selectorOrRun)) && (e.previous !== e.value || typeof e.value === "object"))) {
       reaction(e);
     }
@@ -1563,8 +1570,10 @@ function setKey(node, key, newValue, level) {
         parent.recursivelyAutoActivated = false;
       } while (parent = parent.parent);
     }
-    if (!equals(savedValue, prevValue)) {
-      updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level);
+    const notify2 = !equals(savedValue, prevValue);
+    const forceNotify = !notify2 && childNode.isComputing && isObject(savedValue);
+    if (notify2 || forceNotify) {
+      updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level, forceNotify);
     }
     extractFunctionOrComputed(node, key, savedValue);
   }
@@ -1677,20 +1686,20 @@ function handlerMapSet(node, p, value) {
     };
   }
 }
-function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRoot, level) {
+function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRoot, level, forceNotify) {
   if (!childNode)
     childNode = node;
   beginBatch();
   if (isPrim === void 0) {
     isPrim = isPrimitive(newValue);
   }
-  let hasADiff = isPrim;
+  let hasADiff = forceNotify || isPrim;
   let whenOptimizedOnlyIf = false;
   if (!isPrim || prevValue && !isPrimitive(prevValue)) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && typeof __devUpdateNodes !== "undefined") {
       __devUpdateNodes.clear();
     }
-    hasADiff = updateNodes(childNode, newValue, prevValue);
+    hasADiff = hasADiff || updateNodes(childNode, newValue, prevValue);
     if (isArray(newValue)) {
       whenOptimizedOnlyIf = (newValue == null ? void 0 : newValue.length) !== (prevValue == null ? void 0 : prevValue.length);
     }
@@ -1960,18 +1969,14 @@ function activateNodeFunction(node, lazyFn) {
             }
           } else {
             activatedValue = value;
-            if (node.state.isLoaded.peek()) {
+            const isLoaded = node.state.isLoaded.peek();
+            if (isLoaded || !isFunction(value)) {
               node.isComputing = true;
               set(node, value);
               node.isComputing = false;
-            } else {
-              if (!isFunction(value)) {
-                setNodeValue(node, value);
-              }
-              node.state.assign({
-                isLoaded: true,
-                error: void 0
-              });
+            }
+            if (!isLoaded) {
+              node.state.assign({ isLoaded: true, error: void 0 });
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.18",
+  "version": "3.0.0-alpha.19",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/crud.js

@@ -129,7 +129,12 @@ function syncedCrud(props) {
     const deletes = /* @__PURE__ */ new Set();
     const getUpdateValue = (itemValue, prev) => {
       return updatePartial ? Object.assign(
-        sync.diffObjects(prev, itemValue),
+        sync.diffObjects(
+          prev,
+          itemValue,
+          /*deep*/
+          true
+        ),
         itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
       ) : itemValue;
     };

package/sync-plugins/crud.mjs

@@ -127,7 +127,12 @@ function syncedCrud(props) {
     const deletes = /* @__PURE__ */ new Set();
     const getUpdateValue = (itemValue, prev) => {
       return updatePartial ? Object.assign(
-        diffObjects(prev, itemValue),
+        diffObjects(
+          prev,
+          itemValue,
+          /*deep*/
+          true
+        ),
         itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
       ) : itemValue;
     };

package/sync-plugins/keel.js

@@ -214,7 +214,6 @@ function syncedKeel(props) {
     }
   };
   const create = createParam ? async (input, params) => {
-    console.log(createParam.toString());
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
       await handleSetError(error, params, input, createParam, "create");
@@ -222,7 +221,6 @@ function syncedKeel(props) {
     return data;
   } : void 0;
   const update = updateParam ? async (input, params) => {
-    console.log(updateParam.toString());
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;

package/sync-plugins/keel.mjs

@@ -208,7 +208,6 @@ function syncedKeel(props) {
     }
   };
   const create = createParam ? async (input, params) => {
-    console.log(createParam.toString());
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
       await handleSetError(error, params, input, createParam, "create");
@@ -216,7 +215,6 @@ function syncedKeel(props) {
     return data;
   } : void 0;
   const update = updateParam ? async (input, params) => {
-    console.log(updateParam.toString());
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;