@legendapp/state 3.0.0-beta.34 → 3.0.0-beta.36

package/index.js

@@ -1637,7 +1637,11 @@ var proxyHandler = {
       return { configurable: false, enumerable: false };
     }
     const value = getNodeValue(node);
-    return isPrimitive(value) ? void 0 : Reflect.getOwnPropertyDescriptor(value, prop);
+    if (isPrimitive(value)) {
+      return void 0;
+    }
+    const descriptor = Reflect.getOwnPropertyDescriptor(value, prop);
+    return descriptor ? { ...descriptor, configurable: true } : void 0;
   },
   set(node, prop, value) {
     if (node.isSetting) {

package/index.mjs

@@ -1635,7 +1635,11 @@ var proxyHandler = {
       return { configurable: false, enumerable: false };
     }
     const value = getNodeValue(node);
-    return isPrimitive(value) ? void 0 : Reflect.getOwnPropertyDescriptor(value, prop);
+    if (isPrimitive(value)) {
+      return void 0;
+    }
+    const descriptor = Reflect.getOwnPropertyDescriptor(value, prop);
+    return descriptor ? { ...descriptor, configurable: true } : void 0;
   },
   set(node, prop, value) {
     if (node.isSetting) {

package/package.json

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

package/react.d.mts

@@ -187,4 +187,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.d.ts

@@ -187,4 +187,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.js

@@ -510,9 +510,15 @@ function useIsMounted() {
   return obs;
 }
 function useObservableReducer(reducer, initializerArg, initializer) {
-  const obs = useObservable(
-    () => initializerArg !== void 0 && state.isFunction(initializerArg) ? initializer(initializerArg) : initializerArg
-  );
+  const obs = useObservable(() => {
+    if (initializer) {
+      return initializer(initializerArg);
+    }
+    if (state.isFunction(initializerArg)) {
+      return initializerArg();
+    }
+    return initializerArg;
+  });
   const dispatch = (action) => {
     obs.set(reducer(obs.get(), action));
   };
@@ -622,6 +628,7 @@ exports.use$ = useSelector;
 exports.useComputed = useComputed;
 exports.useEffectOnce = useEffectOnce;
 exports.useIsMounted = useIsMounted;
+exports.useLocalObservable = useObservable;
 exports.useMount = useMount;
 exports.useMountOnce = useMountOnce;
 exports.useObservable = useObservable;
@@ -632,5 +639,6 @@ exports.usePauseProvider = usePauseProvider;
 exports.useSelector = useSelector;
 exports.useUnmount = useUnmount;
 exports.useUnmountOnce = useUnmountOnce;
+exports.useValue = useSelector;
 exports.useWhen = useWhen;
 exports.useWhenReady = useWhenReady;

package/react.mjs

@@ -504,9 +504,15 @@ function useIsMounted() {
   return obs;
 }
 function useObservableReducer(reducer, initializerArg, initializer) {
-  const obs = useObservable(
-    () => initializerArg !== void 0 && isFunction(initializerArg) ? initializer(initializerArg) : initializerArg
-  );
+  const obs = useObservable(() => {
+    if (initializer) {
+      return initializer(initializerArg);
+    }
+    if (isFunction(initializerArg)) {
+      return initializerArg();
+    }
+    return initializerArg;
+  });
   const dispatch = (action) => {
     obs.set(reducer(obs.get(), action));
   };
@@ -600,4 +606,4 @@ function useWhenReady(predicate, effect) {
   return useMemo(() => whenReady(predicate, effect), []);
 }
 
-export { Computed, For, Memo, Reactive, Show, Switch, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { Computed, For, Memo, Reactive, Show, Switch, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/sync-plugins/firebase.js

@@ -103,6 +103,61 @@ if (process.env.NODE_ENV === "development") {
   };
 }
 
+// src/is.ts
+function isMap(obj) {
+  return obj instanceof Map || obj instanceof WeakMap;
+}
+var globalState = {
+  pendingNodes: /* @__PURE__ */ new Map(),
+  dirtyNodes: /* @__PURE__ */ new Set()
+};
+function replacer(key, value) {
+  if (isMap(value)) {
+    return {
+      __LSType: "Map",
+      value: Array.from(value.entries())
+      // or with spread: value: [...value]
+    };
+  } else if (value instanceof Set) {
+    return {
+      __LSType: "Set",
+      value: Array.from(value)
+      // or with spread: value: [...value]
+    };
+  } else if (globalState.replacer) {
+    value = globalState.replacer(key, value);
+  }
+  return value;
+}
+var ISO8601 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/;
+function reviver(key, value) {
+  if (value) {
+    if (typeof value === "string" && ISO8601.test(value)) {
+      return new Date(value);
+    }
+    if (typeof value === "object") {
+      if (value.__LSType === "Map") {
+        return new Map(value.value);
+      } else if (value.__LSType === "Set") {
+        return new Set(value.value);
+      }
+    }
+    if (globalState.reviver) {
+      value = globalState.reviver(key, value);
+    }
+  }
+  return value;
+}
+function safeStringify(value) {
+  return value ? JSON.stringify(value, replacer) : value;
+}
+function safeParse(value) {
+  return value ? JSON.parse(value, reviver) : value;
+}
+function clone(value) {
+  return safeParse(safeStringify(value));
+}
+
 // src/sync-plugins/firebase.ts
 var isEnabled$ = state.observable(true);
 var firebaseConfig = {};
@@ -154,9 +209,6 @@ var fns = {
 };
 function syncedFirebase(props) {
   props = { ...firebaseConfig, ...props };
-  const saving$ = state.observable({});
-  const pendingOutgoing$ = state.observable({});
-  const pendingIncoming$ = state.observable({});
   let didList = false;
   const {
     refPath,
@@ -174,6 +226,102 @@ function syncedFirebase(props) {
   const { fieldCreatedAt, changesSince } = props;
   const asType = props.as || "value";
   const fieldUpdatedAt = props.fieldUpdatedAt || "@";
+  const isRealtime = realtime !== false;
+  const pendingWrites = /* @__PURE__ */ new Map();
+  const enqueuePendingWrite = (key) => {
+    let resolveFn;
+    let rejectFn;
+    const promise = new Promise((resolve, reject) => {
+      resolveFn = resolve;
+      rejectFn = reject;
+    });
+    const entry = {
+      resolve: resolveFn,
+      reject: rejectFn
+    };
+    const state = pendingWrites.get(key);
+    if (state) {
+      state.waiting.push(entry);
+      state.pendingCount += 1;
+    } else {
+      pendingWrites.set(key, {
+        waiting: [entry],
+        ready: [],
+        pendingCount: 1
+      });
+    }
+    return { promise, entry };
+  };
+  const flushPending = (key) => {
+    const state = pendingWrites.get(key);
+    if (!state) {
+      return;
+    }
+    if (state.pendingCount === 0 && state.staged) {
+      const { value, apply } = state.staged;
+      state.staged = void 0;
+      while (state.ready.length) {
+        const entry = state.ready.shift();
+        entry.resolve(value);
+      }
+      if (!state.waiting.length && !state.ready.length) {
+        pendingWrites.delete(key);
+      }
+      apply == null ? void 0 : apply(value);
+    }
+  };
+  const resolvePendingWrite = (key, entry) => {
+    const state = pendingWrites.get(key);
+    if (!state) {
+      return;
+    }
+    const waitingIndex = state.waiting.indexOf(entry);
+    if (waitingIndex >= 0) {
+      state.waiting.splice(waitingIndex, 1);
+      state.pendingCount = Math.max(0, state.pendingCount - 1);
+    }
+    state.ready.push(entry);
+    flushPending(key);
+  };
+  const rejectPendingWrite = (key, entry, error) => {
+    const state = pendingWrites.get(key);
+    if (state) {
+      const waitingIndex = state.waiting.indexOf(entry);
+      if (waitingIndex >= 0) {
+        state.waiting.splice(waitingIndex, 1);
+        state.pendingCount = Math.max(0, state.pendingCount - 1);
+      } else {
+        const readyIndex = state.ready.indexOf(entry);
+        if (readyIndex >= 0) {
+          state.ready.splice(readyIndex, 1);
+        }
+      }
+      if (!state.waiting.length && !state.ready.length) {
+        pendingWrites.delete(key);
+      }
+    }
+    entry.reject(error);
+  };
+  const handleServerValue = (key, value, apply) => {
+    var _a;
+    const state = pendingWrites.get(key);
+    if (!state || !state.waiting.length && !state.ready.length) {
+      pendingWrites.delete(key);
+      apply == null ? void 0 : apply(value);
+    } else {
+      state.staged = {
+        value: value && typeof value === "object" ? clone(value) : value,
+        apply: apply != null ? apply : (_a = state.staged) == null ? void 0 : _a.apply
+      };
+      flushPending(key);
+    }
+  };
+  const ensureFieldId = (key, value) => {
+    if (fieldId && key && value && typeof value === "object" && !value[fieldId]) {
+      value[fieldId] = key;
+    }
+    return value;
+  };
   const computeRef = (lastSync) => {
     const pathFirebase = refPath(fns.getCurrentUser());
     let ref = fns.ref(pathFirebase);
@@ -196,10 +344,7 @@ function syncedFirebase(props) {
           let values = [];
           if (!state.isNullOrUndefined(val)) {
             values = asType === "value" ? [val] : Object.entries(val).map(([key, value]) => {
-              if (fieldId && !value[fieldId]) {
-                value[fieldId] = key;
-              }
-              return value;
+              return ensureFieldId(key, value);
             });
           }
           didList = true;
@@ -209,7 +354,7 @@ function syncedFirebase(props) {
       );
     });
   };
-  const subscribe = realtime ? ({ lastSync, update: update2, onError }) => {
+  const subscribe = isRealtime ? ({ lastSync, update: update2, onError }) => {
     const ref = computeRef(lastSync);
     let unsubscribes;
     if (asType === "value") {
@@ -217,14 +362,12 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const val = snap.val();
-        if (saving$[""].get()) {
-          pendingIncoming$[""].set(val);
-        } else {
+        handleServerValue("", val, (resolvedValue) => {
           update2({
-            value: [val],
+            value: [resolvedValue],
             mode: "set"
           });
-        }
+        });
       };
       unsubscribes = [fns.onValue(ref, onValue2, onError)];
     } else {
@@ -232,31 +375,26 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const key = snap.key;
-        const val = snap.val();
-        if (fieldId && !val[fieldId]) {
-          val[fieldId] = key;
-        }
-        if (saving$[key].get()) {
-          pendingIncoming$[key].set(val);
-        } else {
+        const val = ensureFieldId(key, snap.val());
+        handleServerValue(key, val, (resolvedValue) => {
           update2({
-            value: [val],
-            mode: "assign"
+            value: [resolvedValue],
+            mode: "merge"
           });
-        }
+        });
       };
       const onChildDelete = (snap) => {
         if (!didList)
           return;
         const key = snap.key;
-        const val = snap.val();
-        if (fieldId && !val[fieldId]) {
-          val[fieldId] = key;
-        }
-        val[state.symbolDelete] = true;
-        update2({
-          value: [val],
-          mode: "assign"
+        const valueRaw = snap.val();
+        const valueWithId = ensureFieldId(key, state.isNullOrUndefined(valueRaw) ? {} : valueRaw);
+        valueWithId[state.symbolDelete] = true;
+        handleServerValue(key, valueWithId, (resolvedValue) => {
+          update2({
+            value: [resolvedValue],
+            mode: "merge"
+          });
         });
       };
       unsubscribes = [
@@ -280,42 +418,52 @@ function syncedFirebase(props) {
     }
     return addUpdatedAt(input);
   };
-  const upsert = async (input) => {
-    const id = fieldId ? input[fieldId] : "";
-    if (saving$[id].get()) {
-      pendingOutgoing$[id].set(input);
-    } else {
-      saving$[id].set(true);
-      const path = joinPaths(refPath(fns.getCurrentUser()), fieldId ? id : "");
-      await fns.update(fns.ref(path), input);
-      saving$[id].set(false);
-      flushAfterSave();
-    }
-    return state.when(
-      () => !pendingOutgoing$[id].get(),
-      () => {
-        const value = pendingIncoming$[id].get();
-        if (value) {
-          pendingIncoming$[id].delete();
-          return value;
-        }
-      }
-    );
-  };
-  const flushAfterSave = () => {
-    const outgoing = pendingOutgoing$.get();
-    Object.values(outgoing).forEach((value) => {
-      upsert(value);
+  const upsert = (input, params) => {
+    const id = fieldId && asType !== "value" ? input[fieldId] : "";
+    const pendingKey = fieldId && asType !== "value" ? String(id != null ? id : "") : "";
+    const { promise, entry } = enqueuePendingWrite(pendingKey);
+    const userId = fns.getCurrentUser();
+    const basePath = refPath(userId);
+    const childPath = fieldId && asType !== "value" ? pendingKey : "";
+    const path = joinPaths(basePath, childPath);
+    const ref = fns.ref(path);
+    const updatePromise = fns.update(ref, input);
+    updatePromise.then(() => {
+      resolvePendingWrite(pendingKey, entry);
+    }).catch((error) => {
+      rejectPendingWrite(pendingKey, entry, error);
     });
-    pendingOutgoing$.set({});
+    if (!isRealtime) {
+      updatePromise.then(() => {
+        const onceRef = fieldId && asType !== "value" ? ref : fns.ref(basePath);
+        fns.once(
+          onceRef,
+          (snap) => {
+            const rawValue = snap.val();
+            const value = fieldId && asType !== "value" ? ensureFieldId(pendingKey, state.isNullOrUndefined(rawValue) ? {} : rawValue) : rawValue;
+            handleServerValue(pendingKey, value, (resolvedValue) => {
+              params.update({
+                value: resolvedValue,
+                mode: "merge"
+              });
+            });
+          },
+          (error) => {
+            rejectPendingWrite(pendingKey, entry, error);
+          }
+        );
+      }).catch(() => {
+      });
+    }
+    return promise;
   };
-  const create = readonly ? void 0 : (input) => {
+  const create = readonly ? void 0 : (input, params) => {
     addCreatedAt(input);
-    return upsert(input);
+    return upsert(input, params);
   };
-  const update = readonly ? void 0 : (input) => {
+  const update = readonly ? void 0 : (input, params) => {
     addUpdatedAt(input);
-    return upsert(input);
+    return upsert(input, params);
   };
   const deleteFn = readonly ? void 0 : (input) => {
     const path = joinPaths(

package/sync-plugins/firebase.mjs

@@ -1,4 +1,4 @@
-import { observable, symbolDelete, isString, isArray, isObject, computeSelector, isFunction, isNullOrUndefined, isPromise, isNumber, when } from '@legendapp/state';
+import { observable, symbolDelete, isString, isArray, isObject, computeSelector, isFunction, isNullOrUndefined, isPromise, isNumber } from '@legendapp/state';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { getAuth } from 'firebase/auth';
 import { ref, getDatabase, query, orderByChild, startAt, update, onValue, onChildAdded, onChildChanged, onChildRemoved, serverTimestamp, remove, push } from 'firebase/database';
@@ -101,6 +101,61 @@ if (process.env.NODE_ENV === "development") {
   };
 }
 
+// src/is.ts
+function isMap(obj) {
+  return obj instanceof Map || obj instanceof WeakMap;
+}
+var globalState = {
+  pendingNodes: /* @__PURE__ */ new Map(),
+  dirtyNodes: /* @__PURE__ */ new Set()
+};
+function replacer(key, value) {
+  if (isMap(value)) {
+    return {
+      __LSType: "Map",
+      value: Array.from(value.entries())
+      // or with spread: value: [...value]
+    };
+  } else if (value instanceof Set) {
+    return {
+      __LSType: "Set",
+      value: Array.from(value)
+      // or with spread: value: [...value]
+    };
+  } else if (globalState.replacer) {
+    value = globalState.replacer(key, value);
+  }
+  return value;
+}
+var ISO8601 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/;
+function reviver(key, value) {
+  if (value) {
+    if (typeof value === "string" && ISO8601.test(value)) {
+      return new Date(value);
+    }
+    if (typeof value === "object") {
+      if (value.__LSType === "Map") {
+        return new Map(value.value);
+      } else if (value.__LSType === "Set") {
+        return new Set(value.value);
+      }
+    }
+    if (globalState.reviver) {
+      value = globalState.reviver(key, value);
+    }
+  }
+  return value;
+}
+function safeStringify(value) {
+  return value ? JSON.stringify(value, replacer) : value;
+}
+function safeParse(value) {
+  return value ? JSON.parse(value, reviver) : value;
+}
+function clone(value) {
+  return safeParse(safeStringify(value));
+}
+
 // src/sync-plugins/firebase.ts
 var isEnabled$ = observable(true);
 var firebaseConfig = {};
@@ -152,9 +207,6 @@ var fns = {
 };
 function syncedFirebase(props) {
   props = { ...firebaseConfig, ...props };
-  const saving$ = observable({});
-  const pendingOutgoing$ = observable({});
-  const pendingIncoming$ = observable({});
   let didList = false;
   const {
     refPath,
@@ -172,6 +224,102 @@ function syncedFirebase(props) {
   const { fieldCreatedAt, changesSince } = props;
   const asType = props.as || "value";
   const fieldUpdatedAt = props.fieldUpdatedAt || "@";
+  const isRealtime = realtime !== false;
+  const pendingWrites = /* @__PURE__ */ new Map();
+  const enqueuePendingWrite = (key) => {
+    let resolveFn;
+    let rejectFn;
+    const promise = new Promise((resolve, reject) => {
+      resolveFn = resolve;
+      rejectFn = reject;
+    });
+    const entry = {
+      resolve: resolveFn,
+      reject: rejectFn
+    };
+    const state = pendingWrites.get(key);
+    if (state) {
+      state.waiting.push(entry);
+      state.pendingCount += 1;
+    } else {
+      pendingWrites.set(key, {
+        waiting: [entry],
+        ready: [],
+        pendingCount: 1
+      });
+    }
+    return { promise, entry };
+  };
+  const flushPending = (key) => {
+    const state = pendingWrites.get(key);
+    if (!state) {
+      return;
+    }
+    if (state.pendingCount === 0 && state.staged) {
+      const { value, apply } = state.staged;
+      state.staged = void 0;
+      while (state.ready.length) {
+        const entry = state.ready.shift();
+        entry.resolve(value);
+      }
+      if (!state.waiting.length && !state.ready.length) {
+        pendingWrites.delete(key);
+      }
+      apply == null ? void 0 : apply(value);
+    }
+  };
+  const resolvePendingWrite = (key, entry) => {
+    const state = pendingWrites.get(key);
+    if (!state) {
+      return;
+    }
+    const waitingIndex = state.waiting.indexOf(entry);
+    if (waitingIndex >= 0) {
+      state.waiting.splice(waitingIndex, 1);
+      state.pendingCount = Math.max(0, state.pendingCount - 1);
+    }
+    state.ready.push(entry);
+    flushPending(key);
+  };
+  const rejectPendingWrite = (key, entry, error) => {
+    const state = pendingWrites.get(key);
+    if (state) {
+      const waitingIndex = state.waiting.indexOf(entry);
+      if (waitingIndex >= 0) {
+        state.waiting.splice(waitingIndex, 1);
+        state.pendingCount = Math.max(0, state.pendingCount - 1);
+      } else {
+        const readyIndex = state.ready.indexOf(entry);
+        if (readyIndex >= 0) {
+          state.ready.splice(readyIndex, 1);
+        }
+      }
+      if (!state.waiting.length && !state.ready.length) {
+        pendingWrites.delete(key);
+      }
+    }
+    entry.reject(error);
+  };
+  const handleServerValue = (key, value, apply) => {
+    var _a;
+    const state = pendingWrites.get(key);
+    if (!state || !state.waiting.length && !state.ready.length) {
+      pendingWrites.delete(key);
+      apply == null ? void 0 : apply(value);
+    } else {
+      state.staged = {
+        value: value && typeof value === "object" ? clone(value) : value,
+        apply: apply != null ? apply : (_a = state.staged) == null ? void 0 : _a.apply
+      };
+      flushPending(key);
+    }
+  };
+  const ensureFieldId = (key, value) => {
+    if (fieldId && key && value && typeof value === "object" && !value[fieldId]) {
+      value[fieldId] = key;
+    }
+    return value;
+  };
   const computeRef = (lastSync) => {
     const pathFirebase = refPath(fns.getCurrentUser());
     let ref = fns.ref(pathFirebase);
@@ -194,10 +342,7 @@ function syncedFirebase(props) {
           let values = [];
           if (!isNullOrUndefined(val)) {
             values = asType === "value" ? [val] : Object.entries(val).map(([key, value]) => {
-              if (fieldId && !value[fieldId]) {
-                value[fieldId] = key;
-              }
-              return value;
+              return ensureFieldId(key, value);
             });
           }
           didList = true;
@@ -207,7 +352,7 @@ function syncedFirebase(props) {
       );
     });
   };
-  const subscribe = realtime ? ({ lastSync, update: update2, onError }) => {
+  const subscribe = isRealtime ? ({ lastSync, update: update2, onError }) => {
     const ref = computeRef(lastSync);
     let unsubscribes;
     if (asType === "value") {
@@ -215,14 +360,12 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const val = snap.val();
-        if (saving$[""].get()) {
-          pendingIncoming$[""].set(val);
-        } else {
+        handleServerValue("", val, (resolvedValue) => {
           update2({
-            value: [val],
+            value: [resolvedValue],
             mode: "set"
           });
-        }
+        });
       };
       unsubscribes = [fns.onValue(ref, onValue2, onError)];
     } else {
@@ -230,31 +373,26 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const key = snap.key;
-        const val = snap.val();
-        if (fieldId && !val[fieldId]) {
-          val[fieldId] = key;
-        }
-        if (saving$[key].get()) {
-          pendingIncoming$[key].set(val);
-        } else {
+        const val = ensureFieldId(key, snap.val());
+        handleServerValue(key, val, (resolvedValue) => {
           update2({
-            value: [val],
-            mode: "assign"
+            value: [resolvedValue],
+            mode: "merge"
           });
-        }
+        });
       };
       const onChildDelete = (snap) => {
         if (!didList)
           return;
         const key = snap.key;
-        const val = snap.val();
-        if (fieldId && !val[fieldId]) {
-          val[fieldId] = key;
-        }
-        val[symbolDelete] = true;
-        update2({
-          value: [val],
-          mode: "assign"
+        const valueRaw = snap.val();
+        const valueWithId = ensureFieldId(key, isNullOrUndefined(valueRaw) ? {} : valueRaw);
+        valueWithId[symbolDelete] = true;
+        handleServerValue(key, valueWithId, (resolvedValue) => {
+          update2({
+            value: [resolvedValue],
+            mode: "merge"
+          });
         });
       };
       unsubscribes = [
@@ -278,42 +416,52 @@ function syncedFirebase(props) {
     }
     return addUpdatedAt(input);
   };
-  const upsert = async (input) => {
-    const id = fieldId ? input[fieldId] : "";
-    if (saving$[id].get()) {
-      pendingOutgoing$[id].set(input);
-    } else {
-      saving$[id].set(true);
-      const path = joinPaths(refPath(fns.getCurrentUser()), fieldId ? id : "");
-      await fns.update(fns.ref(path), input);
-      saving$[id].set(false);
-      flushAfterSave();
-    }
-    return when(
-      () => !pendingOutgoing$[id].get(),
-      () => {
-        const value = pendingIncoming$[id].get();
-        if (value) {
-          pendingIncoming$[id].delete();
-          return value;
-        }
-      }
-    );
-  };
-  const flushAfterSave = () => {
-    const outgoing = pendingOutgoing$.get();
-    Object.values(outgoing).forEach((value) => {
-      upsert(value);
+  const upsert = (input, params) => {
+    const id = fieldId && asType !== "value" ? input[fieldId] : "";
+    const pendingKey = fieldId && asType !== "value" ? String(id != null ? id : "") : "";
+    const { promise, entry } = enqueuePendingWrite(pendingKey);
+    const userId = fns.getCurrentUser();
+    const basePath = refPath(userId);
+    const childPath = fieldId && asType !== "value" ? pendingKey : "";
+    const path = joinPaths(basePath, childPath);
+    const ref = fns.ref(path);
+    const updatePromise = fns.update(ref, input);
+    updatePromise.then(() => {
+      resolvePendingWrite(pendingKey, entry);
+    }).catch((error) => {
+      rejectPendingWrite(pendingKey, entry, error);
     });
-    pendingOutgoing$.set({});
+    if (!isRealtime) {
+      updatePromise.then(() => {
+        const onceRef = fieldId && asType !== "value" ? ref : fns.ref(basePath);
+        fns.once(
+          onceRef,
+          (snap) => {
+            const rawValue = snap.val();
+            const value = fieldId && asType !== "value" ? ensureFieldId(pendingKey, isNullOrUndefined(rawValue) ? {} : rawValue) : rawValue;
+            handleServerValue(pendingKey, value, (resolvedValue) => {
+              params.update({
+                value: resolvedValue,
+                mode: "merge"
+              });
+            });
+          },
+          (error) => {
+            rejectPendingWrite(pendingKey, entry, error);
+          }
+        );
+      }).catch(() => {
+      });
+    }
+    return promise;
   };
-  const create = readonly ? void 0 : (input) => {
+  const create = readonly ? void 0 : (input, params) => {
     addCreatedAt(input);
-    return upsert(input);
+    return upsert(input, params);
   };
-  const update = readonly ? void 0 : (input) => {
+  const update = readonly ? void 0 : (input, params) => {
     addUpdatedAt(input);
-    return upsert(input);
+    return upsert(input, params);
   };
   const deleteFn = readonly ? void 0 : (input) => {
     const path = joinPaths(

package/sync-plugins/tanstack-query.js

@@ -52,7 +52,7 @@ function syncedQuery(params) {
       }
       return result.data;
     } else {
-      observer.refetch();
+      return Promise.resolve(observer.refetch()).then((res) => res.data);
     }
   };
   const subscribe = ({ update }) => {

package/sync-plugins/tanstack-query.mjs

@@ -50,7 +50,7 @@ function syncedQuery(params) {
       }
       return result.data;
     } else {
-      observer.refetch();
+      return Promise.resolve(observer.refetch()).then((res) => res.data);
     }
   };
   const subscribe = ({ update }) => {

package/sync.js

@@ -179,28 +179,43 @@ function runWithRetry(state, retryOptions, retryId, fn) {
       let timeoutRetry;
       if (mapRetryTimeouts.has(retryId)) {
         clearTimeout(mapRetryTimeouts.get(retryId));
+        mapRetryTimeouts.delete(retryId);
       }
+      const clearRetryState = () => {
+        if (timeoutRetry !== void 0) {
+          clearTimeout(timeoutRetry);
+          timeoutRetry = void 0;
+        }
+        mapRetryTimeouts.delete(retryId);
+      };
       return new Promise((resolve, reject) => {
         const run = () => {
           value.then((val) => {
+            state.retryNum = 0;
+            clearRetryState();
             resolve(val);
           }).catch((error) => {
-            state.retryNum++;
-            if (timeoutRetry) {
+            if (timeoutRetry !== void 0) {
               clearTimeout(timeoutRetry);
+              timeoutRetry = void 0;
             }
-            if (!state.cancelRetry) {
-              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-                value = fn(state);
-                run();
-              });
-              if (timeout === false) {
-                state.cancelRetry = true;
-                reject(error);
-              } else {
-                mapRetryTimeouts.set(retryId, timeout);
-                timeoutRetry = timeout;
-              }
+            state.retryNum++;
+            if (state.cancelRetry) {
+              clearRetryState();
+              reject(error);
+              return;
+            }
+            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+              value = fn(state);
+              run();
+            });
+            if (timeout === false) {
+              state.cancelRetry = true;
+              clearRetryState();
+              reject(error);
+            } else {
+              timeoutRetry = timeout;
+              mapRetryTimeouts.set(retryId, timeout);
             }
           });
         };
@@ -209,6 +224,7 @@ function runWithRetry(state, retryOptions, retryId, fn) {
     }
     return value;
   } catch (error) {
+    mapRetryTimeouts.delete(retryId);
     return Promise.reject(error);
   }
 }
@@ -325,9 +341,14 @@ function mergeChanges(changes) {
     const existing = changesByPath.get(pathStr);
     if (existing) {
       if (change.valueAtPath === existing.prevAtPath) {
-        changesOut.splice(changesOut.indexOf(change), 1);
+        const idx = changesOut.indexOf(existing);
+        if (idx >= 0) {
+          changesOut.splice(idx, 1);
+        }
+        changesByPath.delete(pathStr);
       } else {
         existing.valueAtPath = change.valueAtPath;
+        existing.pathTypes = change.pathTypes;
       }
     } else {
       let found = false;

package/sync.mjs

@@ -177,28 +177,43 @@ function runWithRetry(state, retryOptions, retryId, fn) {
       let timeoutRetry;
       if (mapRetryTimeouts.has(retryId)) {
         clearTimeout(mapRetryTimeouts.get(retryId));
+        mapRetryTimeouts.delete(retryId);
       }
+      const clearRetryState = () => {
+        if (timeoutRetry !== void 0) {
+          clearTimeout(timeoutRetry);
+          timeoutRetry = void 0;
+        }
+        mapRetryTimeouts.delete(retryId);
+      };
       return new Promise((resolve, reject) => {
         const run = () => {
           value.then((val) => {
+            state.retryNum = 0;
+            clearRetryState();
             resolve(val);
           }).catch((error) => {
-            state.retryNum++;
-            if (timeoutRetry) {
+            if (timeoutRetry !== void 0) {
               clearTimeout(timeoutRetry);
+              timeoutRetry = void 0;
             }
-            if (!state.cancelRetry) {
-              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-                value = fn(state);
-                run();
-              });
-              if (timeout === false) {
-                state.cancelRetry = true;
-                reject(error);
-              } else {
-                mapRetryTimeouts.set(retryId, timeout);
-                timeoutRetry = timeout;
-              }
+            state.retryNum++;
+            if (state.cancelRetry) {
+              clearRetryState();
+              reject(error);
+              return;
+            }
+            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+              value = fn(state);
+              run();
+            });
+            if (timeout === false) {
+              state.cancelRetry = true;
+              clearRetryState();
+              reject(error);
+            } else {
+              timeoutRetry = timeout;
+              mapRetryTimeouts.set(retryId, timeout);
             }
           });
         };
@@ -207,6 +222,7 @@ function runWithRetry(state, retryOptions, retryId, fn) {
     }
     return value;
   } catch (error) {
+    mapRetryTimeouts.delete(retryId);
     return Promise.reject(error);
   }
 }
@@ -323,9 +339,14 @@ function mergeChanges(changes) {
     const existing = changesByPath.get(pathStr);
     if (existing) {
       if (change.valueAtPath === existing.prevAtPath) {
-        changesOut.splice(changesOut.indexOf(change), 1);
+        const idx = changesOut.indexOf(existing);
+        if (idx >= 0) {
+          changesOut.splice(idx, 1);
+        }
+        changesByPath.delete(pathStr);
       } else {
         existing.valueAtPath = change.valueAtPath;
+        existing.pathTypes = change.pathTypes;
       }
     } else {
       let found = false;