@legendapp/state 3.0.0-alpha.34 → 3.0.0-alpha.36

package/sync.js

@@ -178,7 +178,7 @@ function runWithRetry(state, retryOptions, fn, onError) {
             clearTimeout(timeoutRetry);
           }
           if (onError) {
-            onError(error);
+            onError(error, state);
           }
           if (!state.cancelRetry) {
             const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
@@ -253,7 +253,7 @@ async function updateMetadataImmediate(value$, localState, syncState2, syncOptio
     await Promise.all(saves);
   }
   const { pluginPersist } = localState;
-  const { table, config } = parseLocalConfig(syncOptions == null ? void 0 : syncOptions.persist);
+  const { table, config } = parseLocalConfig(syncOptions.persist);
   const oldMetadata = metadatas.get(value$);
   const { lastSync } = newMetadata;
   const metadata = Object.assign({}, oldMetadata, newMetadata);
@@ -583,96 +583,104 @@ async function doChangeRemote(changeInfo) {
     }
     state$.numPendingSets.set((v) => (v || 0) + 1);
     state$.isSetting.set(true);
-    onBeforeSet == null ? void 0 : onBeforeSet();
-    let updateResult = void 0;
-    const onError = (error) => {
-      var _a2;
-      state$.error.set(error);
-      (_a2 = syncOptions.onSetError) == null ? void 0 : _a2.call(syncOptions, error, {
-        setParams,
-        source: "set",
-        value$: obs$
-      });
+    const beforeSetParams = {
+      cancel: false
     };
-    const setParams = {
-      node,
-      value$: obs$,
-      changes: changesRemote,
-      value,
-      onError,
-      update: (params) => {
-        if (updateResult) {
-          const { value: value2, lastSync, mode } = params;
-          updateResult = {
-            lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
-            value: deepMerge(updateResult.value, value2),
-            mode
-          };
-        } else {
-          updateResult = params;
+    onBeforeSet == null ? void 0 : onBeforeSet(beforeSetParams);
+    if (!beforeSetParams.cancel) {
+      let updateResult = void 0;
+      let errorHandled = false;
+      const onError = (error, retryParams) => {
+        var _a2;
+        state$.error.set(error);
+        if (!errorHandled) {
+          (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, {
+            setParams,
+            source: "set",
+            value$: obs$,
+            retryParams
+          });
         }
-      },
-      refresh: syncState2.sync,
-      retryNum: 0,
-      cancelRetry: false
-    };
-    let savedPromise = runWithRetry(
-      setParams,
-      syncOptions.retry,
-      async () => {
-        return syncOptions.set(setParams);
-      },
-      onError
-    );
-    let didError = false;
-    if (state.isPromise(savedPromise)) {
-      savedPromise = savedPromise.catch((error) => {
-        didError = true;
-        onError(error);
-      });
-      await savedPromise;
-    }
-    if (!didError) {
-      const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-      const { value: changes, lastSync } = updateResult || {};
-      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;
+        errorHandled = true;
+      };
+      const setParams = {
+        node,
+        value$: obs$,
+        changes: changesRemote,
+        value,
+        onError,
+        update: (params) => {
+          if (updateResult) {
+            const { value: value2, lastSync, mode } = params;
+            updateResult = {
+              lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
+              value: deepMerge(updateResult.value, value2),
+              mode
+            };
+          } else {
+            updateResult = params;
+          }
+        },
+        refresh: syncState2.sync,
+        retryNum: 0,
+        cancelRetry: false
+      };
+      const savedPromise = runWithRetry(
+        setParams,
+        syncOptions.retry,
+        async () => {
+          return syncOptions.set(setParams);
+        },
+        onError
+      );
+      let didError = false;
+      if (state.isPromise(savedPromise)) {
+        await savedPromise.catch(() => {
+          didError = true;
+        });
+      }
+      if (!didError) {
+        const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
+        const { value: changes, lastSync } = updateResult || {};
+        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;
+              }
+              if (pending == null ? void 0 : pending[pathStr]) {
+                delete pending[pathStr];
+              }
             }
-            if (pending == null ? void 0 : pending[pathStr]) {
-              delete pending[pathStr];
+            if (lastSync) {
+              metadata.lastSync = lastSync;
             }
           }
-          if (lastSync) {
-            metadata.lastSync = lastSync;
+          if (changes && !state.isEmpty(changes)) {
+            transformedChanges = transformLoadData(changes, syncOptions, false, "set");
           }
-        }
-        if (changes && !state.isEmpty(changes)) {
-          transformedChanges = transformLoadData(changes, syncOptions, false, "set");
-        }
-        if (transformedChanges !== void 0) {
-          if (state.isPromise(transformedChanges)) {
-            transformedChanges = await transformedChanges;
+          if (transformedChanges !== void 0) {
+            if (state.isPromise(transformedChanges)) {
+              transformedChanges = await transformedChanges;
+            }
+            onChangeRemote(() => state.mergeIntoObservable(obs$, transformedChanges));
           }
-          onChangeRemote(() => state.mergeIntoObservable(obs$, transformedChanges));
-        }
-        if (saveLocal) {
-          if (shouldSaveMetadata && !state.isEmpty(metadata)) {
-            updateMetadata(obs$, localState, syncState2, syncOptions, metadata);
+          if (saveLocal) {
+            if (shouldSaveMetadata && !state.isEmpty(metadata)) {
+              updateMetadata(obs$, localState, syncState2, syncOptions, metadata);
+            }
           }
         }
+        state$.numPendingSets.set((v) => v - 1);
+        state$.isSetting.set(state$.numPendingSets.peek() > 0);
+        onAfterSet == null ? void 0 : onAfterSet();
       }
-      state$.numPendingSets.set((v) => v - 1);
-      state$.isSetting.set(state$.numPendingSets.peek() > 0);
-      onAfterSet == null ? void 0 : onAfterSet();
     }
   }
 }
@@ -710,7 +718,7 @@ async function loadLocal(value$, syncOptions, syncState$, localState) {
       throw new Error("Local persist is not configured");
     }
     if (!mapSyncPlugins.has(PersistPlugin)) {
-      const persistPlugin2 = new PersistPlugin();
+      const persistPlugin2 = state.isFunction(PersistPlugin) ? new PersistPlugin() : PersistPlugin;
       const mapValue = { plugin: persistPlugin2, initialized: state.observable(false) };
       mapSyncPlugins.set(PersistPlugin, mapValue);
       if (persistPlugin2.initialize) {
@@ -792,10 +800,14 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   const syncStateValue = getNodeValue(getNode(syncState$));
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
+  let errorHandled = false;
   const onGetError = (error, params) => {
     var _a;
     syncState$.error.set(error);
-    (_a = syncOptions.onGetError) == null ? void 0 : _a.call(syncOptions, error, { ...params, value$: obs$ });
+    if (!errorHandled) {
+      (_a = syncOptions.onError) == null ? void 0 : _a.call(syncOptions, error, { ...params, value$: obs$ });
+    }
+    errorHandled = true;
   };
   loadLocal(obs$, syncOptions, syncState$, localState);
   let isWaitingForLoad = !!syncOptions.get;
@@ -903,6 +915,9 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 }
               }
               onChangeRemote(() => {
+                if (state.isPlainObject(value)) {
+                  value = state.ObservableHint.plain(value);
+                }
                 if (mode === "assign") {
                   obs$.assign(value);
                 } else if (mode === "append") {
@@ -974,7 +989,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             cancelRetry: false
           };
           let modeBeforeReset = void 0;
-          (_a2 = syncOptions.onBeforeGet) == null ? void 0 : _a2.call(syncOptions, {
+          const beforeGetParams = {
             value: getParams.value,
             lastSync,
             pendingChanges: pending && !state.isEmpty(pending) ? pending : void 0,
@@ -989,52 +1004,56 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               modeBeforeReset = getParams.mode;
               getParams.mode = "set";
               return (_a3 = syncStateValue.clearPersist) == null ? void 0 : _a3.call(syncStateValue);
-            }
-          });
-          syncState$.assign({
-            numPendingGets: (syncStateValue.numPendingGets || 0) + 1,
-            isGetting: true
-          });
-          const got = runWithRetry(
-            getParams,
-            syncOptions.retry,
-            (retryEvent) => {
-              const params = getParams;
-              params.cancelRetry = retryEvent.cancelRetry;
-              params.retryNum = retryEvent.retryNum;
-              return get(params);
             },
-            onError
-          );
-          const numGets = node.numGets = (node.numGets || 0) + 1;
-          const handle = (value) => {
-            syncState$.numPendingGets.set((v) => v - 1);
-            if (isWaitingForLoad) {
-              isWaitingForLoad = false;
-              syncStateValue.numPendingRemoteLoads--;
-            }
-            if (numGets >= (node.getNumResolved || 0)) {
-              node.getNumResolved = node.numGets;
-              onChange({
-                value,
-                lastSync: getParams.lastSync,
-                mode: getParams.mode
-              });
-            }
-            if (modeBeforeReset) {
-              getParams.mode = modeBeforeReset;
-              modeBeforeReset = void 0;
-            }
+            cancel: false
+          };
+          (_a2 = syncOptions.onBeforeGet) == null ? void 0 : _a2.call(syncOptions, beforeGetParams);
+          if (!beforeGetParams.cancel) {
             syncState$.assign({
-              isLoaded: syncStateValue.numPendingRemoteLoads < 1,
-              error: void 0,
-              isGetting: syncStateValue.numPendingGets > 0
+              numPendingGets: (syncStateValue.numPendingGets || 0) + 1,
+              isGetting: true
             });
-          };
-          if (state.isPromise(got)) {
-            got.then(handle);
-          } else {
-            handle(got);
+            const got = runWithRetry(
+              getParams,
+              syncOptions.retry,
+              (retryEvent) => {
+                const params = getParams;
+                params.cancelRetry = retryEvent.cancelRetry;
+                params.retryNum = retryEvent.retryNum;
+                return get(params);
+              },
+              onError
+            );
+            const numGets = node.numGets = (node.numGets || 0) + 1;
+            const handle = (value) => {
+              syncState$.numPendingGets.set((v) => v - 1);
+              if (isWaitingForLoad) {
+                isWaitingForLoad = false;
+                syncStateValue.numPendingRemoteLoads--;
+              }
+              if (numGets >= (node.getNumResolved || 0)) {
+                node.getNumResolved = node.numGets;
+                onChange({
+                  value,
+                  lastSync: getParams.lastSync,
+                  mode: getParams.mode
+                });
+              }
+              if (modeBeforeReset) {
+                getParams.mode = modeBeforeReset;
+                modeBeforeReset = void 0;
+              }
+              syncState$.assign({
+                isLoaded: syncStateValue.numPendingRemoteLoads < 1,
+                error: void 0,
+                isGetting: syncStateValue.numPendingGets > 0
+              });
+            };
+            if (state.isPromise(got)) {
+              got.then(handle);
+            } else {
+              handle(got);
+            }
           }
         };
         if (waitFor) {
@@ -1061,7 +1080,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     }
   }
   syncStateValue.reset = async () => {
-    var _a;
     const wasPersistEnabled = syncStateValue.isPersistEnabled;
     const wasSyncEnabled = syncStateValue.isSyncEnabled;
     const metadata = metadatas.get(obs$);
@@ -1084,7 +1102,10 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     unsubscribe == null ? void 0 : unsubscribe();
     unsubscribe = void 0;
     const promise = syncStateValue.clearPersist();
-    obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
+    onChangeRemote(() => {
+      var _a;
+      obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
+    });
     syncState$.isLoaded.set(false);
     syncStateValue.isPersistEnabled = wasPersistEnabled;
     syncStateValue.isSyncEnabled = wasSyncEnabled;
@@ -1177,11 +1198,11 @@ function installPersistActivateNode() {
 }
 var { deepMerge: deepMerge2 } = state.internal;
 function configureSynced(fnOrOrigOptions, origOptions) {
-  const fn = origOptions ? fnOrOrigOptions : void 0;
+  const fn = origOptions ? fnOrOrigOptions : synced;
   origOptions = origOptions != null ? origOptions : fnOrOrigOptions;
   return (options) => {
     const merged = deepMerge2(origOptions, options);
-    return fn ? fn(merged) : merged;
+    return fn(merged);
   };
 }