tinybase 1.2.1 → 1.3.0-beta.0

package/lib/debug/store.js

@@ -63,10 +63,9 @@ 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, defaultValue, onWillAdd) => {
+const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    onWillAdd?.(defaultValue);
-    map.set(key, defaultValue);
+    map.set(key, getDefaultValue());
   }
   return mapGet(map, key);
 };
@@ -107,11 +106,11 @@ const setAdd = (set, value) => set?.add(value);
 const addDeepSet = (deepSet, value, ids) =>
   arrayLength(ids) < 2
     ? setAdd(
-        arrayIsEmpty(ids) ? deepSet : mapEnsure(deepSet, ids[0], setNew()),
+        arrayIsEmpty(ids) ? deepSet : mapEnsure(deepSet, ids[0], setNew),
         value,
       )
     : addDeepSet(
-        mapEnsure(deepSet, ids[0], mapNew()),
+        mapEnsure(deepSet, ids[0], mapNew),
         value,
         arrayFromSecond(ids),
       );
@@ -210,6 +209,7 @@ const idsChanged = (ids, id, added) =>
   mapSet(ids, id, mapGet(ids, id) == -added ? void 0 : added);
 const createStore = () => {
   let hasSchema;
+  let cellsTouched;
   let nextRowId = 0;
   let transactions = 0;
   const changedTableIds = mapNew();
@@ -228,6 +228,7 @@ const createStore = () => {
   const cellIdsListeners = mapNewPair();
   const cellListeners = mapNewPair();
   const invalidCellListeners = mapNewPair();
+  const finishTransactionListeners = mapNewPair(setNew);
   const [addListener, callListeners, delListenerImpl, callListenerImpl] =
     getListenerFunctions(() => store);
   const validateSchema = (schema) =>
@@ -310,7 +311,7 @@ const createStore = () => {
         const rowDefaulted = mapNew();
         const rowNonDefaulted = setNew();
         transformMap(
-          mapEnsure(schemaMap, tableId, mapNew()),
+          mapEnsure(schemaMap, tableId, mapNew),
           tableSchema,
           (tableSchemaMap, cellId, cellSchema) => {
             mapSet(tableSchemaMap, cellId, cellSchema);
@@ -337,18 +338,20 @@ const createStore = () => {
     );
   const setValidTable = (tableId, table) =>
     transformMap(
-      mapEnsure(tablesMap, tableId, mapNew(), () =>
-        tableIdsChanged(tableId, 1),
-      ),
+      mapEnsure(tablesMap, tableId, () => {
+        tableIdsChanged(tableId, 1);
+        return mapNew();
+      }),
       table,
       (tableMap, rowId, row) => setValidRow(tableId, tableMap, rowId, row),
       (tableMap, rowId) => delValidRow(tableId, tableMap, rowId),
     );
   const setValidRow = (tableId, tableMap, rowId, newRow, forceDel) =>
     transformMap(
-      mapEnsure(tableMap, rowId, mapNew(), () =>
-        rowIdsChanged(tableId, rowId, 1),
-      ),
+      mapEnsure(tableMap, rowId, () => {
+        rowIdsChanged(tableId, rowId, 1);
+        return mapNew();
+      }),
       newRow,
       (rowMap, cellId, cell) =>
         setValidCell(tableId, rowId, rowMap, cellId, cell),
@@ -411,25 +414,25 @@ const createStore = () => {
   const tableIdsChanged = (tableId, added) =>
     idsChanged(changedTableIds, tableId, added);
   const rowIdsChanged = (tableId, rowId, added) =>
-    idsChanged(mapEnsure(changedRowIds, tableId, mapNew()), rowId, added);
+    idsChanged(mapEnsure(changedRowIds, tableId, mapNew), rowId, added);
   const cellIdsChanged = (tableId, rowId, cellId, added) =>
     idsChanged(
-      mapEnsure(mapEnsure(changedCellIds, tableId, mapNew()), rowId, mapNew()),
+      mapEnsure(mapEnsure(changedCellIds, tableId, mapNew), rowId, mapNew),
       cellId,
       added,
     );
   const cellChanged = (tableId, rowId, cellId, oldCell, newCell) =>
     (mapEnsure(
-      mapEnsure(mapEnsure(changedCells, tableId, mapNew()), rowId, mapNew()),
+      mapEnsure(mapEnsure(changedCells, tableId, mapNew), rowId, mapNew),
       cellId,
-      [oldCell],
+      () => [oldCell, 0],
     )[1] = newCell);
   const cellInvalid = (tableId, rowId, cellId, invalidCell, defaultedCell) => {
     arrayPush(
       mapEnsure(
-        mapEnsure(mapEnsure(invalidCells, tableId, mapNew()), rowId, mapNew()),
+        mapEnsure(mapEnsure(invalidCells, tableId, mapNew), rowId, mapNew),
         cellId,
-        [],
+        () => [],
       ),
       invalidCell,
     );
@@ -458,75 +461,73 @@ const createStore = () => {
         )
       : 0;
   const callListenersForChanges = (mutator) => {
-    if (!collIsEmpty(changedCells)) {
-      const emptyIdListeners =
-        collIsEmpty(cellIdsListeners[mutator]) &&
-        collIsEmpty(rowIdsListeners[mutator]) &&
-        collIsEmpty(tableIdsListeners[mutator]);
-      const emptyOtherListeners =
-        collIsEmpty(cellListeners[mutator]) &&
-        collIsEmpty(rowListeners[mutator]) &&
-        collIsEmpty(tableListeners[mutator]) &&
-        collIsEmpty(tablesListeners[mutator]);
-      if (!(emptyIdListeners && emptyOtherListeners)) {
-        const changes = mutator
-          ? [
-              mapClone(changedTableIds),
-              mapClone2(changedRowIds),
-              mapClone(changedCellIds, mapClone2),
-              mapClone(changedCells, mapClone2),
-            ]
-          : [changedTableIds, changedRowIds, changedCellIds, changedCells];
-        if (!emptyIdListeners) {
-          collForEach(changes[2], (rowCellIds, tableId) =>
-            collForEach(rowCellIds, (changedIds, rowId) => {
-              if (!collIsEmpty(changedIds)) {
-                callListeners(cellIdsListeners[mutator], [tableId, rowId]);
-              }
-            }),
-          );
-          collForEach(changes[1], (changedIds, tableId) => {
+    const emptyIdListeners =
+      collIsEmpty(cellIdsListeners[mutator]) &&
+      collIsEmpty(rowIdsListeners[mutator]) &&
+      collIsEmpty(tableIdsListeners[mutator]);
+    const emptyOtherListeners =
+      collIsEmpty(cellListeners[mutator]) &&
+      collIsEmpty(rowListeners[mutator]) &&
+      collIsEmpty(tableListeners[mutator]) &&
+      collIsEmpty(tablesListeners[mutator]);
+    if (!(emptyIdListeners && emptyOtherListeners)) {
+      const changes = mutator
+        ? [
+            mapClone(changedTableIds),
+            mapClone2(changedRowIds),
+            mapClone(changedCellIds, mapClone2),
+            mapClone(changedCells, mapClone2),
+          ]
+        : [changedTableIds, changedRowIds, changedCellIds, changedCells];
+      if (!emptyIdListeners) {
+        collForEach(changes[2], (rowCellIds, tableId) =>
+          collForEach(rowCellIds, (changedIds, rowId) => {
             if (!collIsEmpty(changedIds)) {
-              callListeners(rowIdsListeners[mutator], [tableId]);
+              callListeners(cellIdsListeners[mutator], [tableId, rowId]);
             }
-          });
-          if (!collIsEmpty(changes[0])) {
-            callListeners(tableIdsListeners[mutator]);
+          }),
+        );
+        collForEach(changes[1], (changedIds, tableId) => {
+          if (!collIsEmpty(changedIds)) {
+            callListeners(rowIdsListeners[mutator], [tableId]);
           }
+        });
+        if (!collIsEmpty(changes[0])) {
+          callListeners(tableIdsListeners[mutator]);
         }
-        if (!emptyOtherListeners) {
-          let tablesChanged;
-          collForEach(changes[3], (rows, tableId) => {
-            let tableChanged;
-            collForEach(rows, (cells, rowId) => {
-              let rowChanged;
-              collForEach(cells, ([oldCell, newCell], cellId) => {
-                if (newCell !== oldCell) {
-                  callListeners(
-                    cellListeners[mutator],
-                    [tableId, rowId, cellId],
-                    newCell,
-                    oldCell,
-                    getCellChange,
-                  );
-                  tablesChanged = tableChanged = rowChanged = 1;
-                }
-              });
-              if (rowChanged) {
+      }
+      if (!emptyOtherListeners) {
+        let tablesChanged;
+        collForEach(changes[3], (rows, tableId) => {
+          let tableChanged;
+          collForEach(rows, (cells, rowId) => {
+            let rowChanged;
+            collForEach(cells, ([oldCell, newCell], cellId) => {
+              if (newCell !== oldCell) {
                 callListeners(
-                  rowListeners[mutator],
-                  [tableId, rowId],
+                  cellListeners[mutator],
+                  [tableId, rowId, cellId],
+                  newCell,
+                  oldCell,
                   getCellChange,
                 );
+                tablesChanged = tableChanged = rowChanged = 1;
               }
             });
-            if (tableChanged) {
-              callListeners(tableListeners[mutator], [tableId], getCellChange);
+            if (rowChanged) {
+              callListeners(
+                rowListeners[mutator],
+                [tableId, rowId],
+                getCellChange,
+              );
             }
           });
-          if (tablesChanged) {
-            callListeners(tablesListeners[mutator], [], getCellChange);
+          if (tableChanged) {
+            callListeners(tableListeners[mutator], [tableId], getCellChange);
           }
+        });
+        if (tablesChanged) {
+          callListeners(tablesListeners[mutator], [], getCellChange);
         }
       }
     }
@@ -655,61 +656,79 @@ const createStore = () => {
     if (transactions == -1) {
       return;
     }
-    transactions++;
+    startTransaction();
     const result = actions?.();
-    transactions--;
-    if (transactions == 0) {
-      transactions = 1;
-      callInvalidCellListeners(1);
-      callListenersForChanges(1);
-      transactions = -1;
-      if (
-        doRollback?.(
-          mapToObj(
-            changedCells,
-            (table) =>
-              mapToObj(
-                table,
-                (row) =>
-                  mapToObj(
-                    row,
-                    (cells) => [...cells],
-                    ([oldCell, newCell]) => oldCell === newCell,
-                  ),
-                objIsEmpty,
-              ),
-            objIsEmpty,
-          ),
-          mapToObj(invalidCells, (map) => mapToObj(map, mapToObj)),
-        )
-      ) {
+    finishTransaction(doRollback);
+    return result;
+  };
+  const startTransaction = () => {
+    transactions++;
+    return store;
+  };
+  const finishTransaction = (doRollback) => {
+    if (transactions > 0) {
+      transactions--;
+      if (transactions == 0) {
+        cellsTouched = !collIsEmpty(changedCells);
         transactions = 1;
-        collForEach(changedCells, (table, tableId) =>
-          collForEach(table, (row, rowId) =>
-            collForEach(row, ([oldCell], cellId) =>
-              isUndefined(oldCell)
-                ? delCell(tableId, rowId, cellId, true)
-                : setCell(tableId, rowId, cellId, oldCell),
+        callInvalidCellListeners(1);
+        if (cellsTouched) {
+          callListenersForChanges(1);
+        }
+        transactions = -1;
+        if (
+          doRollback?.(
+            mapToObj(
+              changedCells,
+              (table) =>
+                mapToObj(
+                  table,
+                  (row) =>
+                    mapToObj(
+                      row,
+                      (cells) => [...cells],
+                      ([oldCell, newCell]) => oldCell === newCell,
+                    ),
+                  objIsEmpty,
+                ),
+              objIsEmpty,
             ),
-          ),
+            mapToObj(invalidCells, (map) => mapToObj(map, mapToObj)),
+          )
+        ) {
+          transactions = 1;
+          collForEach(changedCells, (table, tableId) =>
+            collForEach(table, (row, rowId) =>
+              collForEach(row, ([oldCell], cellId) =>
+                isUndefined(oldCell)
+                  ? delCell(tableId, rowId, cellId, true)
+                  : setCell(tableId, rowId, cellId, oldCell),
+              ),
+            ),
+          );
+          transactions = -1;
+          cellsTouched = false;
+        }
+        callListeners(finishTransactionListeners[0], [], cellsTouched);
+        callInvalidCellListeners(0);
+        if (cellsTouched) {
+          callListenersForChanges(0);
+        }
+        callListeners(finishTransactionListeners[1], [], cellsTouched);
+        transactions = 0;
+        arrayForEach(
+          [
+            changedCells,
+            invalidCells,
+            changedTableIds,
+            changedRowIds,
+            changedCellIds,
+          ],
+          collClear,
         );
-        transactions = -1;
       }
-      callInvalidCellListeners(0);
-      callListenersForChanges(0);
-      transactions = 0;
-      arrayForEach(
-        [
-          changedCells,
-          invalidCells,
-          changedTableIds,
-          changedRowIds,
-          changedCellIds,
-        ],
-        collClear,
-      );
     }
-    return result;
+    return store;
   };
   const forEachTable = (tableCallback) =>
     collForEach(tablesMap, (tableMap, tableId) =>
@@ -751,6 +770,10 @@ const createStore = () => {
       rowId,
       cellId,
     ]);
+  const addWillFinishTransactionListener = (listener) =>
+    addListener(listener, finishTransactionListeners[0]);
+  const addDidFinishTransactionListener = (listener) =>
+    addListener(listener, finishTransactionListeners[1]);
   const callListener = (listenerId) => {
     callListenerImpl(listenerId, [getTableIds, getRowIds, getCellIds], (ids) =>
       isUndefined(ids[2]) ? [] : arrayPair(getCell(...ids)),
@@ -769,6 +792,7 @@ const createStore = () => {
     row: collPairSize(rowListeners, collSize3),
     cellIds: collPairSize(cellIdsListeners, collSize3),
     cell: collPairSize(cellListeners, collSize4),
+    invalidCell: collPairSize(invalidCellListeners, collSize4),
   });
   const store = {
     getTables,
@@ -798,6 +822,8 @@ const createStore = () => {
     delCell,
     delSchema,
     transaction,
+    startTransaction,
+    finishTransaction,
     forEachTable,
     forEachRow,
     forEachCell,
@@ -809,6 +835,8 @@ const createStore = () => {
     addCellIdsListener,
     addCellListener,
     addInvalidCellListener,
+    addWillFinishTransactionListener,
+    addDidFinishTransactionListener,
     callListener,
     delListener,
     getListenerStats,