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

package/persisters/persister-durable-object-sql-storage/index.js

@@ -99,7 +99,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;
@@ -109,21 +118,22 @@ const collClear = (coll) => coll.clear();
 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 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(
@@ -333,6 +343,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 */) {
@@ -357,6 +372,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -375,6 +391,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-durable-object-sql-storage/with-schemas/index.js

@@ -99,7 +99,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;
@@ -109,21 +118,22 @@ const collClear = (coll) => coll.clear();
 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 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(
@@ -333,6 +343,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 */) {
@@ -357,6 +372,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -375,6 +391,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-durable-object-storage/index.js

@@ -71,21 +71,22 @@ 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 mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
+const mapToObj = (map2, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
-  collForEach(map, (mapValue, id) => {
+  collForEach(map2, (mapValue, id) => {
     {
       const objValue = mapValue;
       {
@@ -303,6 +304,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 */) {
@@ -327,6 +333,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -345,6 +352,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();
@@ -468,12 +476,9 @@ const createDurableObjectStoragePersister = (
     storagePrefix + type + slice(jsonStringWithUndefined(ids), 1, -1);
   const deconstructKey = (key) => {
     if (strStartsWith(key, storagePrefix)) {
-      const type = slice(key, storagePrefix.length, 1);
+      const type = slice(key, size(storagePrefix), size(storagePrefix) + 1);
       return type == T || type == V
-        ? [
-            type,
-            ...JSON.parse('[' + slice(key, storagePrefix.length + 1) + ']'),
-          ]
+        ? [type, ...JSON.parse('[' + slice(key, size(storagePrefix) + 1) + ']')]
         : void 0;
     }
   };
@@ -522,7 +527,9 @@ const createDurableObjectStoragePersister = (
               : 0,
         ),
     );
-    return [tables, values];
+    return objIsEmpty(tables[0]) && objIsEmpty(values[0])
+      ? void 0
+      : [tables, values];
   };
   const setPersisted = async (
     getContent,

package/persisters/persister-durable-object-storage/with-schemas/index.js

@@ -71,21 +71,22 @@ 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 mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
+const mapToObj = (map2, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
-  collForEach(map, (mapValue, id) => {
+  collForEach(map2, (mapValue, id) => {
     {
       const objValue = mapValue;
       {
@@ -303,6 +304,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 */) {
@@ -327,6 +333,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -345,6 +352,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();
@@ -468,12 +476,9 @@ const createDurableObjectStoragePersister = (
     storagePrefix + type + slice(jsonStringWithUndefined(ids), 1, -1);
   const deconstructKey = (key) => {
     if (strStartsWith(key, storagePrefix)) {
-      const type = slice(key, storagePrefix.length, 1);
+      const type = slice(key, size(storagePrefix), size(storagePrefix) + 1);
       return type == T || type == V
-        ? [
-            type,
-            ...JSON.parse('[' + slice(key, storagePrefix.length + 1) + ']'),
-          ]
+        ? [type, ...JSON.parse('[' + slice(key, size(storagePrefix) + 1) + ']')]
         : void 0;
     }
   };
@@ -522,7 +527,9 @@ const createDurableObjectStoragePersister = (
               : 0,
         ),
     );
-    return [tables, values];
+    return objIsEmpty(tables[0]) && objIsEmpty(values[0])
+      ? void 0
+      : [tables, values];
   };
   const setPersisted = async (
     getContent,

package/persisters/persister-electric-sql/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-electric-sql/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();

package/persisters/persister-expo-sqlite/index.js

@@ -137,21 +137,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(
@@ -306,7 +307,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 = () => {
@@ -478,6 +488,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 */) {
@@ -502,6 +517,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -520,6 +536,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-expo-sqlite/with-schemas/index.js

@@ -137,21 +137,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(
@@ -306,7 +307,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 = () => {
@@ -478,6 +488,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 */) {
@@ -502,6 +517,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -520,6 +536,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();