@legendapp/state 2.2.0-next.3 → 2.2.0-next.30

package/persist.js

@@ -139,9 +139,21 @@ function observablePersistRemoteFunctionsAdapter({ get, set, }) {
     const ret = {};
     if (get) {
         ret.get = (async (params) => {
-            const value = (await get(params));
-            params.onChange({ value, dateModified: params.dateModified || Date.now() });
-            params.onGet();
+            try {
+                let value = get(params);
+                if (state.isPromise(value)) {
+                    value = await value;
+                }
+                params.onChange({
+                    value,
+                    dateModified: params.dateModified,
+                    lastSync: params.lastSync,
+                    mode: params.mode,
+                });
+                params.onGet();
+                // eslint-disable-next-line no-empty
+            }
+            catch (_a) { }
         });
     }
     if (set) {
@@ -150,7 +162,22 @@ function observablePersistRemoteFunctionsAdapter({ get, set, }) {
     return ret;
 }
 
-const { getProxy, globalState } = state.internal;
+function removeNullUndefined(val) {
+    if (val) {
+        Object.keys(val).forEach((key) => {
+            const v = val[key];
+            if (v === null || v === undefined) {
+                delete val[key];
+            }
+            else if (state.isObject(v)) {
+                removeNullUndefined(v);
+            }
+        });
+    }
+    return val;
+}
+
+const { globalState: globalState$1 } = state.internal;
 const mapPersistences = new WeakMap();
 const metadatas = new WeakMap();
 const promisesLocalSaves = new Set();
@@ -165,11 +192,12 @@ function doInOrder(arg1, arg2) {
     return state.isPromise(arg1) ? arg1.then(arg2) : arg2(arg1);
 }
 function onChangeRemote(cb) {
-    state.when(() => !globalState.isLoadingRemote$.get(), () => {
+    state.when(() => !globalState$1.isLoadingRemote$.get(), () => {
+        state.endBatch(true);
         // Remote changes should only update local state
-        globalState.isLoadingRemote$.set(true);
+        globalState$1.isLoadingRemote$.set(true);
         state.batch(cb, () => {
-            globalState.isLoadingRemote$.set(false);
+            globalState$1.isLoadingRemote$.set(false);
         });
     });
 }
@@ -216,16 +244,19 @@ async function updateMetadataImmediate(obs, localState, syncState, persistOption
     const { table, config } = parseLocalConfig(local);
     // Save metadata
     const oldMetadata = metadatas.get(obs);
-    const { modified, pending } = newMetadata;
-    const needsUpdate = pending || (modified && (!oldMetadata || modified !== oldMetadata.modified));
+    const { lastSync, pending } = newMetadata;
+    const needsUpdate = pending || (lastSync && (!oldMetadata || lastSync !== oldMetadata.lastSync));
     if (needsUpdate) {
         const metadata = Object.assign({}, oldMetadata, newMetadata);
         metadatas.set(obs, metadata);
         if (persistenceLocal) {
             await persistenceLocal.setMetadata(table, metadata, config);
         }
-        if (modified) {
-            syncState.dateModified.set(modified);
+        if (lastSync) {
+            syncState.assign({
+                lastSync: lastSync,
+                dateModified: lastSync,
+            });
         }
     }
 }
@@ -237,15 +268,53 @@ function updateMetadata(obs, localState, syncState, persistOptions, newMetadata)
     localState.timeoutSaveMetadata = setTimeout(() => updateMetadataImmediate(obs, localState, syncState, persistOptions, newMetadata), ((_a = persistOptions === null || persistOptions === void 0 ? void 0 : persistOptions.remote) === null || _a === void 0 ? void 0 : _a.metadataTimeout) || 0);
 }
 let _queuedChanges = [];
+let _queuedRemoteChanges = [];
+let timeoutSaveRemote = undefined;
+function mergeChanges(changes) {
+    const changesByPath = new Map();
+    const changesOut = [];
+    // TODO: This could be even more robust by going deeper into paths like the firebase plugin's _updatePendingSave
+    for (let i = 0; i < changes.length; i++) {
+        const change = changes[i];
+        const pathStr = change.path.join('/');
+        const existing = changesByPath.get(pathStr);
+        if (existing) {
+            existing.valueAtPath = change.valueAtPath;
+        }
+        else {
+            changesByPath.set(pathStr, change);
+            changesOut.push(change);
+        }
+    }
+    return changesOut;
+}
+function mergeQueuedChanges(allChanges) {
+    const changesByObs = new Map();
+    const out = [];
+    for (let i = 0; i < allChanges.length; i++) {
+        const value = allChanges[i];
+        const { obs, changes } = value;
+        const existing = changesByObs.get(obs);
+        const newChanges = existing ? [...existing, ...changes] : changes;
+        const merged = mergeChanges(newChanges);
+        changesByObs.set(obs, merged);
+        if (!existing) {
+            value.changes = merged;
+            out.push(value);
+        }
+    }
+    return out;
+}
 async function processQueuedChanges() {
+    var _a;
     // Get a local copy of the queued changes and clear the global queue
-    const queuedChanges = _queuedChanges;
+    const queuedChanges = mergeQueuedChanges(_queuedChanges);
     _queuedChanges = [];
+    _queuedRemoteChanges.push(...queuedChanges.filter((c) => !c.inRemoteChange));
     // Note: Summary of the order of operations these functions:
     // 1. Prepare all changes for saving. This may involve waiting for promises if the user has asynchronous transform.
     // We need to prepare all of the changes in the queue before saving so that the saves happen in the correct order,
     // since some may take longer to transformSaveData than others.
-    const changes = await Promise.all(queuedChanges.map(prepChange));
     // 2. Save pending to the metadata table first. If this is the only operation that succeeds, it would try to save
     // the current value again on next load, which isn't too bad.
     // 3. Save local changes to storage. If they never make it to remote, then on the next load they will be pending
@@ -253,25 +322,46 @@ async function processQueuedChanges() {
     // 4. Wait for remote load or error if allowed
     // 5. Save to remote
     // 6. On successful save, merge changes (if any) back into observable
-    // 7. Lastly, update metadata to clear pending and update dateModified. Doing this earlier could potentially cause
+    // 7. Lastly, update metadata to clear pending and update lastSync. Doing this earlier could potentially cause
     // sync inconsistences so it's very important that this is last.
-    changes.forEach(doChange);
+    const preppedChangesLocal = await Promise.all(queuedChanges.map(prepChangeLocal));
+    // TODO Clean this up: We only need to prep this now in ordre to save pending changes, don't need any of the other stuff. Should split that up?
+    await Promise.all(queuedChanges.map(prepChangeRemote));
+    await Promise.all(preppedChangesLocal.map(doChangeLocal));
+    const timeout = (_a = observablePersistConfiguration === null || observablePersistConfiguration === void 0 ? void 0 : observablePersistConfiguration.remoteOptions) === null || _a === void 0 ? void 0 : _a.saveTimeout;
+    if (timeout) {
+        if (timeoutSaveRemote) {
+            clearTimeout(timeoutSaveRemote);
+        }
+        timeoutSaveRemote = setTimeout(processQueuedRemoteChanges, timeout);
+    }
+    else {
+        processQueuedRemoteChanges();
+    }
 }
-async function prepChange(queuedChange) {
+async function processQueuedRemoteChanges() {
+    const queuedRemoteChanges = mergeQueuedChanges(_queuedRemoteChanges);
+    _queuedRemoteChanges = [];
+    const preppedChangesRemote = await Promise.all(queuedRemoteChanges.map(prepChangeRemote));
+    preppedChangesRemote.forEach(doChangeRemote);
+}
+async function prepChangeLocal(queuedChange) {
     const { syncState, changes, localState, persistOptions, inRemoteChange, isApplyingPending } = queuedChange;
     const local = persistOptions.local;
     const { persistenceRemote } = localState;
     const { config: configLocal } = parseLocalConfig(local);
     const configRemote = persistOptions.remote;
     const saveLocal = local && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
-    const saveRemote = !inRemoteChange && (persistenceRemote === null || persistenceRemote === void 0 ? void 0 : persistenceRemote.set) && !(configRemote === null || configRemote === void 0 ? void 0 : configRemote.readonly) && syncState.isEnabledRemote.peek();
+    const saveRemote = !!(!inRemoteChange &&
+        (persistenceRemote === null || persistenceRemote === void 0 ? void 0 : persistenceRemote.set) &&
+        !(configRemote === null || configRemote === void 0 ? void 0 : configRemote.readonly) &&
+        syncState.isEnabledRemote.peek());
     if (saveLocal || saveRemote) {
         if (saveLocal && !syncState.isLoadedLocal.peek()) {
             console.error('[legend-state] WARNING: An observable was changed before being loaded from persistence', local);
-            return;
+            return undefined;
         }
         const changesLocal = [];
-        const changesRemote = [];
         const changesPaths = new Set();
         let promisesTransform = [];
         // Reverse order
@@ -310,6 +400,52 @@ async function prepChange(queuedChange) {
                         }
                     }));
                 }
+            }
+        }
+        // If there's any transform promises, wait for them before saving
+        promisesTransform = promisesTransform.filter(Boolean);
+        if (promisesTransform.length > 0) {
+            await Promise.all(promisesTransform);
+        }
+        return { queuedChange, changesLocal, saveRemote };
+    }
+}
+async function prepChangeRemote(queuedChange) {
+    const { syncState, changes, localState, persistOptions, inRemoteChange, isApplyingPending } = queuedChange;
+    const local = persistOptions.local;
+    const { persistenceRemote } = localState;
+    const { config: configLocal } = parseLocalConfig(local);
+    const configRemote = persistOptions.remote;
+    const saveLocal = local && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
+    const saveRemote = !inRemoteChange && (persistenceRemote === null || persistenceRemote === void 0 ? void 0 : persistenceRemote.set) && !(configRemote === null || configRemote === void 0 ? void 0 : configRemote.readonly) && syncState.isEnabledRemote.peek();
+    if (saveLocal || saveRemote) {
+        if (saveLocal && !syncState.isLoadedLocal.peek()) {
+            console.error('[legend-state] WARNING: An observable was changed before being loaded from persistence', local);
+            return undefined;
+        }
+        const changesRemote = [];
+        const changesPaths = new Set();
+        let promisesTransform = [];
+        // Reverse order
+        for (let i = changes.length - 1; i >= 0; i--) {
+            const { path } = changes[i];
+            let found = false;
+            // Optimization to only save the latest update at each path. We might have multiple changes at the same path
+            // and we only need the latest value, so it starts from the end of the array, skipping any earlier changes
+            // already processed. If a later change modifies a parent of an earlier change (which happens on delete()
+            // it should be ignored as it's superseded by the parent modification.
+            if (changesPaths.size > 0) {
+                for (let u = 0; u < path.length; u++) {
+                    if (changesPaths.has((u === path.length - 1 ? path : path.slice(0, u + 1)).join('/'))) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (!found) {
+                const pathStr = path.join('/');
+                changesPaths.add(pathStr);
+                const { prevAtPath, valueAtPath, pathTypes } = changes[i];
                 if (saveRemote) {
                     const promiseTransformRemote = transformOutData(valueAtPath, path, pathTypes, configRemote || {});
                     promisesTransform.push(doInOrder(promiseTransformRemote, ({ path: pathTransformed, value: valueTransformed }) => {
@@ -367,21 +503,20 @@ async function prepChange(queuedChange) {
         if (promisesTransform.length > 0) {
             await Promise.all(promisesTransform);
         }
-        return { queuedChange, changesLocal, changesRemote };
+        return { queuedChange, changesRemote };
     }
 }
-async function doChange(changeInfo) {
-    var _a, _b, _c, _d;
+async function doChangeLocal(changeInfo) {
     if (!changeInfo)
         return;
-    const { queuedChange, changesLocal, changesRemote } = changeInfo;
+    const { queuedChange, changesLocal, saveRemote } = changeInfo;
     const { obs, syncState, localState, persistOptions } = queuedChange;
-    const { persistenceLocal, persistenceRemote } = localState;
+    const { persistenceLocal } = localState;
     const local = persistOptions.local;
     const { table, config: configLocal } = parseLocalConfig(local);
     const configRemote = persistOptions.remote;
     const shouldSaveMetadata = local && (configRemote === null || configRemote === void 0 ? void 0 : configRemote.offlineBehavior) === 'retry';
-    if (changesRemote.length > 0 && shouldSaveMetadata) {
+    if (saveRemote && shouldSaveMetadata) {
         // First save pending changes before saving local or remote
         await updateMetadataImmediate(obs, localState, syncState, persistOptions, {
             pending: localState.pendingChanges,
@@ -401,29 +536,46 @@ async function doChange(changeInfo) {
             await promiseSet;
         }
     }
+}
+async function doChangeRemote(changeInfo) {
+    var _a, _b;
+    if (!changeInfo)
+        return;
+    const { queuedChange, changesRemote } = changeInfo;
+    const { obs, syncState, localState, persistOptions } = queuedChange;
+    const { persistenceLocal, persistenceRemote } = localState;
+    const local = persistOptions.local;
+    const { table, config: configLocal } = parseLocalConfig(local);
+    const { offlineBehavior, allowSetIfError, onBeforeSet, onSetError, waitForSet, onSet } = persistOptions.remote || {};
+    const shouldSaveMetadata = local && offlineBehavior === 'retry';
     if (changesRemote.length > 0) {
         // Wait for remote to be ready before saving
-        await state.when(() => syncState.isLoaded.get() || ((configRemote === null || configRemote === void 0 ? void 0 : configRemote.allowSetIfError) && syncState.error.get()));
+        await state.when(() => syncState.isLoaded.get() || (allowSetIfError && syncState.error.get()));
+        if (waitForSet) {
+            await state.when(state.isFunction(waitForSet) ? waitForSet(changesRemote) : waitForSet);
+        }
         const value = obs.peek();
-        (_a = configRemote === null || configRemote === void 0 ? void 0 : configRemote.onBeforeSet) === null || _a === void 0 ? void 0 : _a.call(configRemote);
-        const saved = await ((_b = persistenceRemote.set({
+        onBeforeSet === null || onBeforeSet === void 0 ? void 0 : onBeforeSet();
+        localState.numSavesOutstanding = (localState.numSavesOutstanding || 0) + 1;
+        const saved = await ((_a = persistenceRemote.set({
             obs,
             syncState: syncState,
             options: persistOptions,
             changes: changesRemote,
             value,
-        })) === null || _b === void 0 ? void 0 : _b.catch((err) => { var _a; return (_a = configRemote === null || configRemote === void 0 ? void 0 : configRemote.onSetError) === null || _a === void 0 ? void 0 : _a.call(configRemote, err); }));
+        })) === null || _a === void 0 ? void 0 : _a.catch((err) => onSetError === null || onSetError === void 0 ? void 0 : onSetError(err)));
+        localState.numSavesOutstanding--;
         // If this remote save changed anything then update persistence and metadata
         // Because save happens after a timeout and they're batched together, some calls to save will
         // return saved data and others won't, so those can be ignored.
         if (saved) {
             const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-            const { changes, dateModified } = saved;
+            const { changes, lastSync } = saved;
             if (pathStrs.length > 0) {
                 if (local) {
                     const metadata = {};
-                    const pending = (_c = persistenceLocal.getMetadata(table, configLocal)) === null || _c === void 0 ? void 0 : _c.pending;
-                    let transformedChanges = [];
+                    const pending = (_b = persistenceLocal.getMetadata(table, configLocal)) === null || _b === void 0 ? void 0 : _b.pending;
+                    let transformedChanges = undefined;
                     for (let i = 0; i < pathStrs.length; i++) {
                         const pathStr = pathStrs[i];
                         // Clear pending for this path
@@ -433,25 +585,37 @@ async function doChange(changeInfo) {
                             metadata.pending = pending;
                         }
                     }
-                    if (dateModified) {
-                        metadata.modified = dateModified;
+                    if (lastSync) {
+                        metadata.lastSync = lastSync;
                     }
                     // Remote can optionally have data that needs to be merged back into the observable,
                     // for example Firebase may update dateModified with the server timestamp
                     if (changes && !state.isEmpty(changes)) {
-                        transformedChanges.push(transformLoadData(changes, persistOptions.remote, false));
+                        transformedChanges = transformLoadData(changes, persistOptions.remote, false);
                     }
-                    if (transformedChanges.length > 0) {
-                        if (transformedChanges.some((change) => state.isPromise(change))) {
-                            transformedChanges = await Promise.all(transformedChanges);
+                    if (localState.numSavesOutstanding > 0) {
+                        if (transformedChanges) {
+                            if (!localState.pendingSaveResults) {
+                                localState.pendingSaveResults = [];
+                            }
+                            localState.pendingSaveResults.push(transformedChanges);
                         }
-                        onChangeRemote(() => state.mergeIntoObservable(obs, ...transformedChanges));
                     }
-                    if (shouldSaveMetadata && !state.isEmpty(metadata)) {
-                        updateMetadata(obs, localState, syncState, persistOptions, metadata);
+                    else {
+                        let allChanges = [...(localState.pendingSaveResults || []), transformedChanges];
+                        if (allChanges.length > 0) {
+                            if (allChanges.some((change) => state.isPromise(change))) {
+                                allChanges = await Promise.all(allChanges);
+                            }
+                            onChangeRemote(() => state.mergeIntoObservable(obs, ...allChanges));
+                        }
+                        if (shouldSaveMetadata && !state.isEmpty(metadata)) {
+                            updateMetadata(obs, localState, syncState, persistOptions, metadata);
+                        }
+                        localState.pendingSaveResults = [];
                     }
                 }
-                (_d = configRemote === null || configRemote === void 0 ? void 0 : configRemote.onSet) === null || _d === void 0 ? void 0 : _d.call(configRemote);
+                onSet === null || onSet === void 0 ? void 0 : onSet();
             }
         }
     }
@@ -499,7 +663,7 @@ async function loadLocal(obs, persistOptions, syncState, localState) {
         }
         const { persist: persistenceLocal, initialized } = mapPersistences.get(localPersistence);
         localState.persistenceLocal = persistenceLocal;
-        if (!initialized.get()) {
+        if (!initialized.peek()) {
             await state.when(initialized);
         }
         // If persistence has an asynchronous load, wait for it
@@ -513,12 +677,21 @@ async function loadLocal(obs, persistOptions, syncState, localState) {
         let value = persistenceLocal.getTable(table, config);
         const metadata = persistenceLocal.getMetadata(table, config);
         if (metadata) {
+            // @ts-expect-error Migration from old version
+            if (!metadata.lastSync && metadata.modified) {
+                // @ts-expect-error Migration from old
+                metadata.lastSync = metadata.modified;
+            }
             metadatas.set(obs, metadata);
             localState.pendingChanges = metadata.pending;
-            syncState.dateModified.set(metadata.modified);
+            // TODOV3 Remove dateModified
+            syncState.assign({
+                dateModified: metadata.lastSync,
+                lastSync: metadata.lastSync,
+            });
         }
         // Merge the data from local persistence into the default state
-        if (value !== null && value !== undefined) {
+        if (value !== undefined) {
             const { transform, fieldTransforms } = config;
             value = transformLoadData(value, { transform, fieldTransforms }, true);
             if (state.isPromise(value)) {
@@ -529,7 +702,12 @@ async function loadLocal(obs, persistOptions, syncState, localState) {
                 // are set on the same observable
                 state.internal.globalState.isLoadingLocal = true;
                 // We want to merge the local data on top of any initial state the object is created with
-                state.mergeIntoObservable(obs, value);
+                if (value === null && !obs.peek()) {
+                    obs.set(value);
+                }
+                else {
+                    state.mergeIntoObservable(obs, value);
+                }
             }, () => {
                 state.internal.globalState.isLoadingLocal = false;
             });
@@ -542,18 +720,11 @@ async function loadLocal(obs, persistOptions, syncState, localState) {
     }
     syncState.isLoadedLocal.set(true);
 }
-function persistObservable(initialOrObservable, persistOptions) {
-    var _a;
-    const obs = (state.isObservable(initialOrObservable)
-        ? initialOrObservable
-        : state.observable(state.isFunction(initialOrObservable) ? initialOrObservable() : initialOrObservable));
+function persistObservable(obs, persistOptions) {
     const node = state.getNode(obs);
-    if (process.env.NODE_ENV === 'development' && ((_a = obs === null || obs === void 0 ? void 0 : obs.peek()) === null || _a === void 0 ? void 0 : _a._state)) {
-        console.warn('[legend-state] WARNING: persistObservable creates a property named "_state" but your observable already has "state" in it');
-    }
     // Merge remote persist options with clobal options
     if (persistOptions.remote) {
-        persistOptions.remote = Object.assign({}, observablePersistConfiguration.remoteOptions, persistOptions.remote);
+        persistOptions.remote = Object.assign({}, observablePersistConfiguration.remoteOptions, removeNullUndefined(persistOptions.remote));
     }
     let { remote } = persistOptions;
     const { local } = persistOptions;
@@ -596,33 +767,28 @@ function persistObservable(initialOrObservable, persistOptions) {
             var _a, _b;
             if (!isSynced) {
                 isSynced = true;
-                const dateModified = (_a = metadatas.get(obs)) === null || _a === void 0 ? void 0 : _a.modified;
+                const lastSync = (_a = metadatas.get(obs)) === null || _a === void 0 ? void 0 : _a.lastSync;
+                const pending = localState.pendingChanges;
                 const get = (_b = localState.persistenceRemote.get) === null || _b === void 0 ? void 0 : _b.bind(localState.persistenceRemote);
                 if (get) {
-                    let attemptNum = 0;
                     const runGet = () => {
                         get({
                             state: syncState,
                             obs,
                             options: persistOptions,
-                            dateModified,
+                            lastSync,
+                            dateModified: lastSync,
                             onError: (error) => {
                                 var _a;
-                                if (remote.retry) {
-                                    const { backoff, delay = 1000, infinite, times = 3, maxDelay = 30000, } = remote.retry;
-                                    if (infinite || attemptNum++ < times) {
-                                        const delayTime = Math.min(delay * (backoff === 'constant' ? 1 : 2 ** attemptNum), maxDelay);
-                                        setTimeout(runGet, delayTime);
-                                        // Don't error when retrying
-                                        return;
-                                    }
-                                }
                                 (_a = remote.onGetError) === null || _a === void 0 ? void 0 : _a.call(remote, error);
                             },
                             onGet: () => {
-                                syncState.isLoaded.set(true);
+                                node.state.assign({
+                                    isLoaded: true,
+                                    error: undefined,
+                                });
                             },
-                            onChange: async ({ value, path = [], pathTypes = [], mode = 'set', dateModified }) => {
+                            onChange: async ({ value, path = [], pathTypes = [], mode = 'set', lastSync }) => {
                                 // Note: value is the constructed value, path is used for setInObservableAtPath
                                 // to start the set into the observable from the path
                                 if (value !== undefined) {
@@ -634,10 +800,12 @@ function persistObservable(initialOrObservable, persistOptions) {
                                     if (path.length && invertedMap) {
                                         path = transformPath(path, pathTypes, invertedMap);
                                     }
-                                    if (mode === 'dateModified') {
-                                        if (dateModified && !state.isEmpty(value)) {
+                                    if (mode === 'lastSync' || mode === 'dateModified') {
+                                        if (lastSync && !state.isEmpty(value)) {
                                             onChangeRemote(() => {
-                                                state.setInObservableAtPath(obs, path, pathTypes, value, 'assign');
+                                                state.setInObservableAtPath(
+                                                // @ts-expect-error Fix this type
+                                                obs, path, pathTypes, value, 'assign');
                                             });
                                         }
                                     }
@@ -647,7 +815,10 @@ function persistObservable(initialOrObservable, persistOptions) {
                                             Object.keys(pending).forEach((key) => {
                                                 const p = key.split('/').filter((p) => p !== '');
                                                 const { v, t } = pending[key];
-                                                if (value[p[0]] !== undefined) {
+                                                if (t.length === 0 || !value) {
+                                                    value = v;
+                                                }
+                                                else if (value[p[0]] !== undefined) {
                                                     value = state.setAtPath(value, p, t, v, obs.peek(), (path, value) => {
                                                         delete pending[key];
                                                         pending[path.join('/')] = {
@@ -660,13 +831,14 @@ function persistObservable(initialOrObservable, persistOptions) {
                                             });
                                         }
                                         onChangeRemote(() => {
+                                            // @ts-expect-error Fix this type
                                             state.setInObservableAtPath(obs, path, pathTypes, value, mode);
                                         });
                                     }
                                 }
-                                if (dateModified && local) {
+                                if (lastSync && local) {
                                     updateMetadata(obs, localState, syncState, persistOptions, {
-                                        modified: dateModified,
+                                        lastSync,
                                     });
                                 }
                             },
@@ -675,11 +847,13 @@ function persistObservable(initialOrObservable, persistOptions) {
                     runGet();
                 }
                 else {
-                    syncState.isLoaded.set(true);
+                    node.state.assign({
+                        isLoaded: true,
+                        error: undefined,
+                    });
                 }
                 // Wait for remote to be ready before saving pending
                 await state.when(() => syncState.isLoaded.get() || (remote.allowSetIfError && syncState.error.get()));
-                const pending = localState.pendingChanges;
                 if (pending && !state.isEmpty(pending)) {
                     localState.isApplyingPending = true;
                     const keys = Object.keys(pending);
@@ -692,6 +866,7 @@ function persistObservable(initialOrObservable, persistOptions) {
                         changes.push({ path, valueAtPath: v, prevAtPath: p, pathTypes: t });
                     }
                     // Send the changes into onObsChange so that they get persisted remotely
+                    // @ts-expect-error Fix this type
                     onObsChange(obs, syncState, localState, persistOptions, {
                         value: obs.peek(),
                         // TODO getPrevious if any remote persistence layers need it
@@ -727,49 +902,122 @@ function persistObservable(initialOrObservable, persistOptions) {
         }
         obs.onChange(onObsChange.bind(this, obs, syncState, localState, persistOptions));
     });
-    return obs;
+    return syncState;
 }
-globalState.activateNode = function activateNodePersist(node, refresh, newValue) {
-    const { onSetFn, subscriber, lastSync, cacheOptions, retryOptions } = node.activationState;
-    let onChange = undefined;
-    const pluginRemote = {
-        get: async (params) => {
-            onChange = params.onChange;
-            if (state.isPromise(newValue)) {
-                newValue = await newValue;
+
+const { getProxy, globalState, runWithRetry, symbolActivated } = state.internal;
+function persistActivateNode() {
+    globalState.activateNode = function activateNodePersist(node, refresh, wasPromise, newValue) {
+        if (node.activationState) {
+            const { get, initial, onSet, subscribe, cache, retry, offlineBehavior, waitForSet } = node.activationState;
+            let onChange = undefined;
+            const pluginRemote = {};
+            if (get) {
+                pluginRemote.get = (params) => {
+                    onChange = params.onChange;
+                    const updateLastSync = (lastSync) => (params.lastSync = lastSync);
+                    const setMode = (mode) => (params.mode = mode);
+                    const nodeValue = state.getNodeValue(node);
+                    const value = runWithRetry(node, { attemptNum: 0 }, () => {
+                        return get({
+                            value: state.isFunction(nodeValue) || (nodeValue === null || nodeValue === void 0 ? void 0 : nodeValue[symbolActivated]) ? undefined : nodeValue,
+                            lastSync: params.lastSync,
+                            updateLastSync,
+                            setMode,
+                            refresh,
+                        });
+                    });
+                    return value;
+                };
+            }
+            if (onSet) {
+                // TODO: Work out these types better
+                pluginRemote.set = async (params) => {
+                    var _a;
+                    if ((_a = node.state) === null || _a === void 0 ? void 0 : _a.isLoaded.get()) {
+                        const retryAttempts = { attemptNum: 0 };
+                        return runWithRetry(node, retryAttempts, async (retryEvent) => {
+                            let changes = {};
+                            let maxModified = 0;
+                            if (!node.state.isLoaded.peek()) {
+                                await state.whenReady(node.state.isLoaded);
+                            }
+                            const cancelRetry = () => {
+                                retryEvent.cancel = true;
+                            };
+                            await onSet({
+                                ...params,
+                                node,
+                                update: (params) => {
+                                    const { value, lastSync } = params;
+                                    maxModified = Math.max(lastSync || 0, maxModified);
+                                    changes = state.mergeIntoObservable(changes, value);
+                                },
+                                retryNum: retryAttempts.attemptNum,
+                                cancelRetry,
+                                refresh,
+                                fromSubscribe: false,
+                            });
+                            return { changes, lastSync: maxModified || undefined };
+                        });
+                    }
+                };
+            }
+            if (subscribe) {
+                subscribe({
+                    node,
+                    update: (params) => {
+                        if (!onChange) {
+                            // TODO: Make this message better
+                            console.log('[legend-state] Cannot update immediately before the first return');
+                        }
+                        else {
+                            onChange(params);
+                        }
+                    },
+                    refresh,
+                });
+            }
+            persistObservable(getProxy(node), {
+                pluginRemote,
+                ...(cache || {}),
+                remote: {
+                    retry: retry,
+                    offlineBehavior,
+                    waitForSet,
+                },
+            });
+            const nodeVal = state.getNodeValue(node);
+            if (nodeVal !== undefined) {
+                newValue = nodeVal;
             }
-            if (lastSync.value) {
-                params.dateModified = lastSync.value;
+            else if (newValue === undefined) {
+                newValue = initial;
             }
-            return newValue;
-        },
+            return { update: onChange, value: newValue };
+        }
+        else {
+            let onChange = undefined;
+            const pluginRemote = {
+                get: async (params) => {
+                    onChange = params.onChange;
+                    if (state.isPromise(newValue)) {
+                        try {
+                            newValue = await newValue;
+                            // eslint-disable-next-line no-empty
+                        }
+                        catch (_a) { }
+                    }
+                    return newValue;
+                },
+            };
+            persistObservable(getProxy(node), {
+                pluginRemote,
+            });
+            return { update: onChange, value: newValue };
+        }
     };
-    if (onSetFn) {
-        // TODO: Work out these types better
-        pluginRemote.set = onSetFn;
-    }
-    if (subscriber) {
-        subscriber({
-            update: (params) => {
-                if (!onChange) {
-                    // TODO: Make this message better
-                    console.log('[legend-state] Cannot update immediately before the first return');
-                }
-                else {
-                    onChange(params);
-                }
-            },
-            refresh,
-        });
-    }
-    persistObservable(getProxy(node), {
-        pluginRemote,
-        ...(cacheOptions || {}),
-        remote: {
-            retry: retryOptions,
-        },
-    });
-};
+}
 
 function isInRemoteChange() {
     return state.internal.globalState.isLoadingRemote$.get();
@@ -777,6 +1025,7 @@ function isInRemoteChange() {
 const internal = {
     observablePersistConfiguration,
 };
+persistActivateNode();
 
 exports.configureObservablePersistence = configureObservablePersistence;
 exports.internal = internal;