tinybase 5.4.0-beta.1 → 5.4.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "5.4.0-beta.1",
+  "version": "5.4.0-beta.3",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -20,29 +20,33 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@automerge/automerge-repo": "^1.2.0",
-    "@electric-sql/pglite": "^0.2.12",
+    "@automerge/automerge-repo": "^1.2.1",
+    "@cloudflare/workers-types": "^4.20241022.0",
+    "@electric-sql/pglite": "^0.2.13",
     "@libsql/client": "^0.14.0",
-    "@powersync/common": "^1.20.0",
+    "@powersync/common": "^1.21.0",
     "@sqlite.org/sqlite-wasm": "^3.47.0-build1",
     "@vlcn.io/crsqlite-wasm": "^0.16.0",
     "electric-sql": "^0.12.1",
-    "expo": "^51.0.0",
-    "expo-sqlite": "^14.0.5",
+    "expo": "^52.0.4",
+    "expo-sqlite": "^15.0.3",
     "partykit": "^0.0.111",
     "partysocket": "^1.0.2",
     "postgres": "^3.4.5",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sqlite3": "^5.1.7",
-    "ws": "^8.17.0",
+    "ws": "^8.18.0",
     "yjs": "^13.6.20"
   },
   "peerDependenciesMeta": {
     "@automerge/automerge-repo": {
       "optional": true
     },
+    "@cloudflare/workers-types": {
+      "optional": true
+    },
     "@electric-sql/pglite": {
       "optional": true
     },
@@ -156,6 +160,12 @@
       "persisters/persister-cr-sqlite-wasm/with-schemas": [
         "./@types/persisters/persister-cr-sqlite-wasm/with-schemas/index.d.ts"
       ],
+      "persisters/persister-durable-object-storage": [
+        "./@types/persisters/persister-durable-object-storage/index.d.ts"
+      ],
+      "persisters/persister-durable-object-storage/with-schemas": [
+        "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts"
+      ],
       "persisters/persister-electric-sql": [
         "./@types/persisters/persister-electric-sql/index.d.ts"
       ],
@@ -270,6 +280,12 @@
       "synchronizers/synchronizer-ws-server-simple/with-schemas": [
         "./@types/synchronizers/synchronizer-ws-server-simple/with-schemas/index.d.ts"
       ],
+      "synchronizers/synchronizer-ws-server-durable-object": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts"
+      ],
+      "synchronizers/synchronizer-ws-server-durable-object/with-schemas": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts"
+      ],
       "synchronizers/synchronizer-broadcast-channel": [
         "./@types/synchronizers/synchronizer-broadcast-channel/index.d.ts"
       ],
@@ -378,6 +394,12 @@
       "min/persisters/persister-cr-sqlite-wasm/with-schemas": [
         "./@types/persisters/persister-cr-sqlite-wasm/with-schemas/index.d.ts"
       ],
+      "min/persisters/persister-durable-object-storage": [
+        "./@types/persisters/persister-durable-object-storage/index.d.ts"
+      ],
+      "min/persisters/persister-durable-object-storage/with-schemas": [
+        "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts"
+      ],
       "min/persisters/persister-electric-sql": [
         "./@types/persisters/persister-electric-sql/index.d.ts"
       ],
@@ -492,6 +514,12 @@
       "min/synchronizers/synchronizer-ws-server-simple/with-schemas": [
         "./@types/synchronizers/synchronizer-ws-server-simple/with-schemas/index.d.ts"
       ],
+      "min/synchronizers/synchronizer-ws-server-durable-object": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts"
+      ],
+      "min/synchronizers/synchronizer-ws-server-durable-object/with-schemas": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts"
+      ],
       "min/synchronizers/synchronizer-broadcast-channel": [
         "./@types/synchronizers/synchronizer-broadcast-channel/index.d.ts"
       ],
@@ -600,6 +628,12 @@
       "es6/persisters/persister-cr-sqlite-wasm/with-schemas": [
         "./@types/persisters/persister-cr-sqlite-wasm/with-schemas/index.d.ts"
       ],
+      "es6/persisters/persister-durable-object-storage": [
+        "./@types/persisters/persister-durable-object-storage/index.d.ts"
+      ],
+      "es6/persisters/persister-durable-object-storage/with-schemas": [
+        "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts"
+      ],
       "es6/persisters/persister-electric-sql": [
         "./@types/persisters/persister-electric-sql/index.d.ts"
       ],
@@ -714,6 +748,12 @@
       "es6/synchronizers/synchronizer-ws-server-simple/with-schemas": [
         "./@types/synchronizers/synchronizer-ws-server-simple/with-schemas/index.d.ts"
       ],
