tinybase 5.0.0-beta.3 → 5.0.0-beta.5

package/lib/debug/store.js

@@ -95,9 +95,11 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -253,9 +255,10 @@ const pairNewMap = () => [mapNew(), mapNew()];
 const pairClone = (array) => [...array];
 const pairIsEqual = ([entry1, entry2]) => entry1 === entry2;
 
-const getCellOrValueType = (cell) => {
-  const type = getTypeOf(cell);
-  return isTypeStringOrBoolean(type) || (type == NUMBER && isFiniteNumber(cell))
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
@@ -296,12 +299,10 @@ const idsChanged = (changedIds, id2, addedOrRemoved) =>
 const createStore = () => {
   let hasTablesSchema;
   let hasValuesSchema;
-  let cellsTouched = false;
-  let valuesTouched = false;
   let hadTables = false;
   let hadValues = false;
   let transactions = 0;
-  let postTransactionListener;
+  let internalListeners = [];
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -1261,8 +1262,8 @@ const createStore = () => {
     ),
   ];
   const getTransactionLog = () => [
-    cellsTouched,
-    valuesTouched,
+    !collIsEmpty(changedCells),
+    !collIsEmpty(changedValues),
     mapToObj3(changedCells, pairClone, pairIsEqual),
     mapToObj3(invalidCells),
     mapToObj(changedValues, pairClone, pairIsEqual),
@@ -1276,15 +1277,13 @@ const createStore = () => {
     if (transactions > 0) {
       transactions--;
       if (transactions == 0) {
-        cellsTouched = !collIsEmpty(changedCells);
-        valuesTouched = !collIsEmpty(changedValues);
         transactions = 1;
         callInvalidCellListeners(1);
-        if (cellsTouched) {
+        if (!collIsEmpty(changedCells)) {
           callTabularListenersForChanges(1);
         }
         callInvalidValueListeners(1);
-        if (valuesTouched) {
+        if (!collIsEmpty(changedValues)) {
           callValuesListenersForChanges(1);
         }
         if (doRollback?.(store)) {
@@ -1295,25 +1294,26 @@ const createStore = () => {
               ),
             ),
           );
+          collClear(changedCells);
           collForEach(changedValues, ([oldValue], valueId) =>
             setOrDelValue(store, valueId, oldValue),
           );
-          cellsTouched = valuesTouched = false;
+          collClear(changedValues);
         }
         callListeners(finishTransactionListeners[0], void 0);
         transactions = -1;
         callInvalidCellListeners(0);
-        if (cellsTouched) {
+        if (!collIsEmpty(changedCells)) {
           callTabularListenersForChanges(0);
         }
         callInvalidValueListeners(0);
-        if (valuesTouched) {
+        if (!collIsEmpty(changedValues)) {
           callValuesListenersForChanges(0);
         }
-        postTransactionListener?.(store);
+        internalListeners[0]?.(store);
         callListeners(finishTransactionListeners[1], void 0);
+        internalListeners[1]?.(store);
         transactions = 0;
-        cellsTouched = valuesTouched = false;
         hadTables = hasTables();
         hadValues = hasValues();
         arrayForEach(
@@ -1438,9 +1438,8 @@ const createStore = () => {
       collSize2(startTransactionListeners) +
       pairCollSize2(finishTransactionListeners),
   });
-  const addPostTransactionListener = (listener) => {
-    postTransactionListener = listener;
-  };
+  const setInternalListeners = (preFinishTransaction, postFinishTransaction) =>
+    (internalListeners = [preFinishTransaction, postFinishTransaction]);
   const store = {
     getContent,
     getTables,
@@ -1518,7 +1517,7 @@ const createStore = () => {
     createStore,
     addListener,
     callListeners,
-    addPostTransactionListener,
+    setInternalListeners,
   };
   objToArray(
     {