tinybase 2.0.0-beta.3 → 2.0.0-beta.5

package/lib/debug/queries.js

@@ -347,8 +347,20 @@ const createQueries = getCreateFunction((store) => {
         listenerId,
       ),
     );
-  const cleanPreStores = (queryId) =>
+  const resetPreStores = (queryId) => {
+    ifNotUndefined(
+      mapGet(preStoreListenerIds, queryId),
+      (queryPreStoreListenerIds) => {
+        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+          collForEach(listenerIds, (listenerId) =>
+            preStore2.delListener(listenerId),
+          ),
+        );
+        collClear(queryPreStoreListenerIds);
+      },
+    );
     arrayForEach([resultStore, preStore], (store2) => store2.delTable(queryId));
+  };
   const synchronizeTransactions = (queryId, fromStore, toStore) =>
     addPreStoreListener(
       fromStore,
@@ -360,7 +372,7 @@ const createQueries = getCreateFunction((store) => {
     );
   const setQueryDefinition = (queryId, tableId, build) => {
     setDefinition(queryId, tableId);
-    cleanPreStores(queryId);
+    resetPreStores(queryId);
     const selectEntries = [];
     const joinEntries = [[null, [tableId, null, null, [], mapNew()]]];
     const wheres = [];
@@ -505,12 +517,18 @@ const createQueries = getCreateFunction((store) => {
                 }
               },
             );
-            (collIsEmpty(selectedRowIds) ||
+            if (
+              collIsEmpty(selectedRowIds) ||
               !arrayEvery(havings, (having2) =>
                 having2((cellId) => groupRow[cellId]),
               )
-              ? resultStore.delRow
-              : resultStore.setRow)(queryId, groupRowId, groupRow);
+            ) {
+              resultStore.delRow(queryId, groupRowId);
+            } else if (isUndefined(groupRowId)) {
+              leaf[2] = resultStore.addRow(queryId, groupRow);
+            } else {
+              resultStore.setRow(queryId, groupRowId, groupRow);
+            }
           },
         );
       addPreStoreListener(
@@ -550,18 +568,10 @@ const createQueries = getCreateFunction((store) => {
             });
             if (changedLeaf) {
               writeGroupRow(
-                visitTree(
-                  tree,
-                  oldPath,
-                  void 0,
-                  ([, selectedRowIds, groupRowId]) => {
-                    collDel(selectedRowIds, selectedRowId);
-                    if (collIsEmpty(selectedRowIds)) {
-                      resultStore.delRow(queryId, groupRowId);
-                      return 1;
-                    }
-                  },
-                ),
+                visitTree(tree, oldPath, void 0, ([, selectedRowIds]) => {
+                  collDel(selectedRowIds, selectedRowId);
+                  return collIsEmpty(selectedRowIds);
+                }),
                 changedGroupedSelectedCells,
                 selectedRowId,
                 1,
@@ -584,12 +594,7 @@ const createQueries = getCreateFunction((store) => {
                             selectedCellId,
                           )),
                     );
-                    return [
-                      mapNew(),
-                      setNew(),
-                      resultStore.addRow(queryId, groupRow, 1),
-                      groupRow,
-                    ];
+                    return [mapNew(), setNew(), void 0, groupRow];
                   },
                   ([, selectedRowIds]) => {
                     setAdd(selectedRowIds, selectedRowId);
@@ -694,12 +699,7 @@ const createQueries = getCreateFunction((store) => {
     return queries;
   };
   const delQueryDefinition = (queryId) => {
-    mapForEach(mapGet(preStoreListenerIds, queryId), (preStore2, listenerIds) =>
-      collForEach(listenerIds, (listenerId) =>
-        preStore2.delListener(listenerId),
-      ),
-    );
-    cleanPreStores(queryId);
+    resetPreStores(queryId);
     delDefinition(queryId);
     return queries;
   };

package/lib/debug/relationships.d.ts

@@ -244,7 +244,7 @@ export type RelationshipsListenerStats = {
  * relationships.destroy();
  * ```
  * @see Relationships And Checkpoints guides
- * @see TinyDraw demo
+ * @see Drawing demo
  * @category Relationships
  */
 export interface Relationships {

package/lib/debug/relationships.js

@@ -7,7 +7,7 @@ const arrayLength = (array) => array.length;
 const arrayIsEmpty = (array) => arrayLength(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
-const arrayPop = (array) => array.pop();
+const arrayShift = (array) => array.shift();
 
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
@@ -215,6 +215,20 @@ const getCreateFunction = (getFunction) => {
   };
 };
 
+const INTEGER = /^\d+$/;
+const getPoolFunctions = () => {
+  const pool = [];
+  let nextId = 0;
+  return [
+    () => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (id) => {
+      if (INTEGER.test(id) && arrayLength(pool) < 1e3) {
+        arrayPush(pool, id);
+      }
+    },
+  ];
+};
+
 const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
   const leaves = [];
   const deep = (node, p) =>
@@ -228,12 +242,11 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
 };
 const getListenerFunctions = (getThing) => {
   let thing;
-  let nextId = 0;
-  const listenerPool = [];
+  const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
   const addListener = (listener, idSetNode, path) => {
     thing ??= getThing();
-    const id = arrayPop(listenerPool) ?? EMPTY_STRING + nextId++;
+    const id = getId();
     mapSet(allListeners, id, [listener, idSetNode, path]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
@@ -251,9 +264,7 @@ const getListenerFunctions = (getThing) => {
         return collIsEmpty(idSet) ? 1 : 0;
       });
       mapSet(allListeners, id);
-      if (arrayLength(listenerPool) < 1e3) {
-        arrayPush(listenerPool, id);
-      }
+      releaseId(id);
       return idOrNulls;
     });
   const callListener = (id, idNullGetters, extraArgsGetter) =>

package/lib/debug/store.js

@@ -31,7 +31,7 @@ const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayFilter = (array, cb) => array.filter(cb);
 const arraySlice = (array, start, end) => array.slice(start, end);
 const arrayPush = (array, ...values) => array.push(...values);
-const arrayPop = (array) => array.pop();
+const arrayShift = (array) => array.shift();
 
 const jsonString = (obj) =>
   JSON.stringify(obj, (_key, value) =>
@@ -136,6 +136,20 @@ const objIsEmpty = (obj) => arrayIsEmpty(objIds(obj));
 const setNew = (entries) => new Set(entries);
 const setAdd = (set, value) => set?.add(value);
 
+const INTEGER = /^\d+$/;
+const getPoolFunctions = () => {
+  const pool = [];
+  let nextId = 0;
+  return [
+    () => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (id) => {
+      if (INTEGER.test(id) && arrayLength(pool) < 1e3) {
+        arrayPush(pool, id);
+      }
+    },
+  ];
+};
+
 const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
   const leaves = [];
   const deep = (node, p) =>
@@ -149,12 +163,11 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
 };
 const getListenerFunctions = (getThing) => {
   let thing;
-  let nextId = 0;
-  const listenerPool = [];
+  const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
   const addListener = (listener, idSetNode, path) => {
     thing ??= getThing();
-    const id = arrayPop(listenerPool) ?? EMPTY_STRING + nextId++;
+    const id = getId();
     mapSet(allListeners, id, [listener, idSetNode, path]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
@@ -172,9 +185,7 @@ const getListenerFunctions = (getThing) => {
         return collIsEmpty(idSet) ? 1 : 0;
       });
       mapSet(allListeners, id);
-      if (arrayLength(listenerPool) < 1e3) {
-        arrayPush(listenerPool, id);
-      }
+      releaseId(id);
       return idOrNulls;
     });
   const callListener = (id, idNullGetters, extraArgsGetter) =>
@@ -240,7 +251,6 @@ const idsChanged = (changedIds, id2, added) =>
 const createStore = () => {
   let hasSchema;
   let cellsTouched;
-  let nextRowId = 0;
   let transactions = 0;
   const changedTableIds = mapNew();
   const changedRowIds = mapNew();
@@ -249,6 +259,7 @@ const createStore = () => {
   const invalidCells = mapNew();
   const schemaMap = mapNew();
   const schemaRowCache = mapNew();
+  const tablePoolFunctions = mapNew();
   const tablesMap = mapNew();
   const tablesListeners = pairNewMap();
   const tableIdsListeners = pairNewMap();
@@ -411,18 +422,26 @@ const createStore = () => {
           addDefaultsToRow({[cellId]: validCell}, tableId, rowId),
         ),
     );
-  const getNewRowId = (tableMap) => {
-    const rowId = EMPTY_STRING + nextRowId++;
-    if (!collHas(tableMap, rowId)) {
+  const getNewRowId = (tableId) => {
+    const [getId] = mapEnsure(tablePoolFunctions, tableId, getPoolFunctions);
+    const rowId = getId();
+    if (!collHas(mapGet(tablesMap, tableId), rowId)) {
       return rowId;
     }
-    return getNewRowId(tableMap);
+    return getNewRowId(tableId);
   };
   const getOrCreateTable = (tableId) =>
     mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});
   const delValidTable = (tableId) => setValidTable(tableId, {});
-  const delValidRow = (tableId, tableMap, rowId) =>
+  const delValidRow = (tableId, tableMap, rowId) => {
+    const [, releaseId] = mapEnsure(
+      tablePoolFunctions,
+      tableId,
+      getPoolFunctions,
+    );
+    releaseId(rowId);
     setValidRow(tableId, tableMap, rowId, {}, true);
+  };
   const delValidCell = (tableId, table, rowId, row, cellId, forceDel) => {
     const defaultCell = mapGet(mapGet(schemaRowCache, tableId)?.[0], cellId);
     if (!isUndefined(defaultCell) && !forceDel) {
@@ -668,16 +687,17 @@ const createStore = () => {
       tableId,
       rowId,
     );
-  const addRow = (tableId, row, forceId) =>
+  const addRow = (tableId, row) =>
     transaction(() => {
-      tableId = id(tableId);
-      const isValidRow = validateRow(tableId, void 0, row);
-      const rowId =
-        isValidRow || forceId
-          ? getNewRowId(mapGet(tablesMap, tableId))
-          : void 0;
-      if (isValidRow) {
-        setValidRow(tableId, getOrCreateTable(tableId), rowId, row);
+      let rowId = void 0;
+      if (validateRow(tableId, rowId, row)) {
+        tableId = id(tableId);
+        setValidRow(
+          tableId,
+          getOrCreateTable(tableId),
+          (rowId = getNewRowId(tableId)),
+          row,
+        );
       }
       return rowId;
     });

package/lib/debug/tinybase.js

@@ -49,6 +49,7 @@ const arraySlice = (array, start, end) => array.slice(start, end);
 const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayPop = (array) => array.pop();
+const arrayShift = (array) => array.shift();
 
 const jsonString = (obj) =>
   JSON.stringify(obj, (_key, value) =>
@@ -295,6 +296,20 @@ const getCreateFunction = (getFunction) => {
   };
 };
 
+const INTEGER = /^\d+$/;
+const getPoolFunctions = () => {
+  const pool = [];
+  let nextId = 0;
+  return [
+    () => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (id) => {
+      if (INTEGER.test(id) && arrayLength(pool) < 1e3) {
+        arrayPush(pool, id);
+      }
+    },
+  ];
+};
+
 const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
   const leaves = [];
   const deep = (node, p) =>
@@ -308,12 +323,11 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
 };
 const getListenerFunctions = (getThing) => {
   let thing;
-  let nextId = 0;
-  const listenerPool = [];
+  const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
   const addListener = (listener, idSetNode, path) => {
     thing ??= getThing();
-    const id = arrayPop(listenerPool) ?? EMPTY_STRING + nextId++;
+    const id = getId();
     mapSet(allListeners, id, [listener, idSetNode, path]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
@@ -331,9 +345,7 @@ const getListenerFunctions = (getThing) => {
         return collIsEmpty(idSet) ? 1 : 0;
       });
       mapSet(allListeners, id);
-      if (arrayLength(listenerPool) < 1e3) {
-        arrayPush(listenerPool, id);
-      }
+      releaseId(id);
       return idOrNulls;
     });
   const callListener = (id, idNullGetters, extraArgsGetter) =>
@@ -470,7 +482,7 @@ const createCheckpoints = getCreateFunction((store) => {
   const goForwardImpl = () => {
     if (!arrayIsEmpty(forwardIds)) {
       arrayPush(backwardIds, currentId);
-      currentId = forwardIds.shift();
+      currentId = arrayShift(forwardIds);
       updateStore(1, currentId);
       checkpointsChanged = 1;
     }
@@ -1122,8 +1134,20 @@ const createQueries = getCreateFunction((store) => {
         listenerId,
       ),
     );
-  const cleanPreStores = (queryId) =>
+  const resetPreStores = (queryId) => {
+    ifNotUndefined(
+      mapGet(preStoreListenerIds, queryId),
+      (queryPreStoreListenerIds) => {
+        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+          collForEach(listenerIds, (listenerId) =>
+            preStore2.delListener(listenerId),
+          ),
+        );
+        collClear(queryPreStoreListenerIds);
+      },
+    );
     arrayForEach([resultStore, preStore], (store2) => store2.delTable(queryId));
+  };
   const synchronizeTransactions = (queryId, fromStore, toStore) =>
     addPreStoreListener(
       fromStore,
@@ -1135,7 +1159,7 @@ const createQueries = getCreateFunction((store) => {
     );
   const setQueryDefinition = (queryId, tableId, build) => {
     setDefinition(queryId, tableId);
-    cleanPreStores(queryId);
+    resetPreStores(queryId);
     const selectEntries = [];
     const joinEntries = [[null, [tableId, null, null, [], mapNew()]]];
     const wheres = [];
@@ -1280,12 +1304,18 @@ const createQueries = getCreateFunction((store) => {
                 }
               },
             );
-            (collIsEmpty(selectedRowIds) ||
+            if (
+              collIsEmpty(selectedRowIds) ||
               !arrayEvery(havings, (having2) =>
                 having2((cellId) => groupRow[cellId]),
               )
-              ? resultStore.delRow
-              : resultStore.setRow)(queryId, groupRowId, groupRow);
+            ) {
+              resultStore.delRow(queryId, groupRowId);
+            } else if (isUndefined(groupRowId)) {
+              leaf[2] = resultStore.addRow(queryId, groupRow);
+            } else {
+              resultStore.setRow(queryId, groupRowId, groupRow);
+            }
           },
         );
       addPreStoreListener(
@@ -1325,18 +1355,10 @@ const createQueries = getCreateFunction((store) => {
             });
             if (changedLeaf) {
               writeGroupRow(
-                visitTree(
-                  tree,
-                  oldPath,
-                  void 0,
-                  ([, selectedRowIds, groupRowId]) => {
-                    collDel(selectedRowIds, selectedRowId);
-                    if (collIsEmpty(selectedRowIds)) {
-                      resultStore.delRow(queryId, groupRowId);
-                      return 1;
-                    }
-                  },
-                ),
+                visitTree(tree, oldPath, void 0, ([, selectedRowIds]) => {
+                  collDel(selectedRowIds, selectedRowId);
+                  return collIsEmpty(selectedRowIds);
+                }),
                 changedGroupedSelectedCells,
                 selectedRowId,
                 1,
@@ -1359,12 +1381,7 @@ const createQueries = getCreateFunction((store) => {
                             selectedCellId,
                           )),
                     );
-                    return [
-                      mapNew(),
-                      setNew(),
-                      resultStore.addRow(queryId, groupRow, 1),
-                      groupRow,
-                    ];
+                    return [mapNew(), setNew(), void 0, groupRow];
                   },
                   ([, selectedRowIds]) => {
                     setAdd(selectedRowIds, selectedRowId);
@@ -1469,12 +1486,7 @@ const createQueries = getCreateFunction((store) => {
     return queries;
   };
   const delQueryDefinition = (queryId) => {
-    mapForEach(mapGet(preStoreListenerIds, queryId), (preStore2, listenerIds) =>
-      collForEach(listenerIds, (listenerId) =>
-        preStore2.delListener(listenerId),
-      ),
-    );
-    cleanPreStores(queryId);
+    resetPreStores(queryId);
     delDefinition(queryId);
     return queries;
   };
@@ -1749,7 +1761,6 @@ const idsChanged = (changedIds, id2, added) =>
 const createStore = () => {
   let hasSchema;
   let cellsTouched;
-  let nextRowId = 0;
   let transactions = 0;
   const changedTableIds = mapNew();
   const changedRowIds = mapNew();
@@ -1758,6 +1769,7 @@ const createStore = () => {
   const invalidCells = mapNew();
   const schemaMap = mapNew();
   const schemaRowCache = mapNew();
+  const tablePoolFunctions = mapNew();
   const tablesMap = mapNew();
   const tablesListeners = pairNewMap();
   const tableIdsListeners = pairNewMap();
@@ -1920,18 +1932,26 @@ const createStore = () => {
           addDefaultsToRow({[cellId]: validCell}, tableId, rowId),
         ),
     );
-  const getNewRowId = (tableMap) => {
-    const rowId = EMPTY_STRING + nextRowId++;
-    if (!collHas(tableMap, rowId)) {
+  const getNewRowId = (tableId) => {
+    const [getId] = mapEnsure(tablePoolFunctions, tableId, getPoolFunctions);
+    const rowId = getId();
+    if (!collHas(mapGet(tablesMap, tableId), rowId)) {
       return rowId;
     }
-    return getNewRowId(tableMap);
+    return getNewRowId(tableId);
   };
   const getOrCreateTable = (tableId) =>
     mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});
   const delValidTable = (tableId) => setValidTable(tableId, {});
-  const delValidRow = (tableId, tableMap, rowId) =>
+  const delValidRow = (tableId, tableMap, rowId) => {
+    const [, releaseId] = mapEnsure(
+      tablePoolFunctions,
+      tableId,
+      getPoolFunctions,
+    );
+    releaseId(rowId);
     setValidRow(tableId, tableMap, rowId, {}, true);
+  };
   const delValidCell = (tableId, table, rowId, row, cellId, forceDel) => {
     const defaultCell = mapGet(mapGet(schemaRowCache, tableId)?.[0], cellId);
     if (!isUndefined(defaultCell) && !forceDel) {
@@ -2177,16 +2197,17 @@ const createStore = () => {
       tableId,
       rowId,
     );
-  const addRow = (tableId, row, forceId) =>
+  const addRow = (tableId, row) =>
     transaction(() => {
-      tableId = id(tableId);
-      const isValidRow = validateRow(tableId, void 0, row);
-      const rowId =
-        isValidRow || forceId
-          ? getNewRowId(mapGet(tablesMap, tableId))
-          : void 0;
-      if (isValidRow) {
-        setValidRow(tableId, getOrCreateTable(tableId), rowId, row);
+      let rowId = void 0;
+      if (validateRow(tableId, rowId, row)) {
+        tableId = id(tableId);
+        setValidRow(
+          tableId,
+          getOrCreateTable(tableId),
+          (rowId = getNewRowId(tableId)),
+          row,
+        );
       }
       return rowId;
     });