@legendapp/state 3.0.0-beta.21 → 3.0.0-beta.23

package/index.d.mts

@@ -113,6 +113,7 @@ declare function setNodeValue(node: NodeInfo, newValue: any): {
 declare function getNodeValue(node: NodeInfo): any;
 declare function ensureNodeValue(node: NodeInfo): any;
 declare function findIDKey(obj: unknown | undefined, node: NodeInfo): string | ((value: any) => string) | undefined;
+declare function getKeys(obj: Record<any, any> | Array<any> | undefined, isArr: boolean, isMap: boolean, isSet: boolean): string[];
 
 type TrackingType = undefined | true | symbol;
 interface GetOptions {
@@ -397,6 +398,7 @@ declare const internal: {
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
     get: typeof get;
+    getKeys: typeof getKeys;
     getNode: typeof getNode;
     getNodeValue: typeof getNodeValue;
     getPathType: typeof getPathType;

package/index.d.ts

@@ -113,6 +113,7 @@ declare function setNodeValue(node: NodeInfo, newValue: any): {
 declare function getNodeValue(node: NodeInfo): any;
 declare function ensureNodeValue(node: NodeInfo): any;
 declare function findIDKey(obj: unknown | undefined, node: NodeInfo): string | ((value: any) => string) | undefined;
+declare function getKeys(obj: Record<any, any> | Array<any> | undefined, isArr: boolean, isMap: boolean, isSet: boolean): string[];
 
 type TrackingType = undefined | true | symbol;
 interface GetOptions {
@@ -397,6 +398,7 @@ declare const internal: {
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
     get: typeof get;
+    getKeys: typeof getKeys;
     getNode: typeof getNode;
     getNodeValue: typeof getNodeValue;
     getPathType: typeof getPathType;

package/index.js

@@ -257,6 +257,9 @@ function extractFunction(node, key, fnOrComputed) {
 function equals(a, b) {
   return a === b || isDate(a) && isDate(b) && +a === +b;
 }
+function getKeys(obj, isArr, isMap2, isSet2) {
+  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
+}
 
 // src/ObservableHint.ts
 function addSymbol(value, symbol) {
@@ -593,6 +596,7 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
       if (!isArraySubset(changes[0].path, change.path)) {
         changes.push(change);
         changeInBatch.level = Math.min(changeInBatch.level, level);
+        changeInBatch.whenOptimizedOnlyIf || (changeInBatch.whenOptimizedOnlyIf = whenOptimizedOnlyIf);
       }
     } else {
       changesInBatch.set(node, {
@@ -1180,9 +1184,6 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
   }
 }
-function getKeys(obj, isArr, isMap2, isSet2) {
-  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
-}
 function updateNodes(parent, obj, prevValue) {
   var _a, _b, _c;
   if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && typeof __devUpdateNodes !== "undefined" && isObject(obj)) {
@@ -2340,6 +2341,7 @@ var internal = {
   ensureNodeValue,
   findIDKey,
   get,
+  getKeys,
   getNode,
   getNodeValue,
   getPathType,

package/index.mjs

@@ -255,6 +255,9 @@ function extractFunction(node, key, fnOrComputed) {
 function equals(a, b) {
   return a === b || isDate(a) && isDate(b) && +a === +b;
 }
+function getKeys(obj, isArr, isMap2, isSet2) {
+  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
+}
 
 // src/ObservableHint.ts
 function addSymbol(value, symbol) {
@@ -591,6 +594,7 @@ function computeChangesAtNode(changesInBatch, node, isFromPersist, isFromSync, v
       if (!isArraySubset(changes[0].path, change.path)) {
         changes.push(change);
         changeInBatch.level = Math.min(changeInBatch.level, level);
+        changeInBatch.whenOptimizedOnlyIf || (changeInBatch.whenOptimizedOnlyIf = whenOptimizedOnlyIf);
       }
     } else {
       changesInBatch.set(node, {
@@ -1178,9 +1182,6 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
   }
 }
-function getKeys(obj, isArr, isMap2, isSet2) {
-  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
-}
 function updateNodes(parent, obj, prevValue) {
   var _a, _b, _c;
   if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && typeof __devUpdateNodes !== "undefined" && isObject(obj)) {
@@ -2338,6 +2339,7 @@ var internal = {
   ensureNodeValue,
   findIDKey,
   get,
+  getKeys,
   getNode,
   getNodeValue,
   getPathType,

package/package.json

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

package/sync-plugins/crud.js

@@ -4,7 +4,7 @@ var state = require('@legendapp/state');
 var sync = require('@legendapp/state/sync');
 
 // src/sync-plugins/crud.ts
-var { clone } = state.internal;
+var { clone, getKeys } = state.internal;
 var { waitForSet, runWithRetry } = sync.internal;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
@@ -25,6 +25,17 @@ function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
   }
   return newLastSync;
 }
+function arrayToRecord(arr, keyField) {
+  const record = {};
+  if (arr == null ? void 0 : arr.length) {
+    for (let i = 0; i < arr.length; i++) {
+      const v = arr[i];
+      const key = v[keyField];
+      record[key] = v;
+    }
+  }
+  return record;
+}
 function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetries, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
@@ -179,6 +190,7 @@ function syncedCrud(props) {
     const { value, changes, update, retryAsCreate, node } = params;
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
+    const updateFullValues = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
     const changesById = /* @__PURE__ */ new Map();
     const getUpdateValue = (itemValue, prev) => {
@@ -193,6 +205,7 @@ function syncedCrud(props) {
       ) : itemValue;
     };
     changes.forEach((change) => {
+      var _a, _b;
       const { path, prevAtPath, valueAtPath, pathTypes } = change;
       if (asType === "value") {
         if (value) {
@@ -215,6 +228,7 @@ function syncedCrud(props) {
             } else if (path.length === 0) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
+                updateFullValues.set(id, valueAtPath);
               } else if (prevAtPath) {
                 deletes.add(prevAtPath);
               }
@@ -226,6 +240,7 @@ function syncedCrud(props) {
                 true
               );
               updates.set(id, getUpdateValue(value, previous));
+              updateFullValues.set(id, value);
             }
           } else {
             console.error("[legend-state]: added synced item without an id");
@@ -237,17 +252,30 @@ function syncedCrud(props) {
       } else {
         let itemsChanged = [];
         if (path.length === 0) {
-          const changed = asMap ? Array.from(valueAtPath.entries()) : Object.entries(valueAtPath);
-          for (let i = 0; i < changed.length; i++) {
-            const [key, value2] = changed[i];
-            const prev = prevAtPath ? asMap ? prevAtPath.get(key) : prevAtPath[key] : void 0;
+          const valueAsObject = asArray ? arrayToRecord(valueAtPath, fieldId) : valueAtPath;
+          const prevAsObject = asArray ? arrayToRecord(prevAtPath, fieldId) : prevAtPath;
+          const keys = getKeys(valueAsObject, false, asMap, false);
+          const keysPrev = getKeys(prevAsObject, false, asMap, false);
+          const keysSet = new Set(keys);
+          const length = ((_a = keys || valueAsObject) == null ? void 0 : _a.length) || 0;
+          const lengthPrev = ((_b = keysPrev || prevAsObject) == null ? void 0 : _b.length) || 0;
+          for (let i = 0; i < lengthPrev; i++) {
+            const key = keysPrev[i];
+            if (!keysSet.has(key)) {
+              deletes.add(prevAsObject[key]);
+            }
+          }
+          for (let i = 0; i < length; i++) {
+            const key = keys[i];
+            const value2 = asMap ? valueAsObject.get(key) : valueAsObject[key];
+            const prev = prevAsObject ? asMap ? prevAsObject.get(key) : prevAsObject[key] : void 0;
             if (state.isNullOrUndefined(value2) && !state.isNullOrUndefined(prev)) {
               deletes.add(prev);
               return false;
             } else {
-              const isDiff = !prevAtPath || !sync.deepEqual(value2, prev);
+              const isDiff = !prevAsObject || !sync.deepEqual(value2, prev);
               if (isDiff) {
-                itemsChanged.push([getUpdateValue(value2, prev), prev]);
+                itemsChanged.push([getUpdateValue(value2, prev), prev, value2]);
               }
             }
           }
@@ -266,10 +294,10 @@ function syncedCrud(props) {
               pathTypes.slice(1),
               prevAtPath
             );
-            itemsChanged = [[getUpdateValue(itemValue, previous), previous]];
+            itemsChanged = [[getUpdateValue(itemValue, previous), previous, itemValue]];
           }
         }
-        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
+        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev, fullValue]) => {
           const isCreate = !pendingCreates.has(item[fieldId]) && (fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : state.isNullOrUndefined(prev));
           if (isCreate) {
             if (generateId) {
@@ -291,6 +319,10 @@ function syncedCrud(props) {
               const id = item[fieldId];
               changesById.set(id, change);
               updates.set(id, updates.has(id) ? Object.assign(updates.get(id), item) : item);
+              updateFullValues.set(
+                id,
+                updateFullValues.has(id) ? Object.assign(updateFullValues.get(id), fullValue) : fullValue
+              );
             } else {
               console.warn("[legend-state] missing update function");
             }
@@ -377,7 +409,8 @@ function syncedCrud(props) {
       // Handle updates
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
         if (waitForSetParam) {
-          await waitForSet(waitForSetParam, changes, itemValue, { type: "update" });
+          const fullValue = updateFullValues.get(itemKey);
+          await waitForSet(waitForSetParam, changes, fullValue, { type: "update" });
         }
         const changed = await transformOut(itemValue, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {

package/sync-plugins/crud.mjs

@@ -2,7 +2,7 @@ import { isPromise, isNullOrUndefined, applyChanges, setAtPath, symbolDelete, is
 import { synced, deepEqual, internal as internal$1, diffObjects } from '@legendapp/state/sync';
 
 // src/sync-plugins/crud.ts
-var { clone } = internal;
+var { clone, getKeys } = internal;
 var { waitForSet, runWithRetry } = internal$1;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
@@ -23,6 +23,17 @@ function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
   }
   return newLastSync;
 }
+function arrayToRecord(arr, keyField) {
+  const record = {};
+  if (arr == null ? void 0 : arr.length) {
+    for (let i = 0; i < arr.length; i++) {
+      const v = arr[i];
+      const key = v[keyField];
+      record[key] = v;
+    }
+  }
+  return record;
+}
 function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetries, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
@@ -177,6 +188,7 @@ function syncedCrud(props) {
     const { value, changes, update, retryAsCreate, node } = params;
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
+    const updateFullValues = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
     const changesById = /* @__PURE__ */ new Map();
     const getUpdateValue = (itemValue, prev) => {
@@ -191,6 +203,7 @@ function syncedCrud(props) {
       ) : itemValue;
     };
     changes.forEach((change) => {
+      var _a, _b;
       const { path, prevAtPath, valueAtPath, pathTypes } = change;
       if (asType === "value") {
         if (value) {
@@ -213,6 +226,7 @@ function syncedCrud(props) {
             } else if (path.length === 0) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
+                updateFullValues.set(id, valueAtPath);
               } else if (prevAtPath) {
                 deletes.add(prevAtPath);
               }
@@ -224,6 +238,7 @@ function syncedCrud(props) {
                 true
               );
               updates.set(id, getUpdateValue(value, previous));
+              updateFullValues.set(id, value);
             }
           } else {
             console.error("[legend-state]: added synced item without an id");
@@ -235,17 +250,30 @@ function syncedCrud(props) {
       } else {
         let itemsChanged = [];
         if (path.length === 0) {
-          const changed = asMap ? Array.from(valueAtPath.entries()) : Object.entries(valueAtPath);
-          for (let i = 0; i < changed.length; i++) {
-            const [key, value2] = changed[i];
-            const prev = prevAtPath ? asMap ? prevAtPath.get(key) : prevAtPath[key] : void 0;
+          const valueAsObject = asArray ? arrayToRecord(valueAtPath, fieldId) : valueAtPath;
+          const prevAsObject = asArray ? arrayToRecord(prevAtPath, fieldId) : prevAtPath;
+          const keys = getKeys(valueAsObject, false, asMap, false);
+          const keysPrev = getKeys(prevAsObject, false, asMap, false);
+          const keysSet = new Set(keys);
+          const length = ((_a = keys || valueAsObject) == null ? void 0 : _a.length) || 0;
+          const lengthPrev = ((_b = keysPrev || prevAsObject) == null ? void 0 : _b.length) || 0;
+          for (let i = 0; i < lengthPrev; i++) {
+            const key = keysPrev[i];
+            if (!keysSet.has(key)) {
+              deletes.add(prevAsObject[key]);
+            }
+          }
+          for (let i = 0; i < length; i++) {
+            const key = keys[i];
+            const value2 = asMap ? valueAsObject.get(key) : valueAsObject[key];
+            const prev = prevAsObject ? asMap ? prevAsObject.get(key) : prevAsObject[key] : void 0;
             if (isNullOrUndefined(value2) && !isNullOrUndefined(prev)) {
               deletes.add(prev);
               return false;
             } else {
-              const isDiff = !prevAtPath || !deepEqual(value2, prev);
+              const isDiff = !prevAsObject || !deepEqual(value2, prev);
               if (isDiff) {
-                itemsChanged.push([getUpdateValue(value2, prev), prev]);
+                itemsChanged.push([getUpdateValue(value2, prev), prev, value2]);
               }
             }
           }
@@ -264,10 +292,10 @@ function syncedCrud(props) {
               pathTypes.slice(1),
               prevAtPath
             );
-            itemsChanged = [[getUpdateValue(itemValue, previous), previous]];
+            itemsChanged = [[getUpdateValue(itemValue, previous), previous, itemValue]];
           }
         }
-        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
+        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev, fullValue]) => {
           const isCreate = !pendingCreates.has(item[fieldId]) && (fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : isNullOrUndefined(prev));
           if (isCreate) {
             if (generateId) {
@@ -289,6 +317,10 @@ function syncedCrud(props) {
               const id = item[fieldId];
               changesById.set(id, change);
               updates.set(id, updates.has(id) ? Object.assign(updates.get(id), item) : item);
+              updateFullValues.set(
+                id,
+                updateFullValues.has(id) ? Object.assign(updateFullValues.get(id), fullValue) : fullValue
+              );
             } else {
               console.warn("[legend-state] missing update function");
             }
@@ -375,7 +407,8 @@ function syncedCrud(props) {
       // Handle updates
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
         if (waitForSetParam) {
-          await waitForSet(waitForSetParam, changes, itemValue, { type: "update" });
+          const fullValue = updateFullValues.get(itemKey);
+          await waitForSet(waitForSetParam, changes, fullValue, { type: "update" });
         }
         const changed = await transformOut(itemValue, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {