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

package/persisters/persister-partykit-client/with-schemas/index.js

@@ -2,6 +2,7 @@ const getTypeOf = (thing) => typeof thing;
 const EMPTY_STRING = '';
 const STRING = getTypeOf(EMPTY_STRING);
 const MESSAGE = 'message';
+const UNDEFINED = '\uFFFC';
 const strStartsWith = (str, prefix) => str.startsWith(prefix);
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
@@ -30,12 +31,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(
@@ -49,6 +52,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;
 
@@ -58,6 +66,19 @@ const jsonStringWithMap = (obj) =>
   jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  // 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;
@@ -65,17 +86,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(
@@ -277,6 +299,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 */) {
@@ -301,6 +328,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -319,6 +347,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();
@@ -435,13 +464,17 @@ const SET_CHANGES = 's';
 const STORE_PATH = '/store';
 const PUT = 'PUT';
 const construct = (prefix, type, payload) =>
-  prefix + type + (isString(payload) ? payload : jsonStringWithMap(payload));
+  prefix +
+  type +
+  (isString(payload) ? payload : jsonStringWithUndefined(payload));
 const deconstruct = (prefix, message, stringified) => {
   const prefixSize = size(prefix);
   return strStartsWith(message, prefix)
     ? [
         message[prefixSize],
-        (stringified ? jsonParse : String)(slice(message, prefixSize + 1)),
+        (stringified ? jsonParseWithUndefined : String)(
+          slice(message, prefixSize + 1),
+        ),
       ]
     : void 0;
 };

package/persisters/persister-partykit-server/index.js

@@ -3,15 +3,19 @@ const EMPTY_STRING = '';
 const STRING = getTypeOf(EMPTY_STRING);
 const T = 't';
 const V = 'v';
+const UNDEFINED = '\uFFFC';
 const strStartsWith = (str, prefix) => str.startsWith(prefix);
 
 const promise = Promise;
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value) ? otherwise?.() : then(value);
 const isInstanceOf = (thing, cls) => thing instanceof cls;
+const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = async (promises) => promise.all(promises);
@@ -23,11 +27,25 @@ const arrayPush = (array, ...values) => array.push(...values);
 const arrayUnshift = (array, ...values) => array.unshift(...values);
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
+const isObject = (obj) =>
+  !isNullish(obj) &&
+  ifNotNullish(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isNullish(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objHas = (obj, id) => id in obj;
 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 objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
     obj[id] = getDefaultValue();
@@ -41,23 +59,40 @@ const jsonStringWithMap = (obj) =>
   jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  // 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 collForEach = (coll, cb) => coll?.forEach(cb);
 
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
+const mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
 
 const SET_CHANGES = 's';
 const STORE_PATH = '/store';
 const PUT = 'PUT';
 const construct = (prefix, type, payload) =>
-  prefix + type + (isString(payload) ? payload : jsonStringWithMap(payload));
+  prefix +
+  type +
+  (isString(payload) ? payload : jsonStringWithUndefined(payload));
 const deconstruct = (prefix, message, stringified) => {
   const prefixSize = size(prefix);
   return strStartsWith(message, prefix)
     ? [
         message[prefixSize],
-        (stringified ? jsonParse : String)(slice(message, prefixSize + 1)),
+        (stringified ? jsonParseWithUndefined : String)(
+          slice(message, prefixSize + 1),
+        ),
       ]
     : void 0;
 };

package/persisters/persister-partykit-server/with-schemas/index.js

@@ -3,15 +3,19 @@ const EMPTY_STRING = '';
 const STRING = getTypeOf(EMPTY_STRING);
 const T = 't';
 const V = 'v';
+const UNDEFINED = '\uFFFC';
 const strStartsWith = (str, prefix) => str.startsWith(prefix);
 
 const promise = Promise;
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value) ? otherwise?.() : then(value);
 const isInstanceOf = (thing, cls) => thing instanceof cls;
+const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = async (promises) => promise.all(promises);
@@ -23,11 +27,25 @@ const arrayPush = (array, ...values) => array.push(...values);
 const arrayUnshift = (array, ...values) => array.unshift(...values);
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
+const isObject = (obj) =>
+  !isNullish(obj) &&
+  ifNotNullish(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isNullish(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objHas = (obj, id) => id in obj;
 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 objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
     obj[id] = getDefaultValue();
@@ -41,23 +59,40 @@ const jsonStringWithMap = (obj) =>
   jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  // 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 collForEach = (coll, cb) => coll?.forEach(cb);
 
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
+const mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
 
 const SET_CHANGES = 's';
 const STORE_PATH = '/store';
 const PUT = 'PUT';
 const construct = (prefix, type, payload) =>
-  prefix + type + (isString(payload) ? payload : jsonStringWithMap(payload));
+  prefix +
+  type +
+  (isString(payload) ? payload : jsonStringWithUndefined(payload));
 const deconstruct = (prefix, message, stringified) => {
   const prefixSize = size(prefix);
   return strStartsWith(message, prefix)
     ? [
         message[prefixSize],
-        (stringified ? jsonParse : String)(slice(message, prefixSize + 1)),
+        (stringified ? jsonParseWithUndefined : String)(
+          slice(message, prefixSize + 1),
+        ),
       ]
     : void 0;
 };

package/persisters/persister-pglite/index.js

@@ -93,7 +93,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) => {
@@ -106,21 +115,22 @@ const getHash = (string) => {
   return hash >>> 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(
@@ -481,6 +491,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 */) {
@@ -505,6 +520,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -523,6 +539,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

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

@@ -93,7 +93,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) => {
@@ -106,21 +115,22 @@ const getHash = (string) => {
   return hash >>> 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(
@@ -481,6 +491,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 */) {
@@ -505,6 +520,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -523,6 +539,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/persisters/persister-postgres/index.js

@@ -92,7 +92,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) => {
@@ -105,21 +114,22 @@ const getHash = (string) => {
   return hash >>> 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(
@@ -480,6 +490,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 */) {
@@ -504,6 +519,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -522,6 +538,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

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

@@ -92,7 +92,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) => {
@@ -105,21 +114,22 @@ const getHash = (string) => {
   return hash >>> 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(
@@ -480,6 +490,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 */) {
@@ -504,6 +519,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -522,6 +538,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();