@legendapp/state 3.0.0-alpha.33 → 3.0.0-alpha.35

package/sync-plugins/keel.mjs

@@ -1,5 +1,4 @@
-import { observable, computeSelector, isFunction, isEmpty, when } from '@legendapp/state';
-import { removeNullUndefined } from '@legendapp/state/sync';
+import { observable, isFunction, when, batch, isEmpty } from '@legendapp/state';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import ksuid from 'ksuid';
 
@@ -8,24 +7,50 @@ var KeelKeys = ["createdAt", "updatedAt"];
 function generateKeelId() {
   return ksuid.randomSync().string;
 }
-var keelConfig = {};
 var modifiedClients = /* @__PURE__ */ new WeakSet();
-var isEnabled$ = observable(true);
-async function ensureAuthToken() {
-  await when(isEnabled$.get());
-  if (keelConfig.refreshAuth) {
-    await keelConfig.refreshAuth();
+var isAuthed$ = observable(false);
+var isAuthing$ = observable(false);
+async function ensureAuthToken(props, force) {
+  if (!force && isAuthed$.get()) {
+    return true;
   }
-  let isAuthed = await keelConfig.client.auth.isAuthenticated();
+  const { client, refreshAuth } = props;
+  let isAuthed = await client.auth.isAuthenticated().then(({ data }) => data);
   if (!isAuthed) {
-    isAuthed = await keelConfig.client.auth.refresh();
+    if (!force && isAuthing$.get()) {
+      return when(
+        () => !isAuthing$.get(),
+        () => isAuthed$.get()
+      );
+    }
+    isAuthing$.set(true);
+    if (refreshAuth) {
+      await refreshAuth();
+    }
+    isAuthed = await client.auth.isAuthenticated().then(({ data }) => data);
+    if (!isAuthed) {
+      isAuthed = await client.auth.refresh().then(({ data }) => data);
+    }
+  }
+  if (isAuthed) {
+    batch(() => {
+      isAuthed$.set(true);
+      isAuthing$.set(false);
+    });
+  } else {
+    setTimeout(() => ensureAuthToken(
+      props,
+      /*force*/
+      true
+    ), 1e3);
   }
   return isAuthed;
 }
-async function handleApiError(error, retry) {
+async function handleApiError(props, error, retry) {
   if (error.type === "unauthorized" || error.type === "forbidden") {
     console.warn("Keel token expired, refreshing...");
-    await ensureAuthToken();
+    isAuthed$.set(false);
+    await ensureAuthToken(props);
   }
 }
 function convertObjectToCreate(item) {
@@ -45,49 +70,30 @@ function convertObjectToCreate(item) {
   });
   return cloned;
 }
-function getSyncedKeelConfiguration() {
-  return keelConfig;
-}
-function configureSyncedKeel(config) {
-  const { enabled, realtimePlugin, client, ...rest } = config;
-  Object.assign(keelConfig, removeNullUndefined(rest));
-  if (enabled !== void 0) {
-    isEnabled$.set(enabled);
-  }
-  if (realtimePlugin) {
-    keelConfig.realtimePlugin = realtimePlugin;
-    if (client && !modifiedClients.has(client)) {
-      modifiedClients.add(client);
-      const queries = client.api.queries;
-      Object.keys(queries).forEach((key) => {
-        if (key.startsWith("list")) {
-          const oldFn = queries[key];
-          queries[key] = (i) => {
-            const realtimeKey = [key, ...Object.values(i.where || {})].filter((value) => value && typeof value !== "object").join("/");
-            const subscribe = (params) => {
-              if (realtimeKey) {
-                return realtimePlugin.subscribe(realtimeKey, params);
-              }
-            };
-            return oldFn(i).then((ret) => {
-              if (subscribe) {
-                ret.subscribe = subscribe;
-                ret.subscribeKey = realtimeKey;
-              }
-              return ret;
-            });
+var realtimeState = { current: {} };
+function setupRealtime(props) {
+  const { client } = props;
+  if (client && !modifiedClients.has(client)) {
+    modifiedClients.add(client);
+    const queries = client.api.queries;
+    Object.keys(queries).forEach((key) => {
+      if (key.startsWith("list")) {
+        const origFn = queries[key];
+        queries[key] = (i) => {
+          realtimeState.current = {
+            lastAction: key,
+            lastParams: i
           };
-        }
-      });
-    }
+          return origFn(i);
+        };
+      }
+    });
   }
 }
 var NumPerPage = 200;
-async function getAllPages(listFn, params) {
+async function getAllPages(props, listFn, params) {
   const allData = [];
   let pageInfo = void 0;
-  let subscribe_;
-  let subscribeKey_;
   const { first: firstParam } = params;
   do {
     const first = firstParam ? Math.min(firstParam - allData.length, NumPerPage) : NumPerPage;
@@ -99,13 +105,9 @@ async function getAllPages(listFn, params) {
     pageInfo = void 0;
     const ret = await listFn(paramsWithCursor);
     if (ret) {
-      const { data, error, subscribe, subscribeKey } = ret;
-      if (subscribe) {
-        subscribe_ = subscribe;
-        subscribeKey_ = subscribeKey;
-      }
+      const { data, error } = ret;
       if (error) {
-        await handleApiError(error);
+        await handleApiError(props, error);
         throw new Error(error.message);
       } else if (data) {
         pageInfo = data.pageInfo;
@@ -113,23 +115,25 @@ async function getAllPages(listFn, params) {
       }
     }
   } while (pageInfo == null ? void 0 : pageInfo.hasNextPage);
-  return { results: allData, subscribe: subscribe_, subscribeKey: subscribeKey_ };
+  return allData;
 }
 function syncedKeel(props) {
-  const { realtimePlugin } = keelConfig;
-  props = { ...keelConfig, ...props };
   const {
     get: getParam,
     list: listParam,
     create: createParam,
     update: updateParam,
     delete: deleteParam,
+    subscribe: subscribeParam,
     first,
     where: whereParam,
     waitFor,
     waitForSet,
     fieldDeleted,
+    realtime,
     mode,
+    onError,
+    requireAuth = true,
     ...rest
   } = props;
   const { changesSince } = props;
@@ -138,13 +142,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 setupSubscribe = realtime ? async (getParams) => {
+    const { lastAction, lastParams } = realtimeState.current;
+    const { path, plugin } = realtime;
+    if (lastAction && path && plugin) {
+      const key = await path(lastAction, lastParams);
+      subscribeFn = () => realtime.plugin.subscribe(key, getParams);
+      subscribeFnKey$.set(key);
     }
-  };
+  } : void 0;
   const list = listParam ? async (listParams) => {
     const { lastSync } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
@@ -153,18 +159,21 @@ function syncedKeel(props) {
       isFunction(whereParam) ? whereParam() : whereParam
     );
     const params = { where, first };
-    const { results, subscribe: subscribe2, subscribeKey } = await getAllPages(listParam, params);
-    if (subscribe2) {
-      setupSubscribe(() => subscribe2(listParams), subscribeKey, lastSync);
+    realtimeState.current = {};
+    const promise = getAllPages(props, listParam, params);
+    if (realtime) {
+      setupSubscribe(listParams);
     }
-    return results;
+    return promise;
   } : void 0;
   const get = getParam ? async (getParams) => {
     const { refresh } = getParams;
-    const { data, error, subscribe: subscribe2, subscribeKey } = await getParam({ refresh });
-    if (subscribe2) {
-      setupSubscribe(() => subscribe2(getParams), subscribeKey);
+    realtimeState.current = {};
+    const promise = getParam({ refresh });
+    if (realtime) {
+      setupSubscribe(getParams);
     }
+    const { data, error } = await promise;
     if (error) {
       throw new Error(error.message);
     } else {
@@ -173,17 +182,16 @@ function syncedKeel(props) {
   } : void 0;
   const onSaved = ({ saved }) => {
     if (saved) {
-      const updatedAt = saved[fieldUpdatedAt];
-      if (updatedAt && realtimePlugin) {
+      if (realtime == null ? void 0 : realtime.plugin) {
         const subscribeFnKey = subscribeFnKey$.get();
         if (subscribeFnKey) {
-          realtimePlugin.setLatestChange(subscribeFnKey, updatedAt);
+          realtime == null ? void 0 : realtime.plugin.setSaved(subscribeFnKey);
         }
       }
     }
   };
   const handleSetError = async (error, params, input, fn, from) => {
-    var _a, _b, _c;
+    var _a, _b;
     const { retryNum, update: update2 } = params;
     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__) {
@@ -202,13 +210,19 @@ function syncedKeel(props) {
         params.cancelRetry = true;
       }
     } else if (error.type === "bad_request") {
-      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, { error, params, input, type: from, action: fn.name || fn.toString() });
+      onError == null ? void 0 : onError(new Error(error.message), params, {
+        error,
+        params,
+        input,
+        type: from,
+        action: fn.name || fn.toString()
+      });
       if (retryNum > 4) {
         params.cancelRetry = true;
       }
       throw new Error(error.message, { cause: { input } });
     } else {
-      await handleApiError(error);
+      await handleApiError(props, error);
       throw new Error(error.message, { cause: { input } });
     }
   };
@@ -238,7 +252,10 @@ function syncedKeel(props) {
     }
     return data;
   } : void 0;
-  const subscribe = (params) => {
+  if (realtime) {
+    setupRealtime(props);
+  }
+  const subscribe = subscribeParam || (realtime ? (params) => {
     let unsubscribe = void 0;
     when(subscribeFnKey$, () => {
       unsubscribe = subscribeFn(params);
@@ -246,7 +263,7 @@ function syncedKeel(props) {
     return () => {
       unsubscribe == null ? void 0 : unsubscribe();
     };
-  };
+  } : void 0);
   return syncedCrud({
     ...rest,
     as: asType,
@@ -255,8 +272,17 @@ function syncedKeel(props) {
     create,
     update,
     delete: deleteFn,
-    waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
-    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
+    waitFor: () => {
+      ensureAuthToken(props);
+      return [requireAuth ? isAuthed$ : true, waitFor || true];
+    },
+    waitForSet: (params) => {
+      ensureAuthToken(props);
+      return [
+        requireAuth ? isAuthed$ : true,
+        () => waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true
+      ];
+    },
     onSaved,
     fieldCreatedAt,
     fieldUpdatedAt,
@@ -270,4 +296,4 @@ function syncedKeel(props) {
   });
 }
 
-export { KeelKeys, configureSyncedKeel, generateKeelId, getSyncedKeelConfiguration, syncedKeel };
+export { KeelKeys, generateKeelId, syncedKeel };

package/sync-plugins/supabase.d.mts

@@ -25,7 +25,7 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, Omit<SyncedCrudPropsMany<TRemote, TRemote, TOption>, 'list'> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client> = 'public', TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, Omit<SyncedCrudPropsMany<TRemote, TRemote, TOption>, 'list'> {
     supabase: Client;
     collection: Collection;
     schema?: SchemaName;
@@ -44,6 +44,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.d.ts

@@ -25,7 +25,7 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, Omit<SyncedCrudPropsMany<TRemote, TRemote, TOption>, 'list'> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client> = 'public', TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, Omit<SyncedCrudPropsMany<TRemote, TRemote, TOption>, 'list'> {
     supabase: Client;
     collection: Collection;
     schema?: SchemaName;
@@ -44,6 +44,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client> = 'public', AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync.d.mts

@@ -4,8 +4,8 @@ import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, Update
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
-    name: string;
-    plugin?: ClassConstructor<ObservablePersistPlugin, T[]>;
+    name?: string;
+    plugin?: ClassConstructor<ObservablePersistPlugin, T[]> | ObservablePersistPlugin;
     retrySync?: boolean;
     transform?: SyncTransform<T>;
     readonly?: boolean;
@@ -50,6 +50,7 @@ interface SyncedErrorParams {
     subscribeParams?: SyncedSubscribeParams<any>;
     source: 'get' | 'set' | 'subscribe';
     value$: ObservableParam<any>;
+    retryParams?: OnErrorRetryParams;
 }
 interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOptions<TRemote>, 'get' | 'set'> {
     get?: (params: SyncedGetParams<TRemote>) => Promise<TRemote> | TRemote;
@@ -61,18 +62,19 @@ interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOpti
     syncMode?: 'auto' | 'manual';
     mode?: GetMode;
     transform?: SyncTransform<TLocal, TRemote>;
-    onGetError?: (error: Error, params: SyncedErrorParams) => void;
-    onSetError?: (error: Error, params: SyncedErrorParams) => void;
     onBeforeGet?: (params: {
         value: TRemote;
         lastSync: number | undefined;
         pendingChanges: PendingChanges | undefined;
+        cancel: boolean;
         clearPendingChanges: () => Promise<void>;
         resetCache: () => Promise<void>;
     }) => void;
-    onBeforeSet?: () => void;
+    onBeforeSet?: (params: {
+        cancel: boolean;
+    }) => void;
     onAfterSet?: () => void;
-    log?: (message?: any, ...optionalParams: any[]) => void;
+    onError?: (error: Error, params: SyncedErrorParams) => void;
 }
 interface SyncedOptionsGlobal<T = any> extends Omit<SyncedOptions<T>, 'get' | 'set' | 'persist' | 'initial' | 'waitForSet' | 'waitFor' | 'transform' | 'subscribe'> {
     persist?: ObservablePersistPluginOptions & Omit<PersistOptions, 'name' | 'transform' | 'options'>;
@@ -198,7 +200,7 @@ 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>, {
+declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin> | ObservablePersistPlugin, {
     plugin: ObservablePersistPlugin;
     initialized: Observable<boolean>;
 }>;
@@ -208,12 +210,8 @@ declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: Synced
 
 declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote, TLocal> | (() => TRemote)): Synced<TLocal>;
 
-interface SyncedOptionsConfigure extends Omit<SyncedOptions, 'persist'> {
-    persist?: Partial<PersistOptions<any>>;
-}
-type RetType = typeof synced;
-declare function configureSynced<T extends typeof synced>(fn: T, origOptions: SyncedOptionsConfigure): T;
-declare function configureSynced(origOptions: SyncedOptionsConfigure): RetType;
+declare function configureSynced<T extends (...args: any[]) => any>(fn: T, origOptions: Partial<Parameters<T>[0]>): T;
+declare function configureSynced(origOptions: SyncedOptions): typeof synced;
 
 declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;
 

package/sync.d.ts

@@ -4,8 +4,8 @@ import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, Update
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
-    name: string;
-    plugin?: ClassConstructor<ObservablePersistPlugin, T[]>;
+    name?: string;
+    plugin?: ClassConstructor<ObservablePersistPlugin, T[]> | ObservablePersistPlugin;
     retrySync?: boolean;
     transform?: SyncTransform<T>;
     readonly?: boolean;
@@ -50,6 +50,7 @@ interface SyncedErrorParams {
     subscribeParams?: SyncedSubscribeParams<any>;
     source: 'get' | 'set' | 'subscribe';
     value$: ObservableParam<any>;
+    retryParams?: OnErrorRetryParams;
 }
 interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOptions<TRemote>, 'get' | 'set'> {
     get?: (params: SyncedGetParams<TRemote>) => Promise<TRemote> | TRemote;
@@ -61,18 +62,19 @@ interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOpti
     syncMode?: 'auto' | 'manual';
     mode?: GetMode;
     transform?: SyncTransform<TLocal, TRemote>;
-    onGetError?: (error: Error, params: SyncedErrorParams) => void;
-    onSetError?: (error: Error, params: SyncedErrorParams) => void;
     onBeforeGet?: (params: {
         value: TRemote;
         lastSync: number | undefined;
         pendingChanges: PendingChanges | undefined;
+        cancel: boolean;
         clearPendingChanges: () => Promise<void>;
         resetCache: () => Promise<void>;
     }) => void;
-    onBeforeSet?: () => void;
+    onBeforeSet?: (params: {
+        cancel: boolean;
+    }) => void;
     onAfterSet?: () => void;
-    log?: (message?: any, ...optionalParams: any[]) => void;
+    onError?: (error: Error, params: SyncedErrorParams) => void;
 }
 interface SyncedOptionsGlobal<T = any> extends Omit<SyncedOptions<T>, 'get' | 'set' | 'persist' | 'initial' | 'waitForSet' | 'waitFor' | 'transform' | 'subscribe'> {
     persist?: ObservablePersistPluginOptions & Omit<PersistOptions, 'name' | 'transform' | 'options'>;
@@ -198,7 +200,7 @@ 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>, {
+declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin> | ObservablePersistPlugin, {
     plugin: ObservablePersistPlugin;
     initialized: Observable<boolean>;
 }>;
@@ -208,12 +210,8 @@ declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: Synced
 
 declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote, TLocal> | (() => TRemote)): Synced<TLocal>;
 
-interface SyncedOptionsConfigure extends Omit<SyncedOptions, 'persist'> {
-    persist?: Partial<PersistOptions<any>>;
-}
-type RetType = typeof synced;
-declare function configureSynced<T extends typeof synced>(fn: T, origOptions: SyncedOptionsConfigure): T;
-declare function configureSynced(origOptions: SyncedOptionsConfigure): RetType;
+declare function configureSynced<T extends (...args: any[]) => any>(fn: T, origOptions: Partial<Parameters<T>[0]>): T;
+declare function configureSynced(origOptions: SyncedOptions): typeof synced;
 
 declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;