@legendapp/state 3.0.0-alpha.12 → 3.0.0-alpha.13

package/index.d.mts

@@ -5,7 +5,7 @@ type RemoveIndex<T> = {
 };
 type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any>;
 type IsUserDefinedObject<T> = T extends Function | BuiltIns | any[] ? false : T extends object ? true : false;
-type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : IsUserDefinedObject<T> extends true ? {
+type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;
 } : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: string) => infer TRet ? Record<string, RemoveObservables<TRet>> & T : T;
 interface ObservableArray<T, U> extends ObservablePrimitive<T>, Pick<Array<Observable<U>>, ArrayOverrideFnNames>, Omit<RemoveIndex<Array<U>>, ArrayOverrideFnNames> {
@@ -380,7 +380,6 @@ declare const internal: {
     getValueAtPath: typeof getValueAtPath;
     globalState: {
         isLoadingLocal: boolean;
-        isMerging: boolean;
         isLoadingRemote: boolean;
         activateSyncedNode: (node: NodeValue, newValue: any) => {
             update: UpdateFn;

package/index.d.ts

@@ -5,7 +5,7 @@ type RemoveIndex<T> = {
 };
 type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any>;
 type IsUserDefinedObject<T> = T extends Function | BuiltIns | any[] ? false : T extends object ? true : false;
-type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : IsUserDefinedObject<T> extends true ? {
+type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;
 } : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: string) => infer TRet ? Record<string, RemoveObservables<TRet>> & T : T;
 interface ObservableArray<T, U> extends ObservablePrimitive<T>, Pick<Array<Observable<U>>, ArrayOverrideFnNames>, Omit<RemoveIndex<Array<U>>, ArrayOverrideFnNames> {
@@ -380,7 +380,6 @@ declare const internal: {
     getValueAtPath: typeof getValueAtPath;
     globalState: {
         isLoadingLocal: boolean;
-        isMerging: boolean;
         isLoadingRemote: boolean;
         activateSyncedNode: (node: NodeValue, newValue: any) => {
             update: UpdateFn;

package/index.js

@@ -70,7 +70,6 @@ var optimized = Symbol("optimized");
 var symbolLinked = Symbol("linked");
 var globalState = {
   isLoadingLocal: false,
-  isMerging: false,
   isLoadingRemote: false,
   activateSyncedNode: void 0,
   pendingNodes: /* @__PURE__ */ new Map(),
@@ -141,7 +140,7 @@ function isEvent(value$) {
   return value$ && ((_a = value$[symbolGetNode]) == null ? void 0 : _a.isEvent);
 }
 function setNodeValue(node, newValue) {
-  var _a, _b, _c;
+  var _a;
   const parentNode = (_a = node.parent) != null ? _a : node;
   const key = node.parent ? node.key : "_";
   const isDelete = newValue === symbolDelete;
@@ -151,7 +150,7 @@ function setNodeValue(node, newValue) {
   const prevValue = parentValue[key];
   const isFunc = isFunction(newValue);
   newValue = !parentNode.isAssigning && isFunc && !isFunction(prevValue) ? newValue(prevValue) : newValue;
-  if (newValue !== prevValue && (!globalState.isMerging || isNullOrUndefined(prevValue) || isFunction(prevValue) || !((_c = (_b = node.parent) == null ? void 0 : _b.functions) == null ? void 0 : _c.get(key)))) {
+  if (newValue !== prevValue) {
     try {
       parentNode.isSetting = (parentNode.isSetting || 0) + 1;
       const useMapFn = isMap(parentValue);
@@ -344,7 +343,6 @@ function setInObservableAtPath(value$, path, pathTypes, value, mode) {
 }
 function mergeIntoObservable(target, ...sources) {
   beginBatch();
-  globalState.isMerging = true;
   for (let i = 0; i < sources.length; i++) {
     target = _mergeIntoObservable(
       target,
@@ -353,7 +351,6 @@ function mergeIntoObservable(target, ...sources) {
       i < sources.length - 1
     );
   }
-  globalState.isMerging = false;
   endBatch();
   return target;
 }
@@ -1535,12 +1532,16 @@ function setKey(node, key, newValue, level) {
   } else {
     const { newValue: savedValue, prevValue } = setNodeValue(childNode, newValue);
     const isPrim = isPrimitive(savedValue) || savedValue instanceof Date;
+    if (!isPrim) {
+      let parent = childNode;
+      do {
+        parent.needsExtract = true;
+        parent.recursivelyAutoActivated = false;
+      } while (parent = parent.parent);
+    }
     if (!equals(savedValue, prevValue)) {
       updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level);
     }
-    if (!isPrim) {
-      childNode.needsExtract = true;
-    }
     extractFunctionOrComputed(node, key, savedValue);
   }
 }
@@ -1747,7 +1748,9 @@ function peekInternal(node, activateRecursive) {
   }
   isFlushing = false;
   let value = getNodeValue(node);
-  value = checkLazy(node, value, !!activateRecursive);
+  if (!globalState.isLoadingLocal) {
+    value = checkLazy(node, value, !!activateRecursive);
+  }
   return value;
 }
 function checkLazy(node, value, activateRecursive) {
@@ -1762,10 +1765,12 @@ function checkLazy(node, value, activateRecursive) {
       } else {
         if (node.parent) {
           const parentValue = getNodeValue(node.parent);
-          if (parentValue) {
-            delete parentValue[node.key];
-          } else {
-            node.root._ = void 0;
+          if (isFunction(value)) {
+            if (parentValue) {
+              delete parentValue[node.key];
+            } else {
+              node.root._ = void 0;
+            }
           }
         }
         value = activateNodeFunction(node, lazyFn);
@@ -1854,7 +1859,9 @@ function activateNodeFunction(node, lazyFn) {
       var _a, _b, _c, _d;
       if (isFirst) {
         isFirst = false;
-        setNodeValue(node, void 0);
+        if (isFunction(getNodeValue(node))) {
+          setNodeValue(node, void 0);
+        }
       } else if (!isFlushing && refreshFn) {
         if (shouldIgnoreUnobserved(node, refreshFn)) {
           ignoreThisUpdate = true;

package/index.mjs

@@ -68,7 +68,6 @@ var optimized = Symbol("optimized");
 var symbolLinked = Symbol("linked");
 var globalState = {
   isLoadingLocal: false,
-  isMerging: false,
   isLoadingRemote: false,
   activateSyncedNode: void 0,
   pendingNodes: /* @__PURE__ */ new Map(),
@@ -139,7 +138,7 @@ function isEvent(value$) {
   return value$ && ((_a = value$[symbolGetNode]) == null ? void 0 : _a.isEvent);
 }
 function setNodeValue(node, newValue) {
-  var _a, _b, _c;
+  var _a;
   const parentNode = (_a = node.parent) != null ? _a : node;
   const key = node.parent ? node.key : "_";
   const isDelete = newValue === symbolDelete;
@@ -149,7 +148,7 @@ function setNodeValue(node, newValue) {
   const prevValue = parentValue[key];
   const isFunc = isFunction(newValue);
   newValue = !parentNode.isAssigning && isFunc && !isFunction(prevValue) ? newValue(prevValue) : newValue;
-  if (newValue !== prevValue && (!globalState.isMerging || isNullOrUndefined(prevValue) || isFunction(prevValue) || !((_c = (_b = node.parent) == null ? void 0 : _b.functions) == null ? void 0 : _c.get(key)))) {
+  if (newValue !== prevValue) {
     try {
       parentNode.isSetting = (parentNode.isSetting || 0) + 1;
       const useMapFn = isMap(parentValue);
@@ -342,7 +341,6 @@ function setInObservableAtPath(value$, path, pathTypes, value, mode) {
 }
 function mergeIntoObservable(target, ...sources) {
   beginBatch();
-  globalState.isMerging = true;
   for (let i = 0; i < sources.length; i++) {
     target = _mergeIntoObservable(
       target,
@@ -351,7 +349,6 @@ function mergeIntoObservable(target, ...sources) {
       i < sources.length - 1
     );
   }
-  globalState.isMerging = false;
   endBatch();
   return target;
 }
@@ -1533,12 +1530,16 @@ function setKey(node, key, newValue, level) {
   } else {
     const { newValue: savedValue, prevValue } = setNodeValue(childNode, newValue);
     const isPrim = isPrimitive(savedValue) || savedValue instanceof Date;
+    if (!isPrim) {
+      let parent = childNode;
+      do {
+        parent.needsExtract = true;
+        parent.recursivelyAutoActivated = false;
+      } while (parent = parent.parent);
+    }
     if (!equals(savedValue, prevValue)) {
       updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level);
     }
-    if (!isPrim) {
-      childNode.needsExtract = true;
-    }
     extractFunctionOrComputed(node, key, savedValue);
   }
 }
@@ -1745,7 +1746,9 @@ function peekInternal(node, activateRecursive) {
   }
   isFlushing = false;
   let value = getNodeValue(node);
-  value = checkLazy(node, value, !!activateRecursive);
+  if (!globalState.isLoadingLocal) {
+    value = checkLazy(node, value, !!activateRecursive);
+  }
   return value;
 }
 function checkLazy(node, value, activateRecursive) {
@@ -1760,10 +1763,12 @@ function checkLazy(node, value, activateRecursive) {
       } else {
         if (node.parent) {
           const parentValue = getNodeValue(node.parent);
-          if (parentValue) {
-            delete parentValue[node.key];
-          } else {
-            node.root._ = void 0;
+          if (isFunction(value)) {
+            if (parentValue) {
+              delete parentValue[node.key];
+            } else {
+              node.root._ = void 0;
+            }
           }
         }
         value = activateNodeFunction(node, lazyFn);
@@ -1852,7 +1857,9 @@ function activateNodeFunction(node, lazyFn) {
       var _a, _b, _c, _d;
       if (isFirst) {
         isFirst = false;
-        setNodeValue(node, void 0);
+        if (isFunction(getNodeValue(node))) {
+          setNodeValue(node, void 0);
+        }
       } else if (!isFlushing && refreshFn) {
         if (shouldIgnoreUnobserved(node, refreshFn)) {
           ignoreThisUpdate = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.12",
+  "version": "3.0.0-alpha.13",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/persist-plugins/async-storage.d.mts

@@ -1,9 +1,9 @@
 import { Change } from '@legendapp/state';
-import { ObservablePersistPlugin, ObservablePersistenceConfigLocalGlobalOptions, PersistMetadata } from '@legendapp/state/sync';
+import { ObservablePersistPlugin, ObservablePersistPluginOptions, PersistMetadata } from '@legendapp/state/sync';
 
 declare class ObservablePersistAsyncStorage implements ObservablePersistPlugin {
     private data;
-    initialize(config: ObservablePersistenceConfigLocalGlobalOptions): Promise<void>;
+    initialize(config: ObservablePersistPluginOptions): Promise<void>;
     loadTable(table: string): void | Promise<void>;
     getTable(table: string, init: object): any;
     getMetadata(table: string): PersistMetadata;

package/persist-plugins/async-storage.d.ts

@@ -1,9 +1,9 @@
 import { Change } from '@legendapp/state';
-import { ObservablePersistPlugin, ObservablePersistenceConfigLocalGlobalOptions, PersistMetadata } from '@legendapp/state/sync';
+import { ObservablePersistPlugin, ObservablePersistPluginOptions, PersistMetadata } from '@legendapp/state/sync';
 
 declare class ObservablePersistAsyncStorage implements ObservablePersistPlugin {
     private data;
-    initialize(config: ObservablePersistenceConfigLocalGlobalOptions): Promise<void>;
+    initialize(config: ObservablePersistPluginOptions): Promise<void>;
     loadTable(table: string): void | Promise<void>;
     getTable(table: string, init: object): any;
     getMetadata(table: string): PersistMetadata;

package/sync-plugins/firebase.js

@@ -158,7 +158,6 @@ function syncedFirebase(props) {
   const {
     refPath,
     query,
-    as: asType,
     fieldId,
     realtime,
     requireAuth,
@@ -170,6 +169,7 @@ function syncedFirebase(props) {
     ...rest
   } = props;
   const { fieldCreatedAt, changesSince } = props;
+  const asType = props.as || "value";
   const fieldUpdatedAt = props.fieldUpdatedAt || "@";
   const computeRef = (lastSync) => {
     const pathFirebase = refPath(fns.getCurrentUser());
@@ -346,7 +346,7 @@ function syncedFirebase(props) {
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitFor ? state.computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitForSet ? state.computeSelector(waitForSet) : true),
+    waitForSet: (params) => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitForSet ? state.isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     generateId: fns.generateId,
     transform,
     as: asType

package/sync-plugins/firebase.mjs

@@ -1,4 +1,4 @@
-import { observable, symbolDelete, isString, isArray, isObject, computeSelector, isNullOrUndefined, isPromise, isNumber, when } from '@legendapp/state';
+import { observable, symbolDelete, isString, isArray, isObject, computeSelector, isFunction, isNullOrUndefined, isPromise, isNumber, when } from '@legendapp/state';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { getAuth } from 'firebase/auth';
 import { ref, getDatabase, query, orderByChild, startAt, update, onValue, onChildAdded, onChildChanged, onChildRemoved, serverTimestamp, remove, push } from 'firebase/database';
@@ -156,7 +156,6 @@ function syncedFirebase(props) {
   const {
     refPath,
     query,
-    as: asType,
     fieldId,
     realtime,
     requireAuth,
@@ -168,6 +167,7 @@ function syncedFirebase(props) {
     ...rest
   } = props;
   const { fieldCreatedAt, changesSince } = props;
+  const asType = props.as || "value";
   const fieldUpdatedAt = props.fieldUpdatedAt || "@";
   const computeRef = (lastSync) => {
     const pathFirebase = refPath(fns.getCurrentUser());
@@ -344,7 +344,7 @@ function syncedFirebase(props) {
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitFor ? computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitForSet ? computeSelector(waitForSet) : true),
+    waitForSet: (params) => isEnabled$.get() && (isAuthedIfRequired$ ? isAuthedIfRequired$.get() : true) && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     generateId: fns.generateId,
     transform,
     as: asType

package/sync-plugins/keel.d.mts

@@ -102,7 +102,9 @@ interface SyncedKeelPropsBase<TRemote extends {
         where: any;
         values?: Partial<TRemote>;
     }) => Promise<APIResult<TRemote>>;
-    delete?: (params: TRemote) => Promise<APIResult<string>>;
+    delete?: (params: {
+        id: string;
+    }) => Promise<APIResult<string>>;
 }
 declare function getSyncedKeelConfiguration(): SyncedKeelConfiguration;
 declare function configureSyncedKeel(config: SyncedKeelConfiguration): void;

package/sync-plugins/keel.d.ts

@@ -102,7 +102,9 @@ interface SyncedKeelPropsBase<TRemote extends {
         where: any;
         values?: Partial<TRemote>;
     }) => Promise<APIResult<TRemote>>;
-    delete?: (params: TRemote) => Promise<APIResult<string>>;
+    delete?: (params: {
+        id: string;
+    }) => Promise<APIResult<string>>;
 }
 declare function getSyncedKeelConfiguration(): SyncedKeelConfiguration;
 declare function configureSyncedKeel(config: SyncedKeelConfiguration): void;

package/sync-plugins/keel.js

@@ -221,7 +221,7 @@ function syncedKeel(props) {
     }
   } : void 0;
   const deleteFn = deleteParam ? async (value, params) => {
-    const { data, error } = await deleteParam(value);
+    const { data, error } = await deleteParam({ id: value.id });
     if (error) {
       handleSetError(error, params, false);
     }
@@ -244,7 +244,7 @@ function syncedKeel(props) {
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (waitForSet ? state.computeSelector(waitForSet) : true),
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? state.isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     onSaved,
     fieldCreatedAt,
     fieldUpdatedAt,

package/sync-plugins/keel.mjs

@@ -215,7 +215,7 @@ function syncedKeel(props) {
     }
   } : void 0;
   const deleteFn = deleteParam ? async (value, params) => {
-    const { data, error } = await deleteParam(value);
+    const { data, error } = await deleteParam({ id: value.id });
     if (error) {
       handleSetError(error, params, false);
     }
@@ -238,7 +238,7 @@ function syncedKeel(props) {
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (waitForSet ? computeSelector(waitForSet) : true),
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     onSaved,
     fieldCreatedAt,
     fieldUpdatedAt,

package/sync-plugins/supabase.js

@@ -135,7 +135,7 @@ function syncedSupabase(props) {
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (waitForSet ? state.computeSelector(waitForSet) : true)
+    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';
 
@@ -133,7 +133,7 @@ function syncedSupabase(props) {
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
-    waitForSet: () => isEnabled$.get() && (waitForSet ? computeSelector(waitForSet) : true)
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true)
   });
 }
 

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, Selector, TypeAtPath, ObservableState, RecordValue, ArrayValue } from '@legendapp/state';
+import { ClassConstructor, GetMode, SetParams, NodeValue, UpdateFn, ObservableParam, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, 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;
@@ -55,12 +54,11 @@ 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 | undefined, source: 'get' | 'subscribe') => void;
+    onSetError?: (error: Error, setParams: SyncedSetParams<TRemote>) => void;
     onBeforeSet?: () => void;
     onAfterSet?: () => void;
+    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'>;
@@ -123,143 +121,6 @@ type Synced<T> = T;
 
 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]>;
@@ -331,4 +192,4 @@ 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 ObservableSyncFunctions, 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, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type PersistMetadata, type PersistOptions, 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, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.d.ts

@@ -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, Selector, TypeAtPath, ObservableState, RecordValue, ArrayValue } from '@legendapp/state';
+import { ClassConstructor, GetMode, SetParams, NodeValue, UpdateFn, ObservableParam, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, 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;
@@ -55,12 +54,11 @@ 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 | undefined, source: 'get' | 'subscribe') => void;
+    onSetError?: (error: Error, setParams: SyncedSetParams<TRemote>) => void;
     onBeforeSet?: () => void;
     onAfterSet?: () => void;
+    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'>;
@@ -123,143 +121,6 @@ type Synced<T> = T;
 
 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]>;
@@ -331,4 +192,4 @@ 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 ObservableSyncFunctions, 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, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type PersistMetadata, type PersistOptions, 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, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.js

@@ -139,6 +139,7 @@ function transformStringifyDates(...args) {
 }
 var { clone, getNode, getNodeValue, getValueAtPath, globalState, runWithRetry, symbolLinked, createPreviousHandler } = state.internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
+var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
 var promisesLocalSaves = /* @__PURE__ */ new Set();
 function parseLocalConfig(config) {
@@ -296,9 +297,8 @@ async function prepChangeLocal(queuedChange) {
   const { syncState: syncState2, changes, syncOptions, inRemoteChange, isApplyingPending } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
-  const configRemote = syncOptions;
   const saveLocal = (persist == null ? void 0 : persist.name) && !configLocal.readonly && !isApplyingPending && syncState2.isPersistEnabled.peek();
-  const saveRemote = !!(!inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && (configRemote == null ? void 0 : configRemote.enableSync) !== false && syncState2.isSyncEnabled.peek());
+  const saveRemote = !!(!inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && syncState2.isSyncEnabled.peek());
   if (saveLocal || saveRemote) {
     if (saveLocal && !syncState2.isPersistLoaded.peek()) {
       console.error(
@@ -365,9 +365,8 @@ async function prepChangeRemote(queuedChange) {
   } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
-  const configRemote = syncOptions;
   const saveLocal = persist && !configLocal.readonly && !isApplyingPending && syncState2.isPersistEnabled.peek();
-  const saveRemote = !inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && (configRemote == null ? void 0 : configRemote.enableSync) !== false && syncState2.isSyncEnabled.peek();
+  const saveRemote = !inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && syncState2.isSyncEnabled.peek();
   if (saveLocal || saveRemote) {
     if (saveLocal && !syncState2.isPersistLoaded.peek()) {
       console.error(
@@ -399,7 +398,7 @@ async function prepChangeRemote(queuedChange) {
             valueAtPath,
             path,
             pathTypes,
-            configRemote || {}
+            syncOptions || {}
           );
           promisesTransform.push(
             doInOrder(promiseTransformRemote, ({ value: valueTransformed, path: pathTransformed }) => {
@@ -515,7 +514,7 @@ async function doChangeRemote(changeInfo) {
     const onError = (error) => {
       var _a2;
       state$.error.set(error);
-      (_a2 = syncOptions.onSetError) == null ? void 0 : _a2.call(syncOptions, error);
+      (_a2 = syncOptions.onSetError) == null ? void 0 : _a2.call(syncOptions, error, setParams);
     };
     const setParams = {
       node,
@@ -718,14 +717,15 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   let sync;
   let numOutstandingGets = 0;
   const syncState$ = state.syncState(obs$);
+  allSyncStates.set(syncState$, node);
   syncState$.assign({
     isLoaded: !syncOptions.get,
     getPendingChanges: () => localState.pendingChanges
   });
-  const onError = (error) => {
+  const onError = (error, getParams, source) => {
     var _a;
     node.state.error.set(error);
-    (_a = syncOptions.onGetError) == null ? void 0 : _a.call(syncOptions, error);
+    (_a = syncOptions.onGetError) == null ? void 0 : _a.call(syncOptions, error, getParams, source);
   };
   loadLocal(obs$, syncOptions, syncState$, localState);
   if (syncOptions.get) {
@@ -843,7 +843,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               },
               refresh: () => state.when(node.state.isLoaded, sync),
-              onError
+              onError: (error) => onError(error, void 0, "subscribe")
             });
           }
           const existingValue = getNodeValue(node);
@@ -854,7 +854,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             options: syncOptions,
             lastSync,
             updateLastSync: (lastSync2) => getParams.lastSync = lastSync2,
-            onError
+            onError: (error) => onError(error, getParams, "get")
           };
           numOutstandingGets++;
           node.state.isGetting.set(true);

package/sync.mjs

@@ -137,6 +137,7 @@ function transformStringifyDates(...args) {
 }
 var { clone, getNode, getNodeValue, getValueAtPath, globalState, runWithRetry, symbolLinked, createPreviousHandler } = internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
+var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
 var promisesLocalSaves = /* @__PURE__ */ new Set();
 function parseLocalConfig(config) {
@@ -294,9 +295,8 @@ async function prepChangeLocal(queuedChange) {
   const { syncState: syncState2, changes, syncOptions, inRemoteChange, isApplyingPending } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
-  const configRemote = syncOptions;
   const saveLocal = (persist == null ? void 0 : persist.name) && !configLocal.readonly && !isApplyingPending && syncState2.isPersistEnabled.peek();
-  const saveRemote = !!(!inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && (configRemote == null ? void 0 : configRemote.enableSync) !== false && syncState2.isSyncEnabled.peek());
+  const saveRemote = !!(!inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && syncState2.isSyncEnabled.peek());
   if (saveLocal || saveRemote) {
     if (saveLocal && !syncState2.isPersistLoaded.peek()) {
       console.error(
@@ -363,9 +363,8 @@ async function prepChangeRemote(queuedChange) {
   } = queuedChange;
   const persist = syncOptions.persist;
   const { config: configLocal } = parseLocalConfig(persist);
-  const configRemote = syncOptions;
   const saveLocal = persist && !configLocal.readonly && !isApplyingPending && syncState2.isPersistEnabled.peek();
-  const saveRemote = !inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && (configRemote == null ? void 0 : configRemote.enableSync) !== false && syncState2.isSyncEnabled.peek();
+  const saveRemote = !inRemoteChange && (syncOptions == null ? void 0 : syncOptions.set) && syncState2.isSyncEnabled.peek();
   if (saveLocal || saveRemote) {
     if (saveLocal && !syncState2.isPersistLoaded.peek()) {
       console.error(
@@ -397,7 +396,7 @@ async function prepChangeRemote(queuedChange) {
             valueAtPath,
             path,
             pathTypes,
-            configRemote || {}
+            syncOptions || {}
           );
           promisesTransform.push(
             doInOrder(promiseTransformRemote, ({ value: valueTransformed, path: pathTransformed }) => {
@@ -513,7 +512,7 @@ async function doChangeRemote(changeInfo) {
     const onError = (error) => {
       var _a2;
       state$.error.set(error);
-      (_a2 = syncOptions.onSetError) == null ? void 0 : _a2.call(syncOptions, error);
+      (_a2 = syncOptions.onSetError) == null ? void 0 : _a2.call(syncOptions, error, setParams);
     };
     const setParams = {
       node,
@@ -716,14 +715,15 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   let sync;
   let numOutstandingGets = 0;
   const syncState$ = syncState(obs$);
+  allSyncStates.set(syncState$, node);
   syncState$.assign({
     isLoaded: !syncOptions.get,
     getPendingChanges: () => localState.pendingChanges
   });
-  const onError = (error) => {
+  const onError = (error, getParams, source) => {
     var _a;
     node.state.error.set(error);
-    (_a = syncOptions.onGetError) == null ? void 0 : _a.call(syncOptions, error);
+    (_a = syncOptions.onGetError) == null ? void 0 : _a.call(syncOptions, error, getParams, source);
   };
   loadLocal(obs$, syncOptions, syncState$, localState);
   if (syncOptions.get) {
@@ -841,7 +841,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               },
               refresh: () => when(node.state.isLoaded, sync),
-              onError
+              onError: (error) => onError(error, void 0, "subscribe")
             });
           }
           const existingValue = getNodeValue(node);
@@ -852,7 +852,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             options: syncOptions,
             lastSync,
             updateLastSync: (lastSync2) => getParams.lastSync = lastSync2,
-            onError
+            onError: (error) => onError(error, getParams, "get")
           };
           numOutstandingGets++;
           node.state.isGetting.set(true);