@legendapp/state 3.0.0-beta.16 → 3.0.0-beta.17

package/package.json

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

package/sync-plugins/crud.js

@@ -25,12 +25,7 @@ function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
   }
   return newLastSync;
 }
-var queuedRetries = {
-  create: /* @__PURE__ */ new Map(),
-  update: /* @__PURE__ */ new Map(),
-  delete: /* @__PURE__ */ new Map()
-};
-function retrySet(params, retry, action, itemKey, itemValue, change, actionFn, saveResult) {
+function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetries, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
       queuedRetries.create.delete(itemKey);
@@ -84,6 +79,11 @@ function syncedCrud(props) {
   } = props;
   const fieldId = fieldIdProp || "id";
   const pendingCreates = /* @__PURE__ */ new Set();
+  const queuedRetries = {
+    create: /* @__PURE__ */ new Map(),
+    update: /* @__PURE__ */ new Map(),
+    delete: /* @__PURE__ */ new Map()
+  };
   let asType = props.as;
   if (!asType) {
     asType = getFn ? "value" : "object";
@@ -367,6 +367,7 @@ function syncedCrud(props) {
           itemKey,
           createObj,
           changesById.get(itemKey),
+          queuedRetries,
           createFn,
           saveResult
         ).then(() => {
@@ -387,6 +388,7 @@ function syncedCrud(props) {
             itemKey,
             changed,
             changesById.get(itemKey),
+            queuedRetries,
             updateFn,
             saveResult
           );
@@ -410,6 +412,7 @@ function syncedCrud(props) {
             itemKey,
             valuePrevious,
             changesById.get(itemKey),
+            queuedRetries,
             deleteFn,
             saveResult
           );
@@ -422,6 +425,7 @@ function syncedCrud(props) {
             itemKey,
             { [fieldId]: itemKey, [fieldDeleted]: true },
             changesById.get(itemKey),
+            queuedRetries,
             updateFn,
             saveResult
           );

package/sync-plugins/crud.mjs

@@ -23,12 +23,7 @@ function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
   }
   return newLastSync;
 }
-var queuedRetries = {
-  create: /* @__PURE__ */ new Map(),
-  update: /* @__PURE__ */ new Map(),
-  delete: /* @__PURE__ */ new Map()
-};
-function retrySet(params, retry, action, itemKey, itemValue, change, actionFn, saveResult) {
+function retrySet(params, retry, action, itemKey, itemValue, change, queuedRetries, actionFn, saveResult) {
   if (action === "delete") {
     if (queuedRetries.create.has(itemKey)) {
       queuedRetries.create.delete(itemKey);
@@ -82,6 +77,11 @@ function syncedCrud(props) {
   } = props;
   const fieldId = fieldIdProp || "id";
   const pendingCreates = /* @__PURE__ */ new Set();
+  const queuedRetries = {
+    create: /* @__PURE__ */ new Map(),
+    update: /* @__PURE__ */ new Map(),
+    delete: /* @__PURE__ */ new Map()
+  };
   let asType = props.as;
   if (!asType) {
     asType = getFn ? "value" : "object";
@@ -365,6 +365,7 @@ function syncedCrud(props) {
           itemKey,
           createObj,
           changesById.get(itemKey),
+          queuedRetries,
           createFn,
           saveResult
         ).then(() => {
@@ -385,6 +386,7 @@ function syncedCrud(props) {
             itemKey,
             changed,
             changesById.get(itemKey),
+            queuedRetries,
             updateFn,
             saveResult
           );
@@ -408,6 +410,7 @@ function syncedCrud(props) {
             itemKey,
             valuePrevious,
             changesById.get(itemKey),
+            queuedRetries,
             deleteFn,
             saveResult
           );
@@ -420,6 +423,7 @@ function syncedCrud(props) {
             itemKey,
             { [fieldId]: itemKey, [fieldDeleted]: true },
             changesById.get(itemKey),
+            queuedRetries,
             updateFn,
             saveResult
           );

package/sync-plugins/keel.d.mts

@@ -13,7 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
-    error?: Error;
+    error?: unknown;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {

package/sync-plugins/keel.d.ts

@@ -13,7 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
-    error?: Error;
+    error?: unknown;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {

package/sync.js

@@ -36,12 +36,12 @@ function diffObjects(obj1, obj2, deep = false) {
   return diff;
 }
 function deepEqual(a, b, ignoreFields, nullVsUndefined) {
-  if (a === b) {
+  if (a === b)
     return true;
-  }
-  if (state.isNullOrUndefined(a) !== state.isNullOrUndefined(b)) {
+  if (state.isNullOrUndefined(a) !== state.isNullOrUndefined(b))
     return false;
-  }
+  if (!state.isObject(a) || !state.isObject(b))
+    return a === b;
   if (nullVsUndefined) {
     a = removeNullUndefined(
       a,
@@ -54,8 +54,18 @@ function deepEqual(a, b, ignoreFields, nullVsUndefined) {
       true
     );
   }
-  const replacer = ignoreFields ? (key, value) => ignoreFields.includes(key) ? void 0 : value : void 0;
-  return JSON.stringify(a, replacer) === JSON.stringify(b, replacer);
+  const keysA = Object.keys(a).filter((key) => !(ignoreFields == null ? void 0 : ignoreFields.includes(key)));
+  const keysB = Object.keys(b).filter((key) => !(ignoreFields == null ? void 0 : ignoreFields.includes(key)));
+  if (keysA.length !== keysB.length)
+    return false;
+  return keysA.every((key) => {
+    if (!Object.prototype.hasOwnProperty.call(b, key))
+      return false;
+    if (state.isDate(a[key]) && state.isDate(b[key])) {
+      return a[key].getTime() === b[key].getTime();
+    }
+    return deepEqual(a[key], b[key], ignoreFields, nullVsUndefined);
+  });
 }
 function combineTransforms(...transforms) {
   return {
@@ -309,8 +319,25 @@ function mergeChanges(changes) {
         existing.valueAtPath = change.valueAtPath;
       }
     } else {
-      changesByPath.set(pathStr, change);
-      changesOut.push(change);
+      let found = false;
+      for (let u = 0; u < change.path.length; u++) {
+        const path = change.path.slice(0, u).join("/");
+        if (changesByPath.has(path)) {
+          const remaining = change.path.slice(u);
+          state.setAtPath(
+            changesByPath.get(path).valueAtPath,
+            remaining,
+            change.pathTypes.slice(u),
+            change.valueAtPath
+          );
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        changesByPath.set(pathStr, change);
+        changesOut.push(change);
+      }
     }
   }
   return changesOut;
@@ -860,27 +887,33 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   syncState$.isLoaded.set(!syncState$.numPendingRemoteLoads.peek());
   let isSynced = false;
   let isSubscribed = false;
+  let isApplyingPendingAfterSync = false;
   let unsubscribe = void 0;
   const applyPending = (pending) => {
     if (pending && !state.isEmpty(pending)) {
-      localState.isApplyingPending = true;
       const keys = Object.keys(pending);
+      const value = getNodeValue(node);
       const changes = [];
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         const path = key.split("/").filter((p2) => p2 !== "");
-        const { p, v, t } = pending[key];
-        changes.push({ path, valueAtPath: v, prevAtPath: p, pathTypes: t });
+        const { p, t, v } = pending[key];
+        const valueAtPath = getValueAtPath(value, path);
+        if (isApplyingPendingAfterSync || !deepEqual(valueAtPath, v)) {
+          changes.push({ path, valueAtPath: v, prevAtPath: p, pathTypes: t });
+        }
+      }
+      if (changes.length > 0) {
+        localState.isApplyingPending = true;
+        onObsChange(obs$, syncState$, localState, syncOptions, {
+          value,
+          isFromPersist: false,
+          isFromSync: false,
+          getPrevious: createPreviousHandler(value, changes),
+          changes
+        });
+        localState.isApplyingPending = false;
       }
-      const value = getNodeValue(node);
-      onObsChange(obs$, syncState$, localState, syncOptions, {
-        value,
-        isFromPersist: false,
-        isFromSync: false,
-        getPrevious: createPreviousHandler(value, changes),
-        changes
-      });
-      localState.isApplyingPending = false;
     }
   };
   const { get, subscribe } = syncOptions;
@@ -917,10 +950,10 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   const { v, t } = pending2[key];
                   if (t.length === 0 || !value) {
                     const oldValue = clone2(value);
-                    pending2[key].p = oldValue;
+                    pending2[key].p = key ? oldValue[key] : oldValue;
                     if (state.isObject(value) && state.isObject(v)) {
-                      Object.assign(value, v);
-                    } else {
+                      Object.assign(value, key ? { [key]: v } : v);
+                    } else if (!key) {
                       value = v;
                     }
                   } else if (value[p[0]] !== void 0) {
@@ -932,6 +965,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                     } else {
                       const oldValue = clone2(value);
                       pending2[key].p = getValueAtPath(oldValue, p);
+                      didChangeMetadata = true;
                       value = state.setAtPath(
                         value,
                         p,
@@ -952,7 +986,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   }
                 });
                 if (didChangeMetadata && syncOptions.persist) {
-                  updateMetadata(obs$, localState, syncState$, syncOptions, {
+                  updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
                     pending: pending2
                   });
                 }
@@ -1129,14 +1163,17 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       }
       if (!isSynced) {
         isSynced = true;
-        await state.when(syncState$.isLoaded);
+        isApplyingPendingAfterSync = true;
         applyPending(pending);
+        isApplyingPendingAfterSync = false;
       }
     };
     syncStateValue.sync = sync;
   } else {
     if (!isSynced) {
+      isApplyingPendingAfterSync = true;
       applyPending(localState.pendingChanges);
+      isApplyingPendingAfterSync = false;
     }
   }
   syncStateValue.reset = async () => {

package/sync.mjs

@@ -34,12 +34,12 @@ function diffObjects(obj1, obj2, deep = false) {
   return diff;
 }
 function deepEqual(a, b, ignoreFields, nullVsUndefined) {
-  if (a === b) {
+  if (a === b)
     return true;
-  }
-  if (isNullOrUndefined(a) !== isNullOrUndefined(b)) {
+  if (isNullOrUndefined(a) !== isNullOrUndefined(b))
     return false;
-  }
+  if (!isObject(a) || !isObject(b))
+    return a === b;
   if (nullVsUndefined) {
     a = removeNullUndefined(
       a,
@@ -52,8 +52,18 @@ function deepEqual(a, b, ignoreFields, nullVsUndefined) {
       true
     );
   }
-  const replacer = ignoreFields ? (key, value) => ignoreFields.includes(key) ? void 0 : value : void 0;
-  return JSON.stringify(a, replacer) === JSON.stringify(b, replacer);
+  const keysA = Object.keys(a).filter((key) => !(ignoreFields == null ? void 0 : ignoreFields.includes(key)));
+  const keysB = Object.keys(b).filter((key) => !(ignoreFields == null ? void 0 : ignoreFields.includes(key)));
+  if (keysA.length !== keysB.length)
+    return false;
+  return keysA.every((key) => {
+    if (!Object.prototype.hasOwnProperty.call(b, key))
+      return false;
+    if (isDate(a[key]) && isDate(b[key])) {
+      return a[key].getTime() === b[key].getTime();
+    }
+    return deepEqual(a[key], b[key], ignoreFields, nullVsUndefined);
+  });
 }
 function combineTransforms(...transforms) {
   return {
@@ -307,8 +317,25 @@ function mergeChanges(changes) {
         existing.valueAtPath = change.valueAtPath;
       }
     } else {
-      changesByPath.set(pathStr, change);
-      changesOut.push(change);
+      let found = false;
+      for (let u = 0; u < change.path.length; u++) {
+        const path = change.path.slice(0, u).join("/");
+        if (changesByPath.has(path)) {
+          const remaining = change.path.slice(u);
+          setAtPath(
+            changesByPath.get(path).valueAtPath,
+            remaining,
+            change.pathTypes.slice(u),
+            change.valueAtPath
+          );
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        changesByPath.set(pathStr, change);
+        changesOut.push(change);
+      }
     }
   }
   return changesOut;
@@ -858,27 +885,33 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   syncState$.isLoaded.set(!syncState$.numPendingRemoteLoads.peek());
   let isSynced = false;
   let isSubscribed = false;
+  let isApplyingPendingAfterSync = false;
   let unsubscribe = void 0;
   const applyPending = (pending) => {
     if (pending && !isEmpty(pending)) {
-      localState.isApplyingPending = true;
       const keys = Object.keys(pending);
+      const value = getNodeValue(node);
       const changes = [];
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         const path = key.split("/").filter((p2) => p2 !== "");
-        const { p, v, t } = pending[key];
-        changes.push({ path, valueAtPath: v, prevAtPath: p, pathTypes: t });
+        const { p, t, v } = pending[key];
+        const valueAtPath = getValueAtPath(value, path);
+        if (isApplyingPendingAfterSync || !deepEqual(valueAtPath, v)) {
+          changes.push({ path, valueAtPath: v, prevAtPath: p, pathTypes: t });
+        }
+      }
+      if (changes.length > 0) {
+        localState.isApplyingPending = true;
+        onObsChange(obs$, syncState$, localState, syncOptions, {
+          value,
+          isFromPersist: false,
+          isFromSync: false,
+          getPrevious: createPreviousHandler(value, changes),
+          changes
+        });
+        localState.isApplyingPending = false;
       }
-      const value = getNodeValue(node);
-      onObsChange(obs$, syncState$, localState, syncOptions, {
-        value,
-        isFromPersist: false,
-        isFromSync: false,
-        getPrevious: createPreviousHandler(value, changes),
-        changes
-      });
-      localState.isApplyingPending = false;
     }
   };
   const { get, subscribe } = syncOptions;
@@ -915,10 +948,10 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   const { v, t } = pending2[key];
                   if (t.length === 0 || !value) {
                     const oldValue = clone2(value);
-                    pending2[key].p = oldValue;
+                    pending2[key].p = key ? oldValue[key] : oldValue;
                     if (isObject(value) && isObject(v)) {
-                      Object.assign(value, v);
-                    } else {
+                      Object.assign(value, key ? { [key]: v } : v);
+                    } else if (!key) {
                       value = v;
                     }
                   } else if (value[p[0]] !== void 0) {
@@ -930,6 +963,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                     } else {
                       const oldValue = clone2(value);
                       pending2[key].p = getValueAtPath(oldValue, p);
+                      didChangeMetadata = true;
                       value = setAtPath(
                         value,
                         p,
@@ -950,7 +984,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   }
                 });
                 if (didChangeMetadata && syncOptions.persist) {
-                  updateMetadata(obs$, localState, syncState$, syncOptions, {
+                  updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
                     pending: pending2
                   });
                 }
@@ -1127,14 +1161,17 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       }
       if (!isSynced) {
         isSynced = true;
-        await when(syncState$.isLoaded);
+        isApplyingPendingAfterSync = true;
         applyPending(pending);
+        isApplyingPendingAfterSync = false;
       }
     };
     syncStateValue.sync = sync;
   } else {
     if (!isSynced) {
+      isApplyingPendingAfterSync = true;
       applyPending(localState.pendingChanges);
+      isApplyingPendingAfterSync = false;
     }
   }
   syncStateValue.reset = async () => {