tinybase 5.0.0-beta.3 → 5.0.0-beta.4

package/lib/debug/persisters/persister-yjs.js

@@ -66,6 +66,23 @@ const mapEnsure = (map, key, getDefaultValue) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -86,10 +103,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -126,8 +141,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -141,11 +156,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -185,9 +207,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

package/lib/debug/persisters.js

@@ -44,6 +44,23 @@ const mapEnsure = (map, key, getDefaultValue) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -64,10 +81,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -104,8 +119,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -119,11 +134,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -163,9 +185,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

package/lib/debug/store.js

@@ -296,12 +296,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 postTransactionListener;
+  let internalListeners = [];
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -1261,8 +1259,8 @@ const createStore = () => {
     ),
   ];
   const getTransactionLog = () => [
-    cellsTouched,
-    valuesTouched,
+    !collIsEmpty(changedCells),
+    !collIsEmpty(changedValues),
     mapToObj3(changedCells, pairClone, pairIsEqual),
     mapToObj3(invalidCells),
     mapToObj(changedValues, pairClone, pairIsEqual),
@@ -1276,15 +1274,13 @@ const createStore = () => {
     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?.(store)) {
@@ -1295,25 +1291,26 @@ const createStore = () => {
               ),
             ),
           );
+          collClear(changedCells);
           collForEach(changedValues, ([oldValue], valueId) =>
             setOrDelValue(store, valueId, oldValue),
           );
-          cellsTouched = valuesTouched = false;
+          collClear(changedValues);
         }
         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);
         }
-        postTransactionListener?.(store);
+        internalListeners[0]?.(store);
         callListeners(finishTransactionListeners[1], void 0);
+        internalListeners[1]?.(store);
         transactions = 0;
-        cellsTouched = valuesTouched = false;
         hadTables = hasTables();
         hadValues = hasValues();
         arrayForEach(
@@ -1438,9 +1435,8 @@ const createStore = () => {
       collSize2(startTransactionListeners) +
       pairCollSize2(finishTransactionListeners),
   });
-  const addPostTransactionListener = (listener) => {
-    postTransactionListener = listener;
-  };
+  const setInternalListeners = (preFinishTransaction, postFinishTransaction) =>
+    (internalListeners = [preFinishTransaction, postFinishTransaction]);
   const store = {
     getContent,
     getTables,
@@ -1518,7 +1514,7 @@ const createStore = () => {
     createStore,
     addListener,
     callListeners,
-    addPostTransactionListener,
+    setInternalListeners,
   };
   objToArray(
     {

package/lib/debug/tinybase.js

@@ -1085,6 +1085,23 @@ const createMetrics = getCreateFunction((store) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -1105,10 +1122,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1145,8 +1160,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -1160,11 +1175,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -1204,9 +1226,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;
@@ -1879,9 +1901,11 @@ const createRelationships = getCreateFunction((store) => {
   return objFreeze(relationships);
 });
 
-const stampNew = () => [EMPTY_STRING, void 0];
-const stampNewMap = () => [EMPTY_STRING, mapNew()];
-const mapStamp = ([stamp, value], mapper) => [stamp, mapper(value, stamp)];
+const stampNew = (time = EMPTY_STRING, thing) => [time, thing];
+const stampNewMap = (time = EMPTY_STRING) => stampNew(time, mapNew());
+const stampNewObj = (time) => stampNew(time, objNew());
+const mapStamp = ([time, value], mapper) => [time, mapper(value, time)];
+const cloneStamp = ([time, value]) => [time, value];
 const mapStampMapToObj = (stampedMap, mapper) =>
   mapStamp(stampedMap, (map) => mapToObj(map, mapper));
 const mergeStamps = (newThingStamps, thingStamps, changes, merge) =>
@@ -1941,12 +1965,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 postTransactionListener;
+  let internalListeners = [];
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -2906,8 +2928,8 @@ const createStore = () => {
     ),
   ];
   const getTransactionLog = () => [
-    cellsTouched,
-    valuesTouched,
+    !collIsEmpty(changedCells),
+    !collIsEmpty(changedValues),
     mapToObj3(changedCells, pairClone, pairIsEqual),
     mapToObj3(invalidCells),
     mapToObj(changedValues, pairClone, pairIsEqual),
@@ -2921,15 +2943,13 @@ const createStore = () => {
     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?.(store)) {
@@ -2940,25 +2960,26 @@ const createStore = () => {
               ),
             ),
           );
+          collClear(changedCells);
           collForEach(changedValues, ([oldValue], valueId) =>
             setOrDelValue(store, valueId, oldValue),
           );
-          cellsTouched = valuesTouched = false;
+          collClear(changedValues);
         }
         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);
         }