+      "es6/synchronizers/synchronizer-ws-server-durable-object": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts"
+      ],
+      "es6/synchronizers/synchronizer-ws-server-durable-object/with-schemas": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts"
+      ],
       "es6/synchronizers/synchronizer-broadcast-channel": [
         "./@types/synchronizers/synchronizer-broadcast-channel/index.d.ts"
       ],
@@ -822,6 +862,12 @@
       "es6/min/persisters/persister-cr-sqlite-wasm/with-schemas": [
         "./@types/persisters/persister-cr-sqlite-wasm/with-schemas/index.d.ts"
       ],
+      "es6/min/persisters/persister-durable-object-storage": [
+        "./@types/persisters/persister-durable-object-storage/index.d.ts"
+      ],
+      "es6/min/persisters/persister-durable-object-storage/with-schemas": [
+        "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts"
+      ],
       "es6/min/persisters/persister-electric-sql": [
         "./@types/persisters/persister-electric-sql/index.d.ts"
       ],
@@ -936,6 +982,12 @@
       "es6/min/synchronizers/synchronizer-ws-server-simple/with-schemas": [
         "./@types/synchronizers/synchronizer-ws-server-simple/with-schemas/index.d.ts"
       ],
+      "es6/min/synchronizers/synchronizer-ws-server-durable-object": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts"
+      ],
+      "es6/min/synchronizers/synchronizer-ws-server-durable-object/with-schemas": [
+        "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts"
+      ],
       "es6/min/synchronizers/synchronizer-broadcast-channel": [
         "./@types/synchronizers/synchronizer-broadcast-channel/index.d.ts"
       ],
@@ -1173,6 +1225,26 @@
         "default": "./persisters/persister-cr-sqlite-wasm/with-schemas/index.js"
       }
     },
+    "./persisters/persister-durable-object-storage": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.cts",
+        "default": "./cjs/persisters/persister-durable-object-storage/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.ts",
+        "default": "./persisters/persister-durable-object-storage/index.js"
+      }
+    },
+    "./persisters/persister-durable-object-storage/with-schemas": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.cts",
+        "default": "./cjs/persisters/persister-durable-object-storage/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts",
+        "default": "./persisters/persister-durable-object-storage/with-schemas/index.js"
+      }
+    },
     "./persisters/persister-electric-sql": {
       "require": {
         "types": "./@types/persisters/persister-electric-sql/index.d.cts",
@@ -1553,6 +1625,26 @@
         "default": "./synchronizers/synchronizer-ws-server-simple/with-schemas/index.js"
       }
     },
+    "./synchronizers/synchronizer-ws-server-durable-object": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.cts",
+        "default": "./cjs/synchronizers/synchronizer-ws-server-durable-object/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts",
+        "default": "./synchronizers/synchronizer-ws-server-durable-object/index.js"
+      }
+    },
+    "./synchronizers/synchronizer-ws-server-durable-object/with-schemas": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.cts",
+        "default": "./cjs/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts",
+        "default": "./synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js"
+      }
+    },
     "./synchronizers/synchronizer-broadcast-channel": {
       "require": {
         "types": "./@types/synchronizers/synchronizer-broadcast-channel/index.d.cts",
@@ -1913,6 +2005,26 @@
         "default": "./min/persisters/persister-cr-sqlite-wasm/with-schemas/index.js"
       }
     },
+    "./min/persisters/persister-durable-object-storage": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.cts",
+        "default": "./cjs/min/persisters/persister-durable-object-storage/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.ts",
+        "default": "./min/persisters/persister-durable-object-storage/index.js"
+      }
+    },
+    "./min/persisters/persister-durable-object-storage/with-schemas": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.cts",
+        "default": "./cjs/min/persisters/persister-durable-object-storage/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts",
+        "default": "./min/persisters/persister-durable-object-storage/with-schemas/index.js"
+      }
+    },
     "./min/persisters/persister-electric-sql": {
       "require": {
         "types": "./@types/persisters/persister-electric-sql/index.d.cts",
@@ -2293,6 +2405,26 @@
         "default": "./min/synchronizers/synchronizer-ws-server-simple/with-schemas/index.js"
       }
     },
