remove updateLastSync and applyRemoteChange - it's supposed to just s…

…end changes, dateModified through persist set
LegendApp · Oct 28, 2023 · baf447a · baf447a
1 parent 8ec4fbd
commit baf447a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/persist.ts b/persist.ts
@@ -22,7 +22,6 @@ persistActivateNode();
 declare module '@legendapp/state' {
     interface ActivateParams<T> {
         cache: (cacheOptions: CacheOptions<T> | (() => CacheOptions<T>)) => void;
-        updateLastSync: (lastSync: number) => void;
         retry: (options?: RetryOptions) => void;
     }
     interface OnSetExtra {}

diff --git a/src/ObservableObject.ts b/src/ObservableObject.ts
@@ -865,11 +865,6 @@ function createNodeActivationParams(node: NodeValue): ActivateProxyParams {
     const onSet: ActivateParams['onSet'] = (onSetFnParam) => {
         state.onSetFn = onSetFnParam;
     };
-    // The onSet function handles the observable being set
-    // and forwards the set elsewhere
-    const updateLastSync: ActivateParams['updateLastSync'] = (fn) => {
-        state.lastSync.value = fn;
-    };
     // The subscribe function runs a function that listens to
     // a data source and sends updates into the observable
     const subscribe: ActivateParams['subscribe'] = (fn) => {
@@ -900,7 +895,6 @@ function createNodeActivationParams(node: NodeValue): ActivateProxyParams {
         cache,
         retry,
         subscribe,
-        updateLastSync,
         obs$: getProxy(node),
     };
 }

diff --git a/src/persist/persistActivateNode.ts b/src/persist/persistActivateNode.ts
@@ -1,17 +1,14 @@
 import type {
-    CacheOptions,
     ListenerParams,
     NodeValue,
     ObservableOnChangeParams,
     ObservablePersistRemoteFunctions,
     ObservablePersistRemoteGetParams,
     ObservablePersistRemoteSetParams,
-    ObservablePersistStateBase,
-    RetryOptions,
     UpdateFn,
 } from '@legendapp/state';
 import { internal, isPromise } from '@legendapp/state';
-import { onChangeRemote, persistObservable } from './persistObservable';
+import { persistObservable } from './persistObservable';
 const { getProxy, globalState } = internal;
 
 export function persistActivateNode() {
@@ -43,12 +40,13 @@ export function persistActivateNode() {
             // TODO: Work out these types better
             pluginRemote.set = (params: ObservablePersistRemoteSetParams<any>) => {
                 if (node.state?.isLoaded.get()) {
-                    onSetFn(params as unknown as ListenerParams, {
-                        update: onChange as UpdateFn,
-                        updateLastSync: () => {
-                            console.log('TODO updateLastSync');
-                        },
-                        applyRemoteChange: onChangeRemote,
+                    return new Promise((resolve) => {
+                        onSetFn(params as unknown as ListenerParams, {
+                            update: (params) => {
+                                const { value, dateModified } = params;
+                                resolve({ changes: value as object, dateModified });
+                            },
+                        });
                     });
                 }
             };
@@ -64,7 +62,6 @@ export function persistActivateNode() {
                     }
                 },
                 refresh,
-                applyRemoteChange: onChangeRemote,
             });
         }
         persistObservable(getProxy(node), {