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

package/sync.mjs

@@ -540,7 +540,7 @@ async function prepChangeRemote(queuedChange) {
           );
           promisesTransform.push(
             doInOrder(promiseTransformRemote, ({ value: valueTransformed, path: pathTransformed }) => {
-              var _a;
+              var _a, _b, _c, _d;
               if (!localState.pendingChanges) {
                 localState.pendingChanges = {};
               }
@@ -557,18 +557,27 @@ async function prepChangeRemote(queuedChange) {
                     pathTypesChild,
                     valueAtPath
                   );
+                  if ((_b = localState.pendingClears) == null ? void 0 : _b[pathParent]) {
+                    delete localState.pendingClears[pathParent];
+                  }
                 }
               }
               if (!found2) {
                 for (const key in localState.pendingChanges) {
                   if (key !== pathStr && key.startsWith(pathStr)) {
                     delete localState.pendingChanges[key];
+                    if ((_c = localState.pendingClears) == null ? void 0 : _c[key]) {
+                      delete localState.pendingClears[key];
+                    }
                   }
                 }
                 if (!localState.pendingChanges[pathStr]) {
                   localState.pendingChanges[pathStr] = { p: prevAtPath != null ? prevAtPath : null, t: pathTypes };
                 }
                 localState.pendingChanges[pathStr].v = valueAtPath;
+                if ((_d = localState.pendingClears) == null ? void 0 : _d[pathStr]) {
+                  delete localState.pendingClears[pathStr];
+                }
               }
               changesRemote.push({
                 path: pathTransformed,
@@ -632,7 +641,7 @@ async function doChangeRemote(changeInfo) {
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
   const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
-    if (!syncState2.isLoaded.peek()) {
+    if ((syncOptions.get || syncOptions.subscribe) && !syncState2.isLoaded.peek()) {
       await when(syncState2.isLoaded);
       const pending = localState.pendingChanges;
       if (pending) {
@@ -654,6 +663,12 @@ async function doChangeRemote(changeInfo) {
     if (transformSave) {
       value = transformSave(value);
     }
+    const setGeneration = localState.pendingSetGeneration;
+    const pendingSetsSinceClear = localState.pendingSetsSinceClear || 0;
+    const hadPendingSets = setGeneration !== void 0 ? pendingSetsSinceClear > 0 : (state$.numPendingSets.peek() || 0) > 0;
+    if (setGeneration !== void 0) {
+      localState.pendingSetsSinceClear = pendingSetsSinceClear + 1;
+    }
     state$.numPendingSets.set((v) => (v || 0) + 1);
     state$.isSetting.set(true);
     const beforeSetParams = {
@@ -668,6 +683,7 @@ async function doChangeRemote(changeInfo) {
         if (lastErrorHandled !== error) {
           if (!params) {
             params = {
+              syncOptions,
               setParams,
               source: "set",
               type: "set",
@@ -675,6 +691,11 @@ async function doChangeRemote(changeInfo) {
               retry: setParams,
               revert: createRevertChanges(setParams.value$, setParams.changes)
             };
+          } else if (!params.syncOptions) {
+            params = {
+              ...params,
+              syncOptions
+            };
           }
           state$.error.set(error);
           (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, params);
@@ -720,24 +741,61 @@ async function doChangeRemote(changeInfo) {
       }
       if (!didError || (updateResult == null ? void 0 : updateResult.changes)) {
         const { value: updateValue, changes: updateChanges = changesRemote } = updateResult || {};
-        const pathStrs = Array.from(
-          new Set(updateChanges.map((change) => change.pathStr))
-        );
+        const changesWithPath = updateChanges;
+        const pathStrs = Array.from(new Set(changesWithPath.map((change) => change.pathStr)));
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
-          if (saveLocal) {
-            const pendingMetadata = (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending;
-            const pending = localState.pendingChanges;
-            for (let i = 0; i < pathStrs.length; i++) {
-              const pathStr = pathStrs[i];
-              if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
-                delete pendingMetadata[pathStr];
-                metadata.pending = pendingMetadata;
+          const pending = localState.pendingChanges;
+          const pendingToKeep = /* @__PURE__ */ new Set();
+          if (pending) {
+            const changesByPath = /* @__PURE__ */ new Map();
+            for (let i = 0; i < changesWithPath.length; i++) {
+              const change = changesWithPath[i];
+              changesByPath.set(change.pathStr, change);
+            }
+            for (const key in pending) {
+              const pendingEntry = pending[key];
+              if (!pendingEntry) {
+                continue;
+              }
+              const change = changesByPath.get(key);
+              if (!change || !deepEqual(pendingEntry.v, change.valueAtPath)) {
+                pendingToKeep.add(key);
               }
-              if (pending == null ? void 0 : pending[pathStr]) {
-                delete pending[pathStr];
+            }
+          }
+          const pendingToOverlay = new Set(pendingToKeep);
+          const pendingClears = localState.pendingClears;
+          if (pendingClears) {
+            for (const key in pendingClears) {
+              pendingToOverlay.add(key);
+            }
+          }
+          if (hadPendingSets) {
+            for (let i = 0; i < changesWithPath.length; i++) {
+              pendingToOverlay.add(changesWithPath[i].pathStr);
+            }
+          }
+          const pendingMetadata = saveLocal ? (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending : void 0;
+          const shouldDeferPendingClear = (state$.numPendingSets.peek() || 0) > 1;
+          for (let i = 0; i < pathStrs.length; i++) {
+            const pathStr = pathStrs[i];
+            if (pendingToKeep.has(pathStr)) {
+              continue;
+            }
+            if (shouldDeferPendingClear && (pending == null ? void 0 : pending[pathStr])) {
+              if (!localState.pendingClears) {
+                localState.pendingClears = {};
               }
+              localState.pendingClears[pathStr] = pending[pathStr];
+            }
+            if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
+              delete pendingMetadata[pathStr];
+              metadata.pending = pendingMetadata;
+            }
+            if (pending == null ? void 0 : pending[pathStr]) {
+              delete pending[pathStr];
             }
           }
           if (updateValue && !isEmpty(updateValue)) {
@@ -747,7 +805,48 @@ async function doChangeRemote(changeInfo) {
             if (isPromise$1(transformedChanges)) {
               transformedChanges = await transformedChanges;
             }
-            onChangeRemote2(() => mergeIntoObservable(obs$, transformedChanges));
+            if (pendingToOverlay.size === 0) {
+              onChangeRemote2(() => mergeIntoObservable(obs$, transformedChanges));
+            } else if (!pendingToOverlay.has("")) {
+              let updatePatch = transformedChanges;
+              if (typeof updatePatch === "object" && updatePatch !== null) {
+                updatePatch = clone2(updatePatch);
+                const currentValue = obs$.peek();
+                for (const pathStr of pendingToOverlay) {
+                  if (!pathStr) {
+                    continue;
+                  }
+                  const pendingEntry = (pending == null ? void 0 : pending[pathStr]) || (pendingClears == null ? void 0 : pendingClears[pathStr]);
+                  if (!pendingEntry) {
+                    continue;
+                  }
+                  const path = pathStr.split("/").filter((p) => p);
+                  const currentAtPath = getValueAtPath(currentValue, path);
+                  updatePatch = setAtPath(updatePatch, path, pendingEntry.t, currentAtPath);
+                }
+                if (hadPendingSets) {
+                  for (let i = 0; i < changesWithPath.length; i++) {
+                    const change = changesWithPath[i];
+                    if (!change.pathStr || !pendingToOverlay.has(change.pathStr)) {
+                      continue;
+                    }
+                    const currentAtPath = getValueAtPath(
+                      currentValue,
+                      change.path
+                    );
+                    updatePatch = setAtPath(
+                      updatePatch,
+                      change.path,
+                      change.pathTypes,
+                      currentAtPath
+                    );
+                  }
+                }
+              }
+              if (updatePatch !== void 0) {
+                onChangeRemote2(() => mergeIntoObservable(obs$, updatePatch));
+              }
+            }
           }
           if (saveLocal) {
             if (shouldSaveMetadata && !isEmpty(metadata)) {
@@ -756,7 +855,18 @@ async function doChangeRemote(changeInfo) {
           }
         }
         state$.numPendingSets.set((v) => v - 1);
-        state$.isSetting.set(state$.numPendingSets.peek() > 0);
+        const remainingSets = state$.numPendingSets.peek() || 0;
+        if (setGeneration !== void 0 && localState.pendingSetGeneration === setGeneration) {
+          localState.pendingSetsSinceClear = (localState.pendingSetsSinceClear || 1) - 1;
+        }
+        if (!remainingSets) {
+          if (localState.pendingSetGeneration !== void 0 && !localState.pendingSetsSinceClear) {
+            localState.pendingSetGeneration = void 0;
+            localState.pendingSetsSinceClear = void 0;
+          }
+          localState.pendingClears = void 0;
+        }
+        state$.isSetting.set(remainingSets > 0);
         onAfterSet == null ? void 0 : onAfterSet();
       }
     }
@@ -891,10 +1001,18 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     observableSyncConfiguration,
     removeNullUndefined(syncOptions || {})
   );
-  const localState = {};
-  let sync;
   const syncState$ = syncState(obs$);
   const syncStateValue = getNodeValue(getNode(syncState$));
+  const localState = {};
+  let sync;
+  const resetPendingState = () => {
+    var _a;
+    localState.pendingChanges = {};
+    localState.pendingClears = void 0;
+    const hasPendingSets = (syncStateValue.numPendingSets || 0) > 0;
+    localState.pendingSetGeneration = hasPendingSets ? ((_a = localState.pendingSetGeneration) != null ? _a : 0) + 1 : void 0;
+    localState.pendingSetsSinceClear = hasPendingSets ? 0 : void 0;
+  };
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
   let lastErrorHandled;
@@ -903,9 +1021,15 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (lastErrorHandled !== error) {
       if (!params) {
         params = {
+          syncOptions,
           source: "get",
           type: "get",
-          retry: params
+          retry: { retryNum: 0, cancelRetry: false }
+        };
+      } else if (!params.syncOptions) {
+        params = {
+          ...params,
+          syncOptions
         };
       }
       syncState$.error.set(error);
@@ -1085,7 +1209,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                       onChange(params);
                       if (!syncState$.isLoaded.peek()) {
                         syncState$.assign({
-                          isLoaded: syncStateValue.numPendingRemoteLoads < 1,
+                          isLoaded: (syncStateValue.numPendingRemoteLoads || 0) < 1,
                           error: void 0,
                           isGetting: syncStateValue.numPendingGets > 0
                         });
@@ -1097,6 +1221,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               refresh: () => when(syncState$.isLoaded, callSync),
               onError: (error) => onGetError(error, {
                 source: "subscribe",
+                syncOptions,
                 subscribeParams,
                 type: "get",
                 retry: {}
@@ -1143,7 +1268,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             lastSync,
             pendingChanges: pending && !isEmpty(pending) ? pending : void 0,
             clearPendingChanges: async () => {
-              localState.pendingChanges = {};
+              resetPendingState();
               await updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
                 pending: localState.pendingChanges
               });
@@ -1195,7 +1320,11 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             };
             if (isPromise$1(got)) {
               got.then(handle).catch((error) => {
-                onGetError(error, { getParams, source: "get", type: "get", retry: getParams }, true);
+                onGetError(
+                  error,
+                  { getParams, syncOptions, source: "get", type: "get", retry: getParams },
+                  true
+                );
               });
             } else {
               handle(got);
@@ -1230,6 +1359,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (metadata) {
       Object.assign(metadata, { lastSync: void 0, pending: void 0 });
     }
+    resetPendingState();
     const newState = {
       isPersistEnabled: false,
       isSyncEnabled: false,
@@ -1251,7 +1381,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       var _a;
       obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
     });
-    syncState$.isLoaded.set(false);
     syncStateValue.isPersistEnabled = wasPersistEnabled;
     syncStateValue.isSyncEnabled = wasSyncEnabled;
     node.dirtyFn = sync;

package/types/reactive-web.d.ts

@@ -1,5 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { IReactive, FCReactiveObject } from '@legendapp/state/react';
+import type { JSX } from 'react';
 
 declare module '@legendapp/state/react' {
     // eslint-disable-next-line @typescript-eslint/no-empty-interface