tinybase 2.0.0-beta.2 → 2.0.0-beta.3

package/lib/debug/tinybase.js

@@ -14,6 +14,18 @@ const SUM = 'sum';
 const AVG = 'avg';
 const MIN = 'min';
 const MAX = 'max';
+const LISTENER = 'Listener';
+const RESULT = 'Result';
+const GET = 'get';
+const ADD = 'add';
+const TABLES = 'Tables';
+const TABLE_IDS = 'TableIds';
+const TABLE = 'Table';
+const ROW_IDS = 'RowIds';
+const SORTED_ROW_IDS = 'SortedRowIds';
+const ROW = 'Row';
+const CELL_IDS = 'CellIds';
+const CELL = 'Cell';
 
 const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
@@ -324,8 +336,6 @@ const getListenerFunctions = (getThing) => {
       }
       return idOrNulls;
     });
-  const hasListeners = (idSetNode, ids) =>
-    !arrayEvery(getWildcardedLeaves(idSetNode, ids), isUndefined);
   const callListener = (id, idNullGetters, extraArgsGetter) =>
     ifNotUndefined(mapGet(allListeners, id), ([listener, , idOrNulls = []]) => {
       const callWithIds = (...ids) => {
@@ -340,7 +350,7 @@ const getListenerFunctions = (getThing) => {
       };
       callWithIds();
     });
-  return [addListener, callListeners, delListener, hasListeners, callListener];
+  return [addListener, callListeners, delListener, callListener];
 };
 
 const object = Object;
@@ -1098,25 +1108,22 @@ const createQueries = getCreateFunction((store) => {
     addStoreListeners,
     delStoreListeners,
   ] = getDefinableFunctions(store, () => true, getUndefined);
-  const preStore1 = createStore();
-  const preStore2 = createStore();
+  const preStore = createStore();
   const resultStore = createStore();
   const preStoreListenerIds = mapNew();
-  const addPreStoreListener = (preStore, queryId, ...listenerIds) =>
+  const addPreStoreListener = (preStore2, queryId, ...listenerIds) =>
     arrayForEach(listenerIds, (listenerId) =>
       setAdd(
         mapEnsure(
           mapEnsure(preStoreListenerIds, queryId, mapNew),
-          preStore,
+          preStore2,
           setNew,
         ),
         listenerId,
       ),
     );
   const cleanPreStores = (queryId) =>
-    arrayForEach([resultStore, preStore2, preStore1], (store2) =>
-      store2.delTable(queryId),
-    );
+    arrayForEach([resultStore, preStore], (store2) => store2.delTable(queryId));
   const synchronizeTransactions = (queryId, fromStore, toStore) =>
     addPreStoreListener(
       fromStore,
@@ -1129,13 +1136,11 @@ const createQueries = getCreateFunction((store) => {
   const setQueryDefinition = (queryId, tableId, build) => {
     setDefinition(queryId, tableId);
     cleanPreStores(queryId);
-    let offsetLimit;
     const selectEntries = [];
     const joinEntries = [[null, [tableId, null, null, [], mapNew()]]];
     const wheres = [];
     const groupEntries = [];
     const havings = [];
-    const orders = [];
     const select = (arg1, arg2) => {
       const selectEntry = isFunction(arg1)
         ? [arrayLength(selectEntries) + EMPTY_STRING, arg1]
@@ -1201,17 +1206,7 @@ const createQueries = getCreateFunction((store) => {
           : (getSelectedOrGroupedCell) =>
               getSelectedOrGroupedCell(arg1) === arg2,
       );
-    const order = (arg1, descending) =>
-      arrayPush(orders, [
-        isFunction(arg1)
-          ? arg1
-          : (getSelectedOrGroupedCell) => getSelectedOrGroupedCell(arg1) ?? 0,
-        descending,
-      ]);
-    const limit = (arg1, arg2) => {
-      offsetLimit = isUndefined(arg2) ? [0, arg1] : [arg1, arg2];
-    };
-    build({select, join, where, group, having, order, limit});
+    build({select, join, where, group, having});
     const selects = mapNew(selectEntries);
     if (collIsEmpty(selects)) {
       return queries;
@@ -1223,95 +1218,11 @@ const createQueries = getCreateFunction((store) => {
       ),
     );
     const groups = mapNew(groupEntries);
-    let selectJoinWhereStore = preStore1;
-    let groupHavingStore = preStore2;
-    if (arrayIsEmpty(orders) && isUndefined(offsetLimit)) {
-      groupHavingStore = resultStore;
-    } else {
-      synchronizeTransactions(queryId, groupHavingStore, resultStore);
-      const groupRowIdSorter = (rowId1, rowId2) => {
-        const sortKeys1 = mapGet(sortKeysByGroupRowId, rowId1) ?? [];
-        const sortKeys2 = mapGet(sortKeysByGroupRowId, rowId2) ?? [];
-        const orderIndex = orders.findIndex(
-          (_order, index) => sortKeys1[index] !== sortKeys2[index],
-        );
-        return orderIndex < 0
-          ? 0
-          : defaultSorter(sortKeys1[orderIndex], sortKeys2[orderIndex]) *
-              (orders[orderIndex][1] ? -1 : 1);
-      };
-      const sortKeysByGroupRowId = mapNew();
-      const sortedGroupRowIds = mapNew();
-      addPreStoreListener(
-        groupHavingStore,
-        queryId,
-        arrayIsEmpty(orders)
-          ? groupHavingStore.addRowIdsListener(queryId, () =>
-              collClear(sortedGroupRowIds),
-            )
-          : groupHavingStore.addRowListener(
-              queryId,
-              null,
-              (_store, _tableId, groupRowId) => {
-                let newSortKeys = null;
-                if (groupHavingStore.hasRow(queryId, groupRowId)) {
-                  const oldSortKeys =
-                    mapGet(sortKeysByGroupRowId, groupRowId) ?? [];
-                  const groupRow = groupHavingStore.getRow(queryId, groupRowId);
-                  const getCell = (getSelectedOrGroupedCell) =>
-                    groupRow[getSelectedOrGroupedCell];
-                  newSortKeys = arrayMap(orders, ([getSortKey]) =>
-                    getSortKey(getCell, groupRowId),
-                  );
-                  if (arrayIsEqual(oldSortKeys, newSortKeys)) {
-                    if (mapGet(sortedGroupRowIds, groupRowId)) {
-                      resultStore.setRow(queryId, groupRowId, groupRow);
-                    }
-                    return;
-                  }
-                }
-                mapSet(sortKeysByGroupRowId, groupRowId, newSortKeys);
-                collClear(sortedGroupRowIds);
-              },
-            ),
-        groupHavingStore.addTableListener(queryId, () => {
-          if (collIsEmpty(sortedGroupRowIds)) {
-            resultStore.delTable(queryId);
-            if (groupHavingStore.hasTable(queryId)) {
-              const groupTable = groupHavingStore.getTable(queryId);
-              arrayForEach(
-                arraySort(objIds(groupTable), groupRowIdSorter),
-                (id) => mapSet(sortedGroupRowIds, id, 0),
-              );
-              arrayForEach(
-                ifNotUndefined(
-                  offsetLimit,
-                  ([offset, limit2]) =>
-                    arraySlice(
-                      mapKeys(sortedGroupRowIds),
-                      offset,
-                      offset + limit2,
-                    ),
-                  () => mapKeys(sortedGroupRowIds),
-                ),
-                (groupRowId) => {
-                  resultStore.setRow(
-                    queryId,
-                    groupRowId,
-                    groupTable[groupRowId],
-                  );
-                  mapSet(sortedGroupRowIds, groupRowId, 1);
-                },
-              );
-            }
-          }
-        }),
-      );
-    }
+    let selectJoinWhereStore = preStore;
     if (collIsEmpty(groups) && arrayIsEmpty(havings)) {
-      selectJoinWhereStore = groupHavingStore;
+      selectJoinWhereStore = resultStore;
     } else {
-      synchronizeTransactions(queryId, selectJoinWhereStore, groupHavingStore);
+      synchronizeTransactions(queryId, selectJoinWhereStore, resultStore);
       const groupedSelectedCellIds = mapNew();
       mapForEach(groups, (groupedCellId, [selectedCellId, aggregators]) =>
         setAdd(mapEnsure(groupedSelectedCellIds, selectedCellId, setNew), [
@@ -1373,8 +1284,8 @@ const createQueries = getCreateFunction((store) => {
               !arrayEvery(havings, (having2) =>
                 having2((cellId) => groupRow[cellId]),
               )
-              ? groupHavingStore.delRow
-              : groupHavingStore.setRow)(queryId, groupRowId, groupRow);
+              ? resultStore.delRow
+              : resultStore.setRow)(queryId, groupRowId, groupRow);
           },
         );
       addPreStoreListener(
@@ -1421,7 +1332,7 @@ const createQueries = getCreateFunction((store) => {
                   ([, selectedRowIds, groupRowId]) => {
                     collDel(selectedRowIds, selectedRowId);
                     if (collIsEmpty(selectedRowIds)) {
-                      groupHavingStore.delRow(queryId, groupRowId);
+                      resultStore.delRow(queryId, groupRowId);
                       return 1;
                     }
                   },
@@ -1451,7 +1362,7 @@ const createQueries = getCreateFunction((store) => {
                     return [
                       mapNew(),
                       setNew(),
-                      groupHavingStore.addRow(queryId, groupRow, 1),
+                      resultStore.addRow(queryId, groupRow, 1),
                       groupRow,
                     ];
                   },
@@ -1558,68 +1469,15 @@ const createQueries = getCreateFunction((store) => {
     return queries;
   };
   const delQueryDefinition = (queryId) => {
-    mapForEach(mapGet(preStoreListenerIds, queryId), (preStore, listenerIds) =>
+    mapForEach(mapGet(preStoreListenerIds, queryId), (preStore2, listenerIds) =>
       collForEach(listenerIds, (listenerId) =>
-        preStore.delListener(listenerId),
+        preStore2.delListener(listenerId),
       ),
     );
     cleanPreStores(queryId);
     delDefinition(queryId);
     return queries;
   };
-  const getResultTable = (queryId) => resultStore.getTable(queryId);
-  const getResultRowIds = (queryId) => resultStore.getRowIds(queryId);
-  const getResultSortedRowIds = (queryId, cellId, descending) =>
-    resultStore.getSortedRowIds(queryId, cellId, descending);
-  const getResultRow = (queryId, rowId) => resultStore.getRow(queryId, rowId);
-  const getResultCellIds = (queryId, rowId) =>
-    resultStore.getCellIds(queryId, rowId);
-  const getResultCell = (queryId, rowId, cellId) =>
-    resultStore.getCell(queryId, rowId, cellId);
-  const hasResultTable = (queryId) => resultStore.hasTable(queryId);
-  const hasResultRow = (queryId, rowId) => resultStore.hasRow(queryId, rowId);
-  const hasResultCell = (queryId, rowId, cellId) =>
-    resultStore.hasCell(queryId, rowId, cellId);
-  const forEachResultTable = (tableCallback) =>
-    resultStore.forEachTable(tableCallback);
-  const forEachResultRow = (queryId, rowCallback) =>
-    resultStore.forEachRow(queryId, rowCallback);
-  const forEachResultCell = (queryId, rowId, cellCallback) =>
-    resultStore.forEachCell(queryId, rowId, cellCallback);
-  const addResultTableListener = (queryId, listener) =>
-    resultStore.addTableListener(queryId, (_store, ...args) =>
-      listener(queries, ...args),
-    );
-  const addResultRowIdsListener = (queryId, listener, trackReorder) =>
-    resultStore.addRowIdsListener(
-      queryId,
-      (_store, ...args) => listener(queries, ...args),
-      trackReorder,
-    );
-  const addResultSortedRowIdsListener = (
-    queryId,
-    cellId,
-    descending,
-    listener,
-  ) =>
-    resultStore.addSortedRowIdsListener(
-      queryId,
-      cellId,
-      descending,
-      (_store, ...args) => listener(queries, ...args),
-    );
-  const addResultRowListener = (queryId, rowId, listener) =>
-    resultStore.addRowListener(queryId, rowId, (_store, ...args) =>
-      listener(queries, ...args),
-    );
-  const addResultCellIdsListener = (queryId, rowId, listener) =>
-    resultStore.addCellIdsListener(queryId, rowId, (_store, ...args) =>
-      listener(queries, ...args),
-    );
-  const addResultCellListener = (queryId, rowId, cellId, listener) =>
-    resultStore.addCellListener(queryId, rowId, cellId, (_store, ...args) =>
-      listener(queries, ...args),
-    );
   const delListener = (listenerId) => {
     resultStore.delListener(listenerId);
     return queries;
@@ -1641,28 +1499,34 @@ const createQueries = getCreateFunction((store) => {
     forEachQuery,
     hasQuery,
     getTableId,
-    getResultTable,
-    getResultRowIds,
-    getResultSortedRowIds,
-    getResultRow,
-    getResultCellIds,
-    getResultCell,
-    hasResultTable,
-    hasResultRow,
-    hasResultCell,
-    forEachResultTable,
-    forEachResultRow,
-    forEachResultCell,
-    addResultTableListener,
-    addResultRowIdsListener,
-    addResultSortedRowIdsListener,
-    addResultRowListener,
-    addResultCellIdsListener,
-    addResultCellListener,
     delListener,
     destroy,
     getListenerStats,
   };
+  objForEach(
+    {
+      [TABLE]: [1, 1],
+      [ROW_IDS]: [0, 1],
+      [SORTED_ROW_IDS]: [0, 5],
+      [ROW]: [1, 2],
+      [CELL_IDS]: [0, 2],
+      [CELL]: [1, 3],
+    },
+    ([hasAndForEach, argumentCount], gettable) => {
+      arrayForEach(
+        hasAndForEach ? [GET, 'has', 'forEach'] : [GET],
+        (prefix) =>
+          (queries[prefix + RESULT + gettable] = (...args) =>
+            resultStore[prefix + gettable](...args)),
+      );
+      queries[ADD + RESULT + gettable + LISTENER] = (...args) =>
+        resultStore[ADD + gettable + LISTENER](
+          ...arraySlice(args, 0, argumentCount),
+          (_store, ...listenerArgs) =>
+            args[argumentCount](queries, ...listenerArgs),
+        );
+    },
+  );
   return objFreeze(queries);
 });
 
@@ -1855,11 +1719,7 @@ const createRelationships = getCreateFunction((store) => {
 
 const pairNew = (value) => [value, value];
 const pairCollSize2 = (pair, func = collSize2) => func(pair[0]) + func(pair[1]);
-const pairCollIsEmpty = (pair) => pairCollSize2(pair) == 0;
 const pairNewMap = () => [mapNew(), mapNew()];
-const pair2CollSize2 = (pair2, func = collSize2) =>
-  pairCollSize2(pair2[0], func) + pairCollSize2(pair2[1], func);
-const pair2NewMap = () => [pairNewMap(), pairNewMap()];
 
 const transformMap = (map, toBeLikeObject, setId, delId = mapSet) => {
   const idsToDelete = arrayFilter(
@@ -1900,22 +1760,17 @@ const createStore = () => {
   const schemaRowCache = mapNew();
   const tablesMap = mapNew();
   const tablesListeners = pairNewMap();
-  const tableIdsListeners = pair2NewMap();
+  const tableIdsListeners = pairNewMap();
   const tableListeners = pairNewMap();
-  const rowIdsListeners = pair2NewMap();
+  const rowIdsListeners = pairNewMap();
   const sortedRowIdsListeners = pairNewMap();
   const rowListeners = pairNewMap();
-  const cellIdsListeners = pair2NewMap();
+  const cellIdsListeners = pairNewMap();
   const cellListeners = pairNewMap();
   const invalidCellListeners = pairNewMap();
   const finishTransactionListeners = pairNewMap();
-  const [
-    addListener,
-    callListeners,
-    delListenerImpl,
-    hasListeners,
-    callListenerImpl,
-  ] = getListenerFunctions(() => store);
+  const [addListener, callListeners, delListenerImpl, callListenerImpl] =
+    getListenerFunctions(() => store);
   const validateSchema = (schema) =>
     validate(schema, (tableSchema) =>
       validate(tableSchema, (cellSchema) => {
@@ -2097,49 +1952,12 @@ const createStore = () => {
     }
   };
   const tableIdsChanged = (tableId, added) =>
-    idsChanged(
-      collIsEmpty(changedTableIds)
-        ? mapSet(
-            changedTableIds,
-            null,
-            hasListeners(tableIdsListeners[0][1]) ||
-              hasListeners(tableIdsListeners[1][1])
-              ? getTableIds()
-              : 0,
-          )
-        : changedTableIds,
-      tableId,
-      added,
-    );
+    idsChanged(changedTableIds, tableId, added);
   const rowIdsChanged = (tableId, rowId, added) =>
-    idsChanged(
-      mapEnsure(changedRowIds, tableId, () =>
-        mapNew([
-          [
-            null,
-            hasListeners(rowIdsListeners[0][1], [tableId]) ||
-            hasListeners(rowIdsListeners[1][1], [tableId])
-              ? getRowIds(tableId)
-              : 0,
-          ],
-        ]),
-      ),
-      rowId,
-      added,
-    );
+    idsChanged(mapEnsure(changedRowIds, tableId, mapNew), rowId, added);
   const cellIdsChanged = (tableId, rowId, cellId, added) =>
     idsChanged(
-      mapEnsure(mapEnsure(changedCellIds, tableId, mapNew), rowId, () =>
-        mapNew([
-          [
-            null,
-            hasListeners(cellIdsListeners[0][1], [tableId, rowId]) ||
-            hasListeners(cellIdsListeners[1][1], [tableId, rowId])
-              ? getCellIds(tableId, rowId)
-              : 0,
-          ],
-        ]),
-      ),
+      mapEnsure(mapEnsure(changedCellIds, tableId, mapNew), rowId, mapNew),
       cellId,
       added,
     );
@@ -2182,18 +2000,9 @@ const createStore = () => {
             ),
         )
       : 0;
-  const callIdsListenersIfChanged = (listeners, changedIds, getIds, ids) => {
-    if (collSize(changedIds) > 1) {
-      callListeners(listeners[0], ids);
-      callListeners(listeners[1], ids);
-      return 1;
-    }
-    if (
-      !collIsEmpty(changedIds) &&
-      mapGet(changedIds, null) != 0 &&
-      !arrayIsEqual(mapGet(changedIds, null), getIds(...(ids ?? [])))
-    ) {
-      callListeners(listeners[1], ids);
+  const callIdsListenersIfChanged = (listeners, changedIds, ids) => {
+    if (!collIsEmpty(changedIds)) {
+      callListeners(listeners, ids);
       return 1;
     }
   };
@@ -2202,10 +2011,10 @@ const createStore = () => {
       sortedRowIdsListeners[mutator],
     );
     const emptyIdListeners =
-      pairCollIsEmpty(cellIdsListeners[mutator]) &&
-      pairCollIsEmpty(rowIdsListeners[mutator]) &&
+      collIsEmpty(cellIdsListeners[mutator]) &&
+      collIsEmpty(rowIdsListeners[mutator]) &&
       emptySortedRowIdListeners &&
-      pairCollIsEmpty(tableIdsListeners[mutator]);
+      collIsEmpty(tableIdsListeners[mutator]);
     const emptyOtherListeners =
       collIsEmpty(cellListeners[mutator]) &&
       collIsEmpty(rowListeners[mutator]) &&
@@ -2223,23 +2032,18 @@ const createStore = () => {
       if (!emptyIdListeners) {
         collForEach(changes[2], (rowCellIds, tableId) =>
           collForEach(rowCellIds, (changedIds, rowId) =>
-            callIdsListenersIfChanged(
-              cellIdsListeners[mutator],
-              changedIds,
-              getCellIds,
-              [tableId, rowId],
-            ),
+            callIdsListenersIfChanged(cellIdsListeners[mutator], changedIds, [
+              tableId,
+              rowId,
+            ]),
           ),
         );
         const calledSortableTableIds = setNew();
         collForEach(changes[1], (changedIds, tableId) => {
           if (
-            callIdsListenersIfChanged(
-              rowIdsListeners[mutator],
-              changedIds,
-              getRowIds,
-              [tableId],
-            ) &&
+            callIdsListenersIfChanged(rowIdsListeners[mutator], changedIds, [
+              tableId,
+            ]) &&
             !emptySortedRowIdListeners
           ) {
             callListeners(sortedRowIdsListeners[mutator], [tableId, null]);
@@ -2266,11 +2070,7 @@ const createStore = () => {
             }
           });
         }
-        callIdsListenersIfChanged(
-          tableIdsListeners[mutator],
-          changes[0],
-          getTableIds,
-        );
+        callIdsListenersIfChanged(tableIdsListeners[mutator], changes[0]);
       }
       if (!emptyOtherListeners) {
         let tablesChanged;
@@ -2318,7 +2118,7 @@ const createStore = () => {
   const getTable = (tableId) =>
     mapToObj(mapGet(tablesMap, id(tableId)), mapToObj);
   const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, id(tableId)));
-  const getSortedRowIds = (tableId, cellId, descending) => {
+  const getSortedRowIds = (tableId, cellId, descending, offset = 0, limit) => {
     const cells = [];
     mapForEach(mapGet(tablesMap, id(tableId)), (rowId, row) =>
       arrayPush(cells, [
@@ -2327,10 +2127,14 @@ const createStore = () => {
       ]),
     );
     return arrayMap(
-      arraySort(
-        cells,
-        ([cell1], [cell2]) =>
-          defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+      arraySlice(
+        arraySort(
+          cells,
+          ([cell1], [cell2]) =>
+            defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+        ),
+        offset,
+        isUndefined(limit) ? limit : offset + limit,
       ),
       ([, rowId]) => rowId,
     );
@@ -2575,67 +2379,48 @@ const createStore = () => {
     );
   const forEachCell = (tableId, rowId, cellCallback) =>
     mapForEach(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), cellCallback);
-  const addTablesListener = (listener, mutator) =>
-    addListener(listener, tablesListeners[mutator ? 1 : 0]);
-  const addTableIdsListener = (listener, trackReorder, mutator) =>
-    addListener(
-      listener,
-      tableIdsListeners[mutator ? 1 : 0][trackReorder ? 1 : 0],
-    );
-  const addTableListener = (tableId, listener, mutator) =>
-    addListener(listener, tableListeners[mutator ? 1 : 0], [tableId]);
-  const addRowIdsListener = (tableId, listener, trackReorder, mutator) =>
-    addListener(
-      listener,
-      rowIdsListeners[mutator ? 1 : 0][trackReorder ? 1 : 0],
-      [tableId],
-    );
   const addSortedRowIdsListener = (
     tableId,
     cellId,
     descending,
+    offset,
+    limit,
     listener,
     mutator,
   ) => {
-    let sortedRowIds = getSortedRowIds(tableId, cellId, descending);
+    let sortedRowIds = getSortedRowIds(
+      tableId,
+      cellId,
+      descending,
+      offset,
+      limit,
+    );
     return addListener(
       () => {
-        const newSortedRowIds = getSortedRowIds(tableId, cellId, descending);
+        const newSortedRowIds = getSortedRowIds(
+          tableId,
+          cellId,
+          descending,
+          offset,
+          limit,
+        );
         if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
           sortedRowIds = newSortedRowIds;
-          listener(store, tableId, cellId, descending, sortedRowIds);
+          listener(
+            store,
+            tableId,
+            cellId,
+            descending,
+            offset,
+            limit,
+            sortedRowIds,
+          );
         }
       },
       sortedRowIdsListeners[mutator ? 1 : 0],
       [tableId, cellId],
     );
   };
-  const addRowListener = (tableId, rowId, listener, mutator) =>
-    addListener(listener, rowListeners[mutator ? 1 : 0], [tableId, rowId]);
-  const addCellIdsListener = (
-    tableId,
-    rowId,
-    listener,
-    trackReorder,
-    mutator,
-  ) =>
-    addListener(
-      listener,
-      cellIdsListeners[mutator ? 1 : 0][trackReorder ? 1 : 0],
-      [tableId, rowId],
-    );
-  const addCellListener = (tableId, rowId, cellId, listener, mutator) =>
-    addListener(listener, cellListeners[mutator ? 1 : 0], [
-      tableId,
-      rowId,
-      cellId,
-    ]);
-  const addInvalidCellListener = (tableId, rowId, cellId, listener, mutator) =>
-    addListener(listener, invalidCellListeners[mutator ? 1 : 0], [
-      tableId,
-      rowId,
-      cellId,
-    ]);
   const addWillFinishTransactionListener = (listener) =>
     addListener(listener, finishTransactionListeners[0]);
   const addDidFinishTransactionListener = (listener) =>
@@ -2652,12 +2437,12 @@ const createStore = () => {
   };
   const getListenerStats = () => ({
     tables: pairCollSize2(tablesListeners),
-    tableIds: pair2CollSize2(tableIdsListeners),
+    tableIds: pairCollSize2(tableIdsListeners),
     table: pairCollSize2(tableListeners),
-    rowIds: pair2CollSize2(rowIdsListeners),
+    rowIds: pairCollSize2(rowIdsListeners),
     sortedRowIds: pairCollSize2(sortedRowIdsListeners),
     row: pairCollSize2(rowListeners, collSize3),
-    cellIds: pair2CollSize2(cellIdsListeners, collSize3),
+    cellIds: pairCollSize2(cellIdsListeners, collSize3),
     cell: pairCollSize2(cellListeners, collSize4),
     invalidCell: pairCollSize2(invalidCellListeners, collSize4),
     transaction: pairCollSize2(finishTransactionListeners),
@@ -2696,15 +2481,7 @@ const createStore = () => {
     forEachTable,
     forEachRow,
     forEachCell,
-    addTablesListener,
-    addTableIdsListener,
-    addTableListener,
-    addRowIdsListener,
     addSortedRowIdsListener,
-    addRowListener,
-    addCellIdsListener,
-    addCellListener,
-    addInvalidCellListener,
     addWillFinishTransactionListener,
     addDidFinishTransactionListener,
     callListener,
@@ -2712,6 +2489,26 @@ const createStore = () => {
     getListenerStats,
     createStore,
   };
+  objForEach(
+    {
+      [TABLES]: [0, tablesListeners],
+      [TABLE_IDS]: [0, tableIdsListeners],
+      [TABLE]: [1, tableListeners],
+      [ROW_IDS]: [1, rowIdsListeners],
+      [ROW]: [2, rowListeners],
+      [CELL_IDS]: [2, cellIdsListeners],
+      [CELL]: [3, cellListeners],
+      InvalidCell: [3, invalidCellListeners],
+    },
+    ([argumentCount, idSetNode], listenable) => {
+      store[ADD + listenable + LISTENER] = (...args) =>
+        addListener(
+          args[argumentCount],
+          idSetNode[args[argumentCount + 1] ? 1 : 0],
+          argumentCount > 0 ? arraySlice(args, 0, argumentCount) : void 0,
+        );
+    },
+  );
   return objFreeze(store);
 };