+    "./min/synchronizers/synchronizer-ws-server-durable-object": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.cts",
+        "default": "./cjs/min/synchronizers/synchronizer-ws-server-durable-object/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts",
+        "default": "./min/synchronizers/synchronizer-ws-server-durable-object/index.js"
+      }
+    },
+    "./min/synchronizers/synchronizer-ws-server-durable-object/with-schemas": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.cts",
+        "default": "./cjs/min/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts",
+        "default": "./min/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js"
+      }
+    },
     "./min/synchronizers/synchronizer-broadcast-channel": {
       "require": {
         "types": "./@types/synchronizers/synchronizer-broadcast-channel/index.d.cts",
@@ -2653,6 +2785,26 @@
         "default": "./es6/persisters/persister-cr-sqlite-wasm/with-schemas/index.js"
       }
     },
+    "./es6/persisters/persister-durable-object-storage": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.cts",
+        "default": "./cjs/es6/persisters/persister-durable-object-storage/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.ts",
+        "default": "./es6/persisters/persister-durable-object-storage/index.js"
+      }
+    },
+    "./es6/persisters/persister-durable-object-storage/with-schemas": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.cts",
+        "default": "./cjs/es6/persisters/persister-durable-object-storage/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts",
+        "default": "./es6/persisters/persister-durable-object-storage/with-schemas/index.js"
+      }
+    },
     "./es6/persisters/persister-electric-sql": {
       "require": {
         "types": "./@types/persisters/persister-electric-sql/index.d.cts",
@@ -3033,6 +3185,26 @@
         "default": "./es6/synchronizers/synchronizer-ws-server-simple/with-schemas/index.js"
       }
     },
+    "./es6/synchronizers/synchronizer-ws-server-durable-object": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.cts",
+        "default": "./cjs/es6/synchronizers/synchronizer-ws-server-durable-object/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts",
+        "default": "./es6/synchronizers/synchronizer-ws-server-durable-object/index.js"
+      }
+    },
+    "./es6/synchronizers/synchronizer-ws-server-durable-object/with-schemas": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.cts",
+        "default": "./cjs/es6/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts",
+        "default": "./es6/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js"
+      }
+    },
     "./es6/synchronizers/synchronizer-broadcast-channel": {
       "require": {
         "types": "./@types/synchronizers/synchronizer-broadcast-channel/index.d.cts",
@@ -3393,6 +3565,26 @@
         "default": "./es6/min/persisters/persister-cr-sqlite-wasm/with-schemas/index.js"
       }
     },
+    "./es6/min/persisters/persister-durable-object-storage": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.cts",
+        "default": "./cjs/es6/min/persisters/persister-durable-object-storage/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/index.d.ts",
+        "default": "./es6/min/persisters/persister-durable-object-storage/index.js"
+      }
+    },
+    "./es6/min/persisters/persister-durable-object-storage/with-schemas": {
+      "require": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.cts",
+        "default": "./cjs/es6/min/persisters/persister-durable-object-storage/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/persisters/persister-durable-object-storage/with-schemas/index.d.ts",
+        "default": "./es6/min/persisters/persister-durable-object-storage/with-schemas/index.js"
+      }
+    },
     "./es6/min/persisters/persister-electric-sql": {
       "require": {
         "types": "./@types/persisters/persister-electric-sql/index.d.cts",
@@ -3773,6 +3965,26 @@
         "default": "./es6/min/synchronizers/synchronizer-ws-server-simple/with-schemas/index.js"
       }
     },
