@legendapp/state 3.0.0-alpha.30 → 3.0.0-alpha.31

package/config.d.mts

@@ -1,4 +1,4 @@
-import { N as NodeInfo } from './observableInterfaces-Dilj6F92.mjs';
+import { N as NodeInfo } from './observableInterfaces-CZR3_8mM.mjs';
 
 declare function configureLegendState({ observableFunctions, observableProperties, jsonReplacer, jsonReviver, }: {
     observableFunctions?: Record<string, (node: NodeInfo, ...args: any[]) => any>;

package/config.d.ts

@@ -1,4 +1,4 @@
-import { N as NodeInfo } from './observableInterfaces-Dilj6F92.js';
+import { N as NodeInfo } from './observableInterfaces-CZR3_8mM.js';
 
 declare function configureLegendState({ observableFunctions, observableProperties, jsonReplacer, jsonReviver, }: {
     observableFunctions?: Record<string, (node: NodeInfo, ...args: any[]) => any>;

package/config.js

@@ -871,16 +871,30 @@ function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
     return effect ? predicate.then(effect) : predicate;
   }
+  const isPredicateArray = isArray(predicate);
   let value;
   let effectValue;
   function run(e) {
-    const ret = computeSelector(predicate);
+    const ret = isPredicateArray ? predicate.map((p) => computeSelector(p)) : computeSelector(predicate);
     if (isPromise(ret)) {
       value = ret;
       return void 0;
-    } else if (!isPromise(ret) && (isObservableValueReady(ret) )) {
-      value = ret;
-      e.cancel = true;
+    } else {
+      let isOk = true;
+      if (isArray(ret)) {
+        for (let i = 0; i < ret.length; i++) {
+          if (isObservable(ret[i])) {
+            ret[i] = computeSelector(ret[i]);
+          }
+          isOk = isOk && !!(isObservableValueReady(ret[i]) );
+        }
+      } else {
+        isOk = isObservableValueReady(ret) ;
+      }
+      if (isOk) {
+        value = ret;
+        e.cancel = true;
+      }
     }
     return value;
   }

package/config.mjs

@@ -869,16 +869,30 @@ function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
     return effect ? predicate.then(effect) : predicate;
   }
+  const isPredicateArray = isArray(predicate);
   let value;
   let effectValue;
   function run(e) {
-    const ret = computeSelector(predicate);
+    const ret = isPredicateArray ? predicate.map((p) => computeSelector(p)) : computeSelector(predicate);
     if (isPromise(ret)) {
       value = ret;
       return void 0;
-    } else if (!isPromise(ret) && (isObservableValueReady(ret) )) {
-      value = ret;
-      e.cancel = true;
+    } else {
+      let isOk = true;
+      if (isArray(ret)) {
+        for (let i = 0; i < ret.length; i++) {
+          if (isObservable(ret[i])) {
+            ret[i] = computeSelector(ret[i]);
+          }
+          isOk = isOk && !!(isObservableValueReady(ret[i]) );
+        }
+      } else {
+        isOk = isObservableValueReady(ret) ;
+      }
+      if (isOk) {
+        value = ret;
+        e.cancel = true;
+      }
     }
     return value;
   }

package/index.d.mts

@@ -1,5 +1,5 @@
-import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-Dilj6F92.mjs';
-export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, M as GetMode, a0 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, $ as ObservableBoolean, D as ObservableListenerDispose, a1 as ObservableObject, _ as ObservableObjectFns, E as ObservableRoot, X as ObservableState, V as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, Z as RemoveObservables, Y as RetryOptions, I as RootNodeInfo, K as SetParams, Q as UpdateFnParams, W as WaitForSetFnParams, w as isObservable } from './observableInterfaces-Dilj6F92.mjs';
+import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CZR3_8mM.mjs';
+export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, Q as GetMode, a1 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, a0 as ObservableBoolean, D as ObservableListenerDispose, a2 as ObservableObject, $ as ObservableObjectFns, E as ObservableRoot, Y as ObservableState, X as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, _ as RemoveObservables, Z as RetryOptions, I as RootNodeInfo, K as SetParams, V as UpdateFnParams, W as WaitForSet, M as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CZR3_8mM.mjs';
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
 declare function set(node: NodeInfo, newValue?: any): void;
@@ -74,10 +74,14 @@ declare function trackSelector<T>(selector: Selector<T>, update: (params: Listen
 };
 
 declare function when<T, T2>(predicate: Promise<T>, effect: (value: T) => T2): Promise<T2>;
+declare function when<T, T2>(predicate: Selector<T>[], effect: (value: T[]) => T2): Promise<T2>;
 declare function when<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function when<T>(predicate: Selector<T>[]): Promise<T[]>;
 declare function when<T>(predicate: Selector<T>): Promise<T>;
 declare function whenReady<T, T2>(predicate: Promise<T>, effect: (value: T) => T2): Promise<T2>;
+declare function whenReady<T, T2>(predicate: Selector<T>[], effect: (value: T[]) => T2): Promise<T2[]>;
 declare function whenReady<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function whenReady<T>(predicate: Selector<T>[]): Promise<T[]>;
 declare function whenReady<T>(predicate: Selector<T>): Promise<T>;
 
 declare const internal: {

package/index.d.ts

@@ -1,5 +1,5 @@
-import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-Dilj6F92.js';
-export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, M as GetMode, a0 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, $ as ObservableBoolean, D as ObservableListenerDispose, a1 as ObservableObject, _ as ObservableObjectFns, E as ObservableRoot, X as ObservableState, V as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, Z as RemoveObservables, Y as RetryOptions, I as RootNodeInfo, K as SetParams, Q as UpdateFnParams, W as WaitForSetFnParams, w as isObservable } from './observableInterfaces-Dilj6F92.js';
+import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CZR3_8mM.js';
+export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, Q as GetMode, a1 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, a0 as ObservableBoolean, D as ObservableListenerDispose, a2 as ObservableObject, $ as ObservableObjectFns, E as ObservableRoot, Y as ObservableState, X as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, _ as RemoveObservables, Z as RetryOptions, I as RootNodeInfo, K as SetParams, V as UpdateFnParams, W as WaitForSet, M as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CZR3_8mM.js';
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
 declare function set(node: NodeInfo, newValue?: any): void;
@@ -74,10 +74,14 @@ declare function trackSelector<T>(selector: Selector<T>, update: (params: Listen
 };
 
 declare function when<T, T2>(predicate: Promise<T>, effect: (value: T) => T2): Promise<T2>;
+declare function when<T, T2>(predicate: Selector<T>[], effect: (value: T[]) => T2): Promise<T2>;
 declare function when<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function when<T>(predicate: Selector<T>[]): Promise<T[]>;
 declare function when<T>(predicate: Selector<T>): Promise<T>;
 declare function whenReady<T, T2>(predicate: Promise<T>, effect: (value: T) => T2): Promise<T2>;
+declare function whenReady<T, T2>(predicate: Selector<T>[], effect: (value: T[]) => T2): Promise<T2[]>;
 declare function whenReady<T, T2>(predicate: Selector<T>, effect: (value: T) => T2): Promise<T2>;
+declare function whenReady<T>(predicate: Selector<T>[]): Promise<T[]>;
 declare function whenReady<T>(predicate: Selector<T>): Promise<T>;
 
 declare const internal: {

package/index.js

@@ -1024,16 +1024,30 @@ function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
     return effect ? predicate.then(effect) : predicate;
   }
+  const isPredicateArray = isArray(predicate);
   let value;
   let effectValue;
   function run(e) {
-    const ret = computeSelector(predicate);
+    const ret = isPredicateArray ? predicate.map((p) => computeSelector(p)) : computeSelector(predicate);
     if (isPromise(ret)) {
       value = ret;
       return void 0;
-    } else if (!isPromise(ret) && (checkReady ? isObservableValueReady(ret) : ret)) {
-      value = ret;
-      e.cancel = true;
+    } else {
+      let isOk = true;
+      if (isArray(ret)) {
+        for (let i = 0; i < ret.length; i++) {
+          if (isObservable(ret[i])) {
+            ret[i] = computeSelector(ret[i]);
+          }
+          isOk = isOk && !!(checkReady ? isObservableValueReady(ret[i]) : ret[i]);
+        }
+      } else {
+        isOk = checkReady ? isObservableValueReady(ret) : ret;
+      }
+      if (isOk) {
+        value = ret;
+        e.cancel = true;
+      }
     }
     return value;
   }
@@ -2222,6 +2236,7 @@ function syncState(obs) {
       isSyncEnabled: true,
       isGetting: false,
       isSetting: false,
+      numPendingGets: 0,
       numPendingSets: 0,
       syncCount: 0,
       clearPersist: void 0,

package/index.mjs

@@ -1022,16 +1022,30 @@ function _when(predicate, effect, checkReady) {
   if (isPromise(predicate)) {
     return effect ? predicate.then(effect) : predicate;
   }
+  const isPredicateArray = isArray(predicate);
   let value;
   let effectValue;
   function run(e) {
-    const ret = computeSelector(predicate);
+    const ret = isPredicateArray ? predicate.map((p) => computeSelector(p)) : computeSelector(predicate);
     if (isPromise(ret)) {
       value = ret;
       return void 0;
-    } else if (!isPromise(ret) && (checkReady ? isObservableValueReady(ret) : ret)) {
-      value = ret;
-      e.cancel = true;
+    } else {
+      let isOk = true;
+      if (isArray(ret)) {
+        for (let i = 0; i < ret.length; i++) {
+          if (isObservable(ret[i])) {
+            ret[i] = computeSelector(ret[i]);
+          }
+          isOk = isOk && !!(checkReady ? isObservableValueReady(ret[i]) : ret[i]);
+        }
+      } else {
+        isOk = checkReady ? isObservableValueReady(ret) : ret;
+      }
+      if (isOk) {
+        value = ret;
+        e.cancel = true;
+      }
     }
     return value;
   }
@@ -2220,6 +2234,7 @@ function syncState(obs) {
       isSyncEnabled: true,
       isGetting: false,
       isSetting: false,
+      numPendingGets: 0,
       numPendingSets: 0,
       syncCount: 0,
       clearPersist: void 0,

package/{observableInterfaces-Dilj6F92.d.mts → observableInterfaces-CZR3_8mM.d.mts}

@@ -224,11 +224,12 @@ interface ObserveEventCallback<T> {
     onCleanupReaction?: () => void;
 }
 type SetParams<T> = ListenerParams<T extends Promise<infer t> ? t : T>;
+type WaitForSet<T> = ((params: WaitForSetFnParams<T>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent | ObservableParam<any>[] | ObservableEvent[];
 interface LinkedOptions<T = any> {
     get?: () => Promise<T> | T;
     set?: (params: SetParams<T>) => void | Promise<any>;
     waitFor?: Selector<any>;
-    waitForSet?: ((params: WaitForSetFnParams<T>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
+    waitForSet?: WaitForSet<T>;
     initial?: (() => T) | T;
     activate?: 'auto' | 'lazy';
 }
@@ -254,9 +255,9 @@ interface ObservableSyncStateBase {
     lastSync?: number;
     syncCount?: number;
     isGetting?: boolean;
+    isSetting?: boolean;
     numPendingGets?: number;
     numPendingSets?: number;
-    isSetting?: boolean;
     clearPersist: () => Promise<void>;
     sync: () => Promise<void>;
     getPendingChanges: () => Record<string, {
@@ -279,4 +280,4 @@ interface RetryOptions {
     maxDelay?: number;
 }
 
-export { type ObservableBoolean as $, type ArrayValue as A, type ClassConstructor as B, type Change as C, type ObservableListenerDispose as D, type ObservableRoot as E, type NotPrimitive as F, type GetOptions as G, type NodeListener as H, type RootNodeInfo as I, type ChildNodeInfo as J, type SetParams as K, type LinkedOptions as L, type GetMode as M, type NodeInfo as N, type Observable as O, type Primitive as P, type UpdateFnParams as Q, type RecursiveValueOrFunction as R, type Selector as S, type TrackingType as T, type UpdateFn as U, type ObservableSyncStateBase as V, type WaitForSetFnParams as W, type ObservableState as X, type RetryOptions as Y, type RemoveObservables as Z, type ObservableObjectFns as _, type ObservableEvent as a, type ImmutableObservableBase as a0, type ObservableObject as a1, type ObserveEvent as b, type ObservableParam as c, type OpaqueObject as d, type TypeAtPath as e, type Linked as f, type ObservablePrimitive as g, type ObserveOptions as h, type ObserveEventCallback as i, type ObservableSyncState as j, type ListenerParams as k, type TrackingNode as l, clone as m, ensureNodeValue as n, findIDKey as o, getNode as p, getNodeValue as q, getPathType as r, safeParse as s, safeStringify as t, setNodeValue as u, type TrackingState as v, isObservable as w, type ListenerFn as x, type RecordValue as y, type ObservableValue as z };
+export { type ObservableObjectFns as $, type ArrayValue as A, type ClassConstructor as B, type Change as C, type ObservableListenerDispose as D, type ObservableRoot as E, type NotPrimitive as F, type GetOptions as G, type NodeListener as H, type RootNodeInfo as I, type ChildNodeInfo as J, type SetParams as K, type LinkedOptions as L, type WaitForSetFnParams as M, type NodeInfo as N, type Observable as O, type Primitive as P, type GetMode as Q, type RecursiveValueOrFunction as R, type Selector as S, type TrackingType as T, type UpdateFn as U, type UpdateFnParams as V, type WaitForSet as W, type ObservableSyncStateBase as X, type ObservableState as Y, type RetryOptions as Z, type RemoveObservables as _, type ObservableEvent as a, type ObservableBoolean as a0, type ImmutableObservableBase as a1, type ObservableObject as a2, type ObserveEvent as b, type ObservableParam as c, type OpaqueObject as d, type TypeAtPath as e, type Linked as f, type ObservablePrimitive as g, type ObserveOptions as h, type ObserveEventCallback as i, type ObservableSyncState as j, type ListenerParams as k, type TrackingNode as l, clone as m, ensureNodeValue as n, findIDKey as o, getNode as p, getNodeValue as q, getPathType as r, safeParse as s, safeStringify as t, setNodeValue as u, type TrackingState as v, isObservable as w, type ListenerFn as x, type RecordValue as y, type ObservableValue as z };

package/{observableInterfaces-Dilj6F92.d.ts → observableInterfaces-CZR3_8mM.d.ts}

@@ -224,11 +224,12 @@ interface ObserveEventCallback<T> {
     onCleanupReaction?: () => void;
 }
 type SetParams<T> = ListenerParams<T extends Promise<infer t> ? t : T>;
+type WaitForSet<T> = ((params: WaitForSetFnParams<T>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent | ObservableParam<any>[] | ObservableEvent[];
 interface LinkedOptions<T = any> {
     get?: () => Promise<T> | T;
     set?: (params: SetParams<T>) => void | Promise<any>;
     waitFor?: Selector<any>;
-    waitForSet?: ((params: WaitForSetFnParams<T>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
+    waitForSet?: WaitForSet<T>;
     initial?: (() => T) | T;
     activate?: 'auto' | 'lazy';
 }
@@ -254,9 +255,9 @@ interface ObservableSyncStateBase {
     lastSync?: number;
     syncCount?: number;
     isGetting?: boolean;
+    isSetting?: boolean;
     numPendingGets?: number;
     numPendingSets?: number;
-    isSetting?: boolean;
     clearPersist: () => Promise<void>;
     sync: () => Promise<void>;
     getPendingChanges: () => Record<string, {
@@ -279,4 +280,4 @@ interface RetryOptions {
     maxDelay?: number;
 }
 
-export { type ObservableBoolean as $, type ArrayValue as A, type ClassConstructor as B, type Change as C, type ObservableListenerDispose as D, type ObservableRoot as E, type NotPrimitive as F, type GetOptions as G, type NodeListener as H, type RootNodeInfo as I, type ChildNodeInfo as J, type SetParams as K, type LinkedOptions as L, type GetMode as M, type NodeInfo as N, type Observable as O, type Primitive as P, type UpdateFnParams as Q, type RecursiveValueOrFunction as R, type Selector as S, type TrackingType as T, type UpdateFn as U, type ObservableSyncStateBase as V, type WaitForSetFnParams as W, type ObservableState as X, type RetryOptions as Y, type RemoveObservables as Z, type ObservableObjectFns as _, type ObservableEvent as a, type ImmutableObservableBase as a0, type ObservableObject as a1, type ObserveEvent as b, type ObservableParam as c, type OpaqueObject as d, type TypeAtPath as e, type Linked as f, type ObservablePrimitive as g, type ObserveOptions as h, type ObserveEventCallback as i, type ObservableSyncState as j, type ListenerParams as k, type TrackingNode as l, clone as m, ensureNodeValue as n, findIDKey as o, getNode as p, getNodeValue as q, getPathType as r, safeParse as s, safeStringify as t, setNodeValue as u, type TrackingState as v, isObservable as w, type ListenerFn as x, type RecordValue as y, type ObservableValue as z };
+export { type ObservableObjectFns as $, type ArrayValue as A, type ClassConstructor as B, type Change as C, type ObservableListenerDispose as D, type ObservableRoot as E, type NotPrimitive as F, type GetOptions as G, type NodeListener as H, type RootNodeInfo as I, type ChildNodeInfo as J, type SetParams as K, type LinkedOptions as L, type WaitForSetFnParams as M, type NodeInfo as N, type Observable as O, type Primitive as P, type GetMode as Q, type RecursiveValueOrFunction as R, type Selector as S, type TrackingType as T, type UpdateFn as U, type UpdateFnParams as V, type WaitForSet as W, type ObservableSyncStateBase as X, type ObservableState as Y, type RetryOptions as Z, type RemoveObservables as _, type ObservableEvent as a, type ObservableBoolean as a0, type ImmutableObservableBase as a1, type ObservableObject as a2, type ObserveEvent as b, type ObservableParam as c, type OpaqueObject as d, type TypeAtPath as e, type Linked as f, type ObservablePrimitive as g, type ObserveOptions as h, type ObserveEventCallback as i, type ObservableSyncState as j, type ListenerParams as k, type TrackingNode as l, clone as m, ensureNodeValue as n, findIDKey as o, getNode as p, getNodeValue as q, getPathType as r, safeParse as s, safeStringify as t, setNodeValue as u, type TrackingState as v, isObservable as w, type ListenerFn as x, type RecordValue as y, type ObservableValue as z };

package/package.json

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

package/sync-plugins/crud.d.mts

@@ -1,3 +1,4 @@
+import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
 import { SyncedGetParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
@@ -19,7 +20,10 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
     isCreate: boolean;
     props: SyncedCrudPropsBase<TRemote, TLocal>;
 }
-interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe'> {
+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'> {
     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>;
@@ -33,6 +37,7 @@ interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends
     changesSince?: 'all' | 'last-sync';
     generateId?: () => string | number;
     subscribe?: (params: SyncedSubscribeParams<TRemote[]>) => (() => void) | void;
+    waitForSet?: ((params: WaitForSetCrudFnParams<TLocal>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
 }
 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 {
@@ -43,4 +48,4 @@ type SyncedCrudReturnType<TLocal, TAsOption extends CrudAsOption> = TAsOption ex
 declare function syncedCrud<TRemote extends object, TLocal = TRemote>(props: SyncedCrudPropsBase<TRemote, TLocal> & SyncedCrudPropsSingle<TRemote, TLocal>): SyncedCrudReturnType<TLocal, 'value'>;
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: SyncedCrudPropsBase<TRemote, TLocal> & SyncedCrudPropsMany<TRemote, TLocal, TAsOption>): SyncedCrudReturnType<TLocal, Exclude<TAsOption, 'value'>>;
 
-export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, syncedCrud };
+export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };

package/sync-plugins/crud.d.ts

@@ -1,3 +1,4 @@
+import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
 import { SyncedGetParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
@@ -19,7 +20,10 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
     isCreate: boolean;
     props: SyncedCrudPropsBase<TRemote, TLocal>;
 }
-interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends Omit<SyncedOptions<TRemote, TLocal>, 'get' | 'set' | 'initial' | 'subscribe'> {
+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'> {
     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>;
@@ -33,6 +37,7 @@ interface SyncedCrudPropsBase<TRemote extends object, TLocal = TRemote> extends
     changesSince?: 'all' | 'last-sync';
     generateId?: () => string | number;
     subscribe?: (params: SyncedSubscribeParams<TRemote[]>) => (() => void) | void;
+    waitForSet?: ((params: WaitForSetCrudFnParams<TLocal>) => any) | Promise<any> | ObservableParam<any> | ObservableEvent;
 }
 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 {
@@ -43,4 +48,4 @@ type SyncedCrudReturnType<TLocal, TAsOption extends CrudAsOption> = TAsOption ex
 declare function syncedCrud<TRemote extends object, TLocal = TRemote>(props: SyncedCrudPropsBase<TRemote, TLocal> & SyncedCrudPropsSingle<TRemote, TLocal>): SyncedCrudReturnType<TLocal, 'value'>;
 declare function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption extends CrudAsOption = 'object'>(props: SyncedCrudPropsBase<TRemote, TLocal> & SyncedCrudPropsMany<TRemote, TLocal, TAsOption>): SyncedCrudReturnType<TLocal, Exclude<TAsOption, 'value'>>;
 
-export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, syncedCrud };
+export { type CrudAsOption, type CrudResult, type SyncedCrudOnSavedParams, type SyncedCrudPropsBase, type SyncedCrudPropsMany, type SyncedCrudPropsSingle, type SyncedCrudReturnType, type WaitForSetCrudFnParams, syncedCrud };

package/sync-plugins/crud.js

@@ -5,6 +5,7 @@ var sync = require('@legendapp/state/sync');
 
 // src/sync-plugins/crud.ts
 var { clone } = state.internal;
+var { waitForSet } = sync.internal;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
 }
@@ -43,9 +44,11 @@ function syncedCrud(props) {
     mode: modeParam,
     changesSince,
     generateId,
+    waitForSet: waitForSetParam,
     ...rest
   } = props;
   const fieldId = fieldIdProp || "id";
+  const pendingCreates = /* @__PURE__ */ new Set();
   let asType = props.as;
   if (!asType) {
     asType = getFn ? "value" : "object";
@@ -154,13 +157,20 @@ function syncedCrud(props) {
       if (asType === "value") {
         if (value) {
           let id = value == null ? void 0 : value[fieldId];
-          const isCreate = fieldCreatedAt ? !value[fieldCreatedAt] : !prevAtPath;
+          let isCreate = fieldCreatedAt ? !value[fieldCreatedAt] : !prevAtPath;
           if (!id && generateId) {
             id = ensureId(value, fieldId, generateId);
           }
           if (id) {
+            if (pendingCreates.has(id)) {
+              isCreate = false;
+            }
             if (isCreate || retryAsCreate) {
-              creates.set(id, value);
+              if (createFn) {
+                creates.set(id, value);
+              } else {
+                console.log("[legend-state] missing create function");
+              }
             } else if (path.length === 0) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
@@ -217,7 +227,7 @@ function syncedCrud(props) {
           }
         }
         itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
-          const isCreate = fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : state.isNullOrUndefined(prev);
+          const isCreate = !pendingCreates.has(item.id) && (fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : state.isNullOrUndefined(prev));
           if (isCreate) {
             if (generateId) {
               ensureId(item, fieldId, generateId);
@@ -226,6 +236,7 @@ function syncedCrud(props) {
               console.error("[legend-state]: added item without an id");
             }
             if (createFn) {
+              pendingCreates.add(item.id);
               creates.set(item.id, item);
             } else {
               console.log("[legend-state] missing create function");
@@ -289,12 +300,20 @@ function syncedCrud(props) {
     };
     return Promise.all([
       ...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) => saveResult(itemKey, createObj, result, true)
-        );
+        return createFn(createObj, params).then((result) => {
+          return saveResult(itemKey, createObj, result, true);
+        }).finally(() => {
+          pendingCreates.delete(itemKey);
+        });
       }),
       ...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);
         if (Object.keys(changed).length > 0) {
@@ -303,8 +322,11 @@ function syncedCrud(props) {
           );
         }
       }),
-      ...Array.from(deletes).map((valuePrevious) => {
+      ...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) {

package/sync-plugins/crud.mjs

@@ -1,8 +1,9 @@
 import { isPromise, applyChanges, isNullOrUndefined, setAtPath, symbolDelete, isArray, internal, isObservable, getNodeValue } from '@legendapp/state';
-import { synced, deepEqual, diffObjects } from '@legendapp/state/sync';
+import { synced, deepEqual, internal as internal$1, diffObjects } from '@legendapp/state/sync';
 
 // src/sync-plugins/crud.ts
 var { clone } = internal;
+var { waitForSet } = internal$1;
 function transformOut(data, transform) {
   return transform ? transform(clone(data)) : data;
 }
@@ -41,9 +42,11 @@ function syncedCrud(props) {
     mode: modeParam,
     changesSince,
     generateId,
+    waitForSet: waitForSetParam,
     ...rest
   } = props;
   const fieldId = fieldIdProp || "id";
+  const pendingCreates = /* @__PURE__ */ new Set();
   let asType = props.as;
   if (!asType) {
     asType = getFn ? "value" : "object";
@@ -152,13 +155,20 @@ function syncedCrud(props) {
       if (asType === "value") {
         if (value) {
           let id = value == null ? void 0 : value[fieldId];
-          const isCreate = fieldCreatedAt ? !value[fieldCreatedAt] : !prevAtPath;
+          let isCreate = fieldCreatedAt ? !value[fieldCreatedAt] : !prevAtPath;
           if (!id && generateId) {
             id = ensureId(value, fieldId, generateId);
           }
           if (id) {
+            if (pendingCreates.has(id)) {
+              isCreate = false;
+            }
             if (isCreate || retryAsCreate) {
-              creates.set(id, value);
+              if (createFn) {
+                creates.set(id, value);
+              } else {
+                console.log("[legend-state] missing create function");
+              }
             } else if (path.length === 0) {
               if (valueAtPath) {
                 updates.set(id, getUpdateValue(valueAtPath, prevAtPath));
@@ -215,7 +225,7 @@ function syncedCrud(props) {
           }
         }
         itemsChanged == null ? void 0 : itemsChanged.forEach(([item, prev]) => {
-          const isCreate = fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : isNullOrUndefined(prev);
+          const isCreate = !pendingCreates.has(item.id) && (fieldCreatedAt ? !item[fieldCreatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : fieldUpdatedAt ? !item[fieldUpdatedAt] && !(prev == null ? void 0 : prev[fieldCreatedAt]) : isNullOrUndefined(prev));
           if (isCreate) {
             if (generateId) {
               ensureId(item, fieldId, generateId);
@@ -224,6 +234,7 @@ function syncedCrud(props) {
               console.error("[legend-state]: added item without an id");
             }
             if (createFn) {
+              pendingCreates.add(item.id);
               creates.set(item.id, item);
             } else {
               console.log("[legend-state] missing create function");
@@ -287,12 +298,20 @@ function syncedCrud(props) {
     };
     return Promise.all([
       ...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) => saveResult(itemKey, createObj, result, true)
-        );
+        return createFn(createObj, params).then((result) => {
+          return saveResult(itemKey, createObj, result, true);
+        }).finally(() => {
+          pendingCreates.delete(itemKey);
+        });
       }),
       ...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);
         if (Object.keys(changed).length > 0) {
@@ -301,8 +320,11 @@ function syncedCrud(props) {
           );
         }
       }),
-      ...Array.from(deletes).map((valuePrevious) => {
+      ...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) {

package/sync-plugins/firebase.d.mts

@@ -2,8 +2,9 @@ import { FieldTransforms } 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';
-export { invertFieldMap, transformObjectFields } from './_transformObjectFields.mjs';
-import '@legendapp/state';
+
+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> {
     refPath: (uid: string | undefined) => string;
@@ -23,4 +24,4 @@ interface SyncedFirebaseConfiguration {
 declare function configureSyncedFirebase(config: SyncedFirebaseConfiguration): void;
 declare function syncedFirebase<TRemote extends object, TLocal = TRemote, TAs extends CrudAsOption = 'object'>(props: SyncedFirebaseProps<TRemote, TLocal, TAs>): SyncedCrudReturnType<TLocal, TAs>;
 
-export { type SyncedFirebaseProps, configureSyncedFirebase, syncedFirebase };
+export { type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };

package/sync-plugins/firebase.d.ts

@@ -2,8 +2,9 @@ import { FieldTransforms } 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';
-export { invertFieldMap, transformObjectFields } from './_transformObjectFields.js';
-import '@legendapp/state';
+
+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> {
     refPath: (uid: string | undefined) => string;
@@ -23,4 +24,4 @@ interface SyncedFirebaseConfiguration {
 declare function configureSyncedFirebase(config: SyncedFirebaseConfiguration): void;
 declare function syncedFirebase<TRemote extends object, TLocal = TRemote, TAs extends CrudAsOption = 'object'>(props: SyncedFirebaseProps<TRemote, TLocal, TAs>): SyncedCrudReturnType<TLocal, TAs>;
 
-export { type SyncedFirebaseProps, configureSyncedFirebase, syncedFirebase };
+export { type SyncedFirebaseProps, configureSyncedFirebase, invertFieldMap, syncedFirebase, transformObjectFields };

package/sync-plugins/keel.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var ksuid = require('ksuid');
 var state = require('@legendapp/state');
 var sync = require('@legendapp/state/sync');
 var crud = require('@legendapp/state/sync-plugins/crud');
+var ksuid = require('ksuid');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var ksuid__default = /*#__PURE__*/_interopDefault(ksuid);
 
 // src/sync-plugins/keel.ts
-var { clone } = state.internal;
 var KeelKeys = ["createdAt", "updatedAt"];
 function generateKeelId() {
   return ksuid__default.default.randomSync().string;
@@ -36,17 +35,20 @@ async function handleApiError(error, retry) {
   }
 }
 function convertObjectToCreate(item) {
-  const cloned = clone(item);
-  Object.keys(cloned).forEach((key) => {
+  const cloned = {};
+  Object.keys(item).forEach((key) => {
     if (key.endsWith("Id")) {
-      if (cloned[key]) {
-        cloned[key.slice(0, -2)] = { id: cloned[key] };
+      if (item[key]) {
+        cloned[key.slice(0, -2)] = { id: item[key] };
+      }
+    } else if (key !== "createdAt" && key !== "updatedAt") {
+      if (item[key] === void 0) {
+        cloned[key] = null;
+      } else {
+        cloned[key] = item[key];
       }
-      delete cloned[key];
     }
   });
-  delete cloned.createdAt;
-  delete cloned.updatedAt;
   return cloned;
 }
 function getSyncedKeelConfiguration() {
@@ -227,8 +229,6 @@ function syncedKeel(props) {
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;
-    delete values.createdAt;
-    delete values.updatedAt;
     if (!state.isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {

package/sync-plugins/keel.mjs

@@ -1,10 +1,9 @@
-import ksuid from 'ksuid';
-import { observable, computeSelector, isFunction, isEmpty, when, internal } from '@legendapp/state';
+import { observable, computeSelector, isFunction, isEmpty, when } from '@legendapp/state';
 import { removeNullUndefined } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
+import ksuid from 'ksuid';
 
 // src/sync-plugins/keel.ts
-var { clone } = internal;
 var KeelKeys = ["createdAt", "updatedAt"];
 function generateKeelId() {
   return ksuid.randomSync().string;
@@ -30,17 +29,20 @@ async function handleApiError(error, retry) {
   }
 }
 function convertObjectToCreate(item) {
-  const cloned = clone(item);
-  Object.keys(cloned).forEach((key) => {
+  const cloned = {};
+  Object.keys(item).forEach((key) => {
     if (key.endsWith("Id")) {
-      if (cloned[key]) {
-        cloned[key.slice(0, -2)] = { id: cloned[key] };
+      if (item[key]) {
+        cloned[key.slice(0, -2)] = { id: item[key] };
+      }
+    } else if (key !== "createdAt" && key !== "updatedAt") {
+      if (item[key] === void 0) {
+        cloned[key] = null;
+      } else {
+        cloned[key] = item[key];
       }
-      delete cloned[key];
     }
   });
-  delete cloned.createdAt;
-  delete cloned.updatedAt;
   return cloned;
 }
 function getSyncedKeelConfiguration() {
@@ -221,8 +223,6 @@ function syncedKeel(props) {
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;
-    delete values.createdAt;
-    delete values.updatedAt;
     if (!isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {

package/sync.d.mts

@@ -1,6 +1,6 @@
 import { MMKVConfiguration } from 'react-native-mmkv';
 import { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
@@ -215,8 +215,11 @@ type RetType = typeof synced;
 declare function configureSynced<T extends typeof synced>(fn: T, origOptions: SyncedOptionsConfigure): T;
 declare function configureSynced(origOptions: SyncedOptionsConfigure): RetType;
 
+declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;
+
 declare const internal: {
     observableSyncConfiguration: SyncedOptionsGlobal;
+    waitForSet: typeof waitForSet;
 };
 
 export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.d.ts

@@ -1,6 +1,6 @@
 import { MMKVConfiguration } from 'react-native-mmkv';
 import { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
@@ -215,8 +215,11 @@ type RetType = typeof synced;
 declare function configureSynced<T extends typeof synced>(fn: T, origOptions: SyncedOptionsConfigure): T;
 declare function configureSynced(origOptions: SyncedOptionsConfigure): RetType;
 
+declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;
+
 declare const internal: {
     observableSyncConfiguration: SyncedOptionsGlobal;
+    waitForSet: typeof waitForSet;
 };
 
 export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.js

@@ -200,6 +200,12 @@ function runWithRetry(state, retryOptions, fn, onError) {
   }
   return value;
 }
+async function waitForSet(waitForSet2, changes, value, params = {}) {
+  const waitFn = state.isFunction(waitForSet2) ? waitForSet2({ changes, value, ...params }) : waitForSet2;
+  if (waitFn) {
+    await state.when(waitFn);
+  }
+}
 
 // src/sync/syncObservable.ts
 var { clone, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = state.internal;
@@ -549,7 +555,7 @@ async function doChangeRemote(changeInfo) {
   const state$ = node.state;
   const persist = syncOptions.persist;
   const { table, config: configLocal } = parseLocalConfig(persist);
-  const { onBeforeSet, waitForSet, onAfterSet } = syncOptions || {};
+  const { onBeforeSet, waitForSet: waitForSetParam, onAfterSet } = syncOptions || {};
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
   const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
@@ -567,11 +573,8 @@ async function doChangeRemote(changeInfo) {
         });
       }
     }
-    if (waitForSet) {
-      const waitFn = state.isFunction(waitForSet) ? waitForSet({ changes: changesRemote, value: obs$.peek() }) : waitForSet;
-      if (waitFn) {
-        await state.when(waitFn);
-      }
+    if (waitForSetParam) {
+      await waitForSet(waitForSetParam, changesRemote, obs$.peek());
     }
     let value = clone(obs$.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
@@ -1061,9 +1064,21 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     var _a;
     const wasPersistEnabled = syncStateValue.isPersistEnabled;
     const wasSyncEnabled = syncStateValue.isSyncEnabled;
-    syncStateValue.isPersistEnabled = false;
-    syncStateValue.isSyncEnabled = false;
-    syncStateValue.syncCount = 0;
+    const metadata = metadatas.get(obs$);
+    if (metadata) {
+      Object.assign(metadata, { lastSync: void 0, pending: void 0 });
+    }
+    Object.assign(syncStateValue, {
+      isPersistEnabled: false,
+      isSyncEnabled: false,
+      lastSync: void 0,
+      numPendingGets: 0,
+      isLoaded: false,
+      isGetting: false,
+      isSetting: false,
+      numPendingSets: 0,
+      syncCount: 0
+    });
     isSynced = false;
     isSubscribed = false;
     unsubscribe == null ? void 0 : unsubscribe();
@@ -1172,7 +1187,8 @@ function configureSynced(fnOrOrigOptions, origOptions) {
 
 // sync.ts
 var internal4 = {
-  observableSyncConfiguration
+  observableSyncConfiguration,
+  waitForSet
 };
 
 exports.combineTransforms = combineTransforms;

package/sync.mjs

@@ -198,6 +198,12 @@ function runWithRetry(state, retryOptions, fn, onError) {
   }
   return value;
 }
+async function waitForSet(waitForSet2, changes, value, params = {}) {
+  const waitFn = isFunction(waitForSet2) ? waitForSet2({ changes, value, ...params }) : waitForSet2;
+  if (waitFn) {
+    await when(waitFn);
+  }
+}
 
 // src/sync/syncObservable.ts
 var { clone, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = internal;
@@ -547,7 +553,7 @@ async function doChangeRemote(changeInfo) {
   const state$ = node.state;
   const persist = syncOptions.persist;
   const { table, config: configLocal } = parseLocalConfig(persist);
-  const { onBeforeSet, waitForSet, onAfterSet } = syncOptions || {};
+  const { onBeforeSet, waitForSet: waitForSetParam, onAfterSet } = syncOptions || {};
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
   const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
@@ -565,11 +571,8 @@ async function doChangeRemote(changeInfo) {
         });
       }
     }
-    if (waitForSet) {
-      const waitFn = isFunction(waitForSet) ? waitForSet({ changes: changesRemote, value: obs$.peek() }) : waitForSet;
-      if (waitFn) {
-        await when(waitFn);
-      }
+    if (waitForSetParam) {
+      await waitForSet(waitForSetParam, changesRemote, obs$.peek());
     }
     let value = clone(obs$.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
@@ -1059,9 +1062,21 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     var _a;
     const wasPersistEnabled = syncStateValue.isPersistEnabled;
     const wasSyncEnabled = syncStateValue.isSyncEnabled;
-    syncStateValue.isPersistEnabled = false;
-    syncStateValue.isSyncEnabled = false;
-    syncStateValue.syncCount = 0;
+    const metadata = metadatas.get(obs$);
+    if (metadata) {
+      Object.assign(metadata, { lastSync: void 0, pending: void 0 });
+    }
+    Object.assign(syncStateValue, {
+      isPersistEnabled: false,
+      isSyncEnabled: false,
+      lastSync: void 0,
+      numPendingGets: 0,
+      isLoaded: false,
+      isGetting: false,
+      isSetting: false,
+      numPendingSets: 0,
+      syncCount: 0
+    });
     isSynced = false;
     isSubscribed = false;
     unsubscribe == null ? void 0 : unsubscribe();
@@ -1170,7 +1185,8 @@ function configureSynced(fnOrOrigOptions, origOptions) {
 
 // sync.ts
 var internal4 = {
-  observableSyncConfiguration
+  observableSyncConfiguration,
+  waitForSet
 };
 
 export { combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal4 as internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync-plugins/_transformObjectFields.d.mts

@@ -1,31 +0,0 @@
-import { RecordValue, ArrayValue } from '@legendapp/state';
-import { SyncTransform } from '@legendapp/state/sync';
-
-declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
-declare function invertFieldMap(obj: Record<string, any>): any;
-declare const fieldTransformToTransform: <T extends object>(fieldTransform: FieldTransforms<T>) => SyncTransform<T>;
-declare type FieldTransforms<T> = (T extends Record<string, Record<string, any>> ? {
-    _dict: FieldTransformsInner<RecordValue<T>>;
-} : never) | FieldTransformsInner<T>;
-declare type FieldTransformsInner<T> = {
-    [K in keyof T]: string;
-} & ({
-    [K in keyof ObjectKeys<T> as `${K}_obj`]?: FieldTransforms<T[K]>;
-} | {
-    [K in keyof DictKeys<T> as `${K}_dict`]?: FieldTransforms<RecordValue<T[K]>>;
-}) & {
-    [K in keyof ArrayKeys<T> as `${K}_arr`]?: FieldTransforms<ArrayValue<T[K]>>;
-} & {
-    [K in keyof ArrayKeys<T> as `${K}_val`]?: FieldTransforms<ArrayValue<T[K]>>;
-};
-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]>;
-declare type DictKeys<T> = Pick<T, {
-    [K in keyof T]-?: K extends string ? (T[K] extends Record<string, Record<string, any>> ? K : never) : never;
-}[keyof T]>;
-declare type ArrayKeys<T> = Pick<T, {
-    [K in keyof T]-?: K extends string | number ? (T[K] extends any[] ? K : never) : never;
-}[keyof T]>;
-
-export { type FieldTransforms, type FieldTransformsInner, fieldTransformToTransform, invertFieldMap, transformObjectFields };

package/sync-plugins/_transformObjectFields.d.ts

@@ -1,31 +0,0 @@
-import { RecordValue, ArrayValue } from '@legendapp/state';
-import { SyncTransform } from '@legendapp/state/sync';
-
-declare function transformObjectFields(dataIn: Record<string, any>, map: Record<string, any>): any;
-declare function invertFieldMap(obj: Record<string, any>): any;
-declare const fieldTransformToTransform: <T extends object>(fieldTransform: FieldTransforms<T>) => SyncTransform<T>;
-declare type FieldTransforms<T> = (T extends Record<string, Record<string, any>> ? {
-    _dict: FieldTransformsInner<RecordValue<T>>;
-} : never) | FieldTransformsInner<T>;
-declare type FieldTransformsInner<T> = {
-    [K in keyof T]: string;
-} & ({
-    [K in keyof ObjectKeys<T> as `${K}_obj`]?: FieldTransforms<T[K]>;
-} | {
-    [K in keyof DictKeys<T> as `${K}_dict`]?: FieldTransforms<RecordValue<T[K]>>;
-}) & {
-    [K in keyof ArrayKeys<T> as `${K}_arr`]?: FieldTransforms<ArrayValue<T[K]>>;
-} & {
-    [K in keyof ArrayKeys<T> as `${K}_val`]?: FieldTransforms<ArrayValue<T[K]>>;
-};
-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]>;
-declare type DictKeys<T> = Pick<T, {
-    [K in keyof T]-?: K extends string ? (T[K] extends Record<string, Record<string, any>> ? K : never) : never;
-}[keyof T]>;
-declare type ArrayKeys<T> = Pick<T, {
-    [K in keyof T]-?: K extends string | number ? (T[K] extends any[] ? K : never) : never;
-}[keyof T]>;
-
-export { type FieldTransforms, type FieldTransformsInner, fieldTransformToTransform, invertFieldMap, transformObjectFields };

package/sync-plugins/_transformObjectFields.js

@@ -1,114 +0,0 @@
-'use strict';
-
-var state = require('@legendapp/state');
-
-// src/sync-plugins/_transformObjectFields.ts
-var validateMap;
-function transformObjectFields(dataIn, map) {
-  if (process.env.NODE_ENV === "development") {
-    validateMap(map);
-  }
-  let ret = dataIn;
-  if (dataIn) {
-    if (dataIn === state.symbolDelete)
-      return dataIn;
-    if (state.isString(dataIn)) {
-      return map[dataIn];
-    }
-    ret = {};
-    const dict = Object.keys(map).length === 1 && map["_dict"];
-    for (const key in dataIn) {
-      let v = dataIn[key];
-      if (dict) {
-        ret[key] = transformObjectFields(v, dict);
-      } else {
-        const mapped = map[key];
-        if (mapped === void 0) {
-          if (key !== "@") {
-            ret[key] = v;
-            if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
-              console.error("A fatal field transformation error has occurred", key, dataIn, map);
-            }
-          }
-        } else if (mapped !== null) {
-          if (v !== void 0 && v !== null) {
-            if (map[key + "_val"]) {
-              const mapChild = map[key + "_val"];
-              if (state.isArray(v)) {
-                v = v.map((vChild) => mapChild[vChild]);
-              } else {
-                v = mapChild[v];
-              }
-            } else if (map[key + "_arr"] && state.isArray(v)) {
-              const mapChild = map[key + "_arr"];
-              v = v.map((vChild) => transformObjectFields(vChild, mapChild));
-            } else if (state.isObject(v)) {
-              if (map[key + "_obj"]) {
-                v = transformObjectFields(v, map[key + "_obj"]);
-              } else if (map[key + "_dict"]) {
-                const mapChild = map[key + "_dict"];
-                const out = {};
-                for (const keyChild in v) {
-                  out[keyChild] = transformObjectFields(v[keyChild], mapChild);
-                }
-                v = out;
-              }
-            }
-          }
-          ret[mapped] = v;
-        }
-      }
-    }
-  }
-  return ret;
-}
-var invertedMaps = /* @__PURE__ */ new WeakMap();
-function invertFieldMap(obj) {
-  const existing = invertedMaps.get(obj);
-  if (existing)
-    return existing;
-  const target = {};
-  for (const key in obj) {
-    const val = obj[key];
-    if (key === "_dict") {
-      target[key] = invertFieldMap(val);
-    } else if (key.endsWith("_obj") || key.endsWith("_dict") || key.endsWith("_arr") || key.endsWith("_val")) {
-      const keyMapped = obj[key.replace(/_obj|_dict|_arr|_val$/, "")];
-      const suffix = key.match(/_obj|_dict|_arr|_val$/)[0];
-      target[keyMapped + suffix] = invertFieldMap(val);
-    } else if (typeof val === "string") {
-      target[val] = key;
-    }
-  }
-  invertedMaps.set(obj, target);
-  return target;
-}
-var fieldTransformToTransform = (fieldTransform) => ({
-  load(value) {
-    const inverted = invertFieldMap(fieldTransform);
-    return transformObjectFields(value, inverted);
-  },
-  save(value) {
-    return transformObjectFields(value, fieldTransform);
-  }
-});
-if (process.env.NODE_ENV === "development") {
-  validateMap = function(record) {
-    const values = Object.values(record).filter((value) => {
-      if (state.isObject(value)) {
-        validateMap(value);
-      } else {
-        return state.isString(value);
-      }
-    });
-    const uniques = Array.from(new Set(values));
-    if (values.length !== uniques.length) {
-      console.error("Field transform map has duplicate values", record, values.length, uniques.length);
-    }
-    return record;
-  };
-}
-
-exports.fieldTransformToTransform = fieldTransformToTransform;
-exports.invertFieldMap = invertFieldMap;
-exports.transformObjectFields = transformObjectFields;

package/sync-plugins/_transformObjectFields.mjs

@@ -1,110 +0,0 @@
-import { symbolDelete, isString, isArray, isObject } from '@legendapp/state';
-
-// src/sync-plugins/_transformObjectFields.ts
-var validateMap;
-function transformObjectFields(dataIn, map) {
-  if (process.env.NODE_ENV === "development") {
-    validateMap(map);
-  }
-  let ret = dataIn;
-  if (dataIn) {
-    if (dataIn === symbolDelete)
-      return dataIn;
-    if (isString(dataIn)) {
-      return map[dataIn];
-    }
-    ret = {};
-    const dict = Object.keys(map).length === 1 && map["_dict"];
-    for (const key in dataIn) {
-      let v = dataIn[key];
-      if (dict) {
-        ret[key] = transformObjectFields(v, dict);
-      } else {
-        const mapped = map[key];
-        if (mapped === void 0) {
-          if (key !== "@") {
-            ret[key] = v;
-            if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
-              console.error("A fatal field transformation error has occurred", key, dataIn, map);
-            }
-          }
-        } else if (mapped !== null) {
-          if (v !== void 0 && v !== null) {
-            if (map[key + "_val"]) {
-              const mapChild = map[key + "_val"];
-              if (isArray(v)) {
-                v = v.map((vChild) => mapChild[vChild]);
-              } else {
-                v = mapChild[v];
-              }
-            } else if (map[key + "_arr"] && isArray(v)) {
-              const mapChild = map[key + "_arr"];
-              v = v.map((vChild) => transformObjectFields(vChild, mapChild));
-            } else if (isObject(v)) {
-              if (map[key + "_obj"]) {
-                v = transformObjectFields(v, map[key + "_obj"]);
-              } else if (map[key + "_dict"]) {
-                const mapChild = map[key + "_dict"];
-                const out = {};
-                for (const keyChild in v) {
-                  out[keyChild] = transformObjectFields(v[keyChild], mapChild);
-                }
-                v = out;
-              }
-            }
-          }
-          ret[mapped] = v;
-        }
-      }
-    }
-  }
-  return ret;
-}
-var invertedMaps = /* @__PURE__ */ new WeakMap();
-function invertFieldMap(obj) {
-  const existing = invertedMaps.get(obj);
-  if (existing)
-    return existing;
-  const target = {};
-  for (const key in obj) {
-    const val = obj[key];
-    if (key === "_dict") {
-      target[key] = invertFieldMap(val);
-    } else if (key.endsWith("_obj") || key.endsWith("_dict") || key.endsWith("_arr") || key.endsWith("_val")) {
-      const keyMapped = obj[key.replace(/_obj|_dict|_arr|_val$/, "")];
-      const suffix = key.match(/_obj|_dict|_arr|_val$/)[0];
-      target[keyMapped + suffix] = invertFieldMap(val);
-    } else if (typeof val === "string") {
-      target[val] = key;
-    }
-  }
-  invertedMaps.set(obj, target);
-  return target;
-}
-var fieldTransformToTransform = (fieldTransform) => ({
-  load(value) {
-    const inverted = invertFieldMap(fieldTransform);
-    return transformObjectFields(value, inverted);
-  },
-  save(value) {
-    return transformObjectFields(value, fieldTransform);
-  }
-});
-if (process.env.NODE_ENV === "development") {
-  validateMap = function(record) {
-    const values = Object.values(record).filter((value) => {
-      if (isObject(value)) {
-        validateMap(value);
-      } else {
-        return isString(value);
-      }
-    });
-    const uniques = Array.from(new Set(values));
-    if (values.length !== uniques.length) {
-      console.error("Field transform map has duplicate values", record, values.length, uniques.length);
-    }
-    return record;
-  };
-}
-
-export { fieldTransformToTransform, invertFieldMap, transformObjectFields };