@legendapp/state 3.0.0-alpha.15 → 3.0.0-alpha.16

package/index.d.mts

@@ -308,7 +308,7 @@ declare function opaqueObject<T extends object>(value: T): OpaqueObject<T>;
 declare function getValueAtPath(obj: Record<string, any>, path: string[]): any;
 declare function setAtPath<T extends object>(obj: T, path: string[], pathTypes: TypeAtPath[], value: any, mode?: 'set' | 'merge', fullObj?: T, restore?: (path: string[], value: any) => void): T;
 declare function setInObservableAtPath(value$: ObservableParam, path: string[], pathTypes: TypeAtPath[], value: any, mode: 'assign' | 'set' | 'merge'): void;
-declare function mergeIntoObservable<T extends ObservableParam<Record<string, any>> | object>(target: T, ...sources: any[]): T;
+declare function mergeIntoObservable<T extends ObservableParam<any>>(target: T, ...sources: any[]): T;
 declare function constructObjectWithPath(path: string[], pathTypes: TypeAtPath[], value: any): object;
 declare function deconstructObjectWithPath(path: string[], pathTypes: TypeAtPath[], value: any): object;
 declare function isObservableValueReady(value: any): boolean;
@@ -316,6 +316,7 @@ declare function setSilently(value$: ObservableParam, newValue: any): any;
 declare function initializePathType(pathType: TypeAtPath): any;
 declare function applyChange<T extends object>(value: T, change: Change, applyPrevious?: boolean): T;
 declare function applyChanges<T extends object>(value: T, changes: Change[], applyPrevious?: boolean): T;
+declare function deepMerge<T extends object>(target: T, ...sources: any[]): T;
 
 declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;
