@legendapp/state 3.0.0-alpha.2 → 3.0.0-alpha.20

package/sync-plugins/keel.mjs

@@ -59,9 +59,9 @@ function configureSyncedKeel(config) {
           const oldFn = queries[key];
           queries[key] = (i) => {
             const realtimeKey = [key, ...Object.values(i.where || {})].filter((value) => value && typeof value !== "object").join("/");
-            const subscribe = ({ refresh }) => {
+            const subscribe = (params) => {
               if (realtimeKey) {
-                return realtimePlugin.subscribe(realtimeKey, refresh);
+                return realtimePlugin.subscribe(realtimeKey, params);
               }
             };
             return oldFn(i).then((ret) => {
@@ -122,7 +122,9 @@ function syncedKeel(props) {
     first,
     where: whereParam,
     waitFor,
+    waitForSet,
     fieldDeleted,
+    mode,
     ...rest
   } = props;
   const { changesSince } = props;
@@ -131,8 +133,15 @@ function syncedKeel(props) {
   const subscribeFnKey$ = observable("");
   const fieldCreatedAt = "createdAt";
   const fieldUpdatedAt = "updatedAt";
+  const setupSubscribe = (doSubscribe, subscribeKey, lastSync) => {
+    subscribeFn = doSubscribe;
+    subscribeFnKey$.set(subscribeKey);
+    if (realtimePlugin && lastSync) {
+      realtimePlugin.setLatestChange(subscribeKey, new Date(lastSync));
+    }
+  };
   const list = listParam ? async (listParams) => {
-    const { lastSync, refresh } = listParams;
+    const { lastSync } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
     const where = Object.assign(
       queryBySync ? { updatedAt: { after: new Date(lastSync + 1) } } : {},
@@ -141,8 +150,7 @@ function syncedKeel(props) {
     const params = { where, first };
     const { results, subscribe: subscribe2, subscribeKey } = await getAllPages(listParam, params);
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(listParams), subscribeKey, lastSync);
     }
     return results;
   } : void 0;
@@ -150,8 +158,7 @@ function syncedKeel(props) {
     const { refresh } = getParams;
     const { data, error, subscribe: subscribe2, subscribeKey } = await getParam({ refresh });
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(getParams), subscribeKey);
     }
     if (error) {
       throw new Error(error.message);
@@ -170,19 +177,27 @@ function syncedKeel(props) {
       }
     }
   };
-  const handleSetError = async (error, params, isCreate) => {
+  const handleSetError = async (error, params, input, fn, from) => {
     var _a, _b, _c;
     const { retryNum, cancelRetry, update: update2 } = params;
-    if (isCreate && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
+    if (from === "create" && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
       if (__DEV__) {
         console.log("Creating duplicate data already saved, just ignore.");
       }
+      cancelRetry();
       update2({
         value: {},
         mode: "assign"
       });
+    } else if (from === "delete") {
+      if (error.message === "record not found") {
+        if (__DEV__) {
+          console.log("Deleting non-existing data, just ignore.");
+        }
+        cancelRetry();
+      }
     } else if (error.type === "bad_request") {
-      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, error);
+      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, { error, params, input, type: from, action: fn.name || fn.toString() });
       if (retryNum > 4) {
         cancelRetry();
       }
@@ -195,7 +210,7 @@ function syncedKeel(props) {
   const create = createParam ? async (input, params) => {
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
-      handleSetError(error, params, true);
+      await handleSetError(error, params, input, createParam, "create");
     }
     return data;
   } : void 0;
@@ -208,15 +223,15 @@ function syncedKeel(props) {
     if (!isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {
-        handleSetError(error, params, false);
+        await handleSetError(error, params, input, updateParam, "update");
       }
       return data;
     }
   } : void 0;
-  const deleteFn = deleteParam ? async ({ id }, params) => {
-    const { data, error } = await deleteParam({ id });
+  const deleteFn = deleteParam ? async (value, params) => {
+    const { data, error } = await deleteParam({ id: value.id });
     if (error) {
-      handleSetError(error, params, false);
+      await handleSetError(error, params, value, deleteParam, "delete");
     }
     return data;
   } : void 0;
@@ -232,13 +247,14 @@ function syncedKeel(props) {
   return syncedCrud({
     ...rest,
     as: asType,
+    mode: mode || "merge",
     list,
     create,
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     onSaved,
-    onSavedUpdate: "createdUpdatedAt",
     fieldCreatedAt,
     fieldUpdatedAt,
     fieldDeleted: fieldDeleted || "deleted",

package/sync-plugins/supabase.d.mts

@@ -24,7 +24,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
     supabase: Client;
     collection: Collection;
     select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
-    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
         schema?: string;

package/sync-plugins/supabase.d.ts

@@ -24,7 +24,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
     supabase: Client;
     collection: Collection;
     select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
-    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
         schema?: string;

package/sync-plugins/supabase.js

@@ -36,6 +36,7 @@ function syncedSupabase(props) {
     waitFor,
     waitForSet,
     generateId,
+    mode,
     ...rest
   } = props;
   const fieldCreatedAt = fieldCreatedAtParam || (changesSince === "last-sync" ? "created_at" : void 0);
@@ -101,7 +102,7 @@ function syncedSupabase(props) {
           const valueDate = +new Date(valueDateStr);
           if (valueDateStr && (!curDateStr || valueDate > +new Date(curDateStr))) {
             update2({
-              value: { [value.id]: value },
+              value: [value],
               lastSync: valueDate,
               mode: "merge"
             });
@@ -109,7 +110,7 @@ function syncedSupabase(props) {
         } else if (eventType === "DELETE") {
           const { id } = old;
           update2({
-            value: { [id]: state.symbolDelete }
+            value: [{ [id]: state.symbolDelete }]
           });
         }
       }
@@ -123,6 +124,7 @@ function syncedSupabase(props) {
   }
   return crud.syncedCrud({
     ...rest,
+    mode: mode || "merge",
     list,
     create,
     update,
@@ -132,11 +134,10 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
-    onSavedUpdate: "createdUpdatedAt",
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
-    waitForSet
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? state.isFunction(waitForSet) ? waitForSet(params) : waitForSet : true)
   });
 }
 

package/sync-plugins/supabase.mjs

@@ -1,4 +1,4 @@
-import { observable, computeSelector, isObject, symbolDelete } from '@legendapp/state';
+import { observable, computeSelector, isFunction, isObject, symbolDelete } from '@legendapp/state';
 import { removeNullUndefined, transformStringifyDates, combineTransforms } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 
@@ -34,6 +34,7 @@ function syncedSupabase(props) {
     waitFor,
     waitForSet,
     generateId,
+    mode,
     ...rest
   } = props;
   const fieldCreatedAt = fieldCreatedAtParam || (changesSince === "last-sync" ? "created_at" : void 0);
@@ -99,7 +100,7 @@ function syncedSupabase(props) {
           const valueDate = +new Date(valueDateStr);
           if (valueDateStr && (!curDateStr || valueDate > +new Date(curDateStr))) {
             update2({
-              value: { [value.id]: value },
+              value: [value],
               lastSync: valueDate,
               mode: "merge"
             });
@@ -107,7 +108,7 @@ function syncedSupabase(props) {
         } else if (eventType === "DELETE") {
           const { id } = old;
           update2({
-            value: { [id]: symbolDelete }
+            value: [{ [id]: symbolDelete }]
           });
         }
       }
@@ -121,6 +122,7 @@ function syncedSupabase(props) {
   }
   return syncedCrud({
     ...rest,
+    mode: mode || "merge",
     list,
     create,
     update,
@@ -130,11 +132,10 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
-    onSavedUpdate: "createdUpdatedAt",
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
-    waitForSet
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true)
   });
 }
 

package/sync-plugins/tanstack-query.d.mts

@@ -4,11 +4,11 @@ import { QueryKey, QueryObserverOptions, QueryClient, MutationObserverOptions, D
 interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'> {
     queryKey?: TQueryKey | (() => TQueryKey);
 }
-interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends SyncedOptions<TData> {
+interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set'> {
     queryClient: QueryClient;
     query: ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey>;
     mutation?: MutationObserverOptions<TData, TError, void>;
 }
-declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): NonNullable<TData>;
+declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): TData;
 
 export { type ObservableQueryOptions, type SyncedQueryParams, syncedQuery };

package/sync-plugins/tanstack-query.d.ts

@@ -4,11 +4,11 @@ import { QueryKey, QueryObserverOptions, QueryClient, MutationObserverOptions, D
 interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'> {
     queryKey?: TQueryKey | (() => TQueryKey);
 }
-interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends SyncedOptions<TData> {
+interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set'> {
     queryClient: QueryClient;
     query: ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey>;
     mutation?: MutationObserverOptions<TData, TError, void>;
 }
-declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): NonNullable<TData>;
+declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): TData;
 
 export { type ObservableQueryOptions, type SyncedQueryParams, syncedQuery };

package/sync-plugins/tanstack-query.js

@@ -6,7 +6,7 @@ var queryCore = require('@tanstack/query-core');
 
 // src/sync-plugins/tanstack-query.ts
 function syncedQuery(params) {
-  const { query: options, mutation: mutationOptions, queryClient } = params;
+  const { query: options, mutation: mutationOptions, queryClient, ...rest } = params;
   const Observer = queryCore.QueryObserver;
   const defaultedOptions = queryClient.defaultQueryOptions(
     options
@@ -58,7 +58,8 @@ function syncedQuery(params) {
   return sync.synced({
     get,
     set,
-    subscribe
+    subscribe,
+    ...rest
   });
 }
 

package/sync-plugins/tanstack-query.mjs

@@ -4,7 +4,7 @@ import { MutationObserver, QueryObserver, notifyManager } from '@tanstack/query-
 
 // src/sync-plugins/tanstack-query.ts
 function syncedQuery(params) {
-  const { query: options, mutation: mutationOptions, queryClient } = params;
+  const { query: options, mutation: mutationOptions, queryClient, ...rest } = params;
   const Observer = QueryObserver;
   const defaultedOptions = queryClient.defaultQueryOptions(
     options
@@ -56,7 +56,8 @@ function syncedQuery(params) {
   return synced({
     get,
     set,
-    subscribe
+    subscribe,
+    ...rest
   });
 }
 

package/sync-plugins/tanstack-react-query.d.mts

@@ -3,6 +3,6 @@ import { DefaultError, QueryKey } from '@tanstack/query-core';
 import { Observable } from '@legendapp/state';
 import { Synced } from '@legendapp/state/sync';
 
-declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<NonNullable<Synced<TData>>>;
+declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<Synced<TData>>;
 
 export { useObservableSyncedQuery };

package/sync-plugins/tanstack-react-query.d.ts

@@ -3,6 +3,6 @@ import { DefaultError, QueryKey } from '@tanstack/query-core';
 import { Observable } from '@legendapp/state';
 import { Synced } from '@legendapp/state/sync';
 
-declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<NonNullable<Synced<TData>>>;
+declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<Synced<TData>>;
 
 export { useObservableSyncedQuery };

package/sync.d.mts

@@ -1,8 +1,7 @@
 import { MMKVConfiguration } from 'react-native-mmkv';
 import { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { ClassConstructor, GetMode, SetParams, NodeValue, UpdateFn, ObservableParam, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, UpdateFnParams, Selector, TypeAtPath, ObservableState, RecordValue, ArrayValue } from '@legendapp/state';
+import { ClassConstructor, NodeValue, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue } from '@legendapp/state';
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
-import { DatabaseReference, Query } from 'firebase/database';
 
 interface PersistOptions<T = any> {
     name: string;
@@ -17,30 +16,34 @@ interface PersistOptions<T = any> {
     };
     options?: any;
 }
-interface SyncedGetParams {
+interface SyncedGetSetSubscribeBaseParams<T = any> {
+    node: NodeValue;
+    value$: ObservableParam<T>;
+    refresh: () => void;
+}
+interface SyncedGetParams<T> extends SyncedGetSetSubscribeBaseParams<T> {
     value: any;
     lastSync: number | undefined;
     updateLastSync: (lastSync: number) => void;
     mode: GetMode;
-    refresh: () => void;
+    retryNum: number;
+    cancelRetry: () => void;
+    onError: (error: Error) => void;
+    options: SyncedOptions;
 }
-interface SyncedSetParams<T> extends SetParams<T> {
-    node: NodeValue;
-    valuePrevious: T;
-    update: UpdateFn;
-    refresh: () => void;
+interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetSubscribeBaseParams<T> {
+    update: UpdateFn<T>;
     cancelRetry: () => void;
     retryNum: number;
-    fromSubscribe: boolean | undefined;
+    onError: (error: Error) => void;
 }
-interface SyncedSubscribeParams<T = any> {
-    node: NodeValue;
-    value$: ObservableParam<T>;
-    update: UpdateFn;
-    refresh: () => void;
+interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams<T> {
+    lastSync: number | undefined;
+    update: UpdateFn<T>;
+    onError: (error: Error) => void;
 }
 interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOptions<TRemote>, 'get' | 'set'> {
-    get?: (params: SyncedGetParams) => Promise<TRemote> | TRemote;
+    get?: (params: SyncedGetParams<TRemote>) => Promise<TRemote> | TRemote;
     set?: (params: SyncedSetParams<TRemote>) => void | Promise<any>;
     subscribe?: (params: SyncedSubscribeParams<TRemote>) => (() => void) | void;
     retry?: RetryOptions;
@@ -49,13 +52,18 @@ interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOpti
     syncMode?: 'auto' | 'manual';
     mode?: GetMode;
     transform?: SyncTransform<TLocal, TRemote>;
-    enableSync?: boolean;
-    onGetError?: (error: Error) => void;
-    onSetError?: (error: Error) => void;
-    log?: (message?: any, ...optionalParams: any[]) => void;
+    onGetError?: (error: Error, getParams: SyncedGetParams<TRemote> | undefined, source: 'get' | 'subscribe') => void;
+    onSetError?: (error: Error, setParams: SyncedSetParams<TRemote>) => void;
+    onBeforeGet?: (params: {
+        value: TRemote;
+        lastSync: number | undefined;
+        pendingChanges: PendingChanges | undefined;
+        clearPendingChanges: () => Promise<void>;
+        resetCache: () => Promise<void>;
+    }) => void;
     onBeforeSet?: () => void;
     onAfterSet?: () => void;
-    allowSetIfGetError?: boolean;
+    log?: (message?: any, ...optionalParams: any[]) => void;
 }
 interface SyncedOptionsGlobal<T = any> extends Omit<SyncedOptions<T>, 'get' | 'set' | 'persist' | 'initial' | 'waitForSet' | 'waitFor' | 'transform' | 'subscribe'> {
     persist?: ObservablePersistPluginOptions & Omit<PersistOptions, 'name' | 'transform' | 'options'>;
@@ -99,31 +107,9 @@ interface ObservableSyncSetParams<T> {
     options: SyncedOptions<T>;
     changes: Change[];
     value: T;
-    valuePrevious: T;
-}
-interface ObservableSyncGetParams<T> {
-    state: Observable<ObservableSyncState>;
-    value$: ObservableParam<T>;
-    options: SyncedOptions<T>;
-    dateModified?: number;
-    lastSync?: number;
-    mode?: GetMode;
-    onGet: () => void;
-    onError: (error: Error) => void;
-    onChange: (params: UpdateFnParams) => void | Promise<void>;
-}
-type ObservableSyncRemoteGetFnParams<T> = Omit<ObservableSyncGetParams<T>, 'onGet'>;
-interface ObservableSyncClass {
-    get?<T>(params: ObservableSyncGetParams<T>): void;
-    set?<T>(params: ObservableSyncSetParams<T>): void | Promise<void | {
-        changes?: object;
-        dateModified?: number;
-        lastSync?: number;
-        pathStrs?: string[];
-    }>;
 }
 interface ObservableSyncFunctions<T = any> {
-    get?(params: ObservableSyncRemoteGetFnParams<T>): T | Promise<T>;
+    get?(params: SyncedGetParams<T>): T | Promise<T>;
     set?(params: ObservableSyncSetParams<T>): void | Promise<void | {
         changes?: object | undefined;
         dateModified?: number;
@@ -136,146 +122,14 @@ interface SubscribeOptions {
     refresh: () => void;
 }
 type Synced<T> = T;
+type PendingChanges = Record<string, {
+    p: any;
+    v?: any;
+    t: TypeAtPath[];
+}>;
 
 declare function configureObservableSync(options?: SyncedOptionsGlobal$1): void;
 
-interface PersistTransform<TOrig = any, TSaved = TOrig> {
-    load?: (value: TSaved) => TOrig | Promise<TOrig>;
-    save?: (value: TOrig) => TSaved | Promise<TSaved>;
-}
-interface LegacyPersistOptionsLocal<T = any> {
-    name: string;
-    transform?: PersistTransform<T>;
-    fieldTransforms?: FieldTransforms<T>;
-    readonly?: boolean;
-    mmkv?: MMKVConfiguration;
-    indexedDB?: {
-        prefixID?: string;
-        itemID?: string;
-    };
-    options?: any;
-}
-type LegacyPersistOptionsRemote<T = any> = ObservablePersistenceConfigRemoteGlobalOptions & {
-    readonly?: boolean;
-    waitForGet?: Selector<any>;
-    waitForSet?: LinkedOptions['waitForSet'];
-    manual?: boolean;
-    fieldTransforms?: FieldTransforms<T>;
-    allowSetIfError?: boolean;
-    transform?: PersistTransform<T>;
-    firebase?: {
-        refPath: (uid: string | undefined) => string;
-        query?: (ref: DatabaseReference) => DatabaseReference | Query;
-        queryByModified?: QueryByModified<T>;
-        ignoreKeys?: string[];
-        requireAuth?: boolean;
-        mode?: 'once' | 'realtime';
-    };
-    offlineBehavior?: false | 'retry';
-    changeTimeout?: number;
-    metadataTimeout?: number;
-    retry?: RetryOptions;
-    onGetError?: (error: Error) => void;
-    onSetError?: (error: Error) => void;
-    log?: (message?: any, ...optionalParams: any[]) => void;
-    onBeforeSet?: () => void;
-    onSet?: () => void;
-};
-interface ObservablePersistenceConfigLocalGlobalOptions {
-    onGetError?: (error: Error) => void;
-    onSetError?: (error: Error) => void;
-    indexedDB?: {
-        databaseName: string;
-        version: number;
-        tableNames: string[];
-    };
-    asyncStorage?: {
-        AsyncStorage: AsyncStorageStatic;
-        preload?: boolean | string[];
-    };
-}
-interface ObservablePersistenceConfigRemoteGlobalOptions {
-    debounceSet?: number;
-    dateModifiedKey?: string;
-    offlineBehavior?: false | 'retry';
-    retry?: RetryOptions;
-    onGetError?: (error: Error) => void;
-    onSetError?: (error: Error) => void;
-    log?: (logLevel: 'verbose' | 'warning' | 'error', message: any, ...optionalParams: any[]) => void;
-    onBeforeSet?: () => void;
-    onAfterSet?: () => void;
-}
-interface ObservablePersistenceConfig {
-    pluginLocal?: ClassConstructor<ObservablePersistPlugin>;
-    pluginRemote?: ClassConstructor<ObservablePersistRemoteClass> | ObservablePersistRemoteFunctions;
-    localOptions?: ObservablePersistenceConfigLocalGlobalOptions;
-    remoteOptions?: ObservablePersistenceConfigRemoteGlobalOptions;
-}
-interface LegacyPersistOptions<T = any> {
-    local?: string | LegacyPersistOptionsLocal<T>;
-    remote?: LegacyPersistOptionsRemote<T>;
-    pluginLocal?: ClassConstructor<ObservablePersistPlugin>;
-    pluginRemote?: ClassConstructor<ObservablePersistRemoteClass> | ObservablePersistRemoteFunctions<T>;
-}
-interface ObservableOnChangeParams {
-    value: unknown;
-    path?: string[];
-    pathTypes?: TypeAtPath[];
-    mode?: GetMode;
-    dateModified?: number | undefined;
-    lastSync?: number | undefined;
-}
-interface ObservablePersistRemoteSetParams<T> {
-    syncState: Observable<ObservablePersistState>;
-    obs: ObservableParam<T>;
-    options: LegacyPersistOptions<T>;
-    changes: Change[];
-    value: T;
-}
-interface ObservablePersistRemoteGetParams<T> {
-    state: Observable<ObservablePersistState>;
-    obs: ObservableParam<T>;
-    options: LegacyPersistOptions<T>;
-    dateModified?: number;
-    lastSync?: number;
-    mode?: GetMode;
-    onGet: () => void;
-    onError: (error: Error) => void;
-    onChange: (params: ObservableOnChangeParams) => void | Promise<void>;
-}
-type ObservablePersistRemoteGetFnParams<T> = Omit<ObservablePersistRemoteGetParams<T>, 'onGet'>;
-interface ObservablePersistRemoteClass {
-    get?<T>(params: ObservablePersistRemoteGetParams<T>): void;
-    set?<T>(params: ObservablePersistRemoteSetParams<T>): void | Promise<void | {
-        changes?: object;
-        dateModified?: number;
-        lastSync?: number;
-        pathStrs?: string[];
-    }>;
-}
-interface ObservablePersistRemoteFunctions<T = any> {
-    get?(params: ObservablePersistRemoteGetFnParams<T>): T | Promise<T>;
-    set?(params: ObservablePersistRemoteSetParams<T>): void | Promise<void | {
-        changes?: object | undefined;
-        dateModified?: number;
-        lastSync?: number;
-    }>;
-}
-interface ObservablePersistStateBase {
-    isLoadedLocal: boolean;
-    isEnabledLocal: boolean;
-    isEnabledRemote: boolean;
-    dateModified?: number;
-    lastSync?: number;
-    syncCount?: number;
-    clearLocal: () => Promise<void>;
-    sync: () => Promise<void>;
-    getPendingChanges: () => Record<string, {
-        p: any;
-        v?: any;
-    }> | undefined;
-}
-type ObservablePersistState = ObservableState & ObservablePersistStateBase;
 declare type ObjectKeys<T> = Pick<T, {
     [K in keyof T]-?: K extends string ? T[K] extends Record<string, any> ? T[K] extends any[] ? never : K : never : never;
 }[keyof T]>;
@@ -333,8 +187,8 @@ declare function transformStringifyDates<TRemote extends Record<string, any>, TL
 declare function transformStringifyDates<TRemote extends Record<string, any>, Keys extends keyof TRemote = keyof TRemote>(...args: Keys[]): SyncTransform<TransformStringsToDates<TRemote, Keys>, TRemote>;
 declare function transformStringifyDates<TRemote extends Record<string, any>, TLocal extends Record<string, any> = TRemote>(...args: (keyof TRemote)[]): SyncTransform<TRemote, TLocal>;
 
-declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin | ObservableSyncClass>, {
-    plugin: ObservablePersistPlugin | ObservableSyncClass;
+declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin>, {
+    plugin: ObservablePersistPlugin;
     initialized: Observable<boolean>;
 }>;
 declare function onChangeRemote(cb: () => void): void;
@@ -343,9 +197,8 @@ declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: Synced
 
 declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote, TLocal> | (() => TRemote)): Synced<TLocal>;
 
-declare function isInRemoteChange(): boolean;
 declare const internal: {
     observableSyncConfiguration: SyncedOptionsGlobal;
 };
 
-export { type FieldTransforms, type FieldTransformsInner, type LegacyPersistOptions, type LegacyPersistOptionsLocal, type LegacyPersistOptionsRemote, type ObservableOnChangeParams, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservablePersistRemoteClass, type ObservablePersistRemoteFunctions, type ObservablePersistRemoteGetFnParams, type ObservablePersistRemoteGetParams, type ObservablePersistRemoteSetParams, type ObservablePersistState, type ObservablePersistStateBase, type ObservablePersistenceConfig, type ObservablePersistenceConfigLocalGlobalOptions, type ObservablePersistenceConfigRemoteGlobalOptions, type ObservableSyncClass, type ObservableSyncFunctions, type ObservableSyncGetParams, type ObservableSyncRemoteGetFnParams, type ObservableSyncSetParams, type PersistMetadata, type PersistOptions, type PersistTransform, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedGetParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, deepEqual, diffObjects, internal, isInRemoteChange, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedGetParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };