tinybase 7.2.0-beta.2 → 7.2.0

package/ui-react-dom/index.js

@@ -60,6 +60,10 @@ const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
   size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
+const arrayOrValueEqual = (value1, value2) =>
+  isArray(value1) && isArray(value2)
+    ? arrayIsEqual(value1, value2)
+    : value1 === value2;
 const arrayMap = (array, cb) => array.map(cb);
 const arrayFilter = (array, cb) => array.filter(cb);
 
@@ -85,16 +89,23 @@ const objToArray = (obj, cb) =>
 const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
-const objIsEqual = (obj1, obj2) => {
+
+/* istanbul ignore next */
+const objIsEqual = (
+  obj1,
+  obj2,
+  isEqual = (value1, value2) => value1 === value2,
+) => {
   const entries1 = objEntries(obj1);
   return (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
-        : obj2[index] === value1,
+        : isEqual(value1, obj2[index]),
     )
   );
 };
@@ -151,7 +162,16 @@ const OFFSET_RELATIONSHIPS = 3;
 const OFFSET_QUERIES = 4;
 
 const EMPTY_ARRAY = [];
-const DEFAULTS = [{}, [], [EMPTY_ARRAY, void 0, EMPTY_ARRAY], void 0, false, 0];
+const DEFAULTS = [
+  {},
+  [],
+  [EMPTY_ARRAY, void 0, EMPTY_ARRAY],
+  {},
+  void 0,
+  void 0,
+  false,
+  0,
+];
 const IS_EQUALS = [
   objIsEqual,
   arrayIsEqual,
@@ -162,6 +182,9 @@ const IS_EQUALS = [
     currentId1 === currentId2 &&
     arrayIsEqual(backwardIds1, backwardIds2) &&
     arrayIsEqual(forwardIds1, forwardIds2),
+  (paramValues1, paramValues2) =>
+    objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
+  arrayOrValueEqual,
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -173,7 +196,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
   const getResult = useCallback(
     () => {
       const nextResult =
-        thing?.[(returnType == 4 /* Boolean */ ? _HAS : GET) + listenable]?.(
+        thing?.[(returnType == 6 /* Boolean */ ? _HAS : GET) + listenable]?.(
           ...args,
         ) ?? DEFAULTS[returnType];
       return !(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.current)
@@ -187,7 +210,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     (listener) =>
       addAndDelListener(
         thing,
-        (returnType == 4 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
+        (returnType == 6 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
         ...args,
         listener,
       ),
@@ -203,7 +226,7 @@ const useSetCallback = (
   getDeps = EMPTY_ARRAY,
   then = getUndefined,
   thenDeps = EMPTY_ARRAY,
-  methodPrefix = EMPTY_STRING,
+  methodPrefix,
   ...args
 ) =>
   useCallback(
@@ -234,9 +257,9 @@ const useStoreSetCallback = (
   storeOrStoreId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -279,7 +302,7 @@ const useRowCount = (tableId, storeOrStoreId) =>
   useListenable(
     ROW_COUNT,
     useStoreOrStoreById(storeOrStoreId),
-    5 /* Number */,
+    7 /* Number */,
     [tableId],
   );
 const useRowIds = (tableId, storeOrStoreId) =>
@@ -317,7 +340,7 @@ const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
   useListenable(
     CELL,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [tableId, rowId, cellId],
   );
 const useValueIds = (storeOrStoreId) =>
@@ -326,7 +349,7 @@ const useValue = (valueId, storeOrStoreId) =>
   useListenable(
     VALUE,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [valueId],
   );
 const useSetCellCallback = (
@@ -386,7 +409,7 @@ const useRemoteRowId = (
   useListenable(
     REMOTE_ROW_ID,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useQueriesOrQueriesById = (queriesOrQueriesId) =>
@@ -402,7 +425,7 @@ const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5 /* Number */,
+    7 /* Number */,
     [queryId],
   );
 const useResultRowIds = (queryId, queriesOrQueriesId) =>

package/ui-react-dom/with-schemas/index.js

@@ -60,6 +60,10 @@ const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
   size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
+const arrayOrValueEqual = (value1, value2) =>
+  isArray(value1) && isArray(value2)
+    ? arrayIsEqual(value1, value2)
+    : value1 === value2;
 const arrayMap = (array, cb) => array.map(cb);
 const arrayFilter = (array, cb) => array.filter(cb);
 
@@ -85,16 +89,23 @@ const objToArray = (obj, cb) =>
 const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
-const objIsEqual = (obj1, obj2) => {
+
+/* istanbul ignore next */
+const objIsEqual = (
+  obj1,
+  obj2,
+  isEqual = (value1, value2) => value1 === value2,
+) => {
   const entries1 = objEntries(obj1);
   return (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
-        : obj2[index] === value1,
+        : isEqual(value1, obj2[index]),
     )
   );
 };
@@ -151,7 +162,16 @@ const OFFSET_RELATIONSHIPS = 3;
 const OFFSET_QUERIES = 4;
 
 const EMPTY_ARRAY = [];
-const DEFAULTS = [{}, [], [EMPTY_ARRAY, void 0, EMPTY_ARRAY], void 0, false, 0];
+const DEFAULTS = [
+  {},
+  [],
+  [EMPTY_ARRAY, void 0, EMPTY_ARRAY],
+  {},
+  void 0,
+  void 0,
+  false,
+  0,
+];
 const IS_EQUALS = [
   objIsEqual,
   arrayIsEqual,
@@ -162,6 +182,9 @@ const IS_EQUALS = [
     currentId1 === currentId2 &&
     arrayIsEqual(backwardIds1, backwardIds2) &&
     arrayIsEqual(forwardIds1, forwardIds2),
+  (paramValues1, paramValues2) =>
+    objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
+  arrayOrValueEqual,
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -173,7 +196,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
   const getResult = useCallback(
     () => {
       const nextResult =
-        thing?.[(returnType == 4 /* Boolean */ ? _HAS : GET) + listenable]?.(
+        thing?.[(returnType == 6 /* Boolean */ ? _HAS : GET) + listenable]?.(
           ...args,
         ) ?? DEFAULTS[returnType];
       return !(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.current)
@@ -187,7 +210,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     (listener) =>
       addAndDelListener(
         thing,
-        (returnType == 4 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
+        (returnType == 6 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
         ...args,
         listener,
       ),
@@ -203,7 +226,7 @@ const useSetCallback = (
   getDeps = EMPTY_ARRAY,
   then = getUndefined,
   thenDeps = EMPTY_ARRAY,
-  methodPrefix = EMPTY_STRING,
+  methodPrefix,
   ...args
 ) =>
   useCallback(
@@ -234,9 +257,9 @@ const useStoreSetCallback = (
   storeOrStoreId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -279,7 +302,7 @@ const useRowCount = (tableId, storeOrStoreId) =>
   useListenable(
     ROW_COUNT,
     useStoreOrStoreById(storeOrStoreId),
-    5 /* Number */,
+    7 /* Number */,
     [tableId],
   );
 const useRowIds = (tableId, storeOrStoreId) =>
@@ -317,7 +340,7 @@ const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
   useListenable(
     CELL,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [tableId, rowId, cellId],
   );
 const useValueIds = (storeOrStoreId) =>
@@ -326,7 +349,7 @@ const useValue = (valueId, storeOrStoreId) =>
   useListenable(
     VALUE,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [valueId],
   );
 const useSetCellCallback = (
@@ -386,7 +409,7 @@ const useRemoteRowId = (
   useListenable(
     REMOTE_ROW_ID,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useQueriesOrQueriesById = (queriesOrQueriesId) =>
@@ -402,7 +425,7 @@ const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5 /* Number */,
+    7 /* Number */,
     [queryId],
   );
 const useResultRowIds = (queryId, queriesOrQueriesId) =>

package/ui-react-inspector/index.js

@@ -117,6 +117,10 @@ const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
   size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
+const arrayOrValueEqual = (value1, value2) =>
+  isArray(value1) && isArray(value2)
+    ? arrayIsEqual(value1, value2)
+    : value1 === value2;
 const arraySort = (array, sorter) => array.sort(sorter);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
@@ -160,16 +164,23 @@ const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
-const objIsEqual = (obj1, obj2) => {
+
+/* istanbul ignore next */
+const objIsEqual = (
+  obj1,
+  obj2,
+  isEqual = (value1, value2) => value1 === value2,
+) => {
   const entries1 = objEntries(obj1);
   return (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
-        : obj2[index] === value1,
+        : isEqual(value1, obj2[index]),
     )
   );
 };
@@ -2159,7 +2170,16 @@ const OFFSET_RELATIONSHIPS = 3;
 const OFFSET_QUERIES = 4;
 
 const EMPTY_ARRAY = [];
-const DEFAULTS = [{}, [], [EMPTY_ARRAY, void 0, EMPTY_ARRAY], void 0, false, 0];
+const DEFAULTS = [
+  {},
+  [],
+  [EMPTY_ARRAY, void 0, EMPTY_ARRAY],
+  {},
+  void 0,
+  void 0,
+  false,
+  0,
+];
 const IS_EQUALS = [
   objIsEqual,
   arrayIsEqual,
@@ -2170,6 +2190,9 @@ const IS_EQUALS = [
     currentId1 === currentId2 &&
     arrayIsEqual(backwardIds1, backwardIds2) &&
     arrayIsEqual(forwardIds1, forwardIds2),
+  (paramValues1, paramValues2) =>
+    objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
+  arrayOrValueEqual,
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -2181,7 +2204,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
   const getResult = useCallback(
     () => {
       const nextResult =
-        thing?.[(returnType == 4 /* Boolean */ ? _HAS : GET) + listenable]?.(
+        thing?.[(returnType == 6 /* Boolean */ ? _HAS : GET) + listenable]?.(
           ...args,
         ) ?? DEFAULTS[returnType];
       return !(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.current)
@@ -2195,7 +2218,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     (listener) =>
       addAndDelListener(
         thing,
-        (returnType == 4 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
+        (returnType == 6 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
         ...args,
         listener,
       ),
@@ -2211,7 +2234,7 @@ const useSetCallback = (
   getDeps = EMPTY_ARRAY,
   then = getUndefined,
   thenDeps = EMPTY_ARRAY,
-  methodPrefix = EMPTY_STRING,
+  methodPrefix,
   ...args
 ) =>
   useCallback(
@@ -2242,9 +2265,9 @@ const useStoreSetCallback = (
   storeOrStoreId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -2295,7 +2318,7 @@ const useHasTables = (storeOrStoreId) =>
   useListenable(
     TABLES,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [],
   );
 const useTableCellIds = (tableId, storeOrStoreId) =>
@@ -2309,7 +2332,7 @@ const useRowCount = (tableId, storeOrStoreId) =>
   useListenable(
     ROW_COUNT,
     useStoreOrStoreById(storeOrStoreId),
-    5 /* Number */,
+    7 /* Number */,
     [tableId],
   );
 const useRowIds = (tableId, storeOrStoreId) =>
@@ -2347,14 +2370,14 @@ const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
   useListenable(
     CELL,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [tableId, rowId, cellId],
   );
 const useHasValues = (storeOrStoreId) =>
   useListenable(
     VALUES,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [],
   );
 const useValueIds = (storeOrStoreId) =>
@@ -2363,7 +2386,7 @@ const useValue = (valueId, storeOrStoreId) =>
   useListenable(
     VALUE,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [valueId],
   );
 const useSetTableCallback = (
@@ -2488,7 +2511,7 @@ const useRemoteRowId = (
   useListenable(
     REMOTE_ROW_ID,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useQueriesOrQueriesById = (queriesOrQueriesId) =>
@@ -2504,7 +2527,7 @@ const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5 /* Number */,
+    7 /* Number */,
     [queryId],
   );
 const useResultSortedRowIds = (

package/ui-react-inspector/with-schemas/index.js

@@ -117,6 +117,10 @@ const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
   size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
+const arrayOrValueEqual = (value1, value2) =>
+  isArray(value1) && isArray(value2)
+    ? arrayIsEqual(value1, value2)
+    : value1 === value2;
 const arraySort = (array, sorter) => array.sort(sorter);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
@@ -160,16 +164,23 @@ const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
-const objIsEqual = (obj1, obj2) => {
+
+/* istanbul ignore next */
+const objIsEqual = (
+  obj1,
+  obj2,
+  isEqual = (value1, value2) => value1 === value2,
+) => {
   const entries1 = objEntries(obj1);
   return (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
-        : obj2[index] === value1,
+        : isEqual(value1, obj2[index]),
     )
   );
 };
@@ -2159,7 +2170,16 @@ const OFFSET_RELATIONSHIPS = 3;
 const OFFSET_QUERIES = 4;
 
 const EMPTY_ARRAY = [];
-const DEFAULTS = [{}, [], [EMPTY_ARRAY, void 0, EMPTY_ARRAY], void 0, false, 0];
+const DEFAULTS = [
+  {},
+  [],
+  [EMPTY_ARRAY, void 0, EMPTY_ARRAY],
+  {},
+  void 0,
+  void 0,
+  false,
+  0,
+];
 const IS_EQUALS = [
   objIsEqual,
   arrayIsEqual,
@@ -2170,6 +2190,9 @@ const IS_EQUALS = [
     currentId1 === currentId2 &&
     arrayIsEqual(backwardIds1, backwardIds2) &&
     arrayIsEqual(forwardIds1, forwardIds2),
+  (paramValues1, paramValues2) =>
+    objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
+  arrayOrValueEqual,
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -2181,7 +2204,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
   const getResult = useCallback(
     () => {
       const nextResult =
-        thing?.[(returnType == 4 /* Boolean */ ? _HAS : GET) + listenable]?.(
+        thing?.[(returnType == 6 /* Boolean */ ? _HAS : GET) + listenable]?.(
           ...args,
         ) ?? DEFAULTS[returnType];
       return !(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.current)
@@ -2195,7 +2218,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     (listener) =>
       addAndDelListener(
         thing,
-        (returnType == 4 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
+        (returnType == 6 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
         ...args,
         listener,
       ),
@@ -2211,7 +2234,7 @@ const useSetCallback = (
   getDeps = EMPTY_ARRAY,
   then = getUndefined,
   thenDeps = EMPTY_ARRAY,
-  methodPrefix = EMPTY_STRING,
+  methodPrefix,
   ...args
 ) =>
   useCallback(
@@ -2242,9 +2265,9 @@ const useStoreSetCallback = (
   storeOrStoreId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -2295,7 +2318,7 @@ const useHasTables = (storeOrStoreId) =>
   useListenable(
     TABLES,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [],
   );
 const useTableCellIds = (tableId, storeOrStoreId) =>
@@ -2309,7 +2332,7 @@ const useRowCount = (tableId, storeOrStoreId) =>
   useListenable(
     ROW_COUNT,
     useStoreOrStoreById(storeOrStoreId),
-    5 /* Number */,
+    7 /* Number */,
     [tableId],
   );
 const useRowIds = (tableId, storeOrStoreId) =>
@@ -2347,14 +2370,14 @@ const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
   useListenable(
     CELL,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [tableId, rowId, cellId],
   );
 const useHasValues = (storeOrStoreId) =>
   useListenable(
     VALUES,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [],
   );
 const useValueIds = (storeOrStoreId) =>
@@ -2363,7 +2386,7 @@ const useValue = (valueId, storeOrStoreId) =>
   useListenable(
     VALUE,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [valueId],
   );
 const useSetTableCallback = (
@@ -2488,7 +2511,7 @@ const useRemoteRowId = (
   useListenable(
     REMOTE_ROW_ID,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useQueriesOrQueriesById = (queriesOrQueriesId) =>
@@ -2504,7 +2527,7 @@ const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5 /* Number */,
+    7 /* Number */,
     [queryId],
   );
 const useResultSortedRowIds = (