tinybase 5.0.0-beta.0 → 5.0.0-beta.10

package/lib/debug/tinybase.js

@@ -29,7 +29,11 @@ const VALUE = 'Value';
 const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
 const id = (key) => EMPTY_STRING + key;
+const strStartsWith = (str, prefix) => str.startsWith(prefix);
+const strEndsWith = (str, suffix) => str.endsWith(suffix);
+const strCharCodeAt = (str, position) => str.charCodeAt(position);
 
+const promise = Promise;
 const mathMax = Math.max;
 const mathMin = Math.min;
 const isFiniteNumber = isFinite;
@@ -45,6 +49,7 @@ const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
 const getUndefined = () => void 0;
+const promiseNew = (resolver) => new promise(resolver);
 
 const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
@@ -70,9 +75,8 @@ const arrayShift = (array) => array.shift();
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
-const objIds = object.keys;
+const objEntries = object.entries;
 const objFrozen = object.isFrozen;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -80,18 +84,46 @@ const isObject = (obj) =>
     (objPrototype) =>
       objPrototype == object.prototype ||
       isUndefined(getPrototypeOf(objPrototype)),
+    /* istanbul ignore next */
     () => true,
   );
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
+const objIds = object.keys;
+const objFreeze = object.freeze;
+const objNew = (entries = []) => object.fromEntries(entries);
+const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
   return obj;
 };
-const objMap = (obj, cb) =>
-  arrayMap(object.entries(obj), ([id, value]) => cb(value, id));
+const objForEach = (obj, cb) =>
+  arrayForEach(objEntries(obj), ([id, value]) => cb(value, id));
+const objToArray = (obj, cb) =>
+  arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
+const objEnsure = (obj, id, getDefaultValue) => {
+  if (!objHas(obj, id)) {
+    obj[id] = getDefaultValue();
+  }
+  return obj[id];
+};
+const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
+  if (
+    isUndefined(obj) ||
+    !isObject(obj) ||
+    (!emptyIsValid && objIsEmpty(obj)) ||
+    objFrozen(obj)
+  ) {
+    onInvalidObj?.();
+    return false;
+  }
+  objToArray(obj, (child, id) => {
+    if (!validateChild(child, id)) {
+      objDel(obj, id);
+    }
+  });
+  return emptyIsValid ? true : !objIsEmpty(obj);
+};
 
 const collSizeN = (collSizer) => (coll) =>
   arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
@@ -115,35 +147,41 @@ const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 const mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
+  objToArray(obj, (value, id) => set(map, id, value));
   mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
   return map;
 };
