tinybase 4.1.0-beta.2 → 4.1.0-beta.4

package/lib/debug/tinybase.js

@@ -19,6 +19,7 @@ const TABLE = 'Table';
 const TABLES = TABLE + 's';
 const TABLE_IDS = TABLE + IDS;
 const ROW = 'Row';
+const ROW_COUNT = ROW + 'Count';
 const ROW_IDS = ROW + IDS;
 const SORTED_ROW_IDS = 'Sorted' + ROW + IDS;
 const CELL = 'Cell';
@@ -28,6 +29,20 @@ const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
 const id = (key) => EMPTY_STRING + key;
 
+const mathMax = Math.max;
+const mathMin = Math.min;
+const isFiniteNumber = isFinite;
+const isInstanceOf = (thing, cls) => thing instanceof cls;
+const isUndefined = (thing) => thing == void 0;
+const ifNotUndefined = (value, then, otherwise) =>
+  isUndefined(value) ? otherwise?.() : then(value);
+const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
+const isString = (thing) => getTypeOf(thing) == STRING;
+const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
+const isArray = (thing) => Array.isArray(thing);
+const test = (regex, subject) => regex.test(subject);
+const getUndefined = () => void 0;
+
 const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
@@ -52,34 +67,6 @@ const arrayPop = (array) => array.pop();
 const arrayUnshift = (array, ...values) => array.unshift(...values);
 const arrayShift = (array) => array.shift();
 
-const jsonString = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map)
-      ? arrayReduce(
-          [...value],
-          (obj2, [key, value2]) => {
-            obj2[key] = value2;
-            return obj2;
-          },
-          {},
-        )
-      : value,
-  );
-const jsonParse = JSON.parse;
-const mathMax = Math.max;
-const mathMin = Math.min;
-const isFiniteNumber = isFinite;
-const isInstanceOf = (thing, cls) => thing instanceof cls;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
-const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
-const isString = (thing) => getTypeOf(thing) == STRING;
-const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
-const isArray = (thing) => Array.isArray(thing);
-const test = (regex, subject) => regex.test(subject);
-const getUndefined = () => void 0;
-
 const object = Object;
 const objIds = object.keys;
 const objFrozen = object.isFrozen;
@@ -99,7 +86,7 @@ const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
 const collSizeN = (collSizer) => (coll) =>
   arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
-const collSize = (coll) => coll.size;
+const collSize = (coll) => coll?.size ?? 0;
 const collSize2 = collSizeN(collSize);
 const collSize3 = collSizeN(collSize2);
 const collSize4 = collSizeN(collSize3);
@@ -670,7 +657,8 @@ const createCheckpoints = getCreateFunction((store) => {
   return objFreeze(checkpoints.clear());
 });
 