-        postTransactionListener?.(store);
+        internalListeners[0]?.(store);
         callListeners(finishTransactionListeners[1], void 0);
+        internalListeners[1]?.(store);
         transactions = 0;
-        cellsTouched = valuesTouched = false;
         hadTables = hasTables();
         hadValues = hasValues();
         arrayForEach(
@@ -3083,9 +3104,8 @@ const createStore = () => {
       collSize2(startTransactionListeners) +
       pairCollSize2(finishTransactionListeners),
   });
-  const addPostTransactionListener = (listener) => {
-    postTransactionListener = listener;
-  };
+  const setInternalListeners = (preFinishTransaction, postFinishTransaction) =>
+    (internalListeners = [preFinishTransaction, postFinishTransaction]);
   const store = {
     getContent,
     getTables,
@@ -3163,7 +3183,7 @@ const createStore = () => {
     createStore,
     addListener,
     callListeners,
-    addPostTransactionListener,
+    setInternalListeners,
   };
   objToArray(
     {
@@ -3290,23 +3310,23 @@ const decodeHlc = (hlc16) => [
 ];
 const getHlcFunctions = (uniqueId) => {
   let logicalTime = 0;
-  let counter = 0;
+  let lastCounter = -1;
   const uniqueIdHash = hash(uniqueId);
   const getHlc = () => {
     seenHlc();
-    return encodeHlc(logicalTime, ++counter, uniqueIdHash);
+    return encodeHlc(logicalTime, ++lastCounter, uniqueIdHash);
   };
   const seenHlc = (hlc) => {
     const previousLogicalTime = logicalTime;
     const [remoteLogicalTime, remoteCounter] = isUndefined(hlc)
       ? [0, 0]
       : decodeHlc(hlc);
-    logicalTime = Math.max(previousLogicalTime, remoteLogicalTime, Date.now());
-    counter =
+    logicalTime = mathMax(previousLogicalTime, remoteLogicalTime, Date.now());
+    lastCounter =
       logicalTime == previousLogicalTime
         ? logicalTime == remoteLogicalTime
-          ? Math.max(counter, remoteCounter)
-          : counter
+          ? mathMax(lastCounter, remoteCounter)
+          : lastCounter
         : logicalTime == remoteLogicalTime
           ? remoteCounter
           : -1;
@@ -3332,10 +3352,15 @@ const LISTENER_ARGS = {
   InvalidCell: 3,
   InvalidValue: 1,
 };
-const newContentStamp = () => [EMPTY_STRING, [stampNewMap(), stampNewMap()]];
+const newContentStamp = (time = EMPTY_STRING) => [
+  time,
+  [stampNewMap(time), stampNewMap(time)],
+];
 const createMergeableStore = (id) => {
   let listening = 1;
   let contentStamp = newContentStamp();
+  let transactionTime;
+  let finishTransactionMergeableChanges;
   const [getHlc, seenHlc] = getHlcFunctions(id);
   const store = createStore();
   const disableListening = (actions) => {
@@ -3344,37 +3369,41 @@ const createMergeableStore = (id) => {
     actions();
     listening = wasListening;
   };
-  const postTransactionListener = () => {
+  const preFinishTransaction = () => {
     if (listening) {
-      const stamp = getHlc();
-      const [cellsTouched, valuesTouched, changedCells, , changedValues] =
-        store.getTransactionLog();
-      const [tablesStamp, valuesStamp] = contentStamp[1];
-      contentStamp[0] = stamp;
+      finishTransactionMergeableChanges = getTransactionMergeableChanges();
+      const [time, [changedTablesStamp, changedValuesStamp]] =
+        finishTransactionMergeableChanges;
+      const cellsTouched = !objIsEmpty(changedTablesStamp[1]);
+      const valuesTouched = !objIsEmpty(changedValuesStamp[1]);
+      const [, [tablesStamp, valuesStamp]] = contentStamp;
+      if (cellsTouched || valuesTouched) {
+        contentStamp[0] = time;
+      }
       if (cellsTouched) {
-        tablesStamp[0] = stamp;
-        objToArray(changedCells, (changedTable, tableId) => {
-          const tableStamp = mapEnsure(tablesStamp[1], tableId, stampNew);
-          const rowsStamp = (tableStamp[1] ??= mapNew());
-          tableStamp[0] = stamp;
-          objToArray(changedTable, (changedRow, rowId) => {
-            const rowStamp = mapEnsure(rowsStamp, rowId, stampNew);
-            const cellsStamp = (rowStamp[1] ??= mapNew());
-            rowStamp[0] = stamp;
-            objToArray(changedRow, ([, newCell], cellId) =>
-              mapSet(cellsStamp, cellId, [stamp, newCell]),
+        tablesStamp[0] = time;
+        objToArray(changedTablesStamp[1], ([, changedRowStamps], tableId) => {
+          const tableStamp = mapEnsure(tablesStamp[1], tableId, stampNewMap);
+          tableStamp[0] = time;
+          objToArray(changedRowStamps, ([, changedCellStamps], rowId) => {
+            const rowStamp = mapEnsure(tableStamp[1], rowId, stampNewMap);
+            rowStamp[0] = time;
+            objToArray(changedCellStamps, ([, newCell], cellId) =>
+              mapSet(rowStamp[1], cellId, stampNew(time, newCell)),
             );
           });
         });
       }
       if (valuesTouched) {
-        valuesStamp[0] = stamp;
-        objToArray(changedValues, ([, newValue], valueId) => {
-          mapSet(valuesStamp[1], valueId, [stamp, newValue]);
-        });
+        valuesStamp[0] = time;
+        objToArray(changedValuesStamp[1], ([, newValue], valueId) =>
+          mapSet(valuesStamp[1], valueId, stampNew(time, newValue)),
+        );
       }
     }
   };
+  const postFinishTransaction = () =>
+    (transactionTime = finishTransactionMergeableChanges = void 0);
   const merge = (mergeableStore2) => {
     const mergeableContent = mergeableStore.getMergeableContent();
     const mergeableContent2 = mergeableStore2.getMergeableContent();
@@ -3385,10 +3414,10 @@ const createMergeableStore = (id) => {
     mapStamp(contentStamp, ([tablesStamp, valuesStamp]) => [
       mapStampMapToObj(tablesStamp, (rowsStamp) =>
         mapStampMapToObj(rowsStamp, (cellsStamp) =>
-          mapStampMapToObj(cellsStamp, pairClone),
+          mapStampMapToObj(cellsStamp, cloneStamp),
         ),
       ),
-      mapStampMapToObj(valuesStamp, pairClone),
+      mapStampMapToObj(valuesStamp, cloneStamp),
     ]);
   const setMergeableContent = (mergeableContent) => {
     disableListening(() =>
@@ -3400,6 +3429,38 @@ const createMergeableStore = (id) => {
     applyMergeableChanges(mergeableContent);
     return mergeableStore;
   };
+  const getTransactionMergeableChanges = () => {
+    if (isUndefined(finishTransactionMergeableChanges)) {
+      const [, , changedCells, , changedValues] = store.getTransactionLog();
+      const time =
+        !objIsEmpty(changedCells) || !objIsEmpty(changedValues)
+          ? transactionTime ?? (transactionTime = getHlc())
+          : EMPTY_STRING;
+      const mergeableChanges = stampNew(time, [
+        stampNewObj(objIsEmpty(changedCells) ? EMPTY_STRING : time),
+        stampNewObj(objIsEmpty(changedValues) ? EMPTY_STRING : time),
+      ]);
+      const [[, tableStamps], [, valuesStamp]] = mergeableChanges[1];
+      objToArray(changedCells, (changedTable, tableId) => {
+        const [, rowStamps] = (tableStamps[tableId] = stampNewObj(time));
+        objToArray(changedTable, (changedRow, rowId) => {
+          const [, cellStamps] = (rowStamps[rowId] = stampNewObj(time));
+          objToArray(
+            changedRow,
+            ([, newCell], cellId) =>
+              (cellStamps[cellId] = stampNew(time, newCell)),
+          );
+        });
+      });
+      objToArray(
+        changedValues,
+        ([, newValue], valueId) =>
+          (valuesStamp[valueId] = stampNew(time, newValue)),
+      );
+      return mergeableChanges;
+    }
+    return finishTransactionMergeableChanges;
+  };
   const applyMergeableChanges = (newContentStamp2) => {
     const changes = [{}, {}];
     seenHlc(newContentStamp2[0]);
@@ -3439,10 +3500,11 @@ const createMergeableStore = (id) => {
   const mergeableStore = {
     getMergeableContent,
     setMergeableContent,
+    getTransactionMergeableChanges,
     applyMergeableChanges,
     merge,
   };
-  store.addPostTransactionListener(postTransactionListener);
+  store.setInternalListeners(preFinishTransaction, postFinishTransaction);
   objToArray(
     store,
     (method, name) =>