tinybase 2.0.0-beta.4 → 2.0.0-beta.5

package/lib/checkpoints.js

@@ -1 +1 @@
-const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,r=e=>0==n(e),o=(e,...t)=>e.push(...t),s=e=>e.pop(),l=e=>null==e,c=(e,t,n)=>l(e)?n?.():t(e),i=(e,t)=>e?.has(t)??!1,a=e=>l(e)||0==(e=>e.size)(e),d=(e,t)=>e?.forEach(t),u=(e,t)=>e?.delete(t),h=e=>new Map(e),p=(e,t)=>e?.get(t),C=(e,t,n)=>l(n)?(u(e,t),e):e?.set(t,n),g=(e,t,n)=>(i(e,t)||C(e,t,n()),p(e,t)),k=(e,t,r,o,s=0)=>c((r?g:p)(e,t[s],s>n(t)-2?r:h),(l=>{if(s>n(t)-2)return o?.(l)&&C(e,t[s]),l;const c=k(l,t,r,o,s+1);return a(l)&&C(e,t[s]),c})),f=e=>new Set(e),v=e=>{let r,i=0;const g=[],v=h();return[(t,n,o)=>{r??=e();const l=s(g)??""+i++;var c,a;return C(v,l,[t,n,o]),c=k(n,o??[""],f),a=l,c?.add(a),l},(e,s,...l)=>t(((e,r=[""])=>{const s=[],l=(e,c)=>c==n(r)?o(s,e):null===r[c]?d(e,(e=>l(e,c+1))):t([r[c],null],(t=>l(p(e,t),c+1)));return l(e,0),s})(e,s),(e=>d(e,(e=>p(v,e)[0](r,...s??[],...l))))),e=>c(p(v,e),(([,t,r])=>(k(t,r??[""],void 0,(t=>(u(t,e),a(t)?1:0))),C(v,e),n(g)<1e3&&o(g,e),r))),(e,o,s)=>c(p(v,e),(([e,,c=[]])=>{const i=(...a)=>{const d=n(a);d==n(c)?e(r,...a,...s(a)):l(c[d])?t(o[d](...a),(e=>i(...a,e))):i(...a,c[d])};i()}))]},L=Object.freeze,w=(e=>{const t=new WeakMap;return n=>(t.has(n)||t.set(n,e(n)),t.get(n))})((u=>{let k,f,w,S=100,z=h(),E=1;const I=h(),M=h(),[b,j,x]=v((()=>Q)),y=h(),B=h(),F=[],O=[],T=(e,t)=>{E=0,u.transaction((()=>d(p(y,t),((t,n)=>d(t,((t,r)=>d(t,((t,o)=>((e,t,n,r,o)=>l(o)?e.delCell(t,n,r,!0):e.setCell(t,n,r,o))(u,n,r,o,t[e]))))))))),E=1},W=e=>{C(y,e),C(B,e),j(M,[e])},m=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),W),q=()=>m(F,n(F)-S),A=u.addCellListener(null,null,null,((e,t,n,r,l,i)=>{if(E){c(k,(()=>{o(F,k),q(),m(O),k=void 0,w=1}));const e=g(z,t,h),d=g(e,n,h),u=g(d,r,(()=>[i,void 0]));u[1]=l,u[0]===l&&a(C(d,r))&&a(C(e,n))&&a(C(z,t))&&(k=s(F),w=1),J()}})),D=(e="")=>(l(k)&&(k=""+f++,C(y,k,z),N(k,e),z=h(),w=1),k),G=()=>{r(F)||(O.unshift(D()),T(0,k),k=s(F),w=1)},H=()=>{r(O)||(o(F,k),k=O.shift(),T(1,k),w=1)},J=()=>{w&&(j(I),w=0)},K=e=>{const t=D(e);return J(),t},N=(e,t)=>(P(e)&&p(B,e)!==t&&(C(B,e,t),j(M,[e])),Q),P=e=>i(y,e),Q={setSize:e=>(S=e,q(),Q),addCheckpoint:K,setCheckpoint:N,getStore:()=>u,getCheckpointIds:()=>[[...F],k,[...O]],forEachCheckpoint:e=>{return t=e,d(B,((e,n)=>t(n,e)));var t},hasCheckpoint:P,getCheckpoint:e=>p(B,e),goBackward:()=>(G(),J(),Q),goForward:()=>(H(),J(),Q),goTo:t=>{const n=e(F,t)?G:e(O,t)?H:null;for(;!l(n)&&t!=k;)n();return J(),Q},addCheckpointIdsListener:e=>b(e,I),addCheckpointListener:(e,t)=>b(t,M,[e]),delListener:e=>(x(e),Q),clear:()=>(m(F),m(O),l(k)||W(k),k=void 0,f=0,K(),Q),destroy:()=>{u.delListener(A)},getListenerStats:()=>({})};return L(Q.clear())}));export{w as createCheckpoints};
+const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,r=e=>0==n(e),o=(e,...t)=>e.push(...t),s=e=>e.pop(),l=e=>e.shift(),c=e=>null==e,i=(e,t,n)=>c(e)?n?.():t(e),d=(e,t)=>e?.has(t)??!1,a=e=>c(e)||0==(e=>e.size)(e),u=(e,t)=>e?.forEach(t),h=(e,t)=>e?.delete(t),p=e=>new Map(e),C=(e,t)=>e?.get(t),g=(e,t,n)=>c(n)?(h(e,t),e):e?.set(t,n),k=(e,t,n)=>(d(e,t)||g(e,t,n()),C(e,t)),f=(e,t,r,o,s=0)=>i((r?k:C)(e,t[s],s>n(t)-2?r:p),(l=>{if(s>n(t)-2)return o?.(l)&&g(e,t[s]),l;const c=f(l,t,r,o,s+1);return a(l)&&g(e,t[s]),c})),v=e=>new Set(e),L=/^\d+$/,w=e=>{let r;const[s,d]=(()=>{const e=[];let t=0;return[()=>l(e)??""+t++,t=>{L.test(t)&&n(e)<1e3&&o(e,t)}]})(),k=p();return[(t,n,o)=>{r??=e();const l=s();var c,i;return g(k,l,[t,n,o]),c=f(n,o??[""],v),i=l,c?.add(i),l},(e,s,...l)=>t(((e,r=[""])=>{const s=[],l=(e,c)=>c==n(r)?o(s,e):null===r[c]?u(e,(e=>l(e,c+1))):t([r[c],null],(t=>l(C(e,t),c+1)));return l(e,0),s})(e,s),(e=>u(e,(e=>C(k,e)[0](r,...s??[],...l))))),e=>i(C(k,e),(([,t,n])=>(f(t,n??[""],void 0,(t=>(h(t,e),a(t)?1:0))),g(k,e),d(e),n))),(e,o,s)=>i(C(k,e),(([e,,l=[]])=>{const i=(...d)=>{const a=n(d);a==n(l)?e(r,...d,...s(d)):c(l[a])?t(o[a](...d),(e=>i(...d,e))):i(...d,l[a])};i()}))]},S=Object.freeze,z=(e=>{const t=new WeakMap;return n=>(t.has(n)||t.set(n,e(n)),t.get(n))})((h=>{let f,v,L,z=100,E=p(),I=1;const M=p(),b=p(),[j,x,y]=w((()=>Q)),B=p(),F=p(),O=[],T=[],W=(e,t)=>{I=0,h.transaction((()=>u(C(B,t),((t,n)=>u(t,((t,r)=>u(t,((t,o)=>((e,t,n,r,o)=>c(o)?e.delCell(t,n,r,!0):e.setCell(t,n,r,o))(h,n,r,o,t[e]))))))))),I=1},$=e=>{g(B,e),g(F,e),x(b,[e])},m=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),$),q=()=>m(O,n(O)-z),A=h.addCellListener(null,null,null,((e,t,n,r,l,c)=>{if(I){i(f,(()=>{o(O,f),q(),m(T),f=void 0,L=1}));const e=k(E,t,p),d=k(e,n,p),u=k(d,r,(()=>[c,void 0]));u[1]=l,u[0]===l&&a(g(d,r))&&a(g(e,n))&&a(g(E,t))&&(f=s(O),L=1),J()}})),D=(e="")=>(c(f)&&(f=""+v++,g(B,f,E),N(f,e),E=p(),L=1),f),G=()=>{r(O)||(T.unshift(D()),W(0,f),f=s(O),L=1)},H=()=>{r(T)||(o(O,f),f=l(T),W(1,f),L=1)},J=()=>{L&&(x(M),L=0)},K=e=>{const t=D(e);return J(),t},N=(e,t)=>(P(e)&&C(F,e)!==t&&(g(F,e,t),x(b,[e])),Q),P=e=>d(B,e),Q={setSize:e=>(z=e,q(),Q),addCheckpoint:K,setCheckpoint:N,getStore:()=>h,getCheckpointIds:()=>[[...O],f,[...T]],forEachCheckpoint:e=>{return t=e,u(F,((e,n)=>t(n,e)));var t},hasCheckpoint:P,getCheckpoint:e=>C(F,e),goBackward:()=>(G(),J(),Q),goForward:()=>(H(),J(),Q),goTo:t=>{const n=e(O,t)?G:e(T,t)?H:null;for(;!c(n)&&t!=f;)n();return J(),Q},addCheckpointIdsListener:e=>j(e,M),addCheckpointListener:(e,t)=>j(t,b,[e]),delListener:e=>(y(e),Q),clear:()=>(m(O),m(T),c(f)||$(f),f=void 0,v=0,K(),Q),destroy:()=>{h.delListener(A)},getListenerStats:()=>({})};return S(Q.clear())}));export{z as createCheckpoints};