+    "./es6/min/synchronizers/synchronizer-ws-server-durable-object": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.cts",
+        "default": "./cjs/es6/min/synchronizers/synchronizer-ws-server-durable-object/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/index.d.ts",
+        "default": "./es6/min/synchronizers/synchronizer-ws-server-durable-object/index.js"
+      }
+    },
+    "./es6/min/synchronizers/synchronizer-ws-server-durable-object/with-schemas": {
+      "require": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.cts",
+        "default": "./cjs/es6/min/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.cjs"
+      },
+      "default": {
+        "types": "./@types/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.d.ts",
+        "default": "./es6/min/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js"
+      }
+    },
     "./es6/min/synchronizers/synchronizer-broadcast-channel": {
       "require": {
         "types": "./@types/synchronizers/synchronizer-broadcast-channel/index.d.cts",

package/persisters/index.js

@@ -7,8 +7,9 @@ const UNDEFINED = '\uFFFC';
 const strMatch = (str, regex) => str?.match(regex);
 
 const promise = Promise;
+const THOUSAND = 1e3;
 const startInterval = (callback, sec, immediate) => {
-  return setInterval(callback, sec * 1e3);
+  return setInterval(callback, sec * THOUSAND);
 };
 const stopInterval = clearInterval;
 const isUndefined = (thing) => thing == void 0;
@@ -214,12 +215,16 @@ const Persists = {
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+const getStoreFunctions = (
+  persist = 1 /* StoreOnly */,
+  store,
+  isSynchronizer,
+) =>
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
-        store.getTransactionMergeableChanges,
+        () => store.getTransactionMergeableChanges(!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -243,6 +248,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -260,7 +266,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -309,7 +315,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           onIgnoredError?.(error);
@@ -323,7 +329,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoLoad = async (initialContent) => {
-    await stopAutoLoad().load(initialContent);
+    stopAutoLoad();
+    await load(initialContent);
     try {
       autoLoadHandle = await addPersisterListener(async (content, changes) => {
         if (changes || content) {
@@ -370,7 +377,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoSave = async () => {
-    await stopAutoSave().save();
+    stopAutoSave();
+    await save();
     autoSaveListenerId = store.addDidFinishTransactionListener(() => {
       const changes = getChanges();
       if (hasChanges(changes)) {
@@ -380,8 +388,10 @@ const createCustomPersister = (
     return persister;
   };
   const stopAutoSave = () => {
-    ifNotUndefined(autoSaveListenerId, store.delListener);
-    autoSaveListenerId = void 0;
+    if (autoSaveListenerId) {
+      store.delListener(autoSaveListenerId);
+      autoSaveListenerId = void 0;
+    }
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -776,6 +786,7 @@ const createJsonPersister = (
     onIgnoredError,
     persist,
     {[getThing]: () => thing, destroy},
+    0,
     thing,
   );
   return persister;
@@ -902,6 +913,7 @@ const createTabularPersister = (
     onIgnoredError,
     persist,
     {[getThing]: () => thing, destroy},
+    0,
     thing,
   );
   return persister;

package/persisters/persister-automerge/index.js

@@ -187,12 +187,16 @@ const getListenerFunctions = (getThing) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+const getStoreFunctions = (
+  persist = 1 /* StoreOnly */,
+  store,
+  isSynchronizer,
+) =>
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
-        store.getTransactionMergeableChanges,
+        () => store.getTransactionMergeableChanges(!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -216,6 +220,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -233,7 +238,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -282,7 +287,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           onIgnoredError?.(error);
@@ -296,7 +301,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoLoad = async (initialContent) => {
-    await stopAutoLoad().load(initialContent);
+    stopAutoLoad();
+    await load(initialContent);
     try {
       autoLoadHandle = await addPersisterListener(async (content, changes) => {
         if (changes || content) {
@@ -343,7 +349,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoSave = async () => {
-    await stopAutoSave().save();
+    stopAutoSave();
+    await save();
     autoSaveListenerId = store.addDidFinishTransactionListener(() => {
       const changes = getChanges();
       if (hasChanges(changes)) {
@@ -353,8 +360,10 @@ const createCustomPersister = (
     return persister;
   };
   const stopAutoSave = () => {
-    ifNotUndefined(autoSaveListenerId, store.delListener);
-    autoSaveListenerId = void 0;
+    if (autoSaveListenerId) {
+      store.delListener(autoSaveListenerId);
+      autoSaveListenerId = void 0;
+    }
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);

package/persisters/persister-automerge/with-schemas/index.js

@@ -187,12 +187,16 @@ const getListenerFunctions = (getThing) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+const getStoreFunctions = (
+  persist = 1 /* StoreOnly */,
+  store,
+  isSynchronizer,
+) =>
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
-        store.getTransactionMergeableChanges,
+        () => store.getTransactionMergeableChanges(!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -216,6 +220,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -233,7 +238,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -282,7 +287,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           onIgnoredError?.(error);
@@ -296,7 +301,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoLoad = async (initialContent) => {
-    await stopAutoLoad().load(initialContent);
+    stopAutoLoad();
+    await load(initialContent);
     try {
       autoLoadHandle = await addPersisterListener(async (content, changes) => {
         if (changes || content) {
@@ -343,7 +349,8 @@ const createCustomPersister = (
     return persister;
   };
   const startAutoSave = async () => {
-    await stopAutoSave().save();
+    stopAutoSave();
+    await save();
     autoSaveListenerId = store.addDidFinishTransactionListener(() => {
       const changes = getChanges();
       if (hasChanges(changes)) {
@@ -353,8 +360,10 @@ const createCustomPersister = (
     return persister;
   };
   const stopAutoSave = () => {
-    ifNotUndefined(autoSaveListenerId, store.delListener);
-    autoSaveListenerId = void 0;
+    if (autoSaveListenerId) {
+      store.delListener(autoSaveListenerId);
+      autoSaveListenerId = void 0;
+    }
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);