-const mapToObj = (map, mapValue, excludeValue) => {
+const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
-  collForEach(map, (value, id) => {
-    const mappedValue = mapValue ? mapValue(value, id) : value;
-    excludeValue?.(mappedValue, value) ? 0 : (obj[id] = mappedValue);
+  collForEach(map, (mapValue, id) => {
+    if (!excludeMapValue?.(mapValue, id)) {
+      const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
+      excludeObjValue?.(objValue) ? 0 : (obj[id] = objValue);
+    }
   });
   return obj;
 };
-const mapToObj2 = (map, mapValue, excludeValue) =>
+const mapToObj2 = (map, valueMapper, excludeMapValue) =>
   mapToObj(
     map,
-    (childMap) => mapToObj(childMap, mapValue, excludeValue),
+    (childMap) => mapToObj(childMap, valueMapper, excludeMapValue),
+    collIsEmpty,
     objIsEmpty,
   );
-const mapToObj3 = (map, mapValue, excludeValue) =>
+const mapToObj3 = (map, valueMapper, excludeMapValue) =>
   mapToObj(
     map,
-    (childMap) => mapToObj2(childMap, mapValue, excludeValue),
+    (childMap) => mapToObj2(childMap, valueMapper, excludeMapValue),
+    collIsEmpty,
     objIsEmpty,
   );
 const mapClone = (map, mapValue) => {
@@ -175,12 +213,15 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
-const getCellOrValueType = (cell) => {
-  const type = getTypeOf(cell);
-  return isTypeStringOrBoolean(type) || (type == NUMBER && isFiniteNumber(cell))
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
+const isCellOrValueOrNullOrUndefined = (cellOrValue) =>
+  isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
   isUndefined(cell)
     ? store.delCell(tableId, rowId, cellId, true)
@@ -356,13 +397,15 @@ const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
     : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
-const getCreateFunction = (getFunction) => {
-  const getFunctionsByStore = /* @__PURE__ */ new WeakMap();
+const getCreateFunction = (getFunction, initFunction) => {
+  const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {
-    if (!getFunctionsByStore.has(store)) {
-      getFunctionsByStore.set(store, getFunction(store));
+    if (!thingsByStore.has(store)) {
+      thingsByStore.set(store, getFunction(store));
     }
-    return getFunctionsByStore.get(store);
+    const thing = thingsByStore.get(store);
+    initFunction?.(thing);
+    return thing;
   };
 };
 
@@ -450,241 +493,256 @@ const getListenerFunctions = (getThing) => {
   return [addListener, callListeners, delListener, callListener];
 };
 
-const createCheckpoints = getCreateFunction((store) => {
-  let backwardIdsSize = 100;
-  let currentId;
-  let cellsDelta = mapNew();
-  let valuesDelta = mapNew();
-  let listening = 1;
-  let nextCheckpointId;
-  let checkpointsChanged;
-  const checkpointIdsListeners = mapNew();
-  const checkpointListeners = mapNew();
-  const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
-    () => checkpoints,
-  );
-  const deltas = mapNew();
-  const labels = mapNew();
-  const backwardIds = [];
-  const forwardIds = [];
-  const updateStore = (oldOrNew, checkpointId) => {
-    listening = 0;
-    store.transaction(() => {
-      const [cellsDelta2, valuesDelta2] = mapGet(deltas, checkpointId);
-      collForEach(cellsDelta2, (table, tableId) =>
-        collForEach(table, (row, rowId) =>
-          collForEach(row, (oldNew, cellId) =>
-            setOrDelCell(store, tableId, rowId, cellId, oldNew[oldOrNew]),
+const createCheckpoints = getCreateFunction(
+  (store) => {
+    let backwardIdsSize = 100;
+    let currentId;
+    let cellsDelta = mapNew();
+    let valuesDelta = mapNew();
+    let listening = 1;
+    let nextCheckpointId;
+    let checkpointsChanged;
+    const checkpointIdsListeners = mapNew();
+    const checkpointListeners = mapNew();
+    const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
+      () => checkpoints,
+    );
+    const deltas = mapNew();
+    const labels = mapNew();
+    const backwardIds = [];
+    const forwardIds = [];
+    const updateStore = (oldOrNew, checkpointId) => {
+      listening = 0;
+      store.transaction(() => {
+        const [cellsDelta2, valuesDelta2] = mapGet(deltas, checkpointId);
+        collForEach(cellsDelta2, (table, tableId) =>
+          collForEach(table, (row, rowId) =>
+            collForEach(row, (oldNew, cellId) =>
+              setOrDelCell(store, tableId, rowId, cellId, oldNew[oldOrNew]),
+            ),
           ),
-        ),
-      );
-      collForEach(valuesDelta2, (oldNew, valueId) =>
-        setOrDelValue(store, valueId, oldNew[oldOrNew]),
+        );
+        collForEach(valuesDelta2, (oldNew, valueId) =>
+          setOrDelValue(store, valueId, oldNew[oldOrNew]),
+        );
+      });
+      listening = 1;
+    };
+    const clearCheckpointId = (checkpointId) => {
+      mapSet(deltas, checkpointId);
+      mapSet(labels, checkpointId);
+      callListeners(checkpointListeners, [checkpointId]);
+    };
+    const clearCheckpointIds = (checkpointIds, to) =>
+      arrayForEach(
+        arrayClear(checkpointIds, to ?? size(checkpointIds)),
+        clearCheckpointId,
       );
-    });
-    listening = 1;
-  };
-  const clearCheckpointId = (checkpointId) => {
-    mapSet(deltas, checkpointId);
-    mapSet(labels, checkpointId);
-    callListeners(checkpointListeners, [checkpointId]);
-  };
-  const clearCheckpointIds = (checkpointIds, to) =>
-    arrayForEach(
-      arrayClear(checkpointIds, to ?? size(checkpointIds)),
-      clearCheckpointId,
-    );
-  const trimBackwardsIds = () =>
-    clearCheckpointIds(backwardIds, size(backwardIds) - backwardIdsSize);
-  const storeChanged = () =>
-    ifNotUndefined(currentId, () => {
-      arrayPush(backwardIds, currentId);
-      trimBackwardsIds();
-      clearCheckpointIds(forwardIds);
-      currentId = void 0;
+    const trimBackwardsIds = () =>
+      clearCheckpointIds(backwardIds, size(backwardIds) - backwardIdsSize);
+    const storeChanged = () =>
+      ifNotUndefined(currentId, () => {
+        arrayPush(backwardIds, currentId);
+        trimBackwardsIds();
+        clearCheckpointIds(forwardIds);
+        currentId = void 0;
+        checkpointsChanged = 1;
+      });
+    const storeUnchanged = () => {
+      currentId = arrayPop(backwardIds);
       checkpointsChanged = 1;
-    });
-  const storeUnchanged = () => {
-    currentId = arrayPop(backwardIds);
-    checkpointsChanged = 1;
-  };
-  const cellListenerId = store.addCellListener(
-    null,
-    null,
-    null,
-    (_store, tableId, rowId, cellId, newCell, oldCell) => {
-      if (listening) {
-        storeChanged();
-        const table = mapEnsure(cellsDelta, tableId, mapNew);
-        const row = mapEnsure(table, rowId, mapNew);
-        const oldNew = mapEnsure(row, cellId, () => [oldCell, void 0]);
-        oldNew[1] = newCell;
-        if (
-          oldNew[0] === newCell &&
-          collIsEmpty(mapSet(row, cellId)) &&
-          collIsEmpty(mapSet(table, rowId)) &&
-          collIsEmpty(mapSet(cellsDelta, tableId))
-        ) {
-          storeUnchanged();
-        }
-        callListenersIfChanged();
+    };
+    let cellListenerId;
+    let valueListenerId;
+    const addCheckpointImpl = (label = EMPTY_STRING) => {
+      if (isUndefined(currentId)) {
+        currentId = EMPTY_STRING + nextCheckpointId++;
+        mapSet(deltas, currentId, [cellsDelta, valuesDelta]);
+        setCheckpoint(currentId, label);
+        cellsDelta = mapNew();
+        valuesDelta = mapNew();
+        checkpointsChanged = 1;
       }
-    },
-  );
-  const valueListenerId = store.addValueListener(
-    null,
-    (_store, valueId, newValue, oldValue) => {
-      if (listening) {
-        storeChanged();
-        const oldNew = mapEnsure(valuesDelta, valueId, () => [
-          oldValue,
-          void 0,
-        ]);
-        oldNew[1] = newValue;
-        if (
-          oldNew[0] === newValue &&
-          collIsEmpty(mapSet(valuesDelta, valueId))
-        ) {
-          storeUnchanged();
-        }
-        callListenersIfChanged();
+      return currentId;
+    };
+    const goBackwardImpl = () => {
+      if (!arrayIsEmpty(backwardIds)) {
+        arrayUnshift(forwardIds, addCheckpointImpl());
+        updateStore(0, currentId);
+        currentId = arrayPop(backwardIds);
+        checkpointsChanged = 1;
       }
-    },
-  );
-  const addCheckpointImpl = (label = EMPTY_STRING) => {
-    if (isUndefined(currentId)) {
-      currentId = EMPTY_STRING + nextCheckpointId++;
-      mapSet(deltas, currentId, [cellsDelta, valuesDelta]);
-      setCheckpoint(currentId, label);
-      cellsDelta = mapNew();
-      valuesDelta = mapNew();
-      checkpointsChanged = 1;
-    }
-    return currentId;
-  };
-  const goBackwardImpl = () => {
-    if (!arrayIsEmpty(backwardIds)) {
-      arrayUnshift(forwardIds, addCheckpointImpl());
-      updateStore(0, currentId);
-      currentId = arrayPop(backwardIds);
-      checkpointsChanged = 1;
-    }
-  };
-  const goForwardImpl = () => {
-    if (!arrayIsEmpty(forwardIds)) {
-      arrayPush(backwardIds, currentId);
-      currentId = arrayShift(forwardIds);
-      updateStore(1, currentId);
-      checkpointsChanged = 1;
-    }
-  };
-  const callListenersIfChanged = () => {
-    if (checkpointsChanged) {
-      callListeners(checkpointIdsListeners);
-      checkpointsChanged = 0;
-    }
-  };
-  const setSize = (size2) => {
-    backwardIdsSize = size2;
-    trimBackwardsIds();
-    return checkpoints;
-  };
-  const addCheckpoint = (label) => {
-    const id = addCheckpointImpl(label);
-    callListenersIfChanged();
-    return id;
-  };
-  const setCheckpoint = (checkpointId, label) => {
-    if (hasCheckpoint(checkpointId) && mapGet(labels, checkpointId) !== label) {
-      mapSet(labels, checkpointId, label);
-      callListeners(checkpointListeners, [checkpointId]);
-    }
-    return checkpoints;
-  };
-  const getStore = () => store;
-  const getCheckpointIds = () => [[...backwardIds], currentId, [...forwardIds]];
-  const forEachCheckpoint = (checkpointCallback) =>
-    mapForEach(labels, checkpointCallback);
-  const hasCheckpoint = (checkpointId) => collHas(deltas, checkpointId);
-  const getCheckpoint = (checkpointId) => mapGet(labels, checkpointId);
-  const goBackward = () => {
-    goBackwardImpl();
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const goForward = () => {
-    goForwardImpl();
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const goTo = (checkpointId) => {
-    const action = arrayHas(backwardIds, checkpointId)
-      ? goBackwardImpl
-      : arrayHas(forwardIds, checkpointId)
-        ? goForwardImpl
-        : null;
-    while (!isUndefined(action) && checkpointId != currentId) {
-      action();
-    }
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const addCheckpointIdsListener = (listener) =>
-    addListener(listener, checkpointIdsListeners);
-  const addCheckpointListener = (checkpointId, listener) =>
-    addListener(listener, checkpointListeners, [checkpointId]);
-  const delListener = (listenerId) => {
-    delListenerImpl(listenerId);
-    return checkpoints;
-  };
-  const clear = () => {
-    clearCheckpointIds(backwardIds);
-    clearCheckpointIds(forwardIds);
-    if (!isUndefined(currentId)) {
-      clearCheckpointId(currentId);
-    }
-    currentId = void 0;
-    nextCheckpointId = 0;
-    addCheckpoint();
-    return checkpoints;
-  };
-  const clearForward = () => {
-    if (!arrayIsEmpty(forwardIds)) {
+    };
+    const goForwardImpl = () => {
+      if (!arrayIsEmpty(forwardIds)) {
+        arrayPush(backwardIds, currentId);
+        currentId = arrayShift(forwardIds);
+        updateStore(1, currentId);
+        checkpointsChanged = 1;
+      }
+    };
+    const callListenersIfChanged = () => {
+      if (checkpointsChanged) {
+        callListeners(checkpointIdsListeners);
+        checkpointsChanged = 0;
+      }
+    };
+    const setSize = (size2) => {
+      backwardIdsSize = size2;
+      trimBackwardsIds();
+      return checkpoints;
+    };
+    const addCheckpoint = (label) => {
+      const id = addCheckpointImpl(label);
+      callListenersIfChanged();
+      return id;
+    };
+    const setCheckpoint = (checkpointId, label) => {
+      if (
+        hasCheckpoint(checkpointId) &&
+        mapGet(labels, checkpointId) !== label
+      ) {
+        mapSet(labels, checkpointId, label);
+        callListeners(checkpointListeners, [checkpointId]);
+      }
+      return checkpoints;
+    };
+    const getStore = () => store;
+    const getCheckpointIds = () => [
+      [...backwardIds],
+      currentId,
+      [...forwardIds],
+    ];
+    const forEachCheckpoint = (checkpointCallback) =>
+      mapForEach(labels, checkpointCallback);
+    const hasCheckpoint = (checkpointId) => collHas(deltas, checkpointId);
+    const getCheckpoint = (checkpointId) => mapGet(labels, checkpointId);
+    const goBackward = () => {
+      goBackwardImpl();
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const goForward = () => {
+      goForwardImpl();
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const goTo = (checkpointId) => {
+      const action = arrayHas(backwardIds, checkpointId)
+        ? goBackwardImpl
+        : arrayHas(forwardIds, checkpointId)
+          ? goForwardImpl
+          : null;
+      while (!isUndefined(action) && checkpointId != currentId) {
+        action();
+      }
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const addCheckpointIdsListener = (listener) =>
+      addListener(listener, checkpointIdsListeners);
+    const addCheckpointListener = (checkpointId, listener) =>
+      addListener(listener, checkpointListeners, [checkpointId]);
+    const delListener = (listenerId) => {
+      delListenerImpl(listenerId);
+      return checkpoints;
+    };
+    const clear = () => {
+      clearCheckpointIds(backwardIds);
       clearCheckpointIds(forwardIds);
-      callListeners(checkpointIdsListeners);
-    }
-    return checkpoints;
-  };
-  const destroy = () => {
-    store.delListener(cellListenerId);
-    store.delListener(valueListenerId);
-  };
-  const getListenerStats = () => ({
-    checkpointIds: collSize2(checkpointIdsListeners),
-    checkpoint: collSize2(checkpointListeners),
-  });
-  const checkpoints = {
-    setSize,
-    addCheckpoint,
-    setCheckpoint,
-    getStore,
-    getCheckpointIds,
-    forEachCheckpoint,
-    hasCheckpoint,
-    getCheckpoint,
-    goBackward,
-    goForward,
-    goTo,
-    addCheckpointIdsListener,
-    addCheckpointListener,
-    delListener,
-    clear,
-    clearForward,
-    destroy,
-    getListenerStats,
-  };
-  return objFreeze(checkpoints.clear());
-});
+      if (!isUndefined(currentId)) {
+        clearCheckpointId(currentId);
+      }
+      currentId = void 0;
+      nextCheckpointId = 0;
+      addCheckpoint();
+      return checkpoints;
+    };
+    const clearForward = () => {
+      if (!arrayIsEmpty(forwardIds)) {
+        clearCheckpointIds(forwardIds);
+        callListeners(checkpointIdsListeners);
+      }
+      return checkpoints;
+    };
+    const destroy = () => {
+      store.delListener(cellListenerId);
+      store.delListener(valueListenerId);
+    };
+    const getListenerStats = () => ({
+      checkpointIds: collSize2(checkpointIdsListeners),
+      checkpoint: collSize2(checkpointListeners),
+    });
+    const _registerListeners = () => {
+      cellListenerId = store.addCellListener(
+        null,
+        null,
+        null,
+        (_store, tableId, rowId, cellId, newCell, oldCell) => {
+          if (listening) {
+            storeChanged();
+            const table = mapEnsure(cellsDelta, tableId, mapNew);
+            const row = mapEnsure(table, rowId, mapNew);
+            const oldNew = mapEnsure(row, cellId, () => [oldCell, void 0]);
+            oldNew[1] = newCell;
+            if (
+              oldNew[0] === newCell &&
+              collIsEmpty(mapSet(row, cellId)) &&
+              collIsEmpty(mapSet(table, rowId)) &&
+              collIsEmpty(mapSet(cellsDelta, tableId))
+            ) {
+              storeUnchanged();
+            }
+            callListenersIfChanged();
+          }
+        },
+      );
+      valueListenerId = store.addValueListener(
+        null,
+        (_store, valueId, newValue, oldValue) => {
+          if (listening) {
+            storeChanged();
+            const oldNew = mapEnsure(valuesDelta, valueId, () => [
+              oldValue,
+              void 0,
+            ]);
+            oldNew[1] = newValue;
+            if (
+              oldNew[0] === newValue &&
+              collIsEmpty(mapSet(valuesDelta, valueId))
+            ) {
+              storeUnchanged();
+            }
+            callListenersIfChanged();
+          }
+        },
+      );
+    };
+    const checkpoints = {
+      setSize,
+      addCheckpoint,
+      setCheckpoint,
+      getStore,
+      getCheckpointIds,
+      forEachCheckpoint,
+      hasCheckpoint,
+      getCheckpoint,
+      goBackward,
+      goForward,
+      goTo,
+      addCheckpointIdsListener,
+      addCheckpointListener,
+      delListener,
+      clear,
+      clearForward,
+      destroy,
+      getListenerStats,
+      _registerListeners,
+    };
+    return objFreeze(checkpoints.clear());
+  },
+  (checkpoints) => checkpoints._registerListeners(),
+);
 
 const defaultSorter = (sortKey1, sortKey2) =>
   (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
@@ -1060,6 +1118,24 @@ const createMetrics = getCreateFunction((store) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([[changedTables], [changedValues]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -1067,18 +1143,25 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  [getThing, thing] = [],
+  supportsMergeableStore,
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1110,48 +1193,54 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isArray(contentOrChanges?.[0])
+      ? contentOrChanges?.[2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
-        } catch {
-          store.setContent([initialTables, initialValues]);
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
+      autoLoadHandle = addPersisterListener(
+        async (getContent2, getChanges2) => {
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -1160,7 +1249,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -1172,21 +1261,20 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -1195,13 +1283,325 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
+const textEncoder = new globalThis.TextEncoder();
+const getHash = (value) => {
+  let hash = 2166136261;
+  arrayForEach(textEncoder.encode(value), (char) => {
+    hash ^= char;
+    hash +=
+      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+  });
+  return hash >>> 0;
+};
+
+const stampCloneWithHash = ([value, time, hash]) => [value, time, hash];
+const stampCloneWithoutHash = ([value, time]) => newStamp(value, time);
+const newStamp = (value, time) => (time ? [value, time] : [value]);
+const getStampHash = (stamp) => stamp[2];
+const hashIdAndHash = (id, hash) => getHash(id + ':' + hash);
+const replaceTimeHash = (oldTime, newTime) =>
+  newTime > oldTime ? (oldTime ? getHash(oldTime) : 0) ^ getHash(newTime) : 0;
+const getLatestTime = (time1, time2) =>
+  ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+const stampUpdate = (stamp, hash, time) => {
+  stamp[2] = hash >>> 0;
+  if (time > stamp[1]) {
+    stamp[1] = time;
+  }
+};
+const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+const stampNewMap = (time = EMPTY_STRING) => [mapNew(), time, 0];
+const stampMapToObjWithHash = (
+  [map, time, hash],
+  mapper = stampCloneWithHash,
+) => [mapToObj(map, mapper), time, hash];
+const stampMapToObjWithoutHash = (
+  [map, time],
+  mapper = stampCloneWithoutHash,
+) => newStamp(mapToObj(map, mapper), time);
+const stampValidate = (stamp, validateThing) =>
+  isArray(stamp) &&
+  size(stamp) == 3 &&
+  isString(stamp[1]) &&
+  getTypeOf(stamp[2]) == NUMBER &&
+  isFiniteNumber(stamp[2]) &&
+  validateThing(stamp[0]);
+
+const MASK6 = 63;
+const SHIFT36 = 2 ** 36;
+const SHIFT30 = 2 ** 30;
+const SHIFT24 = 2 ** 24;
+const SHIFT18 = 2 ** 18;
+const SHIFT12 = 2 ** 12;
+const SHIFT6 = 2 ** 6;
+const toB64 = (num) => String.fromCharCode(48 + (num & MASK6));
+const fromB64 = (str, pos) => strCharCodeAt(str, pos) - 48;
+const encodeHlc = (logicalTime42, counter24, clientHash30) =>
+  toB64(logicalTime42 / SHIFT36) +
+  toB64(logicalTime42 / SHIFT30) +
+  toB64(logicalTime42 / SHIFT24) +
+  toB64(logicalTime42 / SHIFT18) +
+  toB64(logicalTime42 / SHIFT12) +
+  toB64(logicalTime42 / SHIFT6) +
+  toB64(logicalTime42) +
+  toB64(counter24 / SHIFT18) +
+  toB64(counter24 / SHIFT12) +
+  toB64(counter24 / SHIFT6) +
+  toB64(counter24) +
+  toB64(clientHash30 / SHIFT24) +
+  toB64(clientHash30 / SHIFT18) +
+  toB64(clientHash30 / SHIFT12) +
+  toB64(clientHash30 / SHIFT6) +
+  toB64(clientHash30);
+const decodeHlc = (hlc16) => [
+  fromB64(hlc16, 0) * SHIFT36 +
+    fromB64(hlc16, 1) * SHIFT30 +
+    fromB64(hlc16, 2) * SHIFT24 +
+    fromB64(hlc16, 3) * SHIFT18 +
+    fromB64(hlc16, 4) * SHIFT12 +
+    fromB64(hlc16, 5) * SHIFT6 +
+    fromB64(hlc16, 6),
+  fromB64(hlc16, 7) * SHIFT18 +
+    fromB64(hlc16, 8) * SHIFT12 +
+    fromB64(hlc16, 9) * SHIFT6 +
+    fromB64(hlc16, 10),
+  fromB64(hlc16, 11) * SHIFT24 +
+    fromB64(hlc16, 12) * SHIFT18 +
+    fromB64(hlc16, 13) * SHIFT12 +
+    fromB64(hlc16, 14) * SHIFT6 +
+    fromB64(hlc16, 15),
+];
+const getHlcFunctions = (uniqueId) => {
+  let logicalTime = 0;
+  let lastCounter = -1;
+  const uniqueIdHash = getHash(uniqueId);
+  const getHlc = () => {
+    seenHlc();
+    return encodeHlc(logicalTime, ++lastCounter, uniqueIdHash);
+  };
+  const seenHlc = (hlc) => {
+    const previousLogicalTime = logicalTime;
+    const [remoteLogicalTime, remoteCounter] =
+      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
+    logicalTime = mathMax(
+      previousLogicalTime,
+      remoteLogicalTime,
+      globalThis.HLC_TIME ?? Date.now(),
+    );
+    lastCounter =
+      logicalTime == previousLogicalTime
+        ? logicalTime == remoteLogicalTime
+          ? mathMax(lastCounter, remoteCounter)
+          : lastCounter
+        : logicalTime == remoteLogicalTime
+          ? remoteCounter
+          : -1;
+  };
+  return [getHlc, seenHlc];
+};
+
+const RESPONSE = 0;
+const GET_CONTENT_HASHES = 1;
+const CONTENT_HASHES = 2;
+const CONTENT_DIFF = 3;
+const GET_TABLE_DIFF = 4;
+const GET_ROW_DIFF = 5;
+const GET_CELL_DIFF = 6;
+const GET_VALUE_DIFF = 7;
+const createCustomSynchronizer = (
+  store,
+  send,
+  onReceive,
+  destroyImpl,
+  requestTimeoutSeconds,
+  onIgnoredError,
+  extra = {},
+) => {
+  let persisterListener;
+  let sends = 0;
+  let receives = 0;
+  const [getHlc] = getHlcFunctions(store.getId());
+  const pendingRequests = mapNew();
+  onReceive((fromClientId, requestId, messageType, messageBody) => {
+    {
+      receives++;
+    }
+    if (messageType == RESPONSE) {
+      ifNotUndefined(
+        mapGet(pendingRequests, requestId),
+        ([toClientId, handleResponse]) =>
+          isUndefined(toClientId) || toClientId == fromClientId
+            ? handleResponse(messageBody, fromClientId)
+            : /* istanbul ignore next */
+              0,
+      );
+    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+        persisterListener?.(void 0, () => changes);
+      });
+    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
+      persisterListener?.(void 0, () => messageBody);
+    } else {
+      ifNotUndefined(
+        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+          ? store.getMergeableContentHashes()
+          : messageType == GET_TABLE_DIFF
+            ? store.getMergeableTableDiff(messageBody)
+            : messageType == GET_ROW_DIFF
+              ? store.getMergeableRowDiff(messageBody)
+              : messageType == GET_CELL_DIFF
+                ? store.getMergeableCellDiff(messageBody)
+                : messageType == GET_VALUE_DIFF
+                  ? store.getMergeableValueDiff(messageBody)
+                  : void 0,
+        (response) => {
+          {
+            sends++;
+          }
+          send(fromClientId, requestId, RESPONSE, response);
+        },
+      );
+    }
+  });
+  const request = async (toClientId, messageType, messageBody = EMPTY_STRING) =>
+    promiseNew((resolve, reject) => {
+      const requestId = getHlc();
+      const timeout = setTimeout(() => {
+        collDel(pendingRequests, requestId);
+        reject(
+          `No response from ${toClientId ?? 'anyone'} to '${messageType}'`,
+        );
+      }, requestTimeoutSeconds * 1e3);
+      mapSet(pendingRequests, requestId, [
+        toClientId,
+        (response, fromClientId) => {
+          clearTimeout(timeout);
+          collDel(pendingRequests, requestId);
+          resolve([response, fromClientId]);
+        },
+      ]);
+      {
+        sends++;
+      }
+      send(toClientId, requestId, messageType, messageBody);
+    });
+  const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
+    objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
+      const tableStamp = objEnsure(tablesStamp[0], tableId, stampNewObj);
+      objForEach(rowStamps2, ([cellStamps2, rowTime2], rowId) => {
+        const rowStamp = objEnsure(tableStamp[0], rowId, stampNewObj);
+        objForEach(
+          cellStamps2,
+          ([cell2, cellTime2], cellId) =>
+            (rowStamp[0][cellId] = newStamp(cell2, cellTime2)),
+        );
+        rowStamp[1] = getLatestTime(rowStamp[1], rowTime2);
+      });
+      tableStamp[1] = getLatestTime(tableStamp[1], tableTime2);
+    });
+    tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
+  };
+  const getChangesFromOtherStore = async (
+    otherClientId = null,
+    otherContentHashes,
+  ) => {
+    if (isUndefined(otherContentHashes)) {
+      [otherContentHashes, otherClientId] = await request(
+        otherClientId,
+        GET_CONTENT_HASHES,
+      );
+    }
+    const [otherTablesHash, otherValuesHash] = otherContentHashes;
+    const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+    let tablesChanges = stampNewObj();
+    if (tablesHash != otherTablesHash) {
+      const [newTables, differentTableHashes] = (
+        await request(
+          otherClientId,
+          GET_TABLE_DIFF,
+          store.getMergeableTableHashes(),
+        )
+      )[0];
+      tablesChanges = newTables;
+      if (!objIsEmpty(differentTableHashes)) {
+        const [newRows, differentRowHashes] = (
+          await request(
+            otherClientId,
+            GET_ROW_DIFF,
+            store.getMergeableRowHashes(differentTableHashes),
+          )
+        )[0];
+        mergeTablesStamps(tablesChanges, newRows);
+        if (!objIsEmpty(differentRowHashes)) {
+          const newCells = (
+            await request(
+              otherClientId,
+              GET_CELL_DIFF,
+              store.getMergeableCellHashes(differentRowHashes),
+            )
+          )[0];
+          mergeTablesStamps(tablesChanges, newCells);
+        }
+      }
+    }
+    return [
+      tablesChanges,
+      valuesHash == otherValuesHash
+        ? stampNewObj()
+        : (
+            await request(
+              otherClientId,
+              GET_VALUE_DIFF,
+              store.getMergeableValuesHashes(),
+            )
+          )[0],
+      1,
+    ];
+  };
+  const getPersisted = async () => {
+    const changes = await getChangesFromOtherStore();
+    return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+      ? changes
+      : void 0;
+  };
+  const setPersisted = async (getContent, getChanges) => {
+    {
+      sends++;
+    }
+    if (getChanges) {
+      send(null, null, CONTENT_DIFF, getChanges());
+    } else {
+      send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+    }
+  };
+  const addPersisterListener = (listener) => (persisterListener = listener);
+  const delPersisterListener = () => (persisterListener = void 0);
+  const startSync = async (initialContent) =>
+    await (await persister.startAutoLoad(initialContent)).startAutoSave();
+  const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    destroyImpl();
+    return persister.stopSync();
+  };
+  const getSynchronizerStats = () => ({sends, receives});
+  const persister = createCustomPersister(
+    store,
+    getPersisted,
+    setPersisted,
+    addPersisterListener,
+    delPersisterListener,
+    onIgnoredError,
+    true,
+    {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
+  );
+  return persister;
+};
+
 const createQueries = getCreateFunction((store) => {
   const createStore = store.createStore;
   const preStore = createStore();
@@ -1629,7 +2029,7 @@ const createQueries = getCreateFunction((store) => {
     destroy,
     getListenerStats,
   };
-  objMap(
+  objToArray(
     {
       [TABLE]: [1, 1],
       [TABLE + CELL_IDS]: [0, 1],
@@ -1856,24 +2256,12 @@ const pairNewMap = () => [mapNew(), mapNew()];
 const pairClone = (array) => [...array];
 const pairIsEqual = ([entry1, entry2]) => entry1 === entry2;
 
-const jsonString = (obj) =>
+const jsonStringWithMap = (obj) =>
   JSON.stringify(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
 const jsonParse = JSON.parse;
 
-const validate = (obj, validateChild, onInvalidObj) => {
-  if (isUndefined(obj) || !isObject(obj) || objIsEmpty(obj) || objFrozen(obj)) {
-    onInvalidObj?.();
-    return false;
-  }
-  objMap(obj, (child, id2) => {
-    if (!validateChild(child, id2)) {
-      objDel(obj, id2);
-    }
-  });
-  return !objIsEmpty(obj);
-};
 const idsChanged = (changedIds, id2, addedOrRemoved) =>
   mapSet(
     changedIds,
@@ -1883,11 +2271,10 @@ const idsChanged = (changedIds, id2, addedOrRemoved) =>
 const createStore = () => {
   let hasTablesSchema;
   let hasValuesSchema;
-  let cellsTouched = false;
-  let valuesTouched = false;
   let hadTables = false;
   let hadValues = false;
   let transactions = 0;
+  let internalListeners = [];
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -1934,13 +2321,13 @@ const createStore = () => {
   const [addListener, callListeners, delListenerImpl, callListenerImpl] =
     getListenerFunctions(() => store);
   const validateTablesSchema = (tableSchema) =>
-    validate(tableSchema, (tableSchema2) =>
-      validate(tableSchema2, validateCellOrValueSchema),
+    objValidate(tableSchema, (tableSchema2) =>
+      objValidate(tableSchema2, validateCellOrValueSchema),
     );
   const validateValuesSchema = (valuesSchema) =>
-    validate(valuesSchema, validateCellOrValueSchema);
+    objValidate(valuesSchema, validateCellOrValueSchema);
   const validateCellOrValueSchema = (schema) => {
-    if (!validate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
+    if (!objValidate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
       return false;
     }
     const type = schema[TYPE];
@@ -1953,18 +2340,18 @@ const createStore = () => {
     return true;
   };
   const validateTables = (tables) =>
-    validate(tables, validateTable, cellInvalid);
+    objValidate(tables, validateTable, cellInvalid);
   const validateTable = (table, tableId) =>
     (!hasTablesSchema ||
       collHas(tablesSchemaMap, tableId) ||
       cellInvalid(tableId)) &&
-    validate(
+    objValidate(
       table,
       (row, rowId) => validateRow(tableId, rowId, row),
       () => cellInvalid(tableId),
     );
   const validateRow = (tableId, rowId, row, skipDefaults) =>
-    validate(
+    objValidate(
       skipDefaults ? row : addDefaultsToRow(row, tableId, rowId),
       (cell, cellId) =>
         ifNotUndefined(
@@ -1991,7 +2378,7 @@ const createStore = () => {
         ? cellInvalid(tableId, rowId, cellId, cell)
         : cell;
   const validateValues = (values, skipDefaults) =>
-    validate(
+    objValidate(
       skipDefaults ? values : addDefaultsToValues(values),
       (value, valueId) =>
         ifNotUndefined(
@@ -2254,16 +2641,20 @@ const createStore = () => {
       addedOrRemoved,
     );
   };
-  const cellChanged = (tableId, rowId, cellId, oldCell, newCell) =>
-    (mapEnsure(
+  const cellChanged = (tableId, rowId, cellId, oldCell, newCell) => {
+    mapEnsure(
       mapEnsure(mapEnsure(changedCells, tableId, mapNew), rowId, mapNew),
       cellId,
       () => [oldCell, 0],
-    )[1] = newCell);
+    )[1] = newCell;
+    internalListeners[3]?.(tableId, rowId, cellId, newCell);
+  };
   const valueIdsChanged = (valueId, addedOrRemoved) =>
     idsChanged(changedValueIds, valueId, addedOrRemoved);
-  const valueChanged = (valueId, oldValue, newValue) =>
-    (mapEnsure(changedValues, valueId, () => [oldValue, 0])[1] = newValue);
+  const valueChanged = (valueId, oldValue, newValue) => {
+    mapEnsure(changedValues, valueId, () => [oldValue, 0])[1] = newValue;
+    internalListeners[4]?.(valueId, newValue);
+  };
   const cellInvalid = (tableId, rowId, cellId, invalidCell, defaultedCell) => {
     arrayPush(
       mapEnsure(
@@ -2529,44 +2920,6 @@ const createStore = () => {
     transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
-  const getTransactionChanges = () => [
-    mapToObj(
-      changedCells,
-      (table, tableId) =>
-        mapGet(changedTableIds, tableId) === -1
-          ? null
-          : mapToObj(
-              table,
-              (row, rowId) =>
-                mapGet(mapGet(changedRowIds, tableId), rowId) === -1
-                  ? null
-                  : mapToObj(
-                      row,
-                      ([, newCell]) => newCell ?? null,
-                      (_, changedCell) => pairIsEqual(changedCell),
-                    ),
-              objIsEmpty,
-            ),
-      objIsEmpty,
-    ),
-    mapToObj(
-      changedValues,
-      ([, newValue]) => newValue ?? null,
-      (_, changedValue) => pairIsEqual(changedValue),
-    ),
-  ];
-  const getTransactionLog = () => ({
-    cellsTouched,
-    valuesTouched,
-    changedCells: mapToObj3(changedCells, pairClone, pairIsEqual),
-    invalidCells: mapToObj3(invalidCells),
-    changedValues: mapToObj(changedValues, pairClone, pairIsEqual),
-    invalidValues: mapToObj(invalidValues),
-    changedTableIds: mapToObj(changedTableIds),
-    changedRowIds: mapToObj2(changedRowIds),
-    changedCellIds: mapToObj3(changedCellIds),
-    changedValueIds: mapToObj(changedValueIds),
-  });
   const getContent = () => [getTables(), getValues()];
   const getTables = () => mapToObj3(tablesMap);
   const getTableIds = () => mapKeys(tablesMap);
@@ -2610,12 +2963,13 @@ const createStore = () => {
     collHas(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), id(cellId));
   const hasValues = () => !collIsEmpty(valuesMap);
   const hasValue = (valueId) => collHas(valuesMap, id(valueId));
-  const getTablesJson = () => jsonString(tablesMap);
-  const getValuesJson = () => jsonString(valuesMap);
-  const getJson = () => jsonString([tablesMap, valuesMap]);
-  const getTablesSchemaJson = () => jsonString(tablesSchemaMap);
-  const getValuesSchemaJson = () => jsonString(valuesSchemaMap);
-  const getSchemaJson = () => jsonString([tablesSchemaMap, valuesSchemaMap]);
+  const getTablesJson = () => jsonStringWithMap(tablesMap);
+  const getValuesJson = () => jsonStringWithMap(valuesMap);
+  const getJson = () => jsonStringWithMap([tablesMap, valuesMap]);
+  const getTablesSchemaJson = () => jsonStringWithMap(tablesSchemaMap);
+  const getValuesSchemaJson = () => jsonStringWithMap(valuesSchemaMap);
+  const getSchemaJson = () =>
+    jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
   const setContent = ([tables, values]) =>
     fluentTransaction(() => {
       (objIsEmpty(tables) ? delTables : setTables)(tables);
@@ -2659,7 +3013,7 @@ const createStore = () => {
       (tableId2, rowId2) => {
         if (validateRow(tableId2, rowId2, partialRow, 1)) {
           const table = getOrCreateTable(tableId2);
-          objMap(partialRow, (cell, cellId) =>
+          objToArray(partialRow, (cell, cellId) =>
             setCellIntoDefaultRow(tableId2, table, rowId2, cellId, cell),
           );
         }
@@ -2697,7 +3051,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objMap(partialValues, (value, valueId) =>
+        ? objToArray(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -2714,20 +3068,20 @@ const createStore = () => {
         ),
       valueId,
     );
-  const setTransactionChanges = (transactionChanges) =>
+  const applyChanges = (changes) =>
     fluentTransaction(() => {
-      objMap(transactionChanges[0], (table, tableId) =>
+      objToArray(changes[0], (table, tableId) =>
         isUndefined(table)
           ? delTable(tableId)
-          : objMap(table, (row, rowId) =>
+          : objToArray(table, (row, rowId) =>
               isUndefined(row)
                 ? delRow(tableId, rowId)
-                : objMap(row, (cell, cellId) =>
+                : objToArray(row, (cell, cellId) =>
                     setOrDelCell(store, tableId, rowId, cellId, cell),
                   ),
             ),
       );
-      objMap(transactionChanges[1], (value, valueId) =>
+      objToArray(changes[1], (value, valueId) =>
         setOrDelValue(store, valueId, value),
       );
     });
@@ -2854,31 +3208,66 @@ const createStore = () => {
       transactions++;
     }
     if (transactions == 1) {
-      callListeners(
-        startTransactionListeners,
-        void 0,
-        getTransactionChanges,
-        getTransactionLog,
-      );
+      internalListeners[0]?.();
+      callListeners(startTransactionListeners, void 0);
     }
     return store;
   };
+  const getTransactionChanges = () => [
+    mapToObj(
+      changedCells,
+      (table, tableId) =>
+        mapGet(changedTableIds, tableId) === -1
+          ? void 0
+          : mapToObj(
+              table,
+              (row, rowId) =>
+                mapGet(mapGet(changedRowIds, tableId), rowId) === -1
+                  ? void 0
+                  : mapToObj(
+                      row,
+                      ([, newCell]) => newCell,
+                      (changedCell) => pairIsEqual(changedCell),
+                    ),
+              collIsEmpty,
+              objIsEmpty,
+            ),
+      collIsEmpty,
+      objIsEmpty,
+    ),
+    mapToObj(
+      changedValues,
+      ([, newValue]) => newValue,
+      (changedValue) => pairIsEqual(changedValue),
+    ),
+    1,
+  ];
+  const getTransactionLog = () => [
+    !collIsEmpty(changedCells),
+    !collIsEmpty(changedValues),
+    mapToObj3(changedCells, pairClone, pairIsEqual),
+    mapToObj3(invalidCells),
+    mapToObj(changedValues, pairClone, pairIsEqual),
+    mapToObj(invalidValues),
+    mapToObj(changedTableIds),
+    mapToObj2(changedRowIds),
+    mapToObj3(changedCellIds),
+    mapToObj(changedValueIds),
+  ];
   const finishTransaction = (doRollback) => {
     if (transactions > 0) {
       transactions--;
       if (transactions == 0) {
-        cellsTouched = !collIsEmpty(changedCells);
-        valuesTouched = !collIsEmpty(changedValues);
         transactions = 1;
         callInvalidCellListeners(1);
-        if (cellsTouched) {
+        if (!collIsEmpty(changedCells)) {
           callTabularListenersForChanges(1);
         }
         callInvalidValueListeners(1);
-        if (valuesTouched) {
+        if (!collIsEmpty(changedValues)) {
           callValuesListenersForChanges(1);
         }
-        if (doRollback?.(getTransactionChanges, getTransactionLog)) {
+        if (doRollback?.(store)) {
           collForEach(changedCells, (table, tableId) =>
             collForEach(table, (row, rowId) =>
               collForEach(row, ([oldCell], cellId) =>
@@ -2886,34 +3275,26 @@ const createStore = () => {
               ),
             ),
           );
+          collClear(changedCells);
           collForEach(changedValues, ([oldValue], valueId) =>
             setOrDelValue(store, valueId, oldValue),
           );
-          cellsTouched = valuesTouched = false;
+          collClear(changedValues);
         }
-        callListeners(
-          finishTransactionListeners[0],
-          void 0,
-          getTransactionChanges,
-          getTransactionLog,
-        );
+        callListeners(finishTransactionListeners[0], void 0);
         transactions = -1;
         callInvalidCellListeners(0);
-        if (cellsTouched) {
+        if (!collIsEmpty(changedCells)) {
           callTabularListenersForChanges(0);
         }
         callInvalidValueListeners(0);
-        if (valuesTouched) {
+        if (!collIsEmpty(changedValues)) {
           callValuesListenersForChanges(0);
         }
-        callListeners(
-          finishTransactionListeners[1],
-          void 0,
-          getTransactionChanges,
-          getTransactionLog,
-        );
+        internalListeners[1]?.();
+        callListeners(finishTransactionListeners[1], void 0);
+        internalListeners[2]?.();
         transactions = 0;
-        cellsTouched = valuesTouched = false;
         hadTables = hasTables();
         hadValues = hasValues();
         arrayForEach(
@@ -3038,6 +3419,20 @@ const createStore = () => {
       collSize2(startTransactionListeners) +
       pairCollSize2(finishTransactionListeners),
   });
+  const setInternalListeners = (
+    preStartTransaction,
+    preFinishTransaction,
+    postFinishTransaction,
+    cellChanged2,
+    valueChanged2,
+  ) =>
+    (internalListeners = [
+      preStartTransaction,
+      preFinishTransaction,
+      postFinishTransaction,
+      cellChanged2,
+      valueChanged2,
+    ]);
   const store = {
     getContent,
     getTables,
@@ -3078,7 +3473,7 @@ const createStore = () => {
     setValues,
     setPartialValues,
     setValue,
-    setTransactionChanges,
+    applyChanges,
     setTablesJson,
     setValuesJson,
     setJson,
@@ -3096,6 +3491,8 @@ const createStore = () => {
     delSchema,
     transaction,
     startTransaction,
+    getTransactionChanges,
+    getTransactionLog,
     finishTransaction,
     forEachTable,
     forEachTableCell,
@@ -3113,8 +3510,9 @@ const createStore = () => {
     createStore,
     addListener,
     callListeners,
+    setInternalListeners,
   };
-  objMap(
+  objToArray(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],
@@ -3187,10 +3585,484 @@ const createStore = () => {
   return objFreeze(store);
 };
 
+const LISTENER_ARGS = {
+  HasTable: 1,
+  Table: 1,
+  TableCellIds: 1,
+  HasTableCell: 2,
+  RowCount: 1,
+  RowIds: 1,
+  SortedRowIds: 5,
+  HasRow: 2,
+  Row: 2,
+  CellIds: 2,
+  HasCell: 3,
+  Cell: 3,
+  HasValue: 1,
+  Value: 1,
+  InvalidCell: 3,
+  InvalidValue: 1,
+};
+const newContentStampMap = (time = EMPTY_STRING) => [
+  stampNewMap(time),
+  stampNewMap(time),
+];
+const validateMergeableContent = (mergeableContent) =>
+  isArray(mergeableContent) &&
+  size(mergeableContent) == 2 &&
+  stampValidate(mergeableContent[0], (tableStamps) =>
+    objValidate(
+      tableStamps,
+      (tableStamp) =>
+        stampValidate(tableStamp, (rowStamps) =>
+          objValidate(
+            rowStamps,
+            (rowStamp) =>
+              stampValidate(rowStamp, (cellStamps) =>
+                objValidate(
+                  cellStamps,
+                  (cellStamp) =>
+                    stampValidate(cellStamp, isCellOrValueOrNullOrUndefined),
+                  void 0,
+                  1,
+                ),
+              ),
+            void 0,
+            1,
+          ),
+        ),
+      void 0,
+      1,
+    ),
+  ) &&
+  stampValidate(mergeableContent[1], (values) =>
+    objValidate(
+      values,
+      (value) => stampValidate(value, isCellOrValueOrNullOrUndefined),
+      void 0,
+      1,
+    ),
+  );
+const createMergeableStore = (id) => {
+  let listeningToRawStoreChanges = 1;
+  let contentStampMap = newContentStampMap();
+  let defaultingContent = 0;
+  const touchedCells = mapNew();
+  const touchedValues = setNew();
+  const [getHlc, seenHlc] = getHlcFunctions(id);
+  const store = createStore();
+  const disableListeningToRawStoreChanges = (actions) => {
+    const wasListening = listeningToRawStoreChanges;
+    listeningToRawStoreChanges = 0;
+    actions();
+    listeningToRawStoreChanges = wasListening;
+    return mergeableStore;
+  };
+  const mergeContentOrChanges = (contentOrChanges, isContent = 0) => {
+    const tablesChanges = {};
+    const valuesChanges = {};
+    const [
+      [tablesObj, incomingTablesTime = EMPTY_STRING, incomingTablesHash = 0],
+      values,
+    ] = contentOrChanges;
+    const [tablesStampMap, valuesStampMap] = contentStampMap;
+    const [tableStampMaps, oldTablesTime, oldTablesHash] = tablesStampMap;
+    let tablesHash = isContent ? incomingTablesHash : oldTablesHash;
+    let tablesTime = incomingTablesTime;
+    objForEach(
+      tablesObj,
+      (
+        [rowsObj, incomingTableTime = EMPTY_STRING, incomingTableHash = 0],
+        tableId,
+      ) => {
+        const tableStampMap = mapEnsure(tableStampMaps, tableId, stampNewMap);
+        const [rowStampMaps, oldTableTime, oldTableHash] = tableStampMap;
+        let tableHash = isContent ? incomingTableHash : oldTableHash;
+        let tableTime = incomingTableTime;
+        objForEach(rowsObj, (row, rowId) => {
+          const [rowTime, oldRowHash, rowHash] = mergeCellsOrValues(
+            row,
+            mapEnsure(rowStampMaps, rowId, stampNewMap),
+            objEnsure(objEnsure(tablesChanges, tableId, objNew), rowId, objNew),
+            isContent,
+          );
+          tableHash ^= isContent
+            ? 0
+            : (oldRowHash ? hashIdAndHash(rowId, oldRowHash) : 0) ^
+              hashIdAndHash(rowId, rowHash);
+          tableTime = getLatestTime(tableTime, rowTime);
+        });
+        tableHash ^= isContent
+          ? 0
+          : replaceTimeHash(oldTableTime, incomingTableTime);
+        stampUpdate(tableStampMap, tableHash, incomingTableTime);
+        tablesHash ^= isContent
+          ? 0
+          : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
+            hashIdAndHash(tableId, tableStampMap[2]);
+        tablesTime = getLatestTime(tablesTime, tableTime);
+      },
+    );
+    tablesHash ^= isContent
+      ? 0
+      : replaceTimeHash(oldTablesTime, incomingTablesTime);
+    stampUpdate(tablesStampMap, tablesHash, incomingTablesTime);
+    const [valuesTime] = mergeCellsOrValues(
+      values,
+      valuesStampMap,
+      valuesChanges,
+      isContent,
+    );
+    seenHlc(getLatestTime(tablesTime, valuesTime));
+    return [tablesChanges, valuesChanges, 1];
+  };
+  const mergeCellsOrValues = (
+    things,
+    thingsStampMap,
+    thingsChanges,
+    isContent,
+  ) => {
+    const [
+      thingsObj,
+      incomingThingsTime = EMPTY_STRING,
+      incomingThingsHash = 0,
+    ] = things;
+    const [thingStampMaps, oldThingsTime, oldThingsHash] = thingsStampMap;
+    let thingsTime = incomingThingsTime;
+    let thingsHash = isContent ? incomingThingsHash : oldThingsHash;
+    objForEach(
+      thingsObj,
+      ([thing, thingTime, incomingThingHash = 0], thingId) => {
+        const thingStampMap = mapEnsure(thingStampMaps, thingId, () => [
+          void 0,
+          EMPTY_STRING,
+          0,
+        ]);
+        const [, oldThingTime, oldThingHash] = thingStampMap;
+        if (!oldThingTime || thingTime > oldThingTime) {
+          stampUpdate(
+            thingStampMap,
+            isContent
+              ? incomingThingHash
+              : getHash(jsonStringWithMap(thing ?? null) + ':' + thingTime),
+            thingTime,
+          );
+          thingStampMap[0] = thing;
+          thingsChanges[thingId] = thing;
+          thingsHash ^= isContent
+            ? 0
+            : hashIdAndHash(thingId, oldThingHash) ^
+              hashIdAndHash(thingId, thingStampMap[2]);
+          thingsTime = getLatestTime(thingsTime, thingTime);
+        }
+      },
+    );
+    thingsHash ^= isContent
+      ? 0
+      : replaceTimeHash(oldThingsTime, incomingThingsTime);
+    stampUpdate(thingsStampMap, thingsHash, incomingThingsTime);
+    return [thingsTime, oldThingsHash, thingsStampMap[2]];
+  };
+  const preStartTransaction = () => {};
+  const preFinishTransaction = () => {};
+  const postFinishTransaction = () => {
+    collClear(touchedCells);
+    collClear(touchedValues);
+  };
+  const cellChanged = (tableId, rowId, cellId, newCell) => {
+    setAdd(
+      mapEnsure(mapEnsure(touchedCells, tableId, mapNew), rowId, setNew),
+      cellId,
+    );
+    if (listeningToRawStoreChanges) {
+      mergeContentOrChanges([
+        [
+          {
+            [tableId]: [
+              {
+                [rowId]: [
+                  {
+                    [cellId]: [
+                      newCell,
+                      defaultingContent ? EMPTY_STRING : getHlc(),
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        [{}],
+        1,
+      ]);
+    }
+  };
+  const valueChanged = (valueId, newValue) => {
+    setAdd(touchedValues, valueId);
+    if (listeningToRawStoreChanges) {
+      mergeContentOrChanges([
+        [{}],
+        [{[valueId]: [newValue, defaultingContent ? EMPTY_STRING : getHlc()]}],
+        1,
+      ]);
+    }
+  };
+  const getId = () => id;
+  const getMergeableContent = () => [
+    stampMapToObjWithHash(contentStampMap[0], (tableStampMap) =>
+      stampMapToObjWithHash(tableStampMap, (rowStampMap) =>
+        stampMapToObjWithHash(rowStampMap),
+      ),
+    ),
+    stampMapToObjWithHash(contentStampMap[1]),
+  ];
+  const getMergeableContentHashes = () => [
+    contentStampMap[0][2],
+    contentStampMap[1][2],
+  ];
+  const getMergeableTableHashes = () =>
+    mapToObj(contentStampMap[0][0], getStampHash);
+  const getMergeableTableDiff = (otherTableHashes) => {
+    const newTables = stampNewObj(contentStampMap[0][1]);
+    const differentTableHashes = {};
+    mapForEach(
+      contentStampMap[0][0],
+      (tableId, [tableStampMap, tableTime, hash]) =>
+        objHas(otherTableHashes, tableId)
+          ? hash != otherTableHashes[tableId]
+            ? (differentTableHashes[tableId] = hash)
+            : 0
+          : (newTables[0][tableId] = stampMapToObjWithoutHash(
+              [tableStampMap, tableTime],
+              (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
+            )),
+    );
+    return [newTables, differentTableHashes];
+  };
+  const getMergeableRowHashes = (otherTableHashes) => {
+    const rowHashes = {};
+    objForEach(otherTableHashes, (otherTableHash, tableId) =>
+      ifNotUndefined(
+        mapGet(contentStampMap[0][0], tableId),
+        ([rowStampMaps, , tableHash]) =>
+          tableHash != otherTableHash
+            ? mapForEach(
+                rowStampMaps,
+                (rowId, [, , rowHash]) =>
+                  (objEnsure(rowHashes, tableId, objNew)[rowId] = rowHash),
+              )
+            : 0,
+      ),
+    );
+    return rowHashes;
+  };
+  const getMergeableRowDiff = (otherTableRowHashes) => {
+    const newRows = stampNewObj(contentStampMap[0][1]);
+    const differentRowHashes = {};
+    objForEach(otherTableRowHashes, (otherRowHashes, tableId) =>
+      mapForEach(
+        mapGet(contentStampMap[0][0], tableId)?.[0],
+        (rowId, [rowStampMap, rowTime, hash]) =>
+          objHas(otherRowHashes, rowId)
+            ? hash !== otherRowHashes[rowId]
+              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              : 0
+            : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
+                stampMapToObjWithoutHash([rowStampMap, rowTime])),
+      ),
+    );
+    return [newRows, differentRowHashes];
+  };
+  const getMergeableCellHashes = (otherTableRowHashes) => {
+    const cellHashes = {};
+    objForEach(otherTableRowHashes, (otherRowHashes, tableId) =>
+      ifNotUndefined(mapGet(contentStampMap[0][0], tableId), ([rowStampMaps]) =>
+        objForEach(otherRowHashes, (otherRowHash, rowId) =>
+          ifNotUndefined(
+            mapGet(rowStampMaps, rowId),
+            ([cellStampMaps, , rowHash]) =>
+              rowHash !== otherRowHash
+                ? mapForEach(
+                    cellStampMaps,
+                    (cellId, [, , cellHash]) =>
+                      (objEnsure(
+                        objEnsure(cellHashes, tableId, objNew),
+                        rowId,
+                        objNew,
+                      )[cellId] = cellHash),
+                  )
+                : 0,
+          ),
+        ),
+      ),
+    );
+    return cellHashes;
+  };
+  const getMergeableCellDiff = (otherTableRowCellHashes) => {
+    const [[tableStampMaps, tablesTime]] = contentStampMap;
+    const tablesObj = {};
+    objForEach(otherTableRowCellHashes, (otherRowCellHashes, tableId) =>
+      objForEach(otherRowCellHashes, (otherCellHashes, rowId) =>
+        ifNotUndefined(
+          mapGet(tableStampMaps, tableId),
+          ([rowStampMaps, tableTime]) =>
+            ifNotUndefined(
+              mapGet(rowStampMaps, rowId),
+              ([cellStampMaps, rowTime]) =>
+                mapForEach(cellStampMaps, (cellId, [cell, cellTime, hash]) =>
+                  hash !== otherCellHashes[cellId]
+                    ? (objEnsure(
+                        objEnsure(tablesObj, tableId, () =>
+                          stampNewObj(tableTime),
+                        )[0],
+                        rowId,
+                        () => stampNewObj(rowTime),
+                      )[0][cellId] = [cell, cellTime])
+                    : 0,
+                ),
+            ),
+        ),
+      ),
+    );
+    return newStamp(tablesObj, tablesTime);
+  };
+  const getMergeableValuesHashes = () =>
+    mapToObj(contentStampMap[1][0], getStampHash);
+  const getMergeableValueDiff = (relativeTo) => {
+    const [, [valueStampMaps, valuesTime]] = contentStampMap;
+    const values = mapToObj(
+      valueStampMaps,
+      stampCloneWithoutHash,
+      ([, , hash], valueId) => hash == relativeTo?.[valueId],
+    );
+    return newStamp(values, valuesTime);
+  };
+  const setMergeableContent = (mergeableContent) =>
+    disableListeningToRawStoreChanges(() =>
+      validateMergeableContent(mergeableContent)
+        ? store.transaction(() => {
+            store.delTables().delValues();
+            contentStampMap = newContentStampMap();
+            store.applyChanges(mergeContentOrChanges(mergeableContent, 1));
+          })
+        : 0,
+    );
+  const setDefaultContent = (content) => {
+    store.transaction(() => {
+      defaultingContent = 1;
+      store.setContent(content);
+      defaultingContent = 0;
+    });
+    return mergeableStore;
+  };
+  const getTransactionMergeableChanges = () => {
+    const [[tableStampMaps, tablesTime], [valueStampMaps, valuesTime]] =
+      contentStampMap;
+    const tablesObj = {};
+    collForEach(touchedCells, (touchedTable, tableId) =>
+      ifNotUndefined(
+        mapGet(tableStampMaps, tableId),
+        ([rowStampMaps, tableTime]) => {
+          const tableObj = {};
+          collForEach(touchedTable, (touchedRow, rowId) =>
+            ifNotUndefined(
+              mapGet(rowStampMaps, rowId),
+              ([cellStampMaps, rowTime]) => {
+                const rowObj = {};
+                collForEach(touchedRow, (cellId) => {
+                  ifNotUndefined(
+                    mapGet(cellStampMaps, cellId),
+                    ([cell, time]) => (rowObj[cellId] = newStamp(cell, time)),
+                  );
+                });
+                tableObj[rowId] = newStamp(rowObj, rowTime);
+              },
+            ),
+          );
+          tablesObj[tableId] = newStamp(tableObj, tableTime);
+        },
+      ),
+    );
+    const valuesObj = {};
+    collForEach(touchedValues, (valueId) =>
+      ifNotUndefined(
+        mapGet(valueStampMaps, valueId),
+        ([value, time]) => (valuesObj[valueId] = newStamp(value, time)),
+      ),
+    );
+    return [
+      newStamp(tablesObj, tablesTime),
+      newStamp(valuesObj, valuesTime),
+      1,
+    ];
+  };
+  const applyMergeableChanges = (mergeableChanges) =>
+    disableListeningToRawStoreChanges(() =>
+      store.applyChanges(mergeContentOrChanges(mergeableChanges)),
+    );
+  const merge = (mergeableStore2) => {
+    const mergeableChanges = getMergeableContent();
+    const mergeableChanges2 = mergeableStore2.getMergeableContent();
+    mergeableStore2.applyMergeableChanges(mergeableChanges);
+    return applyMergeableChanges(mergeableChanges2);
+  };
+  const mergeableStore = {
+    getId,
+    getMergeableContent,
+    getMergeableContentHashes,
+    getMergeableTableHashes,
+    getMergeableTableDiff,
+    getMergeableRowHashes,
+    getMergeableRowDiff,
+    getMergeableCellHashes,
+    getMergeableCellDiff,
+    getMergeableValuesHashes,
+    getMergeableValueDiff,
+    setMergeableContent,
+    setDefaultContent,
+    getTransactionMergeableChanges,
+    applyMergeableChanges,
+    merge,
+  };
+  store.setInternalListeners(
+    preStartTransaction,
+    preFinishTransaction,
+    postFinishTransaction,
+    cellChanged,
+    valueChanged,
+  );
+  objToArray(
+    store,
+    (method, name) =>
+      (mergeableStore[name] = // fluent methods
+        strStartsWith(name, 'set') ||
+        strStartsWith(name, 'del') ||
+        strStartsWith(name, 'apply') ||
+        strEndsWith(name, 'Transaction') ||
+        name == 'callListener'
+          ? (...args) => {
+              method(...args);
+              return mergeableStore;
+            }
+          : strStartsWith(name, 'add') && strEndsWith(name, 'Listener')
+            ? (...args) => {
+                const listenerArg = LISTENER_ARGS[slice(name, 3, -8)] ?? 0;
+                const listener = args[listenerArg];
+                args[listenerArg] = (_store, ...args2) =>
+                  listener(mergeableStore, ...args2);
+                return method(...args);
+              }
+            : method),
+  );
+  return objFreeze(mergeableStore);
+};
+
 export {
   createCheckpoints,
   createCustomPersister,
+  createCustomSynchronizer,
   createIndexes,
+  createMergeableStore,
   createMetrics,
   createQueries,
   createRelationships,