@legendapp/state 2.2.0-next.65 → 2.2.0-next.67

package/src/react-hooks/usePersistedObservable.ts

@@ -1,4 +1,4 @@
-import { Observable, ObservableParam, PersistOptions, observable } from '@legendapp/state';
+import { Observable, ObservableParam, LegacyPersistOptions, observable } from '@legendapp/state';
 import { persistObservable } from '@legendapp/state/persist';
 import { useMemo } from 'react';
 
@@ -13,7 +13,7 @@ import { useMemo } from 'react';
  * @see https://www.legendapp.com/dev/state/react/#useObservable
  */
 export function usePersistedObservable<T>(params: {
-    options: PersistOptions<T>;
+    options: LegacyPersistOptions<T>;
     initialValue?: T | (() => T) | (() => Promise<T>);
 }): Observable<T> {
     // Create the observable from the default value

package/src/sync/syncObservable.ts

@@ -1,18 +1,18 @@
 import type {
-    CacheMetadata,
-    CacheOptions,
+    PersistMetadata,
+    PersistOptions,
     Change,
     ClassConstructor,
     ListenerParams,
     NodeValue,
     Observable,
-    ObservableCachePlugin,
+    ObservablePersistPlugin,
     ObservableObject,
     ObservableParam,
     ObservableSyncClass,
     ObservableSyncState,
     SyncTransform,
-    SyncedParams,
+    SyncedOptions,
     TypeAtPath,
 } from '@legendapp/state';
 import {
@@ -36,21 +36,21 @@ import { observableSyncConfiguration } from './configureObservableSync';
 import { removeNullUndefined } from './syncHelpers';
 import { syncObservableAdapter } from './syncObservableAdapter';
 
-const { globalState, symbolLinked, getNode } = internal;
+const { globalState, symbolLinked, getNode, getNodeValue } = internal;
 
 export const mapSyncPlugins: WeakMap<
-    ClassConstructor<ObservableCachePlugin | ObservableSyncClass>,
+    ClassConstructor<ObservablePersistPlugin | ObservableSyncClass>,
     {
-        plugin: ObservableCachePlugin | ObservableSyncClass;
+        plugin: ObservablePersistPlugin | ObservableSyncClass;
         initialized: Observable<boolean>;
     }
 > = new WeakMap();
 
-const metadatas = new WeakMap<ObservableParam<any>, CacheMetadata>();
+const metadatas = new WeakMap<ObservableParam<any>, PersistMetadata>();
 const promisesLocalSaves = new Set<Promise<void>>();
 
 interface LocalState {
-    pluginCache?: ObservableCachePlugin;
+    pluginPersist?: ObservablePersistPlugin;
     pluginSync?: ObservableSyncClass;
     pendingChanges?: Record<string, { p: any; v?: any; t: TypeAtPath[] }>;
     numSavesOutstanding?: number;
@@ -72,15 +72,15 @@ interface PreppedChangeRemote {
 
 type ChangeWithPathStr = Change & { pathStr: string };
 
-function parseLocalConfig(config: string | CacheOptions | undefined): {
+function parseLocalConfig(config: string | PersistOptions | undefined): {
     table: string;
-    config: CacheOptions;
+    config: PersistOptions;
 } {
     return config
         ? isString(config)
             ? { table: config, config: { name: config } }
             : { table: config.name, config }
-        : ({} as { table: string; config: CacheOptions });
+        : ({} as { table: string; config: PersistOptions });
 }
 
 function doInOrder<T>(arg1: T | Promise<T>, arg2: (value: T) => void): any {
@@ -128,19 +128,19 @@ async function updateMetadataImmediate<T>(
     obs: ObservableParam<any>,
     localState: LocalState,
     syncState: Observable<ObservableSyncState>,
-    syncOptions: SyncedParams<T>,
-    newMetadata: CacheMetadata,
+    syncOptions: SyncedOptions<T>,
+    newMetadata: PersistMetadata,
 ) {
     const saves = Array.from(promisesLocalSaves);
     if (saves.length > 0) {
         await Promise.all(saves);
     }
 
-    const { pluginCache } = localState;
-    const { table, config } = parseLocalConfig(syncOptions?.cache);
+    const { pluginPersist } = localState;
+    const { table, config } = parseLocalConfig(syncOptions?.persist);
 
     // Save metadata
-    const oldMetadata: CacheMetadata | undefined = metadatas.get(obs);
+    const oldMetadata: PersistMetadata | undefined = metadatas.get(obs);
 
     const { lastSync, pending } = newMetadata;
 
@@ -149,14 +149,13 @@ async function updateMetadataImmediate<T>(
     if (needsUpdate) {
         const metadata = Object.assign({}, oldMetadata, newMetadata);
         metadatas.set(obs, metadata);
-        if (pluginCache) {
-            await pluginCache!.setMetadata(table, metadata, config);
+        if (pluginPersist) {
+            await pluginPersist!.setMetadata(table, metadata, config);
         }
 
         if (lastSync) {
             syncState.assign({
                 lastSync: lastSync,
-                dateModified: lastSync,
             });
         }
     }
@@ -166,14 +165,14 @@ function updateMetadata<T>(
     obs: ObservableParam<any>,
     localState: LocalState,
     syncState: ObservableObject<ObservableSyncState>,
-    syncOptions: SyncedParams<T>,
-    newMetadata: CacheMetadata,
+    syncOptions: SyncedOptions<T>,
+    newMetadata: PersistMetadata,
 ) {
     if (localState.timeoutSaveMetadata) {
         clearTimeout(localState.timeoutSaveMetadata);
     }
     localState.timeoutSaveMetadata = setTimeout(
-        () => updateMetadataImmediate(obs, localState, syncState, syncOptions as SyncedParams<T>, newMetadata),
+        () => updateMetadataImmediate(obs, localState, syncState, syncOptions as SyncedOptions<T>, newMetadata),
         0,
     );
 }
@@ -184,13 +183,13 @@ interface QueuedChange<T = any> {
     obs: Observable<T>;
     syncState: ObservableObject<ObservableSyncState>;
     localState: LocalState;
-    syncOptions: SyncedParams<T>;
+    syncOptions: SyncedOptions<T>;
     changes: ListenerParams['changes'];
 }
 
 let _queuedChanges: QueuedChange[] = [];
-const _queuedRemoteChanges: Map<SyncedParams, QueuedChange[]> = new Map();
-const _queuedRemoteChangesTimeouts: Map<SyncedParams, number> = new Map();
+const _queuedRemoteChanges: Map<SyncedOptions, QueuedChange[]> = new Map();
+const _queuedRemoteChangesTimeouts: Map<SyncedOptions, number> = new Map();
 
 function mergeChanges(changes: Change[]) {
     const changesByPath = new Map<string, Change>();
@@ -235,7 +234,7 @@ async function processQueuedChanges() {
     const queuedChanges = mergeQueuedChanges(_queuedChanges);
     _queuedChanges = [];
 
-    const pendingSyncOptions = new Set<SyncedParams>();
+    const pendingSyncOptions = new Set<SyncedOptions>();
     for (let i = 0; i < queuedChanges.length; i++) {
         const change = queuedChanges[i];
         if (!change.inRemoteChange) {
@@ -284,7 +283,7 @@ async function processQueuedChanges() {
     }
 }
 
-async function processQueuedRemoteChanges(syncOptions: SyncedParams) {
+async function processQueuedRemoteChanges(syncOptions: SyncedOptions) {
     const arr = _queuedRemoteChanges.get(syncOptions);
     if (arr?.length) {
         const queuedRemoteChanges = mergeQueuedChanges(arr);
@@ -299,11 +298,11 @@ async function processQueuedRemoteChanges(syncOptions: SyncedParams) {
 async function prepChangeLocal(queuedChange: QueuedChange): Promise<PreppedChangeLocal | undefined> {
     const { syncState, changes, localState, syncOptions, inRemoteChange, isApplyingPending } = queuedChange;
 
-    const cache = syncOptions.cache;
+    const persist = syncOptions.persist;
     const { pluginSync } = localState;
-    const { config: configLocal } = parseLocalConfig(cache);
+    const { config: configLocal } = parseLocalConfig(persist);
     const configRemote = syncOptions;
-    const saveLocal = cache?.name && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
+    const saveLocal = persist?.name && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
     const saveRemote = !!(
         !inRemoteChange &&
         pluginSync?.set &&
@@ -313,7 +312,10 @@ async function prepChangeLocal(queuedChange: QueuedChange): Promise<PreppedChang
 
     if (saveLocal || saveRemote) {
         if (saveLocal && !syncState.isLoadedLocal.peek()) {
-            console.error('[legend-state] WARNING: An observable was changed before being loaded from cache', cache);
+            console.error(
+                '[legend-state] WARNING: An observable was changed before being loaded from persist',
+                persist,
+            );
             return undefined;
         }
         const changesLocal: ChangeWithPathStr[] = [];
@@ -387,17 +389,20 @@ async function prepChangeRemote(queuedChange: QueuedChange): Promise<PreppedChan
         isApplyingPending,
     } = queuedChange;
 
-    const cache = syncOptions.cache;
+    const persist = syncOptions.persist;
     const { pluginSync } = localState;
-    const { config: configLocal } = parseLocalConfig(cache!);
+    const { config: configLocal } = parseLocalConfig(persist!);
     const configRemote = syncOptions;
-    const saveLocal = cache && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
+    const saveLocal = persist && !configLocal.readonly && !isApplyingPending && syncState.isEnabledLocal.peek();
     const saveRemote =
         !inRemoteChange && pluginSync?.set && configRemote?.enableSync !== false && syncState.isEnabledRemote.peek();
 
     if (saveLocal || saveRemote) {
         if (saveLocal && !syncState.isLoadedLocal.peek()) {
-            console.error('[legend-state] WARNING: An observable was changed before being loaded from cache', cache);
+            console.error(
+                '[legend-state] WARNING: An observable was changed before being loaded from persist',
+                persist,
+            );
             return undefined;
         }
         const changesRemote: ChangeWithPathStr[] = [];
@@ -509,12 +514,12 @@ async function doChangeLocal(changeInfo: PreppedChangeLocal | undefined) {
 
     const { queuedChange, changesLocal, saveRemote } = changeInfo;
     const { obs, syncState, localState, syncOptions: syncOptions } = queuedChange;
-    const { pluginCache } = localState;
+    const { pluginPersist } = localState;
 
-    const cache = syncOptions.cache;
-    const { table, config: configLocal } = parseLocalConfig(cache!);
+    const persist = syncOptions.persist;
+    const { table, config: configLocal } = parseLocalConfig(persist!);
     const configRemote = syncOptions;
-    const shouldSaveMetadata = cache && configRemote?.offlineBehavior === 'retry';
+    const shouldSaveMetadata = persist && configRemote?.offlineBehavior === 'retry';
 
     if (saveRemote && shouldSaveMetadata) {
         // First save pending changes before saving local or remote
@@ -526,7 +531,7 @@ async function doChangeLocal(changeInfo: PreppedChangeLocal | undefined) {
     if (changesLocal.length > 0) {
         // Save the changes to local cache before saving to remote. They are already marked as pending so
         // if remote sync fails or the app is closed before remote sync, it will attempt to sync them on the next load.
-        let promiseSet = pluginCache!.set(table, changesLocal, configLocal);
+        let promiseSet = pluginPersist!.set(table, changesLocal, configLocal);
 
         if (promiseSet) {
             promiseSet = promiseSet.then(() => {
@@ -545,13 +550,13 @@ async function doChangeRemote(changeInfo: PreppedChangeRemote | undefined) {
 
     const { queuedChange, changesRemote } = changeInfo;
     const { obs, syncState, localState, syncOptions: syncOptions } = queuedChange;
-    const { pluginCache, pluginSync } = localState;
+    const { pluginPersist, pluginSync } = localState;
 
-    const cache = syncOptions.cache;
-    const { table, config: configLocal } = parseLocalConfig(cache!);
+    const persist = syncOptions.persist;
+    const { table, config: configLocal } = parseLocalConfig(persist!);
     const { offlineBehavior, allowSetIfGetError, onBeforeSet, onSetError, waitForSet, onAfterSet } =
-        syncOptions || ({} as SyncedParams);
-    const shouldSaveMetadata = cache && offlineBehavior === 'retry';
+        syncOptions || ({} as SyncedOptions);
+    const shouldSaveMetadata = persist && offlineBehavior === 'retry';
 
     if (changesRemote.length > 0) {
         // Wait for remote to be ready before saving
@@ -598,9 +603,9 @@ async function doChangeRemote(changeInfo: PreppedChangeRemote | undefined) {
             const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
             const { changes, lastSync } = saved;
             if (pathStrs.length > 0) {
-                if (cache) {
-                    const metadata: CacheMetadata = {};
-                    const pending = pluginCache!.getMetadata(table, configLocal)?.pending;
+                if (persist) {
+                    const metadata: PersistMetadata = {};
+                    const pending = pluginPersist!.getMetadata(table, configLocal)?.pending;
                     let transformedChanges: object | undefined = undefined;
 
                     for (let i = 0; i < pathStrs.length; i++) {
@@ -656,7 +661,7 @@ function onObsChange<T>(
     obs: Observable<T>,
     syncState: ObservableObject<ObservableSyncState>,
     localState: LocalState,
-    syncOptions: SyncedParams<T>,
+    syncOptions: SyncedOptions<T>,
     { changes, loading, remote }: ListenerParams,
 ) {
     if (!loading) {
@@ -680,27 +685,28 @@ function onObsChange<T>(
 
 async function loadLocal<T>(
     obs: ObservableParam<T>,
-    syncOptions: SyncedParams<any>,
+    syncOptions: SyncedOptions<any>,
     syncState: ObservableObject<ObservableSyncState>,
     localState: LocalState,
 ) {
-    const { cache } = syncOptions;
+    const { persist } = syncOptions;
 
-    if (cache) {
-        const CachePlugin: ClassConstructor<ObservableCachePlugin> =
-            cache.plugin! || observableSyncConfiguration.cache?.plugin;
-        const { table, config } = parseLocalConfig(cache);
+    if (persist) {
+        const PersistPlugin: ClassConstructor<ObservablePersistPlugin> =
+            persist.plugin! || observableSyncConfiguration.persist?.plugin;
+        const { table, config } = parseLocalConfig(persist);
+        const node = getNode(obs);
 
-        if (!CachePlugin) {
-            throw new Error('Local cache is not configured');
+        if (!PersistPlugin) {
+            throw new Error('Local persist is not configured');
         }
         // Ensure there's only one instance of the cache plugin
-        if (!mapSyncPlugins.has(CachePlugin)) {
-            const cachePlugin = new CachePlugin();
-            const mapValue = { plugin: cachePlugin, initialized: observable(false) };
-            mapSyncPlugins.set(CachePlugin, mapValue);
-            if (cachePlugin.initialize) {
-                const initializePromise = cachePlugin.initialize?.(observableSyncConfiguration?.cache || {});
+        if (!mapSyncPlugins.has(PersistPlugin)) {
+            const persistPlugin = new PersistPlugin();
+            const mapValue = { plugin: persistPlugin, initialized: observable(false) };
+            mapSyncPlugins.set(PersistPlugin, mapValue);
+            if (persistPlugin.initialize) {
+                const initializePromise = persistPlugin.initialize?.(observableSyncConfiguration?.persist || {});
                 if (isPromise(initializePromise)) {
                     await initializePromise;
                 }
@@ -708,33 +714,34 @@ async function loadLocal<T>(
             mapValue.initialized.set(true);
         }
 
-        const { plugin, initialized: initialized$ } = mapSyncPlugins.get(CachePlugin)!;
-        const cachePlugin = plugin as ObservableCachePlugin;
+        const { plugin, initialized: initialized$ } = mapSyncPlugins.get(PersistPlugin)!;
+        const persistPlugin = plugin as ObservablePersistPlugin;
 
-        localState.pluginCache = cachePlugin as ObservableCachePlugin;
+        localState.pluginPersist = persistPlugin as ObservablePersistPlugin;
 
         if (!initialized$.peek()) {
             await when(initialized$);
         }
 
         // If cache has an asynchronous load, wait for it
-        if (cachePlugin.loadTable) {
-            const promise = cachePlugin.loadTable(table, config);
+        if (persistPlugin.loadTable) {
+            const promise = persistPlugin.loadTable(table, config);
             if (promise) {
                 await promise;
             }
         }
 
+        // Get current value for init
+        const prevValue = getNodeValue(node) as object;
+
         // Get the value from state
-        let value = cachePlugin.getTable(table, config);
-        const metadata = cachePlugin.getMetadata(table, config);
+        let value = persistPlugin.getTable(table, prevValue, config);
+        const metadata = persistPlugin.getMetadata(table, config);
 
         if (metadata) {
             metadatas.set(obs, metadata);
             localState.pendingChanges = metadata.pending;
-            // TODOV3 Remove dateModified
             syncState.assign({
-                dateModified: metadata.lastSync,
                 lastSync: metadata.lastSync,
             });
         }
@@ -754,7 +761,6 @@ async function loadLocal<T>(
             internal.globalState.isLoadingLocal = true;
 
             // We want to merge the local data on top of any initial state the object is created with
-            const prevValue = obs.peek();
             if (value === null && (!prevValue || (prevValue as any)[symbolLinked])) {
                 obs.set(value);
             } else {
@@ -764,12 +770,10 @@ async function loadLocal<T>(
             internal.globalState.isLoadingLocal = false;
         }
 
-        const node = getNode(obs);
-
-        (node.state as Observable<ObservableSyncState>).peek().clearLocal = () =>
+        node.state!.peek().clearLocal = () =>
             Promise.all([
-                cachePlugin.deleteTable(table, config),
-                cachePlugin.deleteMetadata(table, config),
+                persistPlugin.deleteTable(table, config),
+                persistPlugin.deleteMetadata(table, config),
             ]) as unknown as Promise<void>;
     }
     syncState.isLoadedLocal.set(true);
@@ -777,7 +781,7 @@ async function loadLocal<T>(
 
 export function syncObservable<T>(
     obs$: ObservableParam<T>,
-    syncOptions: SyncedParams<T>,
+    syncOptions: SyncedOptions<T>,
 ): Observable<ObservableSyncState> {
     const node = getNode(obs$);
 
@@ -786,7 +790,7 @@ export function syncObservable<T>(
         syncOptions = Object.assign(
             {
                 syncMode: 'auto',
-            } as SyncedParams,
+            } as SyncedOptions,
             observableSyncConfiguration,
             removeNullUndefined(syncOptions),
         );
@@ -847,13 +851,18 @@ export function syncObservable<T>(
                                         const { v, t } = pending[key];
 
                                         if (t.length === 0 || !value) {
-                                            value = v;
+                                            if (isObject(value) && isObject(v)) {
+                                                Object.assign(value, v);
+                                            } else {
+                                                value = v;
+                                            }
                                         } else if ((value as any)[p[0]] !== undefined) {
                                             (value as any) = setAtPath(
                                                 value as any,
                                                 p,
                                                 t,
                                                 v,
+                                                'merge',
                                                 obs$.peek(),
                                                 (path: string[], value: any) => {
                                                     delete pending[key];
@@ -882,7 +891,7 @@ export function syncObservable<T>(
                                     }
                                 });
                             }
-                            if (lastSync && syncOptions.cache) {
+                            if (lastSync && syncOptions.persist) {
                                 updateMetadata(obs$, localState, syncState, syncOptions, {
                                     lastSync,
                                 });
@@ -951,7 +960,7 @@ export function syncObservable<T>(
             sync();
         }
 
-        obs$.onChange(onObsChange.bind(this, obs$ as any, syncState, localState, syncOptions as SyncedParams<any>));
+        obs$.onChange(onObsChange.bind(this, obs$ as any, syncState, localState, syncOptions as SyncedOptions<any>));
     });
 
     return syncState;

package/src/sync/syncObservableAdapter.ts

@@ -1,6 +1,6 @@
-import { ObservableSyncGetParams, SyncedParams, isPromise, type ObservableSyncClass } from '@legendapp/state';
+import { ObservableSyncGetParams, SyncedOptions, isPromise, type ObservableSyncClass } from '@legendapp/state';
 
-export function syncObservableAdapter<T = {}>({ get, set }: SyncedParams<T>): ObservableSyncClass {
+export function syncObservableAdapter<T = {}>({ get, set }: SyncedOptions<T>): ObservableSyncClass {
     const ret: ObservableSyncClass = {};
 
     if (get) {

package/src/sync/synced.ts

@@ -1,10 +1,10 @@
-import type { Synced, SyncedParams } from '@legendapp/state';
+import type { Synced, SyncedOptions } from '@legendapp/state';
 import { internal } from '@legendapp/state';
 import { enableActivateSyncedNode } from './activateSyncedNode';
 
 const { symbolLinked } = internal;
 
-export function synced<T>(params: SyncedParams<T>): Synced<T> {
+export function synced<T>(params: SyncedOptions<T>): Synced<T> {
     installPersistActivateNode();
     return (() => ({
         [symbolLinked]: { ...params, synced: true },

package/src/sync-plugins/fetch.ts

@@ -1,7 +1,7 @@
-import { Synced, SyncedParams, SyncedSetParams, isString } from '@legendapp/state';
+import { Synced, SyncedOptions, SyncedSetParams, isString } from '@legendapp/state';
 import { synced } from '@legendapp/state/persist';
 
-export interface SyncedFetchProps extends Omit<SyncedParams, 'get' | 'set'> {
+export interface SyncedFetchProps extends Omit<SyncedOptions, 'get' | 'set'> {
     get: string | RequestInfo;
     set?: string | RequestInfo;
     getInit?: RequestInit;
@@ -20,7 +20,7 @@ export function syncedFetch<T>({
     onSet,
     onSetValueType,
 }: SyncedFetchProps): Synced<T> {
-    const ret: SyncedParams = {
+    const ret: SyncedOptions = {
         get: () => fetch(get, getInit).then((response) => response[valueType || 'json']()),
     };
 

package/src/syncTypes.ts

@@ -16,9 +16,9 @@ import {
 } from './observableInterfaces';
 import { Observable, ObservableParam, ObservableState } from './observableTypes';
 
-export interface CacheOptions<T = any> {
+export interface PersistOptions<T = any> {
     name: string;
-    plugin?: ClassConstructor<ObservableCachePlugin, T[]>;
+    plugin?: ClassConstructor<ObservablePersistPlugin, T[]>;
     transform?: SyncTransform<T>;
     readonly?: boolean;
     mmkv?: MMKVConfiguration;
@@ -48,13 +48,13 @@ export type SyncedSetParams<T> = SetParams<T> & {
 
 export type GetMode = 'set' | 'assign' | 'merge' | 'append' | 'prepend';
 
-export interface SyncedParams<T = any> extends Omit<LinkedParams<T>, 'get' | 'set'> {
+export interface SyncedOptions<T = any> extends Omit<LinkedParams<T>, 'get' | 'set'> {
     get?: (params: SyncedGetParams) => Promise<T> | T;
     set?: (params: SyncedSetParams<T>) => void | Promise<any>;
     subscribe?: (params: { node: NodeValue; update: UpdateFn; refresh: () => void }) => void;
     retry?: RetryOptions;
     offlineBehavior?: false | 'retry';
-    cache?: CacheOptions<any>;
+    persist?: PersistOptions<any>;
     debounceSet?: number;
     syncMode?: 'auto' | 'manual';
     getMode?: GetMode;
@@ -69,11 +69,11 @@ export interface SyncedParams<T = any> extends Omit<LinkedParams<T>, 'get' | 'se
     allowSetIfGetError?: boolean;
 }
 
-export interface SyncedParamsGlobal<T = any> extends Omit<SyncedParams<T>, 'get' | 'set' | 'cache'> {
-    cache?: ObservableCachePluginOptions & { plugin?: ClassConstructor<ObservableCachePlugin, T[]> };
+export interface SyncedParamsGlobal<T = any> extends Omit<SyncedOptions<T>, 'get' | 'set' | 'persist'> {
+    persist?: ObservablePersistPluginOptions & { plugin?: ClassConstructor<ObservablePersistPlugin, T[]> };
 }
 
-export interface ObservableCachePluginOptions {
+export interface ObservablePersistPluginOptions {
     onGetError?: (error: Error) => void;
     onSetError?: (error: Error) => void;
     indexedDB?: {
@@ -86,17 +86,17 @@ export interface ObservableCachePluginOptions {
         preload?: boolean | string[];
     };
 }
-export interface ObservableCachePlugin {
-    initialize?(config: ObservableCachePluginOptions): void | Promise<void>;
-    loadTable?(table: string, config: CacheOptions): Promise<any> | void;
-    getTable<T = any>(table: string, config: CacheOptions): T;
-    set(table: string, changes: Change[], config: CacheOptions): Promise<any> | void;
-    deleteTable(table: string, config: CacheOptions): Promise<any> | void;
-    getMetadata(table: string, config: CacheOptions): CacheMetadata;
-    setMetadata(table: string, metadata: CacheMetadata, config: CacheOptions): Promise<any> | void;
-    deleteMetadata(table: string, config: CacheOptions): Promise<any> | void;
+export interface ObservablePersistPlugin {
+    initialize?(config: ObservablePersistPluginOptions): void | Promise<void>;
+    loadTable?(table: string, config: PersistOptions): Promise<any> | void;
+    getTable<T = any>(table: string, init: object, config: PersistOptions): T;
+    set(table: string, changes: Change[], config: PersistOptions): Promise<any> | void;
+    deleteTable(table: string, config: PersistOptions): Promise<any> | void;
+    getMetadata(table: string, config: PersistOptions): PersistMetadata;
+    setMetadata(table: string, metadata: PersistMetadata, config: PersistOptions): Promise<any> | void;
+    deleteMetadata(table: string, config: PersistOptions): Promise<any> | void;
 }
-export interface CacheMetadata {
+export interface PersistMetadata {
     id?: '__legend_metadata';
     // modified ?: number;
     lastSync?: number;
@@ -110,7 +110,6 @@ export interface ObservableSyncStateBase {
     isLoadedLocal: boolean;
     isEnabledLocal: boolean;
     isEnabledRemote: boolean;
-    dateModified?: number;
     lastSync?: number;
     syncCount?: number;
     clearLocal: () => Promise<void>;
@@ -130,14 +129,14 @@ export type ObservableSyncState = ObservableState & ObservableSyncStateBase;
 export interface ObservableSyncSetParams<T> {
     syncState: Observable<ObservableSyncState>;
     obs: ObservableParam<T>;
-    options: SyncedParams<T>;
+    options: SyncedOptions<T>;
     changes: Change[];
     value: T;
 }
 export interface ObservableSyncGetParams<T> {
     state: Observable<ObservableSyncState>;
     obs: ObservableParam<T>;
-    options: SyncedParams<T>;
+    options: SyncedOptions<T>;
     dateModified?: number;
     lastSync?: number;
     mode?: GetMode;

package/sync-plugins/fetch.d.ts

@@ -1,5 +1,5 @@
-import { Synced, SyncedParams, SyncedSetParams } from '@legendapp/state';
-export interface SyncedFetchProps extends Omit<SyncedParams, 'get' | 'set'> {
+import { Synced, SyncedOptions, SyncedSetParams } from '@legendapp/state';
+export interface SyncedFetchProps extends Omit<SyncedOptions, 'get' | 'set'> {
     get: string | RequestInfo;
     set?: string | RequestInfo;
     getInit?: RequestInit;

package/sync-plugins/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sources":["../src/sync-plugins/fetch.ts"],"sourcesContent":[null],"names":["isString","synced"],"mappings":";;;;;SAagB,WAAW,CAAI,EAC3B,GAAG,EACH,GAAG,EACH,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,EACL,cAAc,GACC,EAAA;AACf,IAAA,MAAM,GAAG,GAAiB;QACtB,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;KACrF,CAAC;IAEF,IAAI,GAAG,EAAE;AACL,QAAA,GAAG,CAAC,GAAG,GAAG,OAAO,MAA4B,KAAI;AAC7C,YAAA,MAAM,WAAW,GAAGA,cAAQ,CAAC,GAAG,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,EAAkB,GAAG,GAAG,CAAC;AACxE,YAAA,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EACtF,OAAO,CACV,CAAC;YACF,IAAI,KAAK,EAAE;AACP,gBAAA,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,cAAc,IAAI,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACjE,KAAK,CAAC,MAAM,CAAC,CAAC;aACjB;AACL,SAAC,CAAC;KACL;AAED,IAAA,OAAOC,cAAM,CAAC,GAAG,CAAC,CAAC;AACvB;;;;"}
+{"version":3,"file":"fetch.js","sources":["../src/sync-plugins/fetch.ts"],"sourcesContent":[null],"names":["isString","synced"],"mappings":";;;;;SAagB,WAAW,CAAI,EAC3B,GAAG,EACH,GAAG,EACH,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,EACL,cAAc,GACC,EAAA;AACf,IAAA,MAAM,GAAG,GAAkB;QACvB,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;KACrF,CAAC;IAEF,IAAI,GAAG,EAAE;AACL,QAAA,GAAG,CAAC,GAAG,GAAG,OAAO,MAA4B,KAAI;AAC7C,YAAA,MAAM,WAAW,GAAGA,cAAQ,CAAC,GAAG,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,EAAkB,GAAG,GAAG,CAAC;AACxE,YAAA,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EACtF,OAAO,CACV,CAAC;YACF,IAAI,KAAK,EAAE;AACP,gBAAA,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,cAAc,IAAI,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACjE,KAAK,CAAC,MAAM,CAAC,CAAC;aACjB;AACL,SAAC,CAAC;KACL;AAED,IAAA,OAAOC,cAAM,CAAC,GAAG,CAAC,CAAC;AACvB;;;;"}

package/sync-plugins/fetch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.mjs","sources":["../src/sync-plugins/fetch.ts"],"sourcesContent":[null],"names":[],"mappings":";;;SAagB,WAAW,CAAI,EAC3B,GAAG,EACH,GAAG,EACH,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,EACL,cAAc,GACC,EAAA;AACf,IAAA,MAAM,GAAG,GAAiB;QACtB,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;KACrF,CAAC;IAEF,IAAI,GAAG,EAAE;AACL,QAAA,GAAG,CAAC,GAAG,GAAG,OAAO,MAA4B,KAAI;AAC7C,YAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,EAAkB,GAAG,GAAG,CAAC;AACxE,YAAA,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EACtF,OAAO,CACV,CAAC;YACF,IAAI,KAAK,EAAE;AACP,gBAAA,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,cAAc,IAAI,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACjE,KAAK,CAAC,MAAM,CAAC,CAAC;aACjB;AACL,SAAC,CAAC;KACL;AAED,IAAA,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACvB;;;;"}
+{"version":3,"file":"fetch.mjs","sources":["../src/sync-plugins/fetch.ts"],"sourcesContent":[null],"names":[],"mappings":";;;SAagB,WAAW,CAAI,EAC3B,GAAG,EACH,GAAG,EACH,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,EACL,cAAc,GACC,EAAA;AACf,IAAA,MAAM,GAAG,GAAkB;QACvB,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;KACrF,CAAC;IAEF,IAAI,GAAG,EAAE;AACL,QAAA,GAAG,CAAC,GAAG,GAAG,OAAO,MAA4B,KAAI;AAC7C,YAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,EAAkB,GAAG,GAAG,CAAC;AACxE,YAAA,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EACtF,OAAO,CACV,CAAC;YACF,IAAI,KAAK,EAAE;AACP,gBAAA,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,cAAc,IAAI,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACjE,KAAK,CAAC,MAAM,CAAC,CAAC;aACjB;AACL,SAAC,CAAC;KACL;AAED,IAAA,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACvB;;;;"}