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

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,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},L=Object.freeze,w=(e=>{const t=new WeakMap;return n=>(t.has(n)||t.set(n,e(n)),t.get(n))})((w=>{let S,z,E,y=100,I=h(),M=1;const b=h(),j=h(),[x,B,F]=(e=>{let r,i=0;const g=[],L=h();return[(t,n,o)=>{r??=e();const l=s(g)??""+i++;var c;return C(L,l,[t,n,o]),c=l,k(n,o??[""],f)?.add(c),l},(e,n,...o)=>t(v(e,n),(e=>d(e,(e=>p(L,e)[0](r,...n??[],...o))))),e=>c(p(L,e),(([,t,r])=>(k(t,r??[""],void 0,(t=>(u(t,e),a(t)?1:0))),C(L,e),n(g)<1e3&&o(g,e),r))),(e,t)=>{return n=v(e,t),r=l,!n.every(r);var n,r},(e,o,s)=>c(p(L,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()}))]})((()=>V)),O=h(),T=h(),W=[],m=[],q=(e,t)=>{M=0,w.transaction((()=>d(p(O,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))(w,n,r,o,t[e]))))))))),M=1},A=e=>{C(O,e),C(T,e),B(j,[e])},D=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),A),G=()=>D(W,n(W)-y),H=w.addCellListener(null,null,null,((e,t,n,r,l,i)=>{if(M){c(S,(()=>{o(W,S),G(),D(m),S=void 0,E=1}));const e=g(I,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(I,t))&&(S=s(W),E=1),P()}})),J=(e="")=>(l(S)&&(S=""+z++,C(O,S,I),R(S,e),I=h(),E=1),S),K=()=>{r(W)||(m.unshift(J()),q(0,S),S=s(W),E=1)},N=()=>{r(m)||(o(W,S),S=m.shift(),q(1,S),E=1)},P=()=>{E&&(B(b),E=0)},Q=e=>{const t=J(e);return P(),t},R=(e,t)=>(U(e)&&p(T,e)!==t&&(C(T,e,t),B(j,[e])),V),U=e=>i(O,e),V={setSize:e=>(y=e,G(),V),addCheckpoint:Q,setCheckpoint:R,getStore:()=>w,getCheckpointIds:()=>[[...W],S,[...m]],forEachCheckpoint:e=>{return t=e,d(T,((e,n)=>t(n,e)));var t},hasCheckpoint:U,getCheckpoint:e=>p(T,e),goBackward:()=>(K(),P(),V),goForward:()=>(N(),P(),V),goTo:t=>{const n=e(W,t)?K:e(m,t)?N:null;for(;!l(n)&&t!=S;)n();return P(),V},addCheckpointIdsListener:e=>x(e,b),addCheckpointListener:(e,t)=>x(t,j,[e]),delListener:e=>(F(e),V),clear:()=>(D(W),D(m),l(S)||A(S),S=void 0,z=0,Q(),V),destroy:()=>{w.delListener(H)},getListenerStats:()=>({})};return L(V.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=>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};

package/lib/debug/checkpoints.js

@@ -1,7 +1,6 @@
 const EMPTY_STRING = '';
 
 const arrayHas = (array, value) => array.includes(value);
-const arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayLength = (array) => array.length;
 const arrayIsEmpty = (array) => arrayLength(array) == 0;
@@ -112,8 +111,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) => {
@@ -128,7 +125,7 @@ const getListenerFunctions = (getThing) => {
       };
       callWithIds();
     });
-  return [addListener, callListeners, delListener, hasListeners, callListener];
+  return [addListener, callListeners, delListener, callListener];
 };
 
 const object = Object;

package/lib/debug/indexes.js

@@ -265,8 +265,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) => {
@@ -281,7 +279,7 @@ const getListenerFunctions = (getThing) => {
       };
       callWithIds();
     });
-  return [addListener, callListeners, delListener, hasListeners, callListener];
+  return [addListener, callListeners, delListener, callListener];
 };
 
 const object = Object;

package/lib/debug/metrics.js

@@ -7,7 +7,6 @@ const AVG = 'avg';
 const MIN = 'min';
 const MAX = 'max';
 
-const arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arraySum = (array) => arrayReduce(array, (i, j) => i + j, 0);
 const arrayLength = (array) => array.length;
