@legendapp/state 3.0.0-alpha.7 → 3.0.0-alpha.9

package/sync.js

@@ -484,21 +484,24 @@ async function doChangeLocal(changeInfo) {
   const { value$: obs, syncState, localState, syncOptions } = queuedChange;
   const { pluginPersist } = localState;
   const persist = syncOptions.persist;
-  const { table, config: configLocal } = parseLocalConfig(persist);
-  const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
-  if (saveRemote && shouldSaveMetadata) {
-    await updateMetadataImmediate(obs, localState, syncState, syncOptions, {
-      pending: localState.pendingChanges
-    });
-  }
-  if (changesLocal.length > 0) {
-    let promiseSet = pluginPersist.set(table, changesLocal, configLocal);
-    if (promiseSet) {
-      promiseSet = promiseSet.then(() => {
-        promisesLocalSaves.delete(promiseSet);
+  const saveLocal = !!(persist == null ? void 0 : persist.name);
+  if (saveLocal) {
+    const { table, config: configLocal } = parseLocalConfig(persist);
+    const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
+    if (saveRemote && shouldSaveMetadata) {
+      await updateMetadataImmediate(obs, localState, syncState, syncOptions, {
+        pending: localState.pendingChanges
       });
-      promisesLocalSaves.add(promiseSet);
-      await promiseSet;
+    }
+    if (changesLocal.length > 0) {
+      let promiseSet = pluginPersist.set(table, changesLocal, configLocal);
+      if (promiseSet) {
+        promiseSet = promiseSet.then(() => {
+          promisesLocalSaves.delete(promiseSet);
+        });
+        promisesLocalSaves.add(promiseSet);
+        await promiseSet;
+      }
     }
   }
 }
@@ -513,6 +516,7 @@ async function doChangeRemote(changeInfo) {
   const { table, config: configLocal } = parseLocalConfig(persist);
   const { allowSetIfGetError, onBeforeSet, onSetError, waitForSet, onAfterSet } = syncOptions || {};
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
+  const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
     await state.when(() => syncState.isLoaded.get() || allowSetIfGetError && syncState.error.get());
     if (waitForSet) {
@@ -521,13 +525,12 @@ async function doChangeRemote(changeInfo) {
         await state.when(waitFor);
       }
     }
-    let value = obs.peek();
+    let value = clone(obs.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
-      value = transformSave(clone(value));
+      value = transformSave(value);
     }
     onBeforeSet == null ? void 0 : onBeforeSet();
-    localState.numSavesOutstanding = (localState.numSavesOutstanding || 0) + 1;
     let savedPromise = pluginSync.set({
       value$: obs,
       syncState,
@@ -540,14 +543,13 @@ async function doChangeRemote(changeInfo) {
       savedPromise = savedPromise.catch((err) => onSetError == null ? void 0 : onSetError(err));
     }
     const saved = await savedPromise;
-    localState.numSavesOutstanding--;
     if (saved !== void 0) {
       const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
       const { changes, lastSync } = saved;
       if (pathStrs.length > 0) {
         let transformedChanges = void 0;
         const metadata = {};
-        if (persist) {
+        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++) {
@@ -567,29 +569,16 @@ async function doChangeRemote(changeInfo) {
         if (changes && !state.isEmpty(changes)) {
           transformedChanges = transformLoadData(changes, syncOptions, false, "set");
         }
-        if (localState.numSavesOutstanding > 0) {
-          if (transformedChanges) {
-            if (!localState.pendingSaveResults) {
-              localState.pendingSaveResults = [];
-            }
-            localState.pendingSaveResults.push(transformedChanges);
-          }
-        } else {
-          let allChanges = [...localState.pendingSaveResults || [], transformedChanges].filter(
-            (v) => v !== void 0
-          );
-          if (allChanges.length > 0) {
-            if (allChanges.some((change) => state.isPromise(change))) {
-              allChanges = await Promise.all(allChanges);
-            }
-            onChangeRemote(() => state.mergeIntoObservable(obs, ...allChanges));
+        if (transformedChanges !== void 0) {
+          if (state.isPromise(transformedChanges)) {
+            transformedChanges = await transformedChanges;
           }
-          if (persist) {
-            if (shouldSaveMetadata && !state.isEmpty(metadata)) {
-              updateMetadata(obs, localState, syncState, syncOptions, metadata);
-            }
+          onChangeRemote(() => state.mergeIntoObservable(obs, transformedChanges));
+        }
+        if (saveLocal) {
+          if (shouldSaveMetadata && !state.isEmpty(metadata)) {
+            updateMetadata(obs, localState, syncState, syncOptions, metadata);
           }
-          localState.pendingSaveResults = [];
         }
         onAfterSet == null ? void 0 : onAfterSet();
       }
@@ -618,10 +607,11 @@ function onObsChange(value$, syncState, localState, syncOptions, { changes, load
 async function loadLocal(value$, syncOptions, syncState, localState) {
   var _a, _b, _c;
   const { persist } = syncOptions;
-  if (persist) {
+  const node = getNode(value$);
+  const nodeValue = getNodeValue(getNode(node.state));
+  if (persist == null ? void 0 : persist.name) {
     const PersistPlugin = persist.plugin || ((_a = observableSyncConfiguration.persist) == null ? void 0 : _a.plugin);
     const { table, config } = parseLocalConfig(persist);
-    const node = getNode(value$);
     if (!PersistPlugin) {
       throw new Error("Local persist is not configured");
     }
@@ -673,10 +663,13 @@ async function loadLocal(value$, syncOptions, syncState, localState) {
       }
       state.internal.globalState.isLoadingLocal = false;
     }
-    getNodeValue(getNode(node.state)).clearPersist = () => Promise.all([
+    nodeValue.clearPersist = () => Promise.all([
       persistPlugin.deleteTable(table, config),
       persistPlugin.deleteMetadata(table, config)
     ]);
+  } else {
+    nodeValue.clearPersist = () => {
+    };
   }
   syncState.isPersistLoaded.set(true);
 }

package/sync.mjs

@@ -482,21 +482,24 @@ async function doChangeLocal(changeInfo) {
   const { value$: obs, syncState, localState, syncOptions } = queuedChange;
   const { pluginPersist } = localState;
   const persist = syncOptions.persist;
-  const { table, config: configLocal } = parseLocalConfig(persist);
-  const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
-  if (saveRemote && shouldSaveMetadata) {
-    await updateMetadataImmediate(obs, localState, syncState, syncOptions, {
-      pending: localState.pendingChanges
-    });
-  }
-  if (changesLocal.length > 0) {
-    let promiseSet = pluginPersist.set(table, changesLocal, configLocal);
-    if (promiseSet) {
-      promiseSet = promiseSet.then(() => {
-        promisesLocalSaves.delete(promiseSet);
+  const saveLocal = !!(persist == null ? void 0 : persist.name);
+  if (saveLocal) {
+    const { table, config: configLocal } = parseLocalConfig(persist);
+    const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
+    if (saveRemote && shouldSaveMetadata) {
+      await updateMetadataImmediate(obs, localState, syncState, syncOptions, {
+        pending: localState.pendingChanges
       });
-      promisesLocalSaves.add(promiseSet);
-      await promiseSet;
+    }
+    if (changesLocal.length > 0) {
+      let promiseSet = pluginPersist.set(table, changesLocal, configLocal);
+      if (promiseSet) {
+        promiseSet = promiseSet.then(() => {
+          promisesLocalSaves.delete(promiseSet);
+        });
+        promisesLocalSaves.add(promiseSet);
+        await promiseSet;
+      }
     }
   }
 }
@@ -511,6 +514,7 @@ async function doChangeRemote(changeInfo) {
   const { table, config: configLocal } = parseLocalConfig(persist);
   const { allowSetIfGetError, onBeforeSet, onSetError, waitForSet, onAfterSet } = syncOptions || {};
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
+  const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
     await when(() => syncState.isLoaded.get() || allowSetIfGetError && syncState.error.get());
     if (waitForSet) {
@@ -519,13 +523,12 @@ async function doChangeRemote(changeInfo) {
         await when(waitFor);
       }
     }
-    let value = obs.peek();
+    let value = clone(obs.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
-      value = transformSave(clone(value));
+      value = transformSave(value);
     }
     onBeforeSet == null ? void 0 : onBeforeSet();
-    localState.numSavesOutstanding = (localState.numSavesOutstanding || 0) + 1;
     let savedPromise = pluginSync.set({
       value$: obs,
       syncState,
@@ -538,14 +541,13 @@ async function doChangeRemote(changeInfo) {
       savedPromise = savedPromise.catch((err) => onSetError == null ? void 0 : onSetError(err));
     }
     const saved = await savedPromise;
-    localState.numSavesOutstanding--;
     if (saved !== void 0) {
       const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
       const { changes, lastSync } = saved;
       if (pathStrs.length > 0) {
         let transformedChanges = void 0;
         const metadata = {};
-        if (persist) {
+        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++) {
@@ -565,29 +567,16 @@ async function doChangeRemote(changeInfo) {
         if (changes && !isEmpty(changes)) {
           transformedChanges = transformLoadData(changes, syncOptions, false, "set");
         }
-        if (localState.numSavesOutstanding > 0) {
-          if (transformedChanges) {
-            if (!localState.pendingSaveResults) {
-              localState.pendingSaveResults = [];
-            }
-            localState.pendingSaveResults.push(transformedChanges);
-          }
-        } else {
-          let allChanges = [...localState.pendingSaveResults || [], transformedChanges].filter(
-            (v) => v !== void 0
-          );
-          if (allChanges.length > 0) {
-            if (allChanges.some((change) => isPromise(change))) {
-              allChanges = await Promise.all(allChanges);
-            }
-            onChangeRemote(() => mergeIntoObservable(obs, ...allChanges));
+        if (transformedChanges !== void 0) {
+          if (isPromise(transformedChanges)) {
+            transformedChanges = await transformedChanges;
           }
-          if (persist) {
-            if (shouldSaveMetadata && !isEmpty(metadata)) {
-              updateMetadata(obs, localState, syncState, syncOptions, metadata);
-            }
+          onChangeRemote(() => mergeIntoObservable(obs, transformedChanges));
+        }
+        if (saveLocal) {
+          if (shouldSaveMetadata && !isEmpty(metadata)) {
+            updateMetadata(obs, localState, syncState, syncOptions, metadata);
           }
-          localState.pendingSaveResults = [];
         }
         onAfterSet == null ? void 0 : onAfterSet();
       }
@@ -616,10 +605,11 @@ function onObsChange(value$, syncState, localState, syncOptions, { changes, load
 async function loadLocal(value$, syncOptions, syncState, localState) {
   var _a, _b, _c;
   const { persist } = syncOptions;
-  if (persist) {
+  const node = getNode(value$);
+  const nodeValue = getNodeValue(getNode(node.state));
+  if (persist == null ? void 0 : persist.name) {
     const PersistPlugin = persist.plugin || ((_a = observableSyncConfiguration.persist) == null ? void 0 : _a.plugin);
     const { table, config } = parseLocalConfig(persist);
-    const node = getNode(value$);
     if (!PersistPlugin) {
       throw new Error("Local persist is not configured");
     }
@@ -671,10 +661,13 @@ async function loadLocal(value$, syncOptions, syncState, localState) {
       }
       internal.globalState.isLoadingLocal = false;
     }
-    getNodeValue(getNode(node.state)).clearPersist = () => Promise.all([
+    nodeValue.clearPersist = () => Promise.all([
       persistPlugin.deleteTable(table, config),
       persistPlugin.deleteMetadata(table, config)
     ]);
+  } else {
+    nodeValue.clearPersist = () => {
+    };
   }
   syncState.isPersistLoaded.set(true);
 }

package/types/babel.d.ts

@@ -1 +1,12 @@
-src/types/babel.d.ts
+import type { ObservableParam } from '@legendapp/state';
+import { ReactNode } from 'react';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type { Computed, Memo } from '@legendapp/state/react';
+declare module '@legendapp/state/react' {
+    export declare const Computed: (props: {
+        children: ObservableParam | (() => ReactNode) | ReactNode;
+    }) => React.ReactElement;
+    export declare const Memo: (props: {
+        children: ObservableParam | (() => ReactNode) | ReactNode;
+    }) => React.ReactElement;
+}