@@ -375,6 +376,7 @@ declare function runWithRetry<T>(state: {
 declare const internal: {
     createPreviousHandler: typeof createPreviousHandler;
     clone: typeof clone;
+    deepMerge: typeof deepMerge;
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
     get: typeof get;

package/index.d.ts

@@ -308,7 +308,7 @@ declare function opaqueObject<T extends object>(value: T): OpaqueObject<T>;
 declare function getValueAtPath(obj: Record<string, any>, path: string[]): any;
 declare function setAtPath<T extends object>(obj: T, path: string[], pathTypes: TypeAtPath[], value: any, mode?: 'set' | 'merge', fullObj?: T, restore?: (path: string[], value: any) => void): T;
 declare function setInObservableAtPath(value$: ObservableParam, path: string[], pathTypes: TypeAtPath[], value: any, mode: 'assign' | 'set' | 'merge'): void;
-declare function mergeIntoObservable<T extends ObservableParam<Record<string, any>> | object>(target: T, ...sources: any[]): T;
+declare function mergeIntoObservable<T extends ObservableParam<any>>(target: T, ...sources: any[]): T;
 declare function constructObjectWithPath(path: string[], pathTypes: TypeAtPath[], value: any): object;
 declare function deconstructObjectWithPath(path: string[], pathTypes: TypeAtPath[], value: any): object;
 declare function isObservableValueReady(value: any): boolean;
@@ -316,6 +316,7 @@ declare function setSilently(value$: ObservableParam, newValue: any): any;
 declare function initializePathType(pathType: TypeAtPath): any;
 declare function applyChange<T extends object>(value: T, change: Change, applyPrevious?: boolean): T;
 declare function applyChanges<T extends object>(value: T, changes: Change[], applyPrevious?: boolean): T;
+declare function deepMerge<T extends object>(target: T, ...sources: any[]): T;
 
 declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;
@@ -375,6 +376,7 @@ declare function runWithRetry<T>(state: {
 declare const internal: {
     createPreviousHandler: typeof createPreviousHandler;
     clone: typeof clone;
+    deepMerge: typeof deepMerge;
     ensureNodeValue: typeof ensureNodeValue;
     findIDKey: typeof findIDKey;
     get: typeof get;

package/index.js

@@ -33,6 +33,9 @@ function isPromise(obj) {
 function isMap(obj) {
   return obj instanceof Map;
 }
+function isSet(obj) {
+  return obj instanceof Set;
+}
 function isNumber(obj) {
   const n = obj;
   return n - n < 1;
@@ -42,6 +45,8 @@ function isEmpty(obj) {
     return false;
   if (isArray(obj))
     return obj.length === 0;
+  if (isMap(obj) || isSet(obj))
+    return obj.size === 0;
   for (const key in obj) {
     if (hasOwnProperty.call(obj, key)) {
       return false;
@@ -305,13 +310,13 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   }
   if (p === void 0) {
     if (mode === "merge") {
-      obj = _mergeIntoObservable(obj, value);
+      obj = deepMerge(obj, value, false, 0);
     } else {
       obj = value;
     }
   } else {
     if (mode === "merge") {
-      o[p] = _mergeIntoObservable(o[p], value);
+      o[p] = deepMerge(o[p], value, false, 0);
     } else if (isMap(o)) {
       o.set(p, value);
     } else {
@@ -342,56 +347,58 @@ function setInObservableAtPath(value$, path, pathTypes, value, mode) {
   }
 }
 function mergeIntoObservable(target, ...sources) {
+  if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+    if (!isObservable(target)) {
+      console.error("[legend-state] should only use mergeIntoObservable with observables");
+    }
+  }
   beginBatch();
   for (let i = 0; i < sources.length; i++) {
-    target = _mergeIntoObservable(
+    _mergeIntoObservable(
       target,
       sources[i],
       /*assign*/
-      i < sources.length - 1
+      i < sources.length - 1,
+      0
     );
   }
   endBatch();
   return target;
 }
-function _mergeIntoObservable(target, source, assign2) {
-  var _a;
+function _mergeIntoObservable(target, source, assign2, levelsDeep) {
   if (isObservable(source)) {
     source = source.peek();
   }
-  const needsSet = isObservable(target);
-  const targetValue = needsSet ? target.peek() : target;
+  const targetValue = target.peek();
   const isTargetArr = isArray(targetValue);
   const isTargetObj = !isTargetArr && isObject(targetValue);
-  if (isTargetObj && isObject(source) && !isEmpty(targetValue) || isTargetArr && targetValue.length > 0) {
-    const keys = Object.keys(source);
+  const isSourceMap = isMap(source);
+  const isSourceSet = isSet(source);
+  if (isSourceSet && isSet(targetValue)) {
+    target.set(/* @__PURE__ */ new Set([...source, ...targetValue]));
+  } else if (isTargetObj && isObject(source) && !isEmpty(targetValue) || isTargetArr && targetValue.length > 0) {
+    const keys = isSourceMap || isSourceSet ? Array.from(source.keys()) : Object.keys(source);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
-      const sourceValue = source[key];
+      const sourceValue = isSourceSet ? key : isSourceMap ? source.get(key) : source[key];
       if (sourceValue === symbolDelete) {
-        needsSet && ((_a = target[key]) == null ? void 0 : _a.delete) ? target[key].delete() : delete target[key];
+        target[key].delete();
       } else {
         const isObj = isObject(sourceValue);
         const isArr = !isObj && isArray(sourceValue);
         const targetChild = target[key];
-        if ((isObj || isArr) && targetChild && (needsSet || !isEmpty(targetChild))) {
-          if (!needsSet && (!targetChild || (isObj ? !isObject(targetChild) : !isArray(targetChild)))) {
-            target[key] = assign2 ? isArr ? [...sourceValue] : { ...sourceValue } : sourceValue;
-          } else {
-            _mergeIntoObservable(targetChild, sourceValue);
-          }
-        } else {
-          if (needsSet) {
+        if ((isObj || isArr) && targetChild) {
+          if (levelsDeep > 0 && isEmpty(sourceValue)) {
             targetChild.set(sourceValue);
-          } else {
-            const toSet = isObservable(sourceValue) ? sourceValue : isObject(sourceValue) ? { ...sourceValue } : isArray(sourceValue) ? [...sourceValue] : sourceValue;
-            target[key] = toSet;
           }
+          _mergeIntoObservable(targetChild, sourceValue, false, levelsDeep + 1);
+        } else {
+          targetChild.set(sourceValue);
         }
       }
     }
   } else if (source !== void 0) {
-    needsSet ? target.set(source) : target = assign2 ? isArray(source) ? [...source] : { ...source } : source;
+    target.set(source);
   }
   return target;
 }
@@ -446,6 +453,25 @@ function applyChanges(value, changes, applyPrevious) {
   }
   return value;
 }
+function deepMerge(target, ...sources) {
+  const result = { ...target };
+  for (let i = 0; i < sources.length; i++) {
+    const obj2 = sources[i];
+    for (const key in obj2) {
+      if (hasOwnProperty.call(obj2, key)) {
+        if (obj2[key] instanceof Object && !isObservable(obj2[key]) && Object.keys(obj2[key]).length > 0) {
+          result[key] = deepMerge(
+            result[key] || (isArray(obj2[key]) ? [] : {}),
+            obj2[key]
+          );
+        } else {
+          result[key] = obj2[key];
+        }
+      }
+    }
+  }
+  return result;
+}
 
 // src/batching.ts
 var timeout;
@@ -2315,6 +2341,7 @@ function runWithRetry(state, fn) {
 var internal = {
   createPreviousHandler,
   clone,
+  deepMerge,
   ensureNodeValue,
   findIDKey,
   get,

package/index.mjs

@@ -31,6 +31,9 @@ function isPromise(obj) {
 function isMap(obj) {
   return obj instanceof Map;
 }
+function isSet(obj) {
+  return obj instanceof Set;
+}
 function isNumber(obj) {
   const n = obj;
   return n - n < 1;
@@ -40,6 +43,8 @@ function isEmpty(obj) {
     return false;
   if (isArray(obj))
     return obj.length === 0;
+  if (isMap(obj) || isSet(obj))
+    return obj.size === 0;
   for (const key in obj) {
     if (hasOwnProperty.call(obj, key)) {
       return false;
@@ -303,13 +308,13 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   }
   if (p === void 0) {
     if (mode === "merge") {
-      obj = _mergeIntoObservable(obj, value);
+      obj = deepMerge(obj, value, false, 0);
     } else {
       obj = value;
     }
   } else {
     if (mode === "merge") {
-      o[p] = _mergeIntoObservable(o[p], value);
+      o[p] = deepMerge(o[p], value, false, 0);
     } else if (isMap(o)) {
       o.set(p, value);
     } else {
@@ -340,56 +345,58 @@ function setInObservableAtPath(value$, path, pathTypes, value, mode) {
   }
 }
 function mergeIntoObservable(target, ...sources) {
+  if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+    if (!isObservable(target)) {
+      console.error("[legend-state] should only use mergeIntoObservable with observables");
+    }
+  }
   beginBatch();
   for (let i = 0; i < sources.length; i++) {
-    target = _mergeIntoObservable(
+    _mergeIntoObservable(
       target,
       sources[i],
       /*assign*/
-      i < sources.length - 1
+      i < sources.length - 1,
+      0
     );
   }
   endBatch();
   return target;
 }
-function _mergeIntoObservable(target, source, assign2) {
-  var _a;
+function _mergeIntoObservable(target, source, assign2, levelsDeep) {
   if (isObservable(source)) {
     source = source.peek();
   }
-  const needsSet = isObservable(target);
-  const targetValue = needsSet ? target.peek() : target;
+  const targetValue = target.peek();
   const isTargetArr = isArray(targetValue);
   const isTargetObj = !isTargetArr && isObject(targetValue);
-  if (isTargetObj && isObject(source) && !isEmpty(targetValue) || isTargetArr && targetValue.length > 0) {
-    const keys = Object.keys(source);
+  const isSourceMap = isMap(source);
+  const isSourceSet = isSet(source);
+  if (isSourceSet && isSet(targetValue)) {
+    target.set(/* @__PURE__ */ new Set([...source, ...targetValue]));
+  } else if (isTargetObj && isObject(source) && !isEmpty(targetValue) || isTargetArr && targetValue.length > 0) {
+    const keys = isSourceMap || isSourceSet ? Array.from(source.keys()) : Object.keys(source);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
-      const sourceValue = source[key];
+      const sourceValue = isSourceSet ? key : isSourceMap ? source.get(key) : source[key];
       if (sourceValue === symbolDelete) {
-        needsSet && ((_a = target[key]) == null ? void 0 : _a.delete) ? target[key].delete() : delete target[key];
+        target[key].delete();
       } else {
         const isObj = isObject(sourceValue);
         const isArr = !isObj && isArray(sourceValue);
         const targetChild = target[key];
-        if ((isObj || isArr) && targetChild && (needsSet || !isEmpty(targetChild))) {
-          if (!needsSet && (!targetChild || (isObj ? !isObject(targetChild) : !isArray(targetChild)))) {
-            target[key] = assign2 ? isArr ? [...sourceValue] : { ...sourceValue } : sourceValue;
-          } else {
-            _mergeIntoObservable(targetChild, sourceValue);
-          }
-        } else {
-          if (needsSet) {
+        if ((isObj || isArr) && targetChild) {
+          if (levelsDeep > 0 && isEmpty(sourceValue)) {
             targetChild.set(sourceValue);
-          } else {
-            const toSet = isObservable(sourceValue) ? sourceValue : isObject(sourceValue) ? { ...sourceValue } : isArray(sourceValue) ? [...sourceValue] : sourceValue;
-            target[key] = toSet;
           }
+          _mergeIntoObservable(targetChild, sourceValue, false, levelsDeep + 1);
+        } else {
+          targetChild.set(sourceValue);
         }
       }
     }
   } else if (source !== void 0) {
-    needsSet ? target.set(source) : target = assign2 ? isArray(source) ? [...source] : { ...source } : source;
+    target.set(source);
   }
   return target;
 }
@@ -444,6 +451,25 @@ function applyChanges(value, changes, applyPrevious) {
   }
   return value;
 }
+function deepMerge(target, ...sources) {
+  const result = { ...target };
+  for (let i = 0; i < sources.length; i++) {
+    const obj2 = sources[i];
+    for (const key in obj2) {
+      if (hasOwnProperty.call(obj2, key)) {
+        if (obj2[key] instanceof Object && !isObservable(obj2[key]) && Object.keys(obj2[key]).length > 0) {
+          result[key] = deepMerge(
+            result[key] || (isArray(obj2[key]) ? [] : {}),
+            obj2[key]
+          );
+        } else {
+          result[key] = obj2[key];
+        }
+      }
+    }
+  }
+  return result;
+}
 
 // src/batching.ts
 var timeout;
@@ -2313,6 +2339,7 @@ function runWithRetry(state, fn) {
 var internal = {
   createPreviousHandler,
   clone,
+  deepMerge,
   ensureNodeValue,
   findIDKey,
   get,

package/package.json

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

package/sync-plugins/crud.js

@@ -123,11 +123,18 @@ function syncedCrud(props) {
     }
   } : void 0;
   const set = createFn || updateFn || deleteFn ? async (params) => {
-    const { value, changes, update, retryAsCreate, valuePrevious, node } = params;
+    const { value, changes, update, retryAsCreate, node } = params;
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
-    changes.forEach(({ path, prevAtPath, valueAtPath }) => {
+    const getUpdateValue = (itemValue, prev) => {
+      return updatePartial ? Object.assign(
+        sync.diffObjects(prev, itemValue),
+        itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
+      ) : itemValue;
+    };
+    changes.forEach((change) => {
+      const { path, prevAtPath, valueAtPath, pathTypes } = change;
       if (asType === "value") {
         if (value) {
           let id = value == null ? void 0 : value[fieldId];
@@ -140,12 +147,18 @@ function syncedCrud(props) {
               creates.set(id, value);
             } else if (path.length === 0) {
               if (valueAtPath) {
-                updates.set(id, valueAtPath);
+                updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
               } else if (prevAtPath) {
                 deletes.add(prevAtPath == null ? void 0 : prevAtPath.id);
               }
-            } else {
-              updates.set(id, Object.assign(updates.get(id) || { id }, value));
+            } else if (!updates.has(id)) {
+              const previous = state.applyChanges(
+                clone(value),
+                changes,
+                /*applyPrevious*/
+                true
+              );
+              updates.set(id, getUpdateValue(value, previous));
             }
           } else {
             console.error("[legend-state]: added synced item without an id");
@@ -154,13 +167,22 @@ function syncedCrud(props) {
           deletes.add(prevAtPath);
         }
       } else {
-        let itemsChanged = void 0;
+        let itemsChanged = [];
         if (path.length === 0) {
-          itemsChanged = (asMap ? Array.from(valueAtPath.entries()) : Object.entries(valueAtPath)).filter(([key, value2]) => {
+          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 = asMap ? prevAtPath.get(key) : prevAtPath[key];
-            const isDiff = !prevAtPath || !sync.deepEqual(value2, prev);
-            return isDiff;
-          });
+            if (state.isNullOrUndefined(value2) && !state.isNullOrUndefined(prev)) {
+              deletes.add(prev);
+              return false;
+            } else {
+              const isDiff = !prevAtPath || !sync.deepEqual(value2, prev);
+              if (isDiff) {
+                itemsChanged.push([getUpdateValue(value2, prev), prev]);
+              }
+            }
+          }
         } else {
           const itemKey = path[0];
           const itemValue = asMap ? value.get(itemKey) : value[itemKey];
@@ -169,36 +191,34 @@ function syncedCrud(props) {
               deletes.add(prevAtPath);
             }
           } else {
-            itemsChanged = [[itemKey, itemValue]];
+            const previous = state.setAtPath(
+              clone(itemValue),
+              path.slice(1),
+              pathTypes.slice(1),
+              prevAtPath
+            );
+            itemsChanged = [[getUpdateValue(itemValue, previous), previous]];
           }
         }
-        itemsChanged == null ? void 0 : itemsChanged.forEach(([itemKey, item]) => {
-          if (state.isNullOrUndefined(item)) {
-            const prev = valuePrevious[itemKey];
-            if (prev) {
-              deletes.add(prev);
+        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
+          const isCreate = 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) {
+              ensureId(item, fieldId, generateId);
+            }
+            if (!item.id) {
+              console.error("[legend-state]: added item without an id");
+            }
+            if (createFn) {
+              creates.set(item.id, item);
+            } else {
+              console.log("[legend-state] missing create function");
             }
           } else {
-            const prev = asMap ? valuePrevious.get(itemKey) : valuePrevious[itemKey];
-            const isCreate = fieldCreatedAt ? !item[fieldCreatedAt] : fieldUpdatedAt ? !item[fieldUpdatedAt] : state.isNullOrUndefined(prev);
-            if (isCreate) {
-              if (generateId) {
-                ensureId(item, fieldId, generateId);
-              }
-              if (!item.id) {
-                console.error("[legend-state]: added item without an id");
-              }
-              if (createFn) {
-                creates.set(item.id, item);
-              } else {
-                console.log("[legend-state] missing create function");
-              }
+            if (updateFn) {
+              updates.set(item.id, item);
             } else {
-              if (updateFn) {
-                updates.set(item.id, item);
-              } else {
-                console.log("[legend-state] missing update function");
-              }
+              console.log("[legend-state] missing update function");
             }
           }
         });
@@ -256,10 +276,7 @@ function syncedCrud(props) {
         );
       }),
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
-        const toSave = updatePartial ? Object.assign(
-          sync.diffObjects(asType === "value" ? valuePrevious : valuePrevious[itemKey], itemValue),
-          itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
-        ) : itemValue;
+        const toSave = itemValue;
         const changed = await transformOut(toSave, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {
           return updateFn(changed, params).then(
@@ -267,11 +284,11 @@ function syncedCrud(props) {
           );
         }
       }),
-      ...Array.from(deletes).map((valuePrevious2) => {
+      ...Array.from(deletes).map((valuePrevious) => {
         if (deleteFn) {
-          deleteFn(valuePrevious2, params);
+          deleteFn(valuePrevious, params);
         } else if (fieldDeleted && updateFn) {
-          const valueId = valuePrevious2[fieldId];
+          const valueId = valuePrevious[fieldId];
           updateFn(
             { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
             params

package/sync-plugins/crud.mjs

@@ -1,4 +1,4 @@
-import { isPromise, isNullOrUndefined, isArray, isObservable, internal, getNodeValue } from '@legendapp/state';
+import { isPromise, applyChanges, isNullOrUndefined, setAtPath, isArray, internal, isObservable, getNodeValue } from '@legendapp/state';
 import { synced, deepEqual, diffObjects } from '@legendapp/state/sync';
 
 // src/sync-plugins/crud.ts
@@ -121,11 +121,18 @@ function syncedCrud(props) {
     }
   } : void 0;
   const set = createFn || updateFn || deleteFn ? async (params) => {
-    const { value, changes, update, retryAsCreate, valuePrevious, node } = params;
+    const { value, changes, update, retryAsCreate, node } = params;
     const creates = /* @__PURE__ */ new Map();
     const updates = /* @__PURE__ */ new Map();
     const deletes = /* @__PURE__ */ new Set();
-    changes.forEach(({ path, prevAtPath, valueAtPath }) => {
+    const getUpdateValue = (itemValue, prev) => {
+      return updatePartial ? Object.assign(
+        diffObjects(prev, itemValue),
+        itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
+      ) : itemValue;
+    };
+    changes.forEach((change) => {
+      const { path, prevAtPath, valueAtPath, pathTypes } = change;
       if (asType === "value") {
         if (value) {
           let id = value == null ? void 0 : value[fieldId];
@@ -138,12 +145,18 @@ function syncedCrud(props) {
               creates.set(id, value);
             } else if (path.length === 0) {
               if (valueAtPath) {
-                updates.set(id, valueAtPath);
+                updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
               } else if (prevAtPath) {
                 deletes.add(prevAtPath == null ? void 0 : prevAtPath.id);
               }
-            } else {
-              updates.set(id, Object.assign(updates.get(id) || { id }, value));
+            } else if (!updates.has(id)) {
+              const previous = applyChanges(
+                clone(value),
+                changes,
+                /*applyPrevious*/
+                true
+              );
+              updates.set(id, getUpdateValue(value, previous));
             }
           } else {
             console.error("[legend-state]: added synced item without an id");
@@ -152,13 +165,22 @@ function syncedCrud(props) {
           deletes.add(prevAtPath);
         }
       } else {
-        let itemsChanged = void 0;
+        let itemsChanged = [];
         if (path.length === 0) {
-          itemsChanged = (asMap ? Array.from(valueAtPath.entries()) : Object.entries(valueAtPath)).filter(([key, value2]) => {
+          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 = asMap ? prevAtPath.get(key) : prevAtPath[key];
-            const isDiff = !prevAtPath || !deepEqual(value2, prev);
-            return isDiff;
-          });
+            if (isNullOrUndefined(value2) && !isNullOrUndefined(prev)) {
+              deletes.add(prev);
+              return false;
+            } else {
+              const isDiff = !prevAtPath || !deepEqual(value2, prev);
+              if (isDiff) {
+                itemsChanged.push([getUpdateValue(value2, prev), prev]);
+              }
+            }
+          }
         } else {
           const itemKey = path[0];
           const itemValue = asMap ? value.get(itemKey) : value[itemKey];
@@ -167,36 +189,34 @@ function syncedCrud(props) {
               deletes.add(prevAtPath);
             }
           } else {
-            itemsChanged = [[itemKey, itemValue]];
+            const previous = setAtPath(
+              clone(itemValue),
+              path.slice(1),
+              pathTypes.slice(1),
+              prevAtPath
+            );
+            itemsChanged = [[getUpdateValue(itemValue, previous), previous]];
           }
         }
-        itemsChanged == null ? void 0 : itemsChanged.forEach(([itemKey, item]) => {
-          if (isNullOrUndefined(item)) {
-            const prev = valuePrevious[itemKey];
-            if (prev) {
-              deletes.add(prev);
+        itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
+          const isCreate = fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : isNullOrUndefined(prev);
+          if (isCreate) {
+            if (generateId) {
+              ensureId(item, fieldId, generateId);
+            }
+            if (!item.id) {
+              console.error("[legend-state]: added item without an id");
+            }
+            if (createFn) {
+              creates.set(item.id, item);
+            } else {
+              console.log("[legend-state] missing create function");
             }
           } else {
-            const prev = asMap ? valuePrevious.get(itemKey) : valuePrevious[itemKey];
-            const isCreate = fieldCreatedAt ? !item[fieldCreatedAt] : fieldUpdatedAt ? !item[fieldUpdatedAt] : isNullOrUndefined(prev);
-            if (isCreate) {
-              if (generateId) {
-                ensureId(item, fieldId, generateId);
-              }
-              if (!item.id) {
-                console.error("[legend-state]: added item without an id");
-              }
-              if (createFn) {
-                creates.set(item.id, item);
-              } else {
-                console.log("[legend-state] missing create function");
-              }
+            if (updateFn) {
+              updates.set(item.id, item);
             } else {
-              if (updateFn) {
-                updates.set(item.id, item);
-              } else {
-                console.log("[legend-state] missing update function");
-              }
+              console.log("[legend-state] missing update function");
             }
           }
         });
@@ -254,10 +274,7 @@ function syncedCrud(props) {
         );
       }),
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
-        const toSave = updatePartial ? Object.assign(
-          diffObjects(asType === "value" ? valuePrevious : valuePrevious[itemKey], itemValue),
-          itemValue[fieldId] ? { [fieldId]: itemValue[fieldId] } : {}
-        ) : itemValue;
+        const toSave = itemValue;
         const changed = await transformOut(toSave, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {
           return updateFn(changed, params).then(
@@ -265,11 +282,11 @@ function syncedCrud(props) {
           );
         }
       }),
-      ...Array.from(deletes).map((valuePrevious2) => {
+      ...Array.from(deletes).map((valuePrevious) => {
         if (deleteFn) {
-          deleteFn(valuePrevious2, params);
+          deleteFn(valuePrevious, params);
         } else if (fieldDeleted && updateFn) {
-          const valueId = valuePrevious2[fieldId];
+          const valueId = valuePrevious[fieldId];
           updateFn(
             { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
             params

package/sync-plugins/keel.js

@@ -216,7 +216,7 @@ function syncedKeel(props) {
   const create = createParam ? async (input, params) => {
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
-      handleSetError(error, params, "create");
+      await handleSetError(error, params, "create");
     }
     return data;
   } : void 0;
@@ -229,7 +229,7 @@ function syncedKeel(props) {
     if (!state.isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {
-        handleSetError(error, params, "update");
+        await handleSetError(error, params, "update");
       }
       return data;
     }
@@ -237,7 +237,7 @@ function syncedKeel(props) {
   const deleteFn = deleteParam ? async (value, params) => {
     const { data, error } = await deleteParam({ id: value.id });
     if (error) {
-      handleSetError(error, params, "delete");
+      await handleSetError(error, params, "delete");
     }
     return data;
   } : void 0;

package/sync-plugins/keel.mjs

@@ -210,7 +210,7 @@ function syncedKeel(props) {
   const create = createParam ? async (input, params) => {
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
-      handleSetError(error, params, "create");
+      await handleSetError(error, params, "create");
     }
     return data;
   } : void 0;
@@ -223,7 +223,7 @@ function syncedKeel(props) {
     if (!isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {
-        handleSetError(error, params, "update");
+        await handleSetError(error, params, "update");
       }
       return data;
     }
@@ -231,7 +231,7 @@ function syncedKeel(props) {
   const deleteFn = deleteParam ? async (value, params) => {
     const { data, error } = await deleteParam({ id: value.id });
     if (error) {
-      handleSetError(error, params, "delete");
+      await handleSetError(error, params, "delete");
     }
     return data;
   } : void 0;

package/sync.d.mts

@@ -32,7 +32,6 @@ interface SyncedGetParams<T> extends SyncedGetSetSubscribeBaseParams<T> {
     options: SyncedOptions;
 }
 interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetSubscribeBaseParams<T> {
-    valuePrevious: T;
     update: UpdateFn<T>;
     cancelRetry: () => void;
     retryNum: number;
@@ -108,7 +107,6 @@ interface ObservableSyncSetParams<T> {
     options: SyncedOptions<T>;
     changes: Change[];
     value: T;
-    valuePrevious: T;
 }
 interface ObservableSyncFunctions<T = any> {
     get?(params: SyncedGetParams<T>): T | Promise<T>;

package/sync.d.ts

@@ -32,7 +32,6 @@ interface SyncedGetParams<T> extends SyncedGetSetSubscribeBaseParams<T> {
     options: SyncedOptions;
 }
 interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetSubscribeBaseParams<T> {
-    valuePrevious: T;
     update: UpdateFn<T>;
     cancelRetry: () => void;
     retryNum: number;
@@ -108,7 +107,6 @@ interface ObservableSyncSetParams<T> {
     options: SyncedOptions<T>;
     changes: Change[];
     value: T;
-    valuePrevious: T;
 }
 interface ObservableSyncFunctions<T = any> {
     get?(params: SyncedGetParams<T>): T | Promise<T>;

package/sync.js

@@ -137,7 +137,17 @@ function transformStringifyDates(...args) {
     }
   };
 }
-var { clone, getNode, getNodeValue, getValueAtPath, globalState, runWithRetry, symbolLinked, createPreviousHandler } = state.internal;
+var {
+  clone,
+  deepMerge,
+  getNode,
+  getNodeValue,
+  getValueAtPath,
+  globalState,
+  runWithRetry,
+  symbolLinked,
+  createPreviousHandler
+} = state.internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
@@ -247,7 +257,6 @@ function mergeQueuedChanges(allChanges) {
     if (!previousByOptions.has(syncOptions)) {
       previousByOptions.set(syncOptions, getPrevious());
     }
-    value.valuePrevious = previousByOptions.get(syncOptions);
     targetMap.set(syncOptions, value);
   }
   return Array.from(outRemote.values()).concat(Array.from(outLocal.values()));
@@ -360,8 +369,7 @@ async function prepChangeRemote(queuedChange) {
     localState,
     syncOptions,
     inRemoteChange,
-    isApplyingPending,
-    valuePrevious
+    isApplyingPending
   } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
@@ -437,8 +445,7 @@ async function prepChangeRemote(queuedChange) {
                 pathTypes,
                 prevAtPath,
                 valueAtPath: valueTransformed,
-                pathStr,
-                valuePrevious
+                pathStr
               });
             })
           );
@@ -485,7 +492,7 @@ async function doChangeRemote(changeInfo) {
   if (!changeInfo)
     return;
   const { queuedChange, changesRemote } = changeInfo;
-  const { value$: obs$, syncState: syncState2, localState, syncOptions, valuePrevious: previous } = queuedChange;
+  const { value$: obs$, syncState: syncState2, localState, syncOptions } = queuedChange;
   const { pluginPersist } = localState;
   const node = getNode(obs$);
   const state$ = node.state;
@@ -505,11 +512,6 @@ async function doChangeRemote(changeInfo) {
           if (!state.isNullOrUndefined(pendingAtPath)) {
             const { p } = pendingAtPath;
             change.prevAtPath = p;
-            if (key) {
-              state.setAtPath(change.valuePrevious, change.path, change.pathTypes, p, "set");
-            } else {
-              change.valuePrevious = p;
-            }
           }
         });
       }
@@ -539,14 +541,13 @@ async function doChangeRemote(changeInfo) {
       value$: obs$,
       changes: changesRemote,
       value,
-      valuePrevious: previous,
       onError,
       update: (params) => {
         if (updateResult) {
           const { value: value2, lastSync, mode } = params;
           updateResult = {
             lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
-            value: state.mergeIntoObservable(updateResult.value, value2),
+            value: deepMerge(updateResult.value, value2),
             mode
           };
         } else {
@@ -703,25 +704,6 @@ async function loadLocal(value$, syncOptions, syncState$, localState) {
   }
   syncState$.isPersistLoaded.set(!(syncStateValue.numPendingLocalLoads > 0));
 }
-function deepMerge(target, ...sources) {
-  const result = { ...target };
-  for (let i = 0; i < sources.length; i++) {
-    const obj2 = sources[i];
-    for (const key in obj2) {
-      if (state.hasOwnProperty.call(obj2, key)) {
-        if (obj2[key] instanceof Object && !state.isObservable(obj2[key]) && Object.keys(obj2[key]).length > 0) {
-          result[key] = deepMerge(
-            result[key] || (state.isArray(obj2[key]) ? [] : {}),
-            obj2[key]
-          );
-        } else {
-          result[key] = obj2[key];
-        }
-      }
-    }
-  }
-  return result;
-}
 function syncObservable(obs$, syncOptionsOrSynced) {
   let syncOptions = syncOptionsOrSynced;
   if (state.isFunction(syncOptions)) {

package/sync.mjs

@@ -1,4 +1,4 @@
-import { isObject, isDate, isNullOrUndefined, isString, endBatch, beginBatch, isFunction, syncState, when, linked, internal, observable, isPromise, mergeIntoObservable, hasOwnProperty, isObservable, isArray, isEmpty, whenReady, shouldIgnoreUnobserved, constructObjectWithPath, setAtPath } from '@legendapp/state';
+import { isObject, isDate, isNullOrUndefined, isString, endBatch, beginBatch, isFunction, syncState, when, linked, internal, observable, isPromise, mergeIntoObservable, isEmpty, whenReady, shouldIgnoreUnobserved, constructObjectWithPath, setAtPath, isArray } from '@legendapp/state';
 
 // src/sync/configureObservableSync.ts
 var observableSyncConfiguration = {};
@@ -135,7 +135,17 @@ function transformStringifyDates(...args) {
     }
   };
 }
-var { clone, getNode, getNodeValue, getValueAtPath, globalState, runWithRetry, symbolLinked, createPreviousHandler } = internal;
+var {
+  clone,
+  deepMerge,
+  getNode,
+  getNodeValue,
+  getValueAtPath,
+  globalState,
+  runWithRetry,
+  symbolLinked,
+  createPreviousHandler
+} = internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
@@ -245,7 +255,6 @@ function mergeQueuedChanges(allChanges) {
     if (!previousByOptions.has(syncOptions)) {
       previousByOptions.set(syncOptions, getPrevious());
     }
-    value.valuePrevious = previousByOptions.get(syncOptions);
     targetMap.set(syncOptions, value);
   }
   return Array.from(outRemote.values()).concat(Array.from(outLocal.values()));
@@ -358,8 +367,7 @@ async function prepChangeRemote(queuedChange) {
     localState,
     syncOptions,
     inRemoteChange,
-    isApplyingPending,
-    valuePrevious
+    isApplyingPending
   } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
@@ -435,8 +443,7 @@ async function prepChangeRemote(queuedChange) {
                 pathTypes,
                 prevAtPath,
                 valueAtPath: valueTransformed,
-                pathStr,
-                valuePrevious
+                pathStr
               });
             })
           );
@@ -483,7 +490,7 @@ async function doChangeRemote(changeInfo) {
   if (!changeInfo)
     return;
   const { queuedChange, changesRemote } = changeInfo;
-  const { value$: obs$, syncState: syncState2, localState, syncOptions, valuePrevious: previous } = queuedChange;
+  const { value$: obs$, syncState: syncState2, localState, syncOptions } = queuedChange;
   const { pluginPersist } = localState;
   const node = getNode(obs$);
   const state$ = node.state;
@@ -503,11 +510,6 @@ async function doChangeRemote(changeInfo) {
           if (!isNullOrUndefined(pendingAtPath)) {
             const { p } = pendingAtPath;
             change.prevAtPath = p;
-            if (key) {
-              setAtPath(change.valuePrevious, change.path, change.pathTypes, p, "set");
-            } else {
-              change.valuePrevious = p;
-            }
           }
         });
       }
@@ -537,14 +539,13 @@ async function doChangeRemote(changeInfo) {
       value$: obs$,
       changes: changesRemote,
       value,
-      valuePrevious: previous,
       onError,
       update: (params) => {
         if (updateResult) {
           const { value: value2, lastSync, mode } = params;
           updateResult = {
             lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
-            value: mergeIntoObservable(updateResult.value, value2),
+            value: deepMerge(updateResult.value, value2),
             mode
           };
         } else {
@@ -701,25 +702,6 @@ async function loadLocal(value$, syncOptions, syncState$, localState) {
   }
   syncState$.isPersistLoaded.set(!(syncStateValue.numPendingLocalLoads > 0));
 }
-function deepMerge(target, ...sources) {
-  const result = { ...target };
-  for (let i = 0; i < sources.length; i++) {
-    const obj2 = sources[i];
-    for (const key in obj2) {
-      if (hasOwnProperty.call(obj2, key)) {
-        if (obj2[key] instanceof Object && !isObservable(obj2[key]) && Object.keys(obj2[key]).length > 0) {
-          result[key] = deepMerge(
-            result[key] || (isArray(obj2[key]) ? [] : {}),
-            obj2[key]
-          );
-        } else {
-          result[key] = obj2[key];
-        }
-      }
-    }
-  }
-  return result;
-}
 function syncObservable(obs$, syncOptionsOrSynced) {
   let syncOptions = syncOptionsOrSynced;
   if (isFunction(syncOptions)) {