package/lib/debug/checkpoints.js

@@ -8,6 +8,7 @@ const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 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 isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
@@ -70,6 +71,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) =>
@@ -83,12 +98,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;
@@ -106,9 +120,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) =>
@@ -229,7 +241,7 @@ const createCheckpoints = getCreateFunction((store) => {
   const goForwardImpl = () => {
     if (!arrayIsEmpty(forwardIds)) {
       arrayPush(backwardIds, currentId);
-      currentId = forwardIds.shift();
+      currentId = arrayShift(forwardIds);
       updateStore(1, currentId);
       checkpointsChanged = 1;
     }

package/lib/debug/indexes.js

@@ -14,7 +14,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) =>
@@ -224,6 +224,20 @@ const getCreateFunction = (getFunction) => {
 
 const defaultSorter = (sortKey1, sortKey2) => (sortKey1 < sortKey2 ? -1 : 1);
 
+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) =>
@@ -237,12 +251,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;
@@ -260,9 +273,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/metrics.js

@@ -13,7 +13,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 mathMax = Math.max;
 const mathMin = Math.min;
@@ -294,6 +294,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) =>
@@ -307,12 +321,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;
@@ -330,9 +343,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/queries.d.ts

@@ -2,10 +2,10 @@
  * The queries module of the TinyBase project provides the ability to create and
  * track queries of the data in Store objects.
  *
- * The main entry point to this module is the createQueries function, which
- * returns a new Queries object. From there, you can create new query
- * definitions, access the results of those directly, and register listeners for
- * when they change.
+ * The main entry point to using the queries module is the createQueries
+ * function, which returns a new Queries object. That object in turn has methods
+ * that let you create new query definitions, access their results directly, and
+ * register listeners for when those results change.
  *
  * @packageDocumentation
  * @module queries
@@ -385,18 +385,18 @@ export type GetTableCell = {
  * The Select type describes a function that lets you specify a Cell or
  * calculated value for including into the query's result.
  *
- * The Select function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method. A query definition must call the Select
- * function at least once, otherwise it will be meaningless and return no data.
+ * The Select function is provided to the third `query` parameter of the
+ * setQueryDefinition method. A query definition must call the Select function
+ * at least once, otherwise it will be meaningless and return no data.
  *
  * @example
  * This example shows a query that selects two Cells from the main query Table.
  *
  * ```js
  * const store = createStore().setTable('pets', {
- *   fido: {species: 'dog', color: 'brown'},
- *   felix: {species: 'cat', color: 'black'},
- *   cujo: {species: 'dog', color: 'black'},
+ *   fido: {species: 'dog', color: 'brown', legs: 4},
+ *   felix: {species: 'cat', color: 'black', legs: 4},
+ *   cujo: {species: 'dog', color: 'black', legs: 4},
  * });
  *
  * const queries = createQueries(store);
@@ -572,9 +572,9 @@ export type SelectedAs = {
 
 /**
  * The Join type describes a function that lets you specify a Cell or calculated
- * value to join the main query Table to others, by Row Id.
+ * value to join the main query Table to other Tables, by their Row Id.
  *
- * The Join function is provided as an parameter in the `build` parameter of the
+ * The Join function is provided to the third `query` parameter of the
  * setQueryDefinition method.
  *
  * You can join zero, one, or many Tables. You can join the same underlying
@@ -856,8 +856,8 @@ export type JoinedAs = {as: (joinedTableId: Id) => void};
  * The Where type describes a function that lets you specify conditions to
  * filter results, based on the underlying Cells of the main or joined Tables.
  *
- * The Where function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method.
+ * The Where function is provided to the third `query` parameter of the
+ * setQueryDefinition method.
  *
  * If you do not specify a Where clause, you should expect every non-empty Row
  * of the main Table to appear in the query's results.
@@ -867,10 +867,10 @@ export type JoinedAs = {as: (joinedTableId: Id) => void};
  * wish to create an 'or' expression, use the single parameter version of the
  * type that allows arbitrary programmatic conditions.
  *
- * The Where clause differs from the Having clause in that the former describes
- * conditions that should be met by underlying Cell values (whether selected or
- * not), and the latter describes conditions based on calculated and aggregated
- * values - after Group clauses have been applied.
+ * The Where keyword differs from the Having keyword in that the former
+ * describes conditions that should be met by underlying Cell values (whether
+ * selected or not), and the latter describes conditions based on calculated and
+ * aggregated values - after Group clauses have been applied.
  *
  * @example
  * This example shows a query that filters the results from a single Table by
@@ -1006,8 +1006,8 @@ export type Where = {
  * The Group type describes a function that lets you specify that the values of
  * a Cell in multiple result Rows should be aggregated together.
  *
- * The Group function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method. When called, it should refer to a Cell Id (or
+ * The Group function is provided to the third `query` parameter of the
+ * setQueryDefinition method. When called, it should refer to a Cell Id (or
  * aliased Id) specified in one of the Select functions, and indicate how the
  * values should be aggregated.
  *
@@ -1225,18 +1225,18 @@ export type GroupedAs = {as: (groupedCellId: Id) => void};
  * The Having type describes a function that lets you specify conditions to
  * filter results, based on the grouped Cells resulting from a Group clause.
  *
- * The Having function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method.
+ * The Having function is provided to the third `query` parameter of the
+ * setQueryDefinition method.
  *
  * A Having condition has to be true for a Row to be included in the results.
  * Each Having class is additive, as though combined with a logical 'and'. If
  * you wish to create an 'or' expression, use the single parameter version of
  * the type that allows arbitrary programmatic conditions.
  *
- * The Where clause differs from the Having clause in that the former describes
- * conditions that should be met by underlying Cell values (whether selected or
- * not), and the latter describes conditions based on calculated and aggregated
- * values - after Group clauses have been applied.
+ * The Where keyword differs from the Having keyword in that the former
+ * describes conditions that should be met by underlying Cell values (whether
+ * selected or not), and the latter describes conditions based on calculated and
+ * aggregated values - after Group clauses have been applied.
  *
  * Whilst it is technically possible to use a Having clause even if the results
  * have not been grouped with a Group clause, you should expect it to be less
@@ -1269,8 +1269,8 @@ export type GroupedAs = {as: (groupedCellId: Id) => void};
  * queries.forEachResultRow('query', (rowId) => {
  *   console.log({[rowId]: queries.getResultRow('query', rowId)});
  * });
- * // -> {1: {species: 'cat', minPrice: 3, maxPrice: 4}}
- * // -> {2: {species: 'parrot', minPrice: 3, maxPrice: 3}}
+ * // -> {0: {species: 'cat', minPrice: 3, maxPrice: 4}}
+ * // -> {1: {species: 'parrot', minPrice: 3, maxPrice: 3}}
  * ```
  * @example
  * This example shows a query that filters the results from a grouped Table with
@@ -1421,7 +1421,9 @@ export type Having = {
  * queries.delListener(listenerId);
  * queries.destroy();
  * ```
- * @see Queries guides
+ * @see Making Queries guides
+ * @see Car Analysis demo
+ * @see Movie Database demo
  * @category Queries
  * @since v2.0.0
  */
@@ -1436,11 +1438,11 @@ export interface Queries {
    * The definition must specify this 'main' Table (by its Id) to be aggregated.
    * Other Tables can be joined to that using Join clauses.
    *
-   * The third `build` parameter is a callback that you provide to define the
-   * query. That callback is provided with a `builders` object that contains the
-   * named 'keywords' for the query, like `select`, `join`, and so on. You can
-   * see how that is used in the simple example below. The following five
-   * clause types are supported:
+   * The third `query` parameter is a callback that you provide to define the
+   * query. That callback is provided with a `keywords` object that contains the
+   * functions you use to define the query, like `select`, `join`, and so on.
+   * You can see how that is used in the simple example below. The following
+   * five clause types are supported:
    *
    * - The Select type describes a function that lets you specify a Cell or
    *   calculated value for including into the query's result.
@@ -1456,14 +1458,14 @@ export interface Queries {
    *
    * Full documentation and examples are provided in the sections for each of
    * those clause types.
-   * 
+   *
    * Additionally, you can use the getResultSortedRowIds method and
    * addResultSortedRowIdsListener method to sort and paginate the results.
    *
    * @param queryId The Id of the query to define.
    * @param tableId The Id of the main Table the query will be based on.
-   * @param build A callback which can take a `builders` object and which uses
-     the clause functions it contains to define the query.
+   * @param query A callback which can take a `keywords` object and which uses
+     the functions it contains to define the query.
    * @returns A reference to the Queries object.
    * @example
    * This example creates a Store, creates a Queries object, and defines a
@@ -1492,7 +1494,7 @@ export interface Queries {
   setQueryDefinition(
     queryId: Id,
     tableId: Id,
-    build: (builders: {
+    query: (keywords: {
       select: Select;
       join: Join;
       where: Where;

package/lib/debug/queries.js

@@ -348,10 +348,16 @@ const createQueries = getCreateFunction((store) => {
       ),
     );
   const resetPreStores = (queryId) => {
-    mapForEach(mapGet(preStoreListenerIds, queryId), (preStore2, listenerIds) =>
-      collForEach(listenerIds, (listenerId) =>
-        preStore2.delListener(listenerId),
-      ),
+    ifNotUndefined(
+      mapGet(preStoreListenerIds, queryId),
+      (queryPreStoreListenerIds) => {
+        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+          collForEach(listenerIds, (listenerId) =>
+            preStore2.delListener(listenerId),
+          ),
+        );
+        collClear(queryPreStoreListenerIds);
+      },
     );
     arrayForEach([resultStore, preStore], (store2) => store2.delTable(queryId));
   };
@@ -511,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(
@@ -556,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,
@@ -590,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);

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;
     });