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

package/index.d.mts

@@ -249,7 +249,11 @@ interface UpdateFnParams<T = any> {
     mode?: GetMode;
     lastSync?: number | undefined;
 }
+interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+    lastSync?: never;
+}
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
+type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
 type Linked<T> = T;
 interface ObserveOptions {
     immediate?: boolean;
@@ -429,4 +433,4 @@ declare const internal: {
     };
 };
 
-export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };

package/index.d.ts

@@ -249,7 +249,11 @@ interface UpdateFnParams<T = any> {
     mode?: GetMode;
     lastSync?: number | undefined;
 }
+interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+    lastSync?: never;
+}
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
+type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
 type Linked<T> = T;
 interface ObserveOptions {
     immediate?: boolean;
@@ -429,4 +433,4 @@ declare const internal: {
     };
 };
 
-export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };

package/index.js

@@ -1173,8 +1173,8 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
   }
 }
-function getKeys(obj, isArr, isMap2) {
-  return isArr ? void 0 : obj ? isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
+function getKeys(obj, isArr, isMap2, isSet2) {
+  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
 }
 function updateNodes(parent, obj, prevValue) {
   var _a, _b, _c;
@@ -1204,9 +1204,11 @@ function updateNodes(parent, obj, prevValue) {
   let prevChildrenById;
   let moved;
   const isCurMap = isMap(obj);
+  const isCurSet = isSet(obj);
   const isPrevMap = isMap(prevValue);
-  const keys = getKeys(obj, isArr, isCurMap);
-  const keysPrev = getKeys(prevValue, isArr, isPrevMap);
+  const isPrevSet = isSet(prevValue);
+  const keys = getKeys(obj, isArr, isCurMap, isCurSet);
+  const keysPrev = getKeys(prevValue, isArr, isPrevMap, isPrevSet);
   const length = ((_a = keys || obj) == null ? void 0 : _a.length) || 0;
   const lengthPrev = ((_b = keysPrev || prevValue) == null ? void 0 : _b.length) || 0;
   let idField;

package/index.mjs

@@ -1171,8 +1171,8 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
   }
 }
-function getKeys(obj, isArr, isMap2) {
-  return isArr ? void 0 : obj ? isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
+function getKeys(obj, isArr, isMap2, isSet2) {
+  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
 }
 function updateNodes(parent, obj, prevValue) {
   var _a, _b, _c;
@@ -1202,9 +1202,11 @@ function updateNodes(parent, obj, prevValue) {
   let prevChildrenById;
   let moved;
   const isCurMap = isMap(obj);
+  const isCurSet = isSet(obj);
   const isPrevMap = isMap(prevValue);
-  const keys = getKeys(obj, isArr, isCurMap);
-  const keysPrev = getKeys(prevValue, isArr, isPrevMap);
+  const isPrevSet = isSet(prevValue);
+  const keys = getKeys(obj, isArr, isCurMap, isCurSet);
+  const keysPrev = getKeys(prevValue, isArr, isPrevMap, isPrevSet);
   const length = ((_a = keys || obj) == null ? void 0 : _a.length) || 0;
   const lengthPrev = ((_b = keysPrev || prevValue) == null ? void 0 : _b.length) || 0;
   let idField;

package/package.json

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

package/react.d.mts

@@ -54,11 +54,11 @@ declare function Switch<T extends object>({ value, children, }: {
     children: Partial<Record<keyof T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends string | number | symbol>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends boolean>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<'false' | 'true' | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T>({ value, children, }: {
@@ -116,7 +116,7 @@ declare function reactiveObserver<T extends object, K extends keyof T>(component
 declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
+declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
 
 declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
 declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;

package/react.d.ts

@@ -54,11 +54,11 @@ declare function Switch<T extends object>({ value, children, }: {
     children: Partial<Record<keyof T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends string | number | symbol>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<T | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T extends boolean>({ value, children, }: {
-    value?: Selector<T>;
+    value?: Selector<T | undefined | null>;
     children: Partial<Record<'false' | 'true' | 'null' | 'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 declare function Switch<T>({ value, children, }: {
@@ -116,7 +116,7 @@ declare function reactiveObserver<T extends object, K extends keyof T>(component
 declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactiveComponents<P extends Record<string, FC>>(components: P): ObjectShapeWith$<P>;
+declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
 
 declare function useComputed<T>(get: () => T | Promise<T>): Observable<T>;
 declare function useComputed<T>(get: () => T | Promise<T>, deps: any[]): Observable<T>;

package/sync-plugins/crud.d.mts

@@ -1,5 +1,5 @@
 import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
-import { SyncedGetParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
+import { SyncedGetParams, SyncedErrorParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
 type CrudResult<T> = T;
@@ -25,7 +25,11 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
 interface WaitForSetCrudFnParams<T> extends WaitForSetFnParams<T> {
     type: 'create' | 'update' | 'delete';
 }
-interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe' | 'waitForSet'> {
+interface CrudErrorParams extends Omit<SyncedErrorParams, 'source'> {
+    source: 'list' | 'get' | 'create' | 'update' | 'delete' | 'unknown';
+}
+type CrudOnErrorFn = (error: Error, params: CrudErrorParams) => void;
+interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe' | 'waitForSet' | 'onError'> {
     create?(input: TRemote, params: SyncedSetParams<TRemote>): Promise<CrudResult<TRemote> | null | undefined | void>;
     update?(input: Partial<TRemote>, params: SyncedSetParams<TRemote>): Promise<CrudResult<Partial<TRemote> | null | undefined | void>>;
     delete?(input: TRemote, params: SyncedSetParams<TRemote>): Promise<any>;
@@ -40,6 +44,7 @@ interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends
     generateId?: () => string | number;
     subscribe?: (params: SyncedSubscribeParams<TRemote[]>) => (() => void) | void;
     waitForSet?: ((params: WaitForSetCrudFnParams<TLocal>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
+    onError?: (error: Error, params: CrudErrorParams) => void;
 }
 type InitialValue<TLocal, TAsOption extends CrudAsOption> = TAsOption extends 'Map' ? Map<string | number, TLocal> : TAsOption extends 'object' ? Record<string | number, TLocal> : TAsOption extends 'value' ? TLocal : TLocal[];
 type SyncedCrudReturnType<TLocal, TAsOption extends CrudAsOption> = TAsOption extends 'Map' ? Map<TLocal extends {
@@ -51,4 +56,4 @@ declare function syncedCrud<TRemote extends object, TLocal = TRemote>(props: Syn
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: SyncedCrudPropsMany<TRemote, TLocal, TAsOption> & SyncedCrudPropsBase<TRemote, TLocal>): SyncedCrudReturnType<TLocal, Exclude<TAsOption, 'value'>>;
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: (SyncedCrudPropsSingle<TRemote, TLocal> | SyncedCrudPropsMany<TRemote, TLocal, TAsOption>) & SyncedCrudPropsBase<TRemote, TLocal>): SyncedCrudReturnType<TLocal, TAsOption>;
 
-export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };
+export { type CrudAsOption, type CrudErrorParams, type CrudOnErrorFn, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };

package/sync-plugins/crud.d.ts

@@ -1,5 +1,5 @@
 import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
-import { SyncedGetParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
+import { SyncedGetParams, SyncedErrorParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
 type CrudResult<T> = T;
@@ -25,7 +25,11 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
 interface WaitForSetCrudFnParams<T> extends WaitForSetFnParams<T> {
     type: 'create' | 'update' | 'delete';
 }
-interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe' | 'waitForSet'> {
+interface CrudErrorParams extends Omit<SyncedErrorParams, 'source'> {
+    source: 'list' | 'get' | 'create' | 'update' | 'delete' | 'unknown';
+}
+type CrudOnErrorFn = (error: Error, params: CrudErrorParams) => void;
+interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe' | 'waitForSet' | 'onError'> {
     create?(input: TRemote, params: SyncedSetParams<TRemote>): Promise<CrudResult<TRemote> | null | undefined | void>;
     update?(input: Partial<TRemote>, params: SyncedSetParams<TRemote>): Promise<CrudResult<Partial<TRemote> | null | undefined | void>>;
     delete?(input: TRemote, params: SyncedSetParams<TRemote>): Promise<any>;
@@ -40,6 +44,7 @@ interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends
     generateId?: () => string | number;
     subscribe?: (params: SyncedSubscribeParams<TRemote[]>) => (() => void) | void;
     waitForSet?: ((params: WaitForSetCrudFnParams<TLocal>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
+    onError?: (error: Error, params: CrudErrorParams) => void;
 }
 type InitialValue<TLocal, TAsOption extends CrudAsOption> = TAsOption extends 'Map' ? Map<string | number, TLocal> : TAsOption extends 'object' ? Record<string | number, TLocal> : TAsOption extends 'value' ? TLocal : TLocal[];
 type SyncedCrudReturnType<TLocal, TAsOption extends CrudAsOption> = TAsOption extends 'Map' ? Map<TLocal extends {
@@ -51,4 +56,4 @@ declare function syncedCrud<TRemote extends object, TLocal = TRemote>(props: Syn
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: SyncedCrudPropsMany<TRemote, TLocal, TAsOption> & SyncedCrudPropsBase<TRemote, TLocal>): SyncedCrudReturnType<TLocal, Exclude<TAsOption, 'value'>>;
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: (SyncedCrudPropsSingle<TRemote, TLocal> | SyncedCrudPropsMany<TRemote, TLocal, TAsOption>) & SyncedCrudPropsBase<TRemote, TLocal>): SyncedCrudReturnType<TLocal, TAsOption>;
 
-export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };
+export { type CrudAsOption, type CrudErrorParams, type CrudOnErrorFn, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };

package/sync-plugins/crud.js

@@ -5,7 +5,7 @@ var sync = require('@legendapp/state/sync');
 
 // src/sync-plugins/crud.ts
 var { clone } = state.internal;
-var { waitForSet } = sync.internal;
+var { waitForSet, runWithRetry } = sync.internal;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
 }
@@ -25,6 +25,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,
@@ -45,6 +78,7 @@ function syncedCrud(props) {
     changesSince,
     generateId,
     waitForSet: waitForSetParam,
+    retry,
     ...rest
   } = props;
   const fieldId = fieldIdProp || "id";
@@ -77,63 +111,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[state.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 state.isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
-      };
-      return state.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 state.isPromise(dataPromise) ? dataPromise.then(processData) : processData(dataPromise);
-    }
+          return state.isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
+        };
+        return state.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 state.isPromise(dataPromise) ? dataPromise.then(processData) : processData(dataPromise);
+      }
+    });
   } : void 0;
   const set = createFn || updateFn || deleteFn ? async (params) => {
     const { value, changes, update, retryAsCreate, node } = params;
@@ -285,59 +324,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 !== state.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 !== state.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;