@@ -336,8 +335,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) => {
@@ -352,7 +349,7 @@ const getListenerFunctions = (getThing) => {
       };
       callWithIds();
     });
-  return [addListener, callListeners, delListener, hasListeners, callListener];
+  return [addListener, callListeners, delListener, callListener];
 };
 
 const object = Object;

package/lib/debug/queries.d.ts

@@ -24,7 +24,7 @@ import {
   Table,
   TableCallback,
 } from './store.d';
-import {Id, IdOrNull, Ids, SortKey} from './common.d';
+import {Id, IdOrNull, Ids} from './common.d';
 
 /**
  * The Aggregate type describes a custom function that takes an array of Cell
@@ -203,15 +203,18 @@ export type ResultRowIdsListener = (queries: Queries, tableId: Id) => void;
  *
  * When called, a ResultSortedRowIdsListener is given a reference to the Queries
  * object, the Id of the Table whose Row Ids changed (which is the same as the
- * query Id), the Cell Id being used to sort them, and and whether descending or
- * not. It also receives the sorted array of Ids itself, so that you can use
- * them in the listener without the additional cost of an explicit call to
+ * query Id), the Cell Id being used to sort them, whether descending or not,
+ * and the offset and limit of the number of Ids returned, for pagination
+ * purposes. It also receives the sorted array of Ids itself, so that you can
+ * use them in the listener without the additional cost of an explicit call to
  * getResultSortedRowIds.
  *
  * @param queries A reference to the Queries object that changed.
  * @param tableId The Id of the Table that changed, which is also the query Id.
  * @param cellId The Id of the Cell whose values were used for the sorting.
  * @param descending Whether the sorting was in descending order.
+ * @param offset The number of Row Ids skipped.
+ * @param limit The maximum number of Row Ids returned.
  * @param sortedRowIds The sorted Row Ids themselves.
  * @category Listener
  * @since v2.0.0-beta
@@ -221,6 +224,8 @@ export type ResultSortedRowIdsListener = (
   tableId: Id,
   cellId: Id | undefined,
   descending: boolean,
+  offset: number,
+  limit: number | undefined,
   sortedRowIds: Ids,
 ) => void;
 
@@ -1323,212 +1328,6 @@ export type Having = {
   (condition: (getSelectedOrGroupedCell: GetCell) => boolean): void;
 };
 
-/**
- * The Order type describes a function that lets you specify how you want the
- * Rows in the result Table to be ordered, based on values within.
- *
- * The Order function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method.
- *
- * An Order clause can either order alphanumerically by the value of a single
- * Cell or by a 'sort key' calculated from Cell values. The alphanumeric sorting
- * will be ascending by default, or descending if the second parameter is set to
- * `true`.
- *
- * This is applied after any grouping.
- *
- * It is possible to provide multiple Order clauses, and a later clause will be
- * used to establish the order of pairs of Rows if the earlier clauses have not
- * been able to.
- *
- * Note that the Order clause does not work by changing the Row Ids of the
- * result Table, but by changing their insert order. Therefore the Ids array
- * returned from the getResultRowIds method will be correctly ordered, even if
- * the Ids themselves might seem out of order based on their values. If you _do_
- * want to sort Rows by their Id, that is provided as a second parameter to the
- * getSortKey callback.
- *
- * Importantly, if you are using the addResultRowIdsListener method to listen to
- * changes to the order of Rows due to this clause, you will need to set the
- * optional `trackReorder` parameter to `true` to track when the set of Ids has
- * not changed, but the order has.
- *
- * @example
- * This example shows a query that orders a Table by a numeric Cell, in a
- * descending fashion.
- *
- * ```js
- * const store = createStore().setTable('pets', {
- *   cujo: {price: 4},
- *   fido: {price: 5},
- *   tom: {price: 3},
- *   carnaby: {price: 3},
- *   felix: {price: 4},
- *   polly: {price: 3},
- * });
- *
- * const queries = createQueries(store);
- * queries.setQueryDefinition('query', 'pets', ({select, order}) => {
- *   select('pets', 'price');
- *   order('price', true);
- * });
- *
- * queries.forEachResultRow('query', (rowId) => {
- *   console.log({[rowId]: queries.getResultRow('query', rowId)});
- * });
- * // -> {fido: {price: 5}}
- * // -> {cujo: {price: 4}}
- * // -> {felix: {price: 4}}
- * // -> {tom: {price: 3}}
- * // -> {carnaby: {price: 3}}
- * // -> {polly: {price: 3}}
- * ```
- * @example
- * This example shows a query that orders a Table by a string Cell, and then a
- * calculated sort key based on the Row Id.
- *
- * ```js
- * const store = createStore().setTable('pets', {
- *   cujo: {species: 'dog'},
- *   fido: {species: 'dog'},
- *   tom: {species: 'cat'},
- *   carnaby: {species: 'parrot'},
- *   felix: {species: 'cat'},
- *   polly: {species: 'parrot'},
- * });
- *
- * const queries = createQueries(store);
- * queries.setQueryDefinition('query', 'pets', ({select, order}) => {
- *   select('pets', 'species');
- *   order('species');
- *   order((getSelectedOrGroupedCell, rowId) => rowId);
- * });
- *
- * queries.forEachResultRow('query', (rowId) => {
- *   console.log({[rowId]: queries.getResultRow('query', rowId)});
- * });
- * // -> {felix: {species: 'cat'}}
- * // -> {tom: {species: 'cat'}}
- * // -> {cujo: {species: 'dog'}}
- * // -> {fido: {species: 'dog'}}
- * // -> {carnaby: {species: 'parrot'}}
- * // -> {polly: {species: 'parrot'}}
- * ```
- * @category Definition
- * @since v2.0.0-beta
- */
-export type Order = {
-  /**
-   * Calling this function with the first parameter as an Id is used to sort the
-   * Rows by the value in that Cell.
-   *
-   * @param selectedOrGroupedCellId The Id of the Cell in the query to sort by.
-   * @param descending Set to `true` to have the Rows sorted in descending
-   * order.
-   */
-  (selectedOrGroupedCellId: Id, descending?: boolean): void;
-  /**
-   * Calling this function with the first parameter as a function is used to
-   * sort the Rows by a value calculate from their Cells or Id.
-   *
-   * @param getSortKey A callback that takes a GetCell function and that should
-   * return a 'sort key' to be used for ordering the Rows.
-   * @param descending Set to `true` to have the Rows sorted in descending
-   * order.
-   */
-  (
-    getSortKey: (getSelectedOrGroupedCell: GetCell, rowId: Id) => SortKey,
-    descending?: boolean,
-  ): void;
-};
-
-/**
- * The Limit type describes a function that lets you specify how many Rows you
- * want in the result Table, and how they should be offset.
- *
- * The Limit function is provided as an parameter in the `build` parameter of
- * the setQueryDefinition method.
- *
- * A Limit clause can either provide an 'page' offset and size limit, or just
- * the limit. The offset is zero-based, so if you specify `2`, say, the results
- * will skip the first two Rows and start with the third.
- *
- * This is applied after any grouping and sorting.
- *
- * @example
- * This example shows a query that limits a Table to four Rows from its first.
- *
- * ```js
- * const store = createStore().setTable('pets', {
- *   cujo: {price: 4},
- *   fido: {price: 5},
- *   tom: {price: 3},
- *   carnaby: {price: 3},
- *   felix: {price: 4},
- *   polly: {price: 3},
- * });
- *
- * const queries = createQueries(store);
- * queries.setQueryDefinition('query', 'pets', ({select, limit}) => {
- *   select('pets', 'price');
- *   limit(4);
- * });
- *
- * queries.forEachResultRow('query', (rowId) => {
- *   console.log({[rowId]: queries.getResultRow('query', rowId)});
- * });
- * // -> {cujo: {price: 4}}
- * // -> {fido: {price: 5}}
- * // -> {tom: {price: 3}}
- * // -> {carnaby: {price: 3}}
- * ```
- * @example
- * This example shows a query that limits a Table to three Rows, offset by two.
- *
- * ```js
- * const store = createStore().setTable('pets', {
- *   cujo: {price: 4},
- *   fido: {price: 5},
- *   tom: {price: 3},
- *   carnaby: {price: 3},
- *   felix: {price: 4},
- *   polly: {price: 3},
- * });
- *
- * const queries = createQueries(store);
- * queries.setQueryDefinition('query', 'pets', ({select, limit}) => {
- *   select('pets', 'price');
- *   limit(2, 3);
- * });
- *
- * queries.forEachResultRow('query', (rowId) => {
- *   console.log({[rowId]: queries.getResultRow('query', rowId)});
- * });
- * // -> {tom: {price: 3}}
- * // -> {carnaby: {price: 3}}
- * // -> {felix: {price: 4}}
- * ```
- * @category Definition
- * @since v2.0.0-beta
- */
-export type Limit = {
-  /**
-   * Calling this function with one numeric parameter is used to limit the Rows
-   * returned, starting from the first.
-   *
-   * @param limit The number of Rows to return.
-   */
-  (limit: number): void;
-  /**
-   * Calling this function with two numeric parameters is used to offset the
-   * start of the results, and then limit the Rows returned.
-   *
-   * @param offset The number of Rows to skip.
-   * @param limit The number of Rows to return.
-   */
-  (offset: number, limit: number): void;
-};
-
 /**
  * A Queries object lets you create and track queries of the data in Store
  * objects.
@@ -1590,33 +1389,32 @@ export type Limit = {
  * console.log(queries.getResultTable('petOwners'));
  * // -> {fido: {owner: 'Alice'}, felix: {owner: 'Bob'}, cujo: {owner: 'Carol'}}
  *
- * // A grouped and ordered query:
+ * // A grouped query:
  * queries.setQueryDefinition(
  *   'colorPrice',
  *   'pets',
- *   ({select, join, group, order}) => {
+ *   ({select, join, group}) => {
  *     select('color');
  *     select('species', 'price');
  *     join('species', 'species');
  *     group('price', 'avg');
- *     order('price');
  *   },
  * );
  * console.log(queries.getResultTable('colorPrice'));
  * // -> {"1": {color: 'black', price: 4.5}, "0": {color: 'brown', price: 5}}
- * console.log(queries.getResultRowIds('colorPrice'));
- * // -> ["1", "0"]
+ * console.log(queries.getResultSortedRowIds('colorPrice', 'price', true));
+ * // -> ["0", "1"]
  *
  * const listenerId = queries.addResultTableListener('colorPrice', () => {
  *   console.log('Average prices per color changed');
  *   console.log(queries.getResultTable('colorPrice'));
- *   console.log(queries.getResultRowIds('colorPrice'));
+ *   console.log(queries.getResultSortedRowIds('colorPrice', 'price', true));
  * });
  *
  * store.setRow('pets', 'lowly', {species: 'worm', color: 'brown'});
  * // -> 'Average prices per color changed'
  * // -> {"0": {color: 'brown', price: 3}, "1": {color: 'black', price: 4.5}}
- * // -> ["0", "1"]
+ * // -> ["1", "0"]
  *
  * queries.delListener(listenerId);
  * queries.destroy();
@@ -1639,7 +1437,7 @@ export interface Queries {
    * 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 seven
+   * 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
@@ -1653,13 +1451,12 @@ export interface Queries {
    *   of a Cell in multiple result Rows should be aggregated together.
    * - 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 Order type describes a function that lets you specify how you want
-   *   the Rows in the result Table to be ordered, based on values within.
-   * - The Limit type describes a function that lets you specify how many Rows
-   *   you want in the result Table, and how they should be offset.
    *
    * 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.
@@ -1699,8 +1496,6 @@ export interface Queries {
       where: Where;
       group: Group;
       having: Having;
-      order: Order;
-      limit: Limit;
     }) => void,
   ): Queries;
 
@@ -1942,9 +1737,6 @@ export interface Queries {
    * returns a copy of, rather than a reference to the list of Ids, so changes
    * made to the list object are not made to the query results themselves.
    *
-   * An Order clause in the query explicitly affects the order of entries in
-   * this array.
-   *
    * @param queryId The Id of a query.
    * @returns An array of the Ids of every Row in the result of the query.
    * @example
@@ -1987,7 +1779,9 @@ export interface Queries {
    * This has the same behavior as a Store's getSortedRowIds method. For
    * example, if the query Id is invalid, the method returns an empty array.
    * Similarly, the sorting of the rows is alphanumeric, and you can indicate
-   * whether it should be in descending order.
+   * whether it should be in descending order. The `offset` and `limit`
+   * parameters are used to paginate results, but default to `0` and `undefined`
+   * to return all available Row Ids if not specified.
    *
    * Note that every call to this method will perform the sorting afresh - there
    * is no caching of the results - and so you are advised to memoize the
@@ -1999,6 +1793,10 @@ export interface Queries {
    * @param cellId The Id of the Cell whose values are used for the sorting, or
    * `undefined` to by sort the Row Id itself.
    * @param descending Whether the sorting should be in descending order.
+   * @param offset The number of Row Ids to skip for pagination purposes, if
+   * any.
+   * @param limit The maximum number of Row Ids to return, or `undefined` for
+   * all.
    * @returns An array of the sorted Ids of every Row in the result of the
    * query.
    * @example
@@ -2031,7 +1829,13 @@ export interface Queries {
    * @category Result
    * @since v2.0.0-beta
    */
