@legendapp/state 3.0.0-beta.13 → 3.0.0-beta.15

package/sync-plugins/crud.mjs

@@ -3,7 +3,7 @@ import { synced, deepEqual, internal as internal$1, diffObjects } from '@legenda
 
 // src/sync-plugins/crud.ts
 var { clone } = internal;
-var { waitForSet } = internal$1;
+var { waitForSet, runWithRetry } = internal$1;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
 }
@@ -23,6 +23,39 @@ function computeLastSync(data, fieldUpdatedAt, fieldCreatedAt) {
   }
   return newLastSync;
 }
+var queuedRetries = {
+  create: /* @__PURE__ */ new Map(),
+  update: /* @__PURE__ */ new Map(),
+  delete: /* @__PURE__ */ new Map()
+};
+function retrySet(params, retry, action, itemKey, itemValue, actionFn, saveResult) {
+  if (action === "delete") {
+    if (queuedRetries.create.has(itemKey)) {
+      queuedRetries.create.delete(itemKey);
+    }
+    if (queuedRetries.update.has(itemKey)) {
+      queuedRetries.update.delete(itemKey);
+    }
+  } else {
+    if (queuedRetries.delete.has(itemKey)) {
+      queuedRetries.delete.delete(itemKey);
+    }
+  }
+  const queuedRetry = queuedRetries[action].get(itemKey);
+  if (queuedRetry) {
+    itemValue = Object.assign(queuedRetry, itemValue);
+  }
+  queuedRetries[action].set(itemKey, itemValue);
+  return runWithRetry(
+    params,
+    retry,
+    "create_" + itemKey,
+    () => actionFn(itemValue, params).then((result) => {
+      queuedRetries[action].delete(itemKey);
+      return saveResult(itemKey, itemValue, result, true);
+    })
+  );
+}
 function syncedCrud(props) {
   const {
     get: getFn,
@@ -43,6 +76,7 @@ function syncedCrud(props) {
     changesSince,
     generateId,
     waitForSet: waitForSetParam,
+    retry,
     ...rest
   } = props;
   const fieldId = fieldIdProp || "id";
@@ -75,63 +109,68 @@ function syncedCrud(props) {
     return out;
   };
   const transformRows = (data) => {
-    return Promise.all(
+    return data.length ? Promise.all(
       data.map(
         (value) => (
           // Skip transforming any children with symbolDelete or fieldDeleted because they'll get deleted by resultsToOutType
           value[symbolDelete] || fieldDeleted && value[fieldDeleted] || fieldDeletedList && value[fieldDeletedList] ? value : transform.load(value, "get")
         )
       )
-    );
+    ) : [];
   };
   const get = getFn || listFn ? (getParams) => {
-    const { updateLastSync, lastSync, value } = getParams;
-    if (listFn) {
-      const isLastSyncMode = changesSince === "last-sync";
-      if (isLastSyncMode && lastSync) {
-        getParams.mode = modeParam || (asType === "array" ? "append" : asType === "value" ? "set" : "assign");
-      }
-      const listPromise = listFn(getParams);
-      const toOut = (transformed) => {
-        var _a;
-        if (asType === "value") {
-          return transformed.length > 0 ? transformed[0] : (_a = (isLastSyncMode && lastSync || fieldDeleted) && value) != null ? _a : null;
-        } else {
-          return resultsToOutType(transformed);
+    return runWithRetry(getParams, retry, getFn || listFn, () => {
+      const { updateLastSync, lastSync, value } = getParams;
+      if (listFn) {
+        const isLastSyncMode = changesSince === "last-sync";
+        if (isLastSyncMode && lastSync) {
+          getParams.mode = modeParam || (asType === "array" ? "append" : asType === "value" ? "set" : "assign");
         }
-      };
-      const processResults = (data) => {
-        data || (data = []);
-        if (fieldUpdatedAt) {
-          const newLastSync = computeLastSync(data, fieldUpdatedAt, fieldCreatedAt);
-          if (newLastSync && newLastSync !== lastSync) {
-            updateLastSync(newLastSync);
+        const listPromise = listFn(getParams);
+        const toOut = (transformed) => {
+          if (asType === "value") {
+            if (transformed.length > 0) {
+              return transformed[0];
+            } else {
+              return value ? void 0 : null;
+            }
+          } else {
+            return resultsToOutType(transformed);
           }
-        }
-        let transformed = data;
-        if (transform == null ? void 0 : transform.load) {
-          transformed = transformRows(data);
-        }
-        return isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
-      };
-      return isPromise(listPromise) ? listPromise.then(processResults) : processResults(listPromise);
-    } else if (getFn) {
-      const dataPromise = getFn(getParams);
-      const processData = (data) => {
-        let transformed = data;
-        if (data) {
-          const newLastSync = data[fieldUpdatedAt] || data[fieldCreatedAt];
-          if (newLastSync && newLastSync !== lastSync) {
-            updateLastSync(newLastSync);
+        };
+        const processResults = (data) => {
+          data || (data = []);
+          if (fieldUpdatedAt) {
+            const newLastSync = computeLastSync(data, fieldUpdatedAt, fieldCreatedAt);
+            if (newLastSync && newLastSync !== lastSync) {
+              updateLastSync(newLastSync);
+            }
           }
+          let transformed = data;
           if (transform == null ? void 0 : transform.load) {
-            transformed = transform.load(data, "get");
+            transformed = transformRows(data);
           }
-        }
-        return transformed;
-      };
-      return isPromise(dataPromise) ? dataPromise.then(processData) : processData(dataPromise);
-    }
+          return isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
+        };
+        return isPromise(listPromise) ? listPromise.then(processResults) : processResults(listPromise);
+      } else if (getFn) {
+        const dataPromise = getFn(getParams);
+        const processData = (data) => {
+          let transformed = data;
+          if (data) {
+            const newLastSync = data[fieldUpdatedAt] || data[fieldCreatedAt];
+            if (newLastSync && newLastSync !== lastSync) {
+              updateLastSync(newLastSync);
+            }
+            if (transform == null ? void 0 : transform.load) {
+              transformed = transform.load(data, "get");
+            }
+          }
+          return transformed;
+        };
+        return isPromise(dataPromise) ? dataPromise.then(processData) : processData(dataPromise);
+      }
+    });
   } : void 0;
   const set = createFn || updateFn || deleteFn ? async (params) => {
     const { value, changes, update, retryAsCreate, node } = params;
@@ -283,59 +322,84 @@ function syncedCrud(props) {
               delete saved[key];
             }
           });
-          const createdAt = fieldCreatedAt ? saved[fieldCreatedAt] : void 0;
-          const updatedAt = fieldUpdatedAt ? saved[fieldUpdatedAt] : void 0;
-          const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: saved } : saved;
-          update({
-            value: value2,
-            lastSync: updatedAt || createdAt ? +new Date(updatedAt || createdAt) : void 0,
-            mode: "merge"
-          });
+          let value2;
+          if (asType === "array") {
+            const index = currentPeeked.findIndex(
+              (cur) => cur[fieldId] === itemKey
+            );
+            if (index < 0) {
+              console.warn("[legend-state] Item saved that does not exist in array", saved);
+            } else {
+              value2 = { [index < 0 ? 0 : index]: saved };
+            }
+          } else {
+            value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: saved } : saved;
+          }
+          if (value2 !== void 0) {
+            update({
+              value: value2,
+              mode: "merge"
+            });
+          }
         }
       }
     };
     return Promise.all([
+      // Handle creates
       ...Array.from(creates).map(async ([itemKey, itemValue]) => {
         if (waitForSetParam) {
           await waitForSet(waitForSetParam, changes, itemValue, { type: "create" });
         }
         const createObj = await transformOut(itemValue, transform == null ? void 0 : transform.save);
-        return createFn(createObj, params).then((result) => {
-          return saveResult(itemKey, createObj, result, true);
-        }).finally(() => {
-          pendingCreates.delete(itemKey);
-        });
+        return retrySet(params, retry, "create", itemKey, createObj, createFn, saveResult).then(
+          () => {
+            pendingCreates.delete(itemKey);
+          }
+        );
       }),
+      // Handle updates
       ...Array.from(updates).map(async ([itemKey, itemValue]) => {
         if (waitForSetParam) {
           await waitForSet(waitForSetParam, changes, itemValue, { type: "update" });
         }
-        const toSave = itemValue;
-        const changed = await transformOut(toSave, transform == null ? void 0 : transform.save);
+        const changed = await transformOut(itemValue, transform == null ? void 0 : transform.save);
         if (Object.keys(changed).length > 0) {
-          return updateFn(changed, params).then(
-            (result) => result && saveResult(itemKey, changed, result, false)
-          );
+          return retrySet(params, retry, "update", itemKey, changed, updateFn, saveResult);
         }
       }),
-      ...Array.from(deletes).map(async (valuePrevious) => {
-        if (valuePrevious !== symbolDelete) {
-          if (waitForSetParam) {
-            await waitForSet(waitForSetParam, changes, valuePrevious, { type: "delete" });
-          }
-          if (deleteFn) {
-            deleteFn(valuePrevious, params);
-          } else if (fieldDeleted && updateFn) {
-            const valueId = valuePrevious[fieldId];
-            if (valueId) {
-              updateFn({ ...{ [fieldId]: valueId }, [fieldDeleted]: true }, params);
-            } else {
-              console.error("[legend-state]: deleting item without an id");
-            }
-          } else {
-            console.warn("[legend-state] missing delete function");
-          }
+      // Handle deletes
+      ...Array.from(deletes).filter((val) => val !== symbolDelete).map(async (valuePrevious) => {
+        if (waitForSetParam) {
+          await waitForSet(waitForSetParam, changes, valuePrevious, { type: "delete" });
+        }
+        const valueId = valuePrevious[fieldId];
+        if (!valueId) {
+          console.error("[legend-state]: deleting item without an id");
+          return;
+        }
+        if (deleteFn) {
+          return retrySet(
+            params,
+            retry,
+            "delete",
+            valueId,
+            valuePrevious,
+            deleteFn,
+            saveResult
+          );
+        }
+        if (fieldDeleted && updateFn) {
+          return retrySet(
+            params,
+            retry,
+            "delete",
+            valueId,
+            { [fieldId]: valueId, [fieldDeleted]: true },
+            updateFn,
+            saveResult
+          );
         }
+        console.warn("[legend-state] missing delete function");
       })
     ]);
   } : void 0;

package/sync-plugins/firebase.d.mts

@@ -1,4 +1,4 @@
-import { FieldTransforms } from '@legendapp/state/sync';
+import { FieldTransforms, SyncedErrorParams } from '@legendapp/state/sync';
 export { FieldTransforms } from '@legendapp/state/sync';
 import { CrudAsOption, SyncedCrudPropsMany, SyncedCrudPropsBase, SyncedCrudReturnType } from '@legendapp/state/sync-plugins/crud';
 import { DatabaseReference, Query } from 'firebase/database';
@@ -6,11 +6,12 @@ import { DatabaseReference, Query } from 'firebase/database';
 declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
 declare function invertFieldMap(obj: Record<string, any>): any;
 
-interface SyncedFirebaseProps<TRemote extends object, TLocal, TAs extends CrudAsOption = 'value'> extends Omit<SyncedCrudPropsMany<TRemote, TLocal, TAs>, 'list' | 'retry'>, SyncedCrudPropsBase<TRemote, TLocal> {
+interface SyncedFirebaseProps<TRemote extends object, TLocal, TAs extends CrudAsOption = 'value'> extends Omit<SyncedCrudPropsMany<TRemote, TLocal, TAs>, 'list' | 'retry'>, Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'onError'> {
     refPath: (uid: string | undefined) => string;
     query?: (ref: DatabaseReference) => DatabaseReference | Query;
     fieldId?: string;
     fieldTransforms?: FieldTransforms<TRemote>;
+    onError?: (error: Error, params: FirebaseErrorParams) => void;
     realtime?: boolean;
     requireAuth?: boolean;
     readonly?: boolean;
@@ -22,6 +23,9 @@ interface SyncedFirebaseConfiguration {
     enabled?: boolean;
 }
 declare function configureSyncedFirebase(config: SyncedFirebaseConfiguration): void;
+interface FirebaseErrorParams extends Omit<SyncedErrorParams, 'source'> {
+    source: 'list' | 'get' | 'create' | 'update' | 'delete';
+}
 declare function syncedFirebase<TRemote extends object, TLocal = TRemote, TAs extends CrudAsOption = 'object'>(props: SyncedFirebaseProps<TRemote, TLocal, TAs>): SyncedCrudReturnType<TLocal, TAs>;
 
-export { type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };
+export { type FirebaseErrorParams, type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };

package/sync-plugins/firebase.d.ts

@@ -1,4 +1,4 @@
-import { FieldTransforms } from '@legendapp/state/sync';
+import { FieldTransforms, SyncedErrorParams } from '@legendapp/state/sync';
 export { FieldTransforms } from '@legendapp/state/sync';
 import { CrudAsOption, SyncedCrudPropsMany, SyncedCrudPropsBase, SyncedCrudReturnType } from '@legendapp/state/sync-plugins/crud';
 import { DatabaseReference, Query } from 'firebase/database';
@@ -6,11 +6,12 @@ import { DatabaseReference, Query } from 'firebase/database';
 declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
 declare function invertFieldMap(obj: Record<string, any>): any;
 
-interface SyncedFirebaseProps<TRemote extends object, TLocal, TAs extends CrudAsOption = 'value'> extends Omit<SyncedCrudPropsMany<TRemote, TLocal, TAs>, 'list' | 'retry'>, SyncedCrudPropsBase<TRemote, TLocal> {
+interface SyncedFirebaseProps<TRemote extends object, TLocal, TAs extends CrudAsOption = 'value'> extends Omit<SyncedCrudPropsMany<TRemote, TLocal, TAs>, 'list' | 'retry'>, Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'onError'> {
     refPath: (uid: string | undefined) => string;
     query?: (ref: DatabaseReference) => DatabaseReference | Query;
     fieldId?: string;
     fieldTransforms?: FieldTransforms<TRemote>;
+    onError?: (error: Error, params: FirebaseErrorParams) => void;
     realtime?: boolean;
     requireAuth?: boolean;
     readonly?: boolean;
@@ -22,6 +23,9 @@ interface SyncedFirebaseConfiguration {
     enabled?: boolean;
 }
 declare function configureSyncedFirebase(config: SyncedFirebaseConfiguration): void;
+interface FirebaseErrorParams extends Omit<SyncedErrorParams, 'source'> {
+    source: 'list' | 'get' | 'create' | 'update' | 'delete';
+}
 declare function syncedFirebase<TRemote extends object, TLocal = TRemote, TAs extends CrudAsOption = 'object'>(props: SyncedFirebaseProps<TRemote, TLocal, TAs>): SyncedCrudReturnType<TLocal, TAs>;
 
-export { type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };
+export { type FirebaseErrorParams, type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };

package/sync-plugins/firebase.js

@@ -185,7 +185,8 @@ function syncedFirebase(props) {
     }
     return ref;
   };
-  const list = async ({ lastSync, onError }) => {
+  const list = async (getParams) => {
+    const { lastSync, onError } = getParams;
     const ref = computeRef(lastSync);
     return new Promise((resolve) => {
       fns.once(
@@ -204,7 +205,7 @@ function syncedFirebase(props) {
           didList = true;
           resolve(values);
         },
-        onError
+        (error) => onError(error, { source: "list", type: "get", retry: getParams })
       );
     });
   };
@@ -354,6 +355,7 @@ function syncedFirebase(props) {
   }
   return crud.syncedCrud({
     ...rest,
+    // Workaround for type errors
     list,
     subscribe,
     create,

package/sync-plugins/firebase.mjs

@@ -183,7 +183,8 @@ function syncedFirebase(props) {
     }
     return ref;
   };
-  const list = async ({ lastSync, onError }) => {
+  const list = async (getParams) => {
+    const { lastSync, onError } = getParams;
     const ref = computeRef(lastSync);
     return new Promise((resolve) => {
       fns.once(
@@ -202,7 +203,7 @@ function syncedFirebase(props) {
           didList = true;
           resolve(values);
         },
-        onError
+        (error) => onError(error, { source: "list", type: "get", retry: getParams })
       );
     });
   };
@@ -352,6 +353,7 @@ function syncedFirebase(props) {
   }
   return syncedCrud({
     ...rest,
+    // Workaround for type errors
     list,
     subscribe,
     create,

package/sync-plugins/keel.d.mts

@@ -1,5 +1,5 @@
-import { SyncedGetSetSubscribeBaseParams, OnErrorRetryParams, SyncedSetParams } from '@legendapp/state/sync';
-import { SyncedCrudPropsBase, SyncedCrudReturnType, CrudAsOption, SyncedCrudPropsSingle, CrudResult, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
+import { SyncedGetSetSubscribeBaseParams } from '@legendapp/state/sync';
+import { CrudErrorParams, SyncedCrudPropsBase, SyncedCrudReturnType, CrudAsOption, SyncedCrudPropsSingle, CrudResult, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
 
 interface KeelObjectBase {
     id: string;
@@ -13,6 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
+    error?: Error;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {
@@ -88,12 +89,8 @@ interface SyncedKeelPropsSingle<TRemote extends {
     list?: never;
     as?: never;
 }
-interface ErrorDetails {
-    type: 'create' | 'update' | 'delete';
-    params: SyncedSetParams<any>;
-    input: any;
+interface KeelErrorParams extends CrudErrorParams {
     action: string;
-    error: APIResult<any>['error'];
 }
 interface SyncedKeelPropsBase<TRemote extends {
     id: string;
@@ -113,7 +110,7 @@ interface SyncedKeelPropsBase<TRemote extends {
     };
     refreshAuth?: () => void | Promise<void>;
     requireAuth?: boolean;
-    onError?: (error: Error, retryParams: OnErrorRetryParams, details: ErrorDetails) => void;
+    onError?: (error: Error, params: KeelErrorParams) => void;
 }
 declare function syncedKeel<TRemote extends {
     id: string;
@@ -122,4 +119,4 @@ declare function syncedKeel<TRemote extends {
     id: string;
 }, TLocal = TRemote, TOption extends CrudAsOption = 'object', Where extends Record<string, any> = {}>(props: SyncedKeelPropsBase<TRemote, TLocal> & SyncedKeelPropsMany<TRemote, TLocal, TOption, Where>): SyncedCrudReturnType<TLocal, Exclude<TOption, 'value'>>;
 
-export { type KeelClient, type KeelGetParams, type KeelKey, KeelKeys, type KeelListParams, type KeelObjectBase, type KeelRealtimePlugin, type OmitKeelBuiltins, type SyncedKeelPropsBase, generateKeelId, syncedKeel };
+export { type KeelClient, type KeelErrorParams, type KeelGetParams, type KeelKey, KeelKeys, type KeelListParams, type KeelObjectBase, type KeelRealtimePlugin, type OmitKeelBuiltins, type SyncedKeelPropsBase, generateKeelId, syncedKeel };

package/sync-plugins/keel.d.ts

@@ -1,5 +1,5 @@
-import { SyncedGetSetSubscribeBaseParams, OnErrorRetryParams, SyncedSetParams } from '@legendapp/state/sync';
-import { SyncedCrudPropsBase, SyncedCrudReturnType, CrudAsOption, SyncedCrudPropsSingle, CrudResult, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
+import { SyncedGetSetSubscribeBaseParams } from '@legendapp/state/sync';
+import { CrudErrorParams, SyncedCrudPropsBase, SyncedCrudReturnType, CrudAsOption, SyncedCrudPropsSingle, CrudResult, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
 
 interface KeelObjectBase {
     id: string;
@@ -13,6 +13,7 @@ type APIError = {
     type: string;
     message: string;
     requestId?: string;
+    error?: Error;
 };
 type APIResult<T> = Result<T, APIError>;
 type Data<T> = {
@@ -88,12 +89,8 @@ interface SyncedKeelPropsSingle<TRemote extends {
     list?: never;
     as?: never;
 }
-interface ErrorDetails {
-    type: 'create' | 'update' | 'delete';
-    params: SyncedSetParams<any>;
-    input: any;
+interface KeelErrorParams extends CrudErrorParams {
     action: string;
-    error: APIResult<any>['error'];
 }
 interface SyncedKeelPropsBase<TRemote extends {
     id: string;
@@ -113,7 +110,7 @@ interface SyncedKeelPropsBase<TRemote extends {
     };
     refreshAuth?: () => void | Promise<void>;
     requireAuth?: boolean;
-    onError?: (error: Error, retryParams: OnErrorRetryParams, details: ErrorDetails) => void;
+    onError?: (error: Error, params: KeelErrorParams) => void;
 }
 declare function syncedKeel<TRemote extends {
     id: string;
@@ -122,4 +119,4 @@ declare function syncedKeel<TRemote extends {
     id: string;
 }, TLocal = TRemote, TOption extends CrudAsOption = 'object', Where extends Record<string, any> = {}>(props: SyncedKeelPropsBase<TRemote, TLocal> & SyncedKeelPropsMany<TRemote, TLocal, TOption, Where>): SyncedCrudReturnType<TLocal, Exclude<TOption, 'value'>>;
 
-export { type KeelClient, type KeelGetParams, type KeelKey, KeelKeys, type KeelListParams, type KeelObjectBase, type KeelRealtimePlugin, type OmitKeelBuiltins, type SyncedKeelPropsBase, generateKeelId, syncedKeel };
+export { type KeelClient, type KeelErrorParams, type KeelGetParams, type KeelKey, KeelKeys, type KeelListParams, type KeelObjectBase, type KeelRealtimePlugin, type OmitKeelBuiltins, type SyncedKeelPropsBase, generateKeelId, syncedKeel };

package/sync-plugins/keel.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var state = require('@legendapp/state');
+var sync = require('@legendapp/state/sync');
 var crud = require('@legendapp/state/sync-plugins/crud');
 var ksuid = require('ksuid');
 
@@ -52,12 +53,17 @@ async function ensureAuthToken(props, force) {
   }
   return isAuthed;
 }
-async function handleApiError(props, error, retry) {
+async function handleApiError(props, error) {
+  var _a;
   if (error.type === "unauthorized" || error.type === "forbidden") {
     console.warn("Keel token expired, refreshing...");
     isAuthed$.set(false);
     await ensureAuthToken(props);
+    return true;
+  } else if (((_a = error.error) == null ? void 0 : _a.message) === "Failed to fetch") {
+    throw error.error;
   }
+  return false;
 }
 function convertObjectToCreate(item) {
   const cloned = {};
@@ -97,7 +103,7 @@ function setupRealtime(props) {
   }
 }
 var NumPerPage = 200;
-async function getAllPages(props, listFn, params) {
+async function getAllPages(props, listFn, params, listParams, onError) {
   const allData = [];
   let pageInfo = void 0;
   const { first: firstParam } = params;
@@ -113,8 +119,17 @@ async function getAllPages(props, listFn, params) {
     if (ret) {
       const { data, error } = ret;
       if (error) {
-        await handleApiError(props, error);
-        throw new Error(error.message);
+        const handled = await handleApiError(props, error);
+        if (!handled) {
+          const err = new Error(error.message, { cause: { error } });
+          onError(err, {
+            getParams: listParams,
+            type: "get",
+            source: "list",
+            action: listFn.name || listFn.toString(),
+            retry: listParams
+          });
+        }
       } else if (data) {
         pageInfo = data.pageInfo;
         allData.push(...data.results);
@@ -138,7 +153,6 @@ function syncedKeel(props) {
     fieldDeleted,
     realtime,
     mode,
-    onError,
     requireAuth = true,
     ...rest
   } = props;
@@ -158,7 +172,7 @@ function syncedKeel(props) {
     }
   } : void 0;
   const list = listParam ? async (listParams) => {
-    const { lastSync } = listParams;
+    const { lastSync, onError } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
     const where = Object.assign(
       queryBySync ? { updatedAt: { after: new Date(lastSync + 1) } } : {},
@@ -166,14 +180,14 @@ function syncedKeel(props) {
     );
     const params = { where, first };
     realtimeState.current = {};
-    const promise = getAllPages(props, listParam, params);
+    const promise = getAllPages(props, listParam, params, listParams, onError);
     if (realtime) {
       setupSubscribe(listParams);
     }
     return promise;
   } : void 0;
   const get = getParam ? async (getParams) => {
-    const { refresh } = getParams;
+    const { refresh, onError } = getParams;
     realtimeState.current = {};
     const promise = getParam({ refresh });
     if (realtime) {
@@ -181,7 +195,17 @@ function syncedKeel(props) {
     }
     const { data, error } = await promise;
     if (error) {
-      throw new Error(error.message);
+      const handled = await handleApiError(props, error);
+      if (!handled) {
+        const err = new Error(error.message, { cause: { error } });
+        onError(err, {
+          getParams,
+          type: "get",
+          source: "get",
+          action: getParam.name || getParam.toString(),
+          retry: getParams
+        });
+      }
     } else {
       return data;
     }
@@ -198,7 +222,7 @@ function syncedKeel(props) {
   };
   const handleSetError = async (error, params, input, fn, from) => {
     var _a, _b;
-    const { retryNum, update: update2 } = params;
+    const { update: update2, onError } = 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__) {
         console.log("Creating duplicate data already saved, just ignore.");
@@ -208,28 +232,25 @@ function syncedKeel(props) {
         value: {},
         mode: "assign"
       });
-    } else if (from === "delete") {
-      if (error.message === "record not found") {
-        if (__DEV__) {
-          console.log("Deleting non-existing data, just ignore.");
-        }
-        params.cancelRetry = true;
-      }
-    } else if (error.type === "bad_request") {
-      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;
+    } else if (from === "delete" && error.message === "record not found") {
+      if (__DEV__) {
+        console.log("Deleting non-existing data, just ignore.");
       }
-      throw new Error(error.message, { cause: { input } });
+      params.cancelRetry = true;
     } else {
-      await handleApiError(props, error);
-      throw new Error(error.message, { cause: { input } });
+      const handled = await handleApiError(props, error);
+      if (!handled) {
+        const err = new Error(error.message, { cause: { error } });
+        onError(err, {
+          setParams: params,
+          input,
+          type: "set",
+          source: from,
+          action: fn.name || fn.toString(),
+          retry: params,
+          revert: sync.createRevertChanges(params.value$, params.changes)
+        });
+      }
     }
   };
   const create = createParam ? async (input, params) => {