tinybase 5.0.0-beta.3 → 5.0.0-beta.5

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

@@ -42,15 +42,34 @@ const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(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 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,
@@ -71,10 +90,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)) {
@@ -111,8 +128,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]);
@@ -126,11 +143,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);
               }
@@ -170,9 +194,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;
@@ -226,7 +250,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    false,
+    true,
     ['getStorageName', storageName],
   );
 };

package/lib/debug/persisters/persister-cr-sqlite-wasm.js

@@ -75,9 +75,11 @@ 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);
 };
@@ -376,6 +378,23 @@ const jsonParse = JSON.parse;
 
 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,
@@ -396,10 +415,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)) {
@@ -436,8 +453,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]);
@@ -451,11 +468,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);
               }
@@ -495,9 +519,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/persister-electric-sql.js

@@ -76,9 +76,11 @@ 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);
 };
@@ -377,6 +379,23 @@ const jsonParse = JSON.parse;
 
 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,
@@ -397,10 +416,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)) {
@@ -437,8 +454,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]);
@@ -452,11 +469,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);
               }
@@ -496,9 +520,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/persister-expo-sqlite-next.js

@@ -77,9 +77,11 @@ 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);
 };
@@ -378,6 +380,23 @@ const jsonParse = JSON.parse;
 
 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,
@@ -398,10 +417,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)) {
@@ -438,8 +455,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]);
@@ -453,11 +470,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);
               }
@@ -497,9 +521,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/persister-expo-sqlite.js

@@ -75,9 +75,11 @@ 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);
 };
@@ -376,6 +378,23 @@ const jsonParse = JSON.parse;
 
 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,
@@ -396,10 +415,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)) {
@@ -436,8 +453,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]);
@@ -451,11 +468,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);
               }
@@ -495,9 +519,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/persister-file.js

@@ -46,15 +46,34 @@ const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(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 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,
@@ -75,10 +94,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)) {
@@ -115,8 +132,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]);
@@ -130,11 +147,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);
               }
@@ -174,9 +198,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;
@@ -214,7 +238,7 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    false,
+    true,
     ['getFilePath', filePath],
   );
 };

package/lib/debug/persisters/persister-indexed-db.js

@@ -51,15 +51,34 @@ const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(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 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,
@@ -80,10 +99,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)) {
@@ -120,8 +137,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]);
@@ -135,11 +152,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);
               }
@@ -179,9 +203,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;