-  getResultSortedRowIds(queryId: Id, cellId?: Id, descending?: boolean): Ids;
+  getResultSortedRowIds(
+    queryId: Id,
+    cellId?: Id,
+    descending?: boolean,
+    offset?: number,
+    limit?: number,
+  ): Ids;
 
   /**
    * The getResultRow method returns an object containing the entire data of a
@@ -2519,22 +2323,13 @@ export interface Queries {
    * the method's first parameter) or changes to any result Table (by providing
    * a `null` wildcard).
    *
-   * Use the optional `trackReorder` parameter to additionally track when the
-   * set of Ids has not changed, but the order has - specifically when the Order
-   * clause of the query causes the Row Ids to be re-sorted. This behavior is
-   * disabled by default due to the potential performance cost of detecting such
-   * changes.
-   *
    * @param queryId The Id of the query to listen to, or `null` as a wildcard.
    * @param listener The function that will be called whenever the Row Ids in
    * the result Table change.
-   * @param trackReorder An optional boolean that indicates that the listener
-   * should be called if the set of Ids remains the same but their order
-   * changes.
    * @returns A unique Id for the listener that can later be used to remove it.
    * @example
    * This example registers a listener that responds to any change to the Row
-   * Ids of a specific result Table, but not their order.
+   * Ids of a specific result Table.
    *
    * ```js
    * const store = createStore().setTable('pets', {
@@ -2546,50 +2341,9 @@ export interface Queries {
    * const queries = createQueries(store).setQueryDefinition(
    *   'dogColors',
    *   'pets',
-   *   ({select, where, order}) => {
-   *     select('color');
-   *     where('species', 'dog');
-   *     order('color');
-   *   },
-   * );
-   *
-   * const listenerId = queries.addResultRowIdsListener(
-   *   'dogColors',
-   *   (queries, tableId) => {
-   *     console.log(`Row Ids for dogColors result table changed`);
-   *     console.log(queries.getResultRowIds('dogColors'));
-   *   },
-   * );
-   *
-   * store.setRow('pets', 'rex', {species: 'dog', color: 'tan'});
-   * // -> 'Row Ids for dogColors result table changed'
-   * // -> ['cujo', 'fido', 'rex']
-   *
-   * store.setCell('pets', 'fido', 'color', 'walnut');
-   * // -> undefined
-   * // trackReorder not set for listener
-   *
-   * store.delListener(listenerId);
-   * ```
-   * @example
-   * This example registers a listener that responds to a change of order in the
-   * rows of a specific result Table, even though the set of Ids themselves has
-   * not changed.
-   *
-   * ```js
-   * const store = createStore().setTable('pets', {
-   *   fido: {species: 'dog', color: 'brown'},
-   *   felix: {species: 'cat', color: 'black'},
-   *   cujo: {species: 'dog', color: 'black'},
-   * });
-   *
-   * const queries = createQueries(store).setQueryDefinition(
-   *   'dogColors',
-   *   'pets',
-   *   ({select, where, order}) => {
+   *   ({select, where}) => {
    *     select('color');
    *     where('species', 'dog');
-   *     order('color');
    *   },
    * );
    *
@@ -2599,16 +2353,11 @@ export interface Queries {
    *     console.log(`Row Ids for dogColors result table changed`);
    *     console.log(queries.getResultRowIds('dogColors'));
    *   },
-   *   true, // track reorder
    * );
    *
    * store.setRow('pets', 'rex', {species: 'dog', color: 'tan'});
    * // -> 'Row Ids for dogColors result table changed'
-   * // -> ['cujo', 'fido', 'rex']
-   *
-   * store.setCell('pets', 'fido', 'color', 'walnut');
-   * // -> 'Row Ids for dogColors result table changed'
-   * // -> ['cujo', 'rex', 'fido']
+   * // -> ['fido', 'cujo', 'rex']
    *
    * store.delListener(listenerId);
    * ```
@@ -2652,20 +2401,21 @@ export interface Queries {
   addResultRowIdsListener(
     queryId: IdOrNull,
     listener: ResultRowIdsListener,
-    trackReorder?: boolean,
   ): Id;
 
   /**
    * The addResultSortedRowIdsListener method registers a listener function with
-   * the Queries object that will be called whenever sorted Row Ids in a result
-   * Table change.
+   * the Queries object that will be called whenever sorted (and optionally,
+   * paginated) Row Ids in a result Table change.
    *
    * The provided listener is a ResultSortedRowIdsListener function, and will be
    * called with a reference to the Queries object, the Id of the result Table
    * whose Row Ids sorting changed (which is also the query Id), the Cell Id
-   * being used to sort them, and whether descending or not. It also receives
-   * the sorted array of Ids itself, so that you can use them in the listener
-   * without the additional cost of an explicit call to getResultSortedRowIds
+   * being used to sort them, whether descending or not, and the offset and
+   * limit of the number of Ids returned, for pagination purposes. It also
+   * receives the sorted array of Ids itself, so that you can use them in the
+   * listener without the additional cost of an explicit call to
+   * getResultSortedRowIds
    *
    * Such a listener is called when a Row is added or removed, but also when a
    * value in the specified Cell (somewhere in the result Table) has changed
@@ -2675,10 +2425,19 @@ export interface Queries {
    * of detecting changes to the sorting). You can only listen to a single
    * specified result Table, sorted by a single specified Cell.
    *
+   * The sorting of the rows is alphanumeric, and you can indicate whether it
+   * should be in descending order. The `offset` and `limit` parameters are used
+   * to paginate results, but default to `0` and `undefined` to return all
+   * available Row Ids if not specified.
+   *
    * @param queryId The Id of the query to listen to.
    * @param cellId The Id of the Cell whose values are used for the sorting, or
    * `undefined` to by sort the result Row Id itself.
    * @param descending Whether the sorting should be in descending order.
+   * @param offset The number of Row Ids to skip for pagination purposes, if
+   * any.
+   * @param limit The maximum number of Row Ids to return, or `undefined` for
+   * all.
    * @param listener The function that will be called whenever the sorted Row
    * Ids in the result Table change.
    * @returns A unique Id for the listener that can later be used to remove it.
@@ -2706,7 +2465,9 @@ export interface Queries {
    *   'dogColors',
    *   'color',
    *   false,
-   *   (queries, tableId, cellId, descending, sortedRowIds) => {
+   *   0,
+   *   undefined,
+   *   (queries, tableId, cellId, descending, offset, limit, sortedRowIds) => {
    *     console.log(`Sorted Row Ids for dogColors result table changed`);
    *     console.log(sortedRowIds);
    *     // ^ cheaper than calling getResultSortedRowIds again
@@ -2739,14 +2500,16 @@ export interface Queries {
    *     where('species', 'dog');
    *   },
    * );
-   * console.log(queries.getResultSortedRowIds('dogColors', undefined, false));
+   * console.log(queries.getResultSortedRowIds('dogColors', undefined));
    * // -> ['cujo', 'fido']
    *
    * const listenerId = queries.addResultSortedRowIdsListener(
    *   'dogColors',
    *   undefined,
    *   false,
-   *   (queries, tableId, cellId, descending, sortedRowIds) => {
+   *   0,
+   *   undefined,
+   *   (queries, tableId, cellId, descending, offset, limit, sortedRowIds) => {
    *     console.log(`Sorted Row Ids for dogColors result table changed`);
    *     console.log(sortedRowIds);
    *     // ^ cheaper than calling getSortedRowIds again
@@ -2765,6 +2528,8 @@ export interface Queries {
     queryId: Id,
     cellId: Id | undefined,
     descending: boolean,
+    offset: number,
+    limit: number | undefined,
     listener: ResultSortedRowIdsListener,
   ): Id;