-const defaultSorter = (sortKey1, sortKey2) => (sortKey1 < sortKey2 ? -1 : 1);
+const defaultSorter = (sortKey1, sortKey2) =>
+  (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 
 const createIndexes = getCreateFunction((store) => {
   const sliceIdsListeners = mapNew();
@@ -1564,6 +1552,7 @@ const createQueries = getCreateFunction((store) => {
     {
       [TABLE]: [1, 1],
       [TABLE + CELL_IDS]: [0, 1],
+      [ROW_COUNT]: [0, 1],
       [ROW_IDS]: [0, 1],
       [SORTED_ROW_IDS]: [0, 5],
       [ROW]: [1, 2],
@@ -1781,6 +1770,12 @@ const pairNewMap = () => [mapNew(), mapNew()];
 const pairClone = (array) => [...array];
 const pairIsEqual = ([entry1, entry2]) => entry1 === entry2;
 
+const jsonString = (obj) =>
+  JSON.stringify(obj, (_key, value) =>
+    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
+  );
+const jsonParse = JSON.parse;
+
 const validate = (obj, validateChild, onInvalidObj) => {
   if (isUndefined(obj) || !isObject(obj) || objIsEmpty(obj) || objFrozen(obj)) {
     onInvalidObj?.();
@@ -1807,6 +1802,7 @@ const createStore = () => {
   let transactions = 0;
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
+  const changedRowCount = mapNew();
   const changedRowIds = mapNew();
   const changedCellIds = mapNew();
   const changedCells = mapNew();
@@ -1827,6 +1823,7 @@ const createStore = () => {
   const tableIdsListeners = pairNewMap();
   const tableListeners = pairNewMap();
   const tableCellIdsListeners = pairNewMap();
+  const rowCountListeners = pairNewMap();
   const rowIdsListeners = pairNewMap();
   const sortedRowIdsListeners = pairNewMap();
   const rowListeners = pairNewMap();
@@ -2132,6 +2129,11 @@ const createStore = () => {
       mapEnsure(changedRowIds, tableId, mapNew),
       rowId,
       addedOrRemoved,
+    ) &&
+    mapSet(
+      changedRowCount,
+      tableId,
+      mapEnsure(changedRowCount, tableId, () => 0) + addedOrRemoved,
     );
   const cellIdsChanged = (tableId, rowId, cellId, addedOrRemoved) => {
     const cellIds = mapGet(tableCellIds, tableId);
@@ -2238,6 +2240,7 @@ const createStore = () => {
     const emptyIdListeners =
       collIsEmpty(cellIdsListeners[mutator]) &&
       collIsEmpty(tableCellIdsListeners[mutator]) &&
+      collIsEmpty(rowCountListeners[mutator]) &&
       collIsEmpty(rowIdsListeners[mutator]) &&
       emptySortedRowIdListeners &&
       collIsEmpty(tableIdsListeners[mutator]);
@@ -2251,6 +2254,7 @@ const createStore = () => {
         ? [
             mapClone(changedTableIds),
             mapClone2(changedTableCellIds),
+            mapClone(changedRowCount),
             mapClone2(changedRowIds),
             mapClone3(changedCellIds),
             mapClone3(changedCells),
@@ -2258,6 +2262,7 @@ const createStore = () => {
         : [
             changedTableIds,
             changedTableCellIds,
+            changedRowCount,
             changedRowIds,
             changedCellIds,
             changedCells,
@@ -2271,8 +2276,17 @@ const createStore = () => {
             [tableId],
           ),
         );
+        collForEach(changes[2], (changedCount, tableId) => {
+          if (changedCount != 0) {
+            callListeners(
+              rowCountListeners[mutator],
+              [tableId],
+              getRowCount(tableId),
+            );
+          }
+        });
         const calledSortableTableIds = setNew();
-        collForEach(changes[2], (changedIds, tableId) => {
+        collForEach(changes[3], (changedIds, tableId) => {
           if (
             callIdsListenersIfChanged(rowIdsListeners[mutator], changedIds, [
               tableId,
@@ -2284,7 +2298,7 @@ const createStore = () => {
           }
         });
         if (!emptySortedRowIdListeners) {
-          collForEach(changes[4], (rows, tableId) => {
+          collForEach(changes[5], (rows, tableId) => {
             if (!collHas(calledSortableTableIds, tableId)) {
               const sortableCellIds = setNew();
               collForEach(rows, (cells) =>
@@ -2303,7 +2317,7 @@ const createStore = () => {
             }
           });
         }
-        collForEach(changes[3], (rowCellIds, tableId) =>
+        collForEach(changes[4], (rowCellIds, tableId) =>
           collForEach(rowCellIds, (changedIds, rowId) =>
             callIdsListenersIfChanged(cellIdsListeners[mutator], changedIds, [
               tableId,
@@ -2314,7 +2328,7 @@ const createStore = () => {
       }
       if (!emptyOtherListeners) {
         let tablesChanged;
-        collForEach(changes[4], (rows, tableId) => {
+        collForEach(changes[5], (rows, tableId) => {
           let tableChanged;
           collForEach(rows, (cells, rowId) => {
             let rowChanged;
@@ -2428,6 +2442,7 @@ const createStore = () => {
   const getTable = (tableId) => mapToObj2(mapGet(tablesMap, id(tableId)));
   const getTableCellIds = (tableId) =>
     mapKeys(mapGet(tableCellIds, id(tableId)));
+  const getRowCount = (tableId) => collSize(mapGet(tablesMap, id(tableId)));
   const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, id(tableId)));
   const getSortedRowIds = (tableId, cellId, descending, offset = 0, limit) =>
     arrayMap(
@@ -2772,6 +2787,7 @@ const createStore = () => {
           [
             changedTableIds,
             changedTableCellIds,
+            changedRowCount,
             changedRowIds,
             changedCellIds,
             changedCells,
@@ -2867,6 +2883,7 @@ const createStore = () => {
     tableIds: pairCollSize2(tableIdsListeners),
     tableCellIds: pairCollSize2(tableCellIdsListeners),
     table: pairCollSize2(tableListeners),
+    rowCount: pairCollSize2(rowCountListeners),
     rowIds: pairCollSize2(rowIdsListeners),
     sortedRowIds: pairCollSize2(sortedRowIdsListeners),
     row: pairCollSize2(rowListeners, collSize3),
@@ -2887,6 +2904,7 @@ const createStore = () => {
     getTableIds,
     getTable,
     getTableCellIds,
+    getRowCount,
     getRowIds,
     getSortedRowIds,
     getRow,
@@ -2957,6 +2975,7 @@ const createStore = () => {
       [TABLE_IDS]: [0, tableIdsListeners],
       [TABLE]: [1, tableListeners, [getTableIds]],
       [TABLE + CELL_IDS]: [1, tableCellIdsListeners, [getTableIds]],
+      [ROW_COUNT]: [1, rowCountListeners, [getTableIds]],
       [ROW_IDS]: [1, rowIdsListeners, [getTableIds]],
       [ROW]: [2, rowListeners, [getTableIds, getRowIds]],
       [CELL_IDS]: [2, cellIdsListeners, [getTableIds, getRowIds]],

package/lib/debug/tools.js

@@ -23,19 +23,6 @@ const VALUE = 'Value';
 const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
 
-const arrayEvery = (array, cb) => array.every(cb);
-const arraySort = (array, sorter) => array.sort(sorter);
-const arrayForEach = (array, cb) => array.forEach(cb);
-const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
-const arrayMap = (array, cb) => array.map(cb);
-const arrayLength = (array) => array.length;
-const arrayFilter = (array, cb) => array.filter(cb);
-const arrayPush = (array, ...values) => array.push(...values);
-const arrayPop = (array) => array.pop();
-const arrayUnshift = (array, ...values) => array.unshift(...values);
-const arrayShift = (array) => array.shift();
-
-const jsonParse = JSON.parse;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
@@ -50,6 +37,18 @@ const getCellOrValueType = (cell) => {
     : void 0;
 };
 
+const arrayEvery = (array, cb) => array.every(cb);
+const arraySort = (array, sorter) => array.sort(sorter);
+const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
+const arrayMap = (array, cb) => array.map(cb);
+const arrayLength = (array) => array.length;
+const arrayFilter = (array, cb) => array.filter(cb);
+const arrayPush = (array, ...values) => array.push(...values);
+const arrayPop = (array) => array.pop();
+const arrayUnshift = (array, ...values) => array.unshift(...values);
+const arrayShift = (array) => array.shift();
+
 const object = Object;
 const objIds = object.keys;
 const objFreeze = object.freeze;
@@ -2803,6 +2802,8 @@ const getStoreApi = (tablesSchema, valuesSchema, module) => {
   ];
 };
 
+const jsonParse = JSON.parse;
+
 const prettierConfig = {
   parser: 'typescript',
   singleQuote: true,