tinybase 7.3.3 → 7.3.4

package/synchronizers/synchronizer-ws-server/index.js

@@ -92,22 +92,23 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-const mapNew = (entries) => new Map(entries);
-const mapKeys = (map) => [...(map?.keys() ?? [])];
-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 mapKeys = (map2) => [...(map2?.keys() ?? [])];
+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(
@@ -363,6 +364,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 */) {
@@ -387,6 +393,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -405,6 +412,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -92,22 +92,23 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-const mapNew = (entries) => new Map(entries);
-const mapKeys = (map) => [...(map?.keys() ?? [])];
-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 mapKeys = (map2) => [...(map2?.keys() ?? [])];
+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(
@@ -363,6 +364,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 */) {
@@ -387,6 +393,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -405,6 +412,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/synchronizers/synchronizer-ws-server-durable-object/index.js

@@ -119,17 +119,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(
@@ -353,6 +354,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 */) {
@@ -377,6 +383,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -395,6 +402,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js

@@ -119,17 +119,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(
@@ -353,6 +354,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 */) {
@@ -377,6 +383,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -395,6 +402,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/synchronizers/synchronizer-ws-server-simple/index.js

@@ -19,17 +19,18 @@ const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 const object = Object;
 const objFreeze = object.freeze;
 
-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 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 mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
+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());
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 
 const MESSAGE_SEPARATOR = '\n';

package/synchronizers/synchronizer-ws-server-simple/with-schemas/index.js

@@ -19,17 +19,18 @@ const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 const object = Object;
 const objFreeze = object.freeze;
 
-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 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 mapForEach = (map2, cb) =>
+  collForEach(map2, (value, key) => cb(key, value));
+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());
   }
-  return mapGet(map, key);
+  return mapGet(map2, key);
 };
 
 const MESSAGE_SEPARATOR = '\n';

package/synchronizers/with-schemas/index.js

@@ -75,17 +75,18 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-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(
@@ -309,6 +310,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 */) {
@@ -333,6 +339,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -351,6 +358,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();

package/ui-react-inspector/index.js

@@ -236,31 +236,32 @@ 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 mapKeys = (map) => [...(map?.keys() ?? [])];
-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 mapKeys = (map2) => [...(map2?.keys() ?? [])];
+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 mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
-  mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
-  return map;
+const mapMatch = (map2, obj, set, del = mapSet) => {
+  objMap(obj, (value, id) => set(map2, id, value));
+  mapForEach(map2, (id) => (objHas(obj, id) ? 0 : del(map2, id)));
+  return map2;
 };
-const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
+const mapToObj = (map2, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
-  collForEach(map, (mapValue, id) => {
+  collForEach(map2, (mapValue, id) => {
     if (!excludeMapValue?.(mapValue, id)) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
       if (!excludeObjValue?.(objValue)) {
@@ -270,27 +271,27 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   });
   return obj;
 };
-const mapToObj2 = (map, valueMapper, excludeMapValue) =>
+const mapToObj2 = (map2, valueMapper, excludeMapValue) =>
   mapToObj(
-    map,
+    map2,
     (childMap) => mapToObj(childMap, valueMapper, excludeMapValue),
     collIsEmpty,
     objIsEmpty,
   );
-const mapToObj3 = (map, valueMapper, excludeMapValue) =>
+const mapToObj3 = (map2, valueMapper, excludeMapValue) =>
   mapToObj(
-    map,
+    map2,
     (childMap) => mapToObj2(childMap, valueMapper, excludeMapValue),
     collIsEmpty,
     objIsEmpty,
   );
-const mapClone = (map, mapValue) => {
-  const map2 = mapNew();
-  collForEach(map, (value, key) => map2.set(key, mapValue?.(value) ?? value));
-  return map2;
+const mapClone = (map2, mapValue) => {
+  const map22 = mapNew();
+  collForEach(map2, (value, key) => map22.set(key, mapValue?.(value) ?? value));
+  return map22;
 };
-const mapClone2 = (map) => mapClone(map, mapClone);
-const mapClone3 = (map) => mapClone(map, mapClone2);
+const mapClone2 = (map2) => mapClone(map2, mapClone);
+const mapClone3 = (map2) => mapClone(map2, mapClone2);
 const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
   ifNotUndefined(
     (ensureLeaf ? mapEnsure : mapGet)(
@@ -491,6 +492,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 */) {
@@ -515,6 +521,7 @@ const createCustomPersister = (
           },
         );
         setStatus(0 /* Idle */);
+        await saveAfterMutated();
       });
     }
     return persister;
@@ -533,6 +540,7 @@ const createCustomPersister = (
                 loads++;
                 setContentOrChanges(changes ?? content);
                 setStatus(0 /* Idle */);
+                await saveAfterMutated();
               }
             } else {
               await load();
@@ -732,6 +740,7 @@ const createStore = () => {
   let hadValues = false;
   let transactions = 0;
   let internalListeners = [];
+  let mutating = 0;
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -1136,13 +1145,13 @@ const createStore = () => {
       cellId,
       () => [oldCell, 0],
     )[1] = newCell;
-    internalListeners[3]?.(tableId, rowId, cellId, newCell);
+    internalListeners[3]?.(tableId, rowId, cellId, newCell, mutating);
   };
   const valueIdsChanged = (valueId, addedOrRemoved) =>
     idsChanged(changedValueIds, valueId, addedOrRemoved);
   const valueChanged = (valueId, oldValue, newValue) => {
     mapEnsure(changedValues, valueId, () => [oldValue, 0])[1] = newValue;
-    internalListeners[4]?.(valueId, newValue);
+    internalListeners[4]?.(valueId, newValue, mutating);
   };
   const cellInvalid = (tableId, rowId, cellId, invalidCell, defaultedCell) => {
     arrayPush(
@@ -1217,14 +1226,11 @@ const createStore = () => {
     }
   };
   const callTabularListenersForChanges = (mutator) => {
-    const hasTablesNow = hasTables();
-    if (hasTablesNow != hadTables) {
-      callListeners(hasTablesListeners[mutator], void 0, hasTablesNow);
-    }
-    const emptySortedRowIdListeners = collIsEmpty(
+    const hasHasTablesListeners = !collIsEmpty(hasTablesListeners[mutator]);
+    const hasSortedRowIdListeners = !collIsEmpty(
       sortedRowIdsListeners[mutator],
     );
-    const emptyIdAndHasListeners =
+    const hasIdOrHasListeners = !(
       collIsEmpty(cellIdsListeners[mutator]) &&
       collIsEmpty(hasCellListeners[mutator]) &&
       collIsEmpty(rowIdsListeners[mutator]) &&
@@ -1232,15 +1238,17 @@ const createStore = () => {
       collIsEmpty(tableCellIdsListeners[mutator]) &&
       collIsEmpty(hasTableCellListeners[mutator]) &&
       collIsEmpty(rowCountListeners[mutator]) &&
-      emptySortedRowIdListeners &&
+      !hasSortedRowIdListeners &&
       collIsEmpty(tableIdsListeners[mutator]) &&
-      collIsEmpty(hasTableListeners[mutator]);
-    const emptyOtherListeners =
+      collIsEmpty(hasTableListeners[mutator])
+    );
+    const hasOtherListeners = !(
       collIsEmpty(cellListeners[mutator]) &&
       collIsEmpty(rowListeners[mutator]) &&
       collIsEmpty(tableListeners[mutator]) &&
-      collIsEmpty(tablesListeners[mutator]);
-    if (!emptyIdAndHasListeners || !emptyOtherListeners) {
+      collIsEmpty(tablesListeners[mutator])
+    );
+    if (hasHasTablesListeners || hasIdOrHasListeners || hasOtherListeners) {
       const changes = mutator
         ? [
             mapClone(changedTableIds),
@@ -1248,7 +1256,9 @@ const createStore = () => {
             mapClone(changedRowCount),
             mapClone2(changedRowIds),
             mapClone3(changedCellIds),
-            mapClone3(changedCells),
+            mapClone(changedCells, (map) =>
+              mapClone(map, (map2) => mapClone(map2, pairClone)),
+            ),
           ]
         : [
             changedTableIds,
@@ -1258,7 +1268,13 @@ const createStore = () => {
             changedCellIds,
             changedCells,
           ];
-      if (!emptyIdAndHasListeners) {
+      if (hasHasTablesListeners) {
+        const hasTablesNow = hasTables();
+        if (hasTablesNow != hadTables) {
+          callListeners(hasTablesListeners[mutator], void 0, hasTablesNow);
+        }
+      }
+      if (hasIdOrHasListeners) {
         callIdsAndHasListenersIfChanged(
           changes[0],
           tableIdsListeners[mutator],
@@ -1290,13 +1306,13 @@ const createStore = () => {
               hasRowListeners[mutator],
               [tableId],
             ) &&
-            !emptySortedRowIdListeners
+            hasSortedRowIdListeners
           ) {
             callListeners(sortedRowIdsListeners[mutator], [tableId, null]);
             setAdd(calledSortableTableIds, tableId);
           }
         });
-        if (!emptySortedRowIdListeners) {
+        if (hasSortedRowIdListeners) {
           collForEach(changes[5], (rows, tableId) => {
             if (!collHas(calledSortableTableIds, tableId)) {
               const sortableCellIds = setNew();
@@ -1327,7 +1343,7 @@ const createStore = () => {
           ),
         );
       }
-      if (!emptyOtherListeners) {
+      if (hasOtherListeners) {
         let tablesChanged;
         collForEach(changes[5], (rows, tableId) => {
           let tableChanged;
@@ -1364,28 +1380,31 @@ const createStore = () => {
     }
   };
   const callValuesListenersForChanges = (mutator) => {
-    const hasValuesNow = hasValues();
-    if (hasValuesNow != hadValues) {
-      callListeners(hasValuesListeners[mutator], void 0, hasValuesNow);
-    }
-    const emptyIdAndHasListeners =
-      collIsEmpty(valueIdsListeners[mutator]) &&
-      collIsEmpty(hasValueListeners[mutator]);
-    const emptyOtherListeners =
-      collIsEmpty(valueListeners[mutator]) &&
-      collIsEmpty(valuesListeners[mutator]);
-    if (!emptyIdAndHasListeners || !emptyOtherListeners) {
+    const hasHasValuesListeners = !collIsEmpty(hasValuesListeners[mutator]);
+    const hasIdOrHasListeners =
+      !collIsEmpty(valueIdsListeners[mutator]) ||
+      !collIsEmpty(hasValueListeners[mutator]);
+    const hasOtherListeners =
+      !collIsEmpty(valueListeners[mutator]) ||
+      !collIsEmpty(valuesListeners[mutator]);
+    if (hasHasValuesListeners || hasIdOrHasListeners || hasOtherListeners) {
       const changes = mutator
-        ? [mapClone(changedValueIds), mapClone(changedValues)]
+        ? [mapClone(changedValueIds), mapClone(changedValues, pairClone)]
         : [changedValueIds, changedValues];
-      if (!emptyIdAndHasListeners) {
+      if (hasHasValuesListeners) {
+        const hasValuesNow = hasValues();
+        if (hasValuesNow != hadValues) {
+          callListeners(hasValuesListeners[mutator], void 0, hasValuesNow);
+        }
+      }
+      if (hasIdOrHasListeners) {
         callIdsAndHasListenersIfChanged(
           changes[0],
           valueIdsListeners[mutator],
           hasValueListeners[mutator],
         );
       }
-      if (!emptyOtherListeners) {
+      if (hasOtherListeners) {
         let valuesChanged;
         collForEach(changes[1], ([oldValue, newValue], valueId) => {
           if (newValue !== oldValue) {
@@ -1782,6 +1801,7 @@ const createStore = () => {
       transactions--;
       if (transactions == 0) {
         transactions = 1;
+        mutating = 1;
         callInvalidCellListeners(1);
         if (!collIsEmpty(changedCells)) {
           callTabularListenersForChanges(1);
@@ -1790,6 +1810,7 @@ const createStore = () => {
         if (!collIsEmpty(changedValues)) {
           callValuesListenersForChanges(1);
         }
+        mutating = 0;
         if (doRollback?.(store)) {
           collForEach(changedCells, (table, tableId) =>
             collForEach(table, (row, rowId) =>