tinybase 8.0.0-beta.0 → 8.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "8.0.0-beta.0",
+  "version": "8.0.0-beta.1",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -21,32 +21,32 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@automerge/automerge-repo": "^2.5.1",
-    "@cloudflare/workers-types": "^4.20251213.0",
-    "@electric-sql/pglite": "^0.3.14",
-    "@libsql/client": "^0.15.15",
-    "@powersync/common": "^1.44.0",
-    "@sinclair/typebox": "^0.34.41",
-    "@sqlite.org/sqlite-wasm": "^3.50.4-build1",
+    "@automerge/automerge-repo": "^2.5.3",
+    "@cloudflare/workers-types": "^4.20260228.0",
+    "@electric-sql/pglite": "^0.3.15",
+    "@libsql/client": "^0.17.0",
+    "@powersync/common": "^1.47.0",
+    "@sinclair/typebox": "^0.34.48",
+    "@sqlite.org/sqlite-wasm": "^3.51.2-build6",
     "@vlcn.io/crsqlite-wasm": "^0.16.0",
     "arktype": "^2.1.29",
-    "bun": "^1.3.3",
-    "effect": "^3.19.12",
+    "bun": "^1.3.9",
+    "effect": "^3.19.18",
     "electric-sql": "^0.12.1",
-    "expo": "^54.0.10",
+    "expo": "^54.0.33",
     "expo-sqlite": "^16.0.10",
     "partykit": "^0.0.115",
-    "partysocket": "^1.1.6",
-    "postgres": "^3.4.7",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-native-mmkv": "4.1.0",
+    "partysocket": "^1.1.14",
+    "postgres": "^3.4.8",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "react-native-mmkv": "4.1.2",
     "react-native-sqlite-storage": "^6.0.1",
     "sqlite3": "^5.1.7",
     "valibot": "^1.2.0",
-    "ws": "^8.18.3",
-    "yjs": "^13.6.27",
-    "zod": "^4.2.0"
+    "ws": "^8.19.0",
+    "yjs": "^13.6.29",
+    "zod": "^4.3.6"
   },
   "peerDependenciesMeta": {
     "@automerge/automerge-repo": {
@@ -174,6 +174,12 @@
       "metrics/with-schemas": [
         "./@types/metrics/with-schemas/index.d.ts"
       ],
+      "middleware": [
+        "./@types/middleware/index.d.ts"
+      ],
+      "middleware/with-schemas": [
+        "./@types/middleware/with-schemas/index.d.ts"
+      ],
       "persisters": [
         "./@types/persisters/index.d.ts"
       ],
@@ -474,6 +480,12 @@
       "min/metrics/with-schemas": [
         "./@types/metrics/with-schemas/index.d.ts"
       ],
+      "min/middleware": [
+        "./@types/middleware/index.d.ts"
+      ],
+      "min/middleware/with-schemas": [
+        "./@types/middleware/with-schemas/index.d.ts"
+      ],
       "min/persisters": [
         "./@types/persisters/index.d.ts"
       ],
@@ -819,6 +831,18 @@
         "default": "./metrics/index.js"
       }
     },
+    "./middleware": {
+      "default": {
+        "types": "./@types/middleware/index.d.ts",
+        "default": "./middleware/index.js"
+      }
+    },
+    "./middleware/with-schemas": {
+      "default": {
+        "types": "./@types/middleware/with-schemas/index.d.ts",
+        "default": "./middleware/index.js"
+      }
+    },
     "./persisters": {
       "default": {
         "types": "./@types/persisters/index.d.ts",
@@ -1419,6 +1443,18 @@
         "default": "./min/metrics/index.js"
       }
     },
+    "./min/middleware": {
+      "default": {
+        "types": "./@types/middleware/index.d.ts",
+        "default": "./min/middleware/index.js"
+      }
+    },
+    "./min/middleware/with-schemas": {
+      "default": {
+        "types": "./@types/middleware/with-schemas/index.d.ts",
+        "default": "./min/middleware/index.js"
+      }
+    },
     "./min/persisters": {
       "default": {
         "types": "./@types/persisters/index.d.ts",

package/persisters/index.js

@@ -94,21 +94,22 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const mapNew = (entries) => new Map(entries);
-const mapGet = (map, key) => map?.get(key);
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
 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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -320,6 +321,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -344,6 +350,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -362,6 +369,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();
@@ -479,7 +487,16 @@ const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
   jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
 
 const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
 const getHash = (string) => {

package/persisters/persister-automerge/index.js

@@ -71,17 +71,18 @@ const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
-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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -283,6 +284,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -307,6 +313,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -325,6 +332,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

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

@@ -71,17 +71,18 @@ const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
-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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -283,6 +284,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -307,6 +313,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -325,6 +332,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-browser/index.js

@@ -26,12 +26,14 @@ const tryCatch = async (action, then1, then2) => {
 };
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
 const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
+const objEntries = object.entries;
 const isObject = (obj) =>
   !isNullish(obj) &&
   ifNotNullish(
@@ -45,6 +47,11 @@ const isObject = (obj) =>
   );
 const objIds = object.keys;
 const objFreeze = object.freeze;
+const objNew = (entries = []) => object.fromEntries(entries);
+const objToArray = (obj, cb) =>
+  arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+const objMap = (obj, cb) =>
+  objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
@@ -53,7 +60,16 @@ const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
   jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
 
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
@@ -61,17 +77,18 @@ const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
-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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -273,6 +290,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -297,6 +319,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -315,6 +338,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

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

@@ -26,12 +26,14 @@ const tryCatch = async (action, then1, then2) => {
 };
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
 const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
+const objEntries = object.entries;
 const isObject = (obj) =>
   !isNullish(obj) &&
   ifNotNullish(
@@ -45,6 +47,11 @@ const isObject = (obj) =>
   );
 const objIds = object.keys;
 const objFreeze = object.freeze;
+const objNew = (entries = []) => object.fromEntries(entries);
+const objToArray = (obj, cb) =>
+  arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+const objMap = (obj, cb) =>
+  objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
@@ -53,7 +60,16 @@ const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
   jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
 
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
@@ -61,17 +77,18 @@ const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
-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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -273,6 +290,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -297,6 +319,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -315,6 +338,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-cr-sqlite-wasm/index.js

@@ -135,21 +135,22 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const mapNew = (entries) => new Map(entries);
-const mapGet = (map, key) => map?.get(key);
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
 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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -304,7 +305,16 @@ const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
   jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
 
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
@@ -476,6 +486,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -500,6 +515,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -518,6 +534,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-cr-sqlite-wasm/with-schemas/index.js

@@ -135,21 +135,22 @@ const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const mapNew = (entries) => new Map(entries);
-const mapGet = (map, key) => map?.get(key);
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
+const map = Map;
+const mapNew = (entries) => new map(entries);
+const mapGet = (map2, key) => map2?.get(key);
+const mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
 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, hadExistingValue) => {
-  if (!collHas(map, key)) {
-    mapSet(map, key, getDefaultValue());
+const mapSet = (map2, key, value) =>
+  isUndefined(value) ? (collDel(map2, key), map2) : map2?.set(key, value);
+const mapEnsure = (map2, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map2, key)) {
+    mapSet(map2, key, getDefaultValue());
   } else {
-    hadExistingValue?.(mapGet(map, key));
+    hadExistingValue?.(mapGet(map2, key));
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
@@ -304,7 +305,16 @@ const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
   jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
 
 const INTEGER = /^\d+$/;
 const getPoolFunctions = () => {
@@ -476,6 +486,11 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
+  const saveAfterMutated = async () => {
+    if (isAutoSaving() && store.hadMutated?.()) {
+      await save();
+    }
+  };
   const load = async (initialContent) => {
     /* istanbul ignore else */
     if (status != 2 /* Saving */) {
@@ -500,6 +515,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -518,6 +534,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();