tinybase 5.0.0-beta.1 → 5.0.0-beta.3

package/lib/debug/store.js

@@ -63,13 +63,12 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
+const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
   return obj;
 };
-const objMap = (obj, cb) =>
+const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
@@ -103,7 +102,7 @@ const mapEnsure = (map, key, getDefaultValue) => {
   return mapGet(map, key);
 };
 const mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
+  objToArray(obj, (value, id) => set(map, id, value));
   mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
   return map;
 };
@@ -281,7 +280,7 @@ const validate = (obj, validateChild, onInvalidObj) => {
     onInvalidObj?.();
     return false;
   }
-  objMap(obj, (child, id2) => {
+  objToArray(obj, (child, id2) => {
     if (!validateChild(child, id2)) {
       objDel(obj, id2);
     }
@@ -302,6 +301,7 @@ const createStore = () => {
   let hadTables = false;
   let hadValues = false;
   let transactions = 0;
+  let postTransactionListener;
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
   const changedRowCount = mapNew();
@@ -943,44 +943,6 @@ const createStore = () => {
     transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
-  const getTransactionChanges = () => [
-    mapToObj(
-      changedCells,
-      (table, tableId) =>
-        mapGet(changedTableIds, tableId) === -1
-          ? null
-          : mapToObj(
-              table,
-              (row, rowId) =>
-                mapGet(mapGet(changedRowIds, tableId), rowId) === -1
-                  ? null
-                  : mapToObj(
-                      row,
-                      ([, newCell]) => newCell ?? null,
-                      (_, changedCell) => pairIsEqual(changedCell),
-                    ),
-              objIsEmpty,
-            ),
-      objIsEmpty,
-    ),
-    mapToObj(
-      changedValues,
-      ([, newValue]) => newValue ?? null,
-      (_, changedValue) => pairIsEqual(changedValue),
-    ),
-  ];
-  const getTransactionLog = () => ({
-    cellsTouched,
-    valuesTouched,
-    changedCells: mapToObj3(changedCells, pairClone, pairIsEqual),
-    invalidCells: mapToObj3(invalidCells),
-    changedValues: mapToObj(changedValues, pairClone, pairIsEqual),
-    invalidValues: mapToObj(invalidValues),
-    changedTableIds: mapToObj(changedTableIds),
-    changedRowIds: mapToObj2(changedRowIds),
-    changedCellIds: mapToObj3(changedCellIds),
-    changedValueIds: mapToObj(changedValueIds),
-  });
   const getContent = () => [getTables(), getValues()];
   const getTables = () => mapToObj3(tablesMap);
   const getTableIds = () => mapKeys(tablesMap);
@@ -1073,7 +1035,7 @@ const createStore = () => {
       (tableId2, rowId2) => {
         if (validateRow(tableId2, rowId2, partialRow, 1)) {
           const table = getOrCreateTable(tableId2);
-          objMap(partialRow, (cell, cellId) =>
+          objToArray(partialRow, (cell, cellId) =>
             setCellIntoDefaultRow(tableId2, table, rowId2, cellId, cell),
           );
         }
@@ -1111,7 +1073,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objMap(partialValues, (value, valueId) =>
+        ? objToArray(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -1128,20 +1090,20 @@ const createStore = () => {
         ),
       valueId,
     );
-  const setTransactionChanges = (transactionChanges) =>
+  const applyChanges = (changes) =>
     fluentTransaction(() => {
-      objMap(transactionChanges[0], (table, tableId) =>
+      objToArray(changes[0], (table, tableId) =>
         isUndefined(table)
           ? delTable(tableId)
-          : objMap(table, (row, rowId) =>
+          : objToArray(table, (row, rowId) =>
               isUndefined(row)
                 ? delRow(tableId, rowId)
-                : objMap(row, (cell, cellId) =>
+                : objToArray(row, (cell, cellId) =>
                     setOrDelCell(store, tableId, rowId, cellId, cell),
                   ),
             ),
       );
-      objMap(transactionChanges[1], (value, valueId) =>
+      objToArray(changes[1], (value, valueId) =>
         setOrDelValue(store, valueId, value),
       );
     });
@@ -1268,15 +1230,48 @@ const createStore = () => {
       transactions++;
     }
     if (transactions == 1) {
-      callListeners(
-        startTransactionListeners,
-        void 0,
-        getTransactionChanges,
-        getTransactionLog,
-      );
+      callListeners(startTransactionListeners, void 0);
     }
     return store;
   };
+  const getTransactionChanges = () => [
+    mapToObj(
+      changedCells,
+      (table, tableId) =>
+        mapGet(changedTableIds, tableId) === -1
+          ? void 0
+          : mapToObj(
+              table,
+              (row, rowId) =>
+                mapGet(mapGet(changedRowIds, tableId), rowId) === -1
+                  ? void 0
+                  : mapToObj(
+                      row,
+                      ([, newCell]) => newCell,
+                      (_, changedCell) => pairIsEqual(changedCell),
+                    ),
+              objIsEmpty,
+            ),
+      objIsEmpty,
+    ),
+    mapToObj(
+      changedValues,
+      ([, newValue]) => newValue,
+      (_, changedValue) => pairIsEqual(changedValue),
+    ),
+  ];
+  const getTransactionLog = () => [
+    cellsTouched,
+    valuesTouched,
+    mapToObj3(changedCells, pairClone, pairIsEqual),
+    mapToObj3(invalidCells),
+    mapToObj(changedValues, pairClone, pairIsEqual),
+    mapToObj(invalidValues),
+    mapToObj(changedTableIds),
+    mapToObj2(changedRowIds),
+    mapToObj3(changedCellIds),
+    mapToObj(changedValueIds),
+  ];
   const finishTransaction = (doRollback) => {
     if (transactions > 0) {
       transactions--;
@@ -1292,7 +1287,7 @@ const createStore = () => {
         if (valuesTouched) {
           callValuesListenersForChanges(1);
         }
-        if (doRollback?.(getTransactionChanges, getTransactionLog)) {
+        if (doRollback?.(store)) {
           collForEach(changedCells, (table, tableId) =>
             collForEach(table, (row, rowId) =>
               collForEach(row, ([oldCell], cellId) =>
@@ -1305,12 +1300,7 @@ const createStore = () => {
           );
           cellsTouched = valuesTouched = false;
         }
-        callListeners(
-          finishTransactionListeners[0],
-          void 0,
-          getTransactionChanges,
-          getTransactionLog,
-        );
+        callListeners(finishTransactionListeners[0], void 0);
         transactions = -1;
         callInvalidCellListeners(0);
         if (cellsTouched) {
@@ -1320,12 +1310,8 @@ const createStore = () => {
         if (valuesTouched) {
           callValuesListenersForChanges(0);
         }
-        callListeners(
-          finishTransactionListeners[1],
-          void 0,
-          getTransactionChanges,
-          getTransactionLog,
-        );
+        postTransactionListener?.(store);
+        callListeners(finishTransactionListeners[1], void 0);
         transactions = 0;
         cellsTouched = valuesTouched = false;
         hadTables = hasTables();
@@ -1452,6 +1438,9 @@ const createStore = () => {
       collSize2(startTransactionListeners) +
       pairCollSize2(finishTransactionListeners),
   });
+  const addPostTransactionListener = (listener) => {
+    postTransactionListener = listener;
+  };
   const store = {
     getContent,
     getTables,
@@ -1492,7 +1481,7 @@ const createStore = () => {
     setValues,
     setPartialValues,
     setValue,
-    setTransactionChanges,
+    applyChanges,
     setTablesJson,
     setValuesJson,
     setJson,
@@ -1510,6 +1499,8 @@ const createStore = () => {
     delSchema,
     transaction,
     startTransaction,
+    getTransactionChanges,
+    getTransactionLog,
     finishTransaction,
     forEachTable,
     forEachTableCell,
@@ -1527,8 +1518,9 @@ const createStore = () => {
     createStore,
     addListener,
     callListeners,
+    addPostTransactionListener,
   };
-  objMap(
+  objToArray(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],