tinybase 7.2.0-beta.2 → 7.2.0

package/omni/with-schemas/index.js

@@ -132,6 +132,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 arrayIsSorted = (array, sorter) =>
   arrayEvery(
     array,
@@ -227,16 +231,23 @@ const objMap = (obj, cb) =>
 const objValues = (obj) => object.values(obj);
 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]),
     )
   );
 };
@@ -5803,6 +5814,8 @@ const createQueries = getCreateFunction((store) => {
   const preStore = createStore();
   const resultStore = createStore();
   const preStoreListenerIds = mapNew();
+  const paramValuesListeners = mapNew();
+  const paramValueListeners = mapNew();
   const {
     addListener,
     callListeners,
@@ -5825,7 +5838,7 @@ const createQueries = getCreateFunction((store) => {
     delStoreListeners,
   ] = getDefinableFunctions(
     store,
-    () => [() => {}, mapNew()],
+    () => [],
     getUndefined,
     addListener,
     callListeners,
@@ -5865,8 +5878,10 @@ const createQueries = getCreateFunction((store) => {
       ),
     );
   const setQueryDefinition = (queryId, tableId, build, paramValues = {}) => {
+    const oldParamValues = getParamValues(queryId);
     setDefinition(queryId, tableId);
     setQueryArgs(queryId, [build, objToMap(paramValues)]);
+    callParamListeners(queryId, oldParamValues, paramValues);
     resetPreStores(queryId);
     const [, paramsMap] = getQueryArgs(queryId);
     const selectEntries = [];
@@ -6195,31 +6210,76 @@ const createQueries = getCreateFunction((store) => {
     );
     return queries;
   };
+  const callParamListeners = (queryId, oldParamValues, newParamValues) => {
+    const allParamIds = setNew([
+      ...objIds(oldParamValues),
+      ...objIds(newParamValues),
+    ]);
+    let changed = 0;
+    collForEach(allParamIds, (paramId) => {
+      const newParamValue = objGet(newParamValues, paramId);
+      if (!arrayOrValueEqual(objGet(oldParamValues, paramId), newParamValue)) {
+        changed = 1;
+        callListeners(paramValueListeners, [queryId, paramId], newParamValue);
+      }
+    });
+    if (changed) {
+      callListeners(paramValuesListeners, [queryId], newParamValues);
+    }
+  };
   const delQueryDefinition = (queryId) => {
+    const oldParamValues = getParamValues(queryId);
     resetPreStores(queryId);
     delDefinition(queryId);
+    callParamListeners(queryId, oldParamValues, {});
     return queries;
   };
-  const setParamValues = (queryId, paramValues) => {
-    ifNotUndefined(getQueryArgs(queryId), (definition) =>
-      resultStore.transaction(() =>
-        setQueryDefinition(
-          queryId,
-          getTableId(queryId),
-          definition[0],
-          paramValues,
-        ),
-      ),
-    );
+  const setParamValues = (queryId, paramValues, force = 0) => {
+    ifNotUndefined(getQueryArgs(queryId), ([definition, oldParamValues]) => {
+      if (
+        force ||
+        !objIsEqual(mapToObj(oldParamValues), paramValues, arrayOrValueEqual)
+      ) {
+        resultStore.transaction(() =>
+          setQueryDefinition(
+            queryId,
+            getTableId(queryId),
+            definition,
+            paramValues,
+          ),
+        );
+      }
+    });
     return queries;
   };
-  const setParamValue = (queryId, paramId, value) =>
-    setParamValues(queryId, {
-      ...mapToObj(getQueryArgs(queryId)?.[1]),
-      [paramId]: value,
-    });
+  const setParamValue = (queryId, paramId, value) => {
+    if (!arrayOrValueEqual(getParamValue(queryId, paramId), value)) {
+      setParamValues(
+        queryId,
+        {...getParamValues(queryId), [paramId]: value},
+        1,
+      );
+    }
+    return queries;
+  };
+  const getParamValues = (queryId) => mapToObj(getQueryArgs(queryId)?.[1]);
+  const getParamValue = (queryId, paramId) =>
+    mapGet(getQueryArgs(queryId)?.[1], paramId);
   const addQueryIdsListener = (listener) =>
     addQueryIdsListenerImpl(() => listener(queries));
+  const addParamValuesListener = (queryId, listener) =>
+    addListener(
+      (_, queryId2, paramValues) => listener(queries, queryId2, paramValues),
+      paramValuesListeners,
+      [queryId],
+    );
+  const addParamValueListener = (queryId, paramId, listener) =>
+    addListener(
+      (_, queryId2, paramId2, paramValue) =>
+        listener(queries, queryId2, paramId2, paramValue),
+      paramValueListeners,
+      [queryId, paramId],
+    );
   const delListener = (listenerId) => {
     delListenerImpl(listenerId);
     return queries;
@@ -6231,11 +6291,17 @@ const createQueries = getCreateFunction((store) => {
       transaction: _3,
       ...stats
     } = resultStore.getListenerStats();
-    return stats;
+    return {
+      ...stats,
+      paramValues: collSize2(paramValuesListeners),
+      paramValue: collSize3(paramValueListeners),
+    };
   };
   const queries = {
     setQueryDefinition,
     delQueryDefinition,
+    getParamValues,
+    getParamValue,
     setParamValues,
     setParamValue,
     getStore,
@@ -6244,6 +6310,8 @@ const createQueries = getCreateFunction((store) => {
     hasQuery,
     getTableId,
     addQueryIdsListener,
+    addParamValuesListener,
+    addParamValueListener,
     delListener,
     destroy,
     getListenerStats,
@@ -7368,7 +7436,16 @@ const Provider = ({
 };
 
 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,
@@ -7379,6 +7456,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 useCreate = (store, create, createDeps = EMPTY_ARRAY) => {
@@ -7405,7 +7485,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)
@@ -7419,7 +7499,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,
       ),
@@ -7449,7 +7529,7 @@ const useSetCallback = (
   getDeps = EMPTY_ARRAY,
   then = getUndefined,
   thenDeps = EMPTY_ARRAY,
-  methodPrefix = EMPTY_STRING,
+  methodPrefix,
   ...args
 ) =>
   useCallback(
@@ -7480,9 +7560,9 @@ const useStoreSetCallback = (
   storeOrStoreId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -7499,9 +7579,9 @@ const useQueriesSetCallback = (
   queriesOrQueriesId,
   settable,
   get,
-  getDeps = EMPTY_ARRAY,
-  then = getUndefined,
-  thenDeps = EMPTY_ARRAY,
+  getDeps,
+  then,
+  thenDeps,
   ...args
 ) =>
   useSetCallback(
@@ -7589,7 +7669,7 @@ const useHasTables = (storeOrStoreId) =>
   useListenable(
     TABLES,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [],
   );
 const useTables = (storeOrStoreId) =>
@@ -7597,7 +7677,7 @@ const useTables = (storeOrStoreId) =>
 const useTableIds = (storeOrStoreId) =>
   useListenable(TABLE_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */);
 const useHasTable = (tableId, storeOrStoreId) =>
-  useListenable(TABLE$1, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
+  useListenable(TABLE$1, useStoreOrStoreById(storeOrStoreId), 6 /* Boolean */, [
     tableId,
   ]);
 const useTable = (tableId, storeOrStoreId) =>
@@ -7615,14 +7695,14 @@ const useHasTableCell = (tableId, cellId, storeOrStoreId) =>
   useListenable(
     TABLE$1 + CELL,
     useStoreOrStoreById(storeOrStoreId),
-    4 /* Boolean */,
+    6 /* Boolean */,
     [tableId, cellId],
   );
 const useRowCount = (tableId, storeOrStoreId) =>
   useListenable(
     ROW_COUNT,
     useStoreOrStoreById(storeOrStoreId),
-    5 /* Number */,
+    7 /* Number */,
     [tableId],
   );
 const useRowIds = (tableId, storeOrStoreId) =>
@@ -7657,7 +7737,7 @@ const useSortedRowIds = (
         ]),
   );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
-  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
+  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 6 /* Boolean */, [
     tableId,
     rowId,
   ]);
@@ -7672,7 +7752,7 @@ const useCellIds = (tableId, rowId, storeOrStoreId) =>
     rowId,
   ]);
 const useHasCell = (tableId, rowId, cellId, storeOrStoreId) =>
-  useListenable(CELL, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
+  useListenable(CELL, useStoreOrStoreById(storeOrStoreId), 6 /* Boolean */, [
     tableId,
     rowId,
     cellId,
@@ -7681,14 +7761,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 useValues = (storeOrStoreId) =>
@@ -7696,14 +7776,14 @@ const useValues = (storeOrStoreId) =>
 const useValueIds = (storeOrStoreId) =>
   useListenable(VALUE_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */);
 const useHasValue = (valueId, storeOrStoreId) =>
-  useListenable(VALUE, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
+  useListenable(VALUE, useStoreOrStoreById(storeOrStoreId), 6 /* Boolean */, [
     valueId,
   ]);
 const useValue = (valueId, storeOrStoreId) =>
   useListenable(
     VALUE,
     useStoreOrStoreById(storeOrStoreId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [valueId],
   );
 const useSetTablesCallback = (
@@ -8252,7 +8332,7 @@ const useMetric = (metricId, metricsOrMetricsId) =>
   useListenable(
     METRIC,
     useMetricsOrMetricsById(metricsOrMetricsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [metricId],
   );
 const useMetricListener = (
@@ -8345,7 +8425,7 @@ const useRemoteRowId = (
   useListenable(
     REMOTE_ROW_ID,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useLocalRowIds = (
@@ -8444,7 +8524,7 @@ const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5 /* Number */,
+    7 /* Number */,
     [queryId],
   );
 const useResultRowIds = (queryId, queriesOrQueriesId) =>
@@ -8486,7 +8566,7 @@ const useResultCell = (queryId, rowId, cellId, queriesOrQueriesId) =>
   useListenable(
     RESULT + CELL,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [queryId, rowId, cellId],
   );
 const useResultTableListener = (
@@ -8601,6 +8681,47 @@ const useResultCellListener = (
     listenerDeps,
     [queryId, rowId, cellId],
   );
+const useParamValues = (queryId, queriesOrQueriesId) =>
+  useListenable(
+    'ParamValues',
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    3 /* ParamValues */,
+    [queryId],
+  );
+const useParamValue = (queryId, paramId, queriesOrQueriesId) =>
+  useListenable(
+    'ParamValue',
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    4 /* ParamValue */,
+    [queryId, paramId],
+  );
+const useParamValuesListener = (
+  queryId,
+  listener,
+  listenerDeps,
+  queriesOrQueriesId,
+) =>
+  useListener(
+    'ParamValues',
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    listener,
+    listenerDeps,
+    [queryId],
+  );
+const useParamValueListener = (
+  queryId,
+  paramId,
+  listener,
+  listenerDeps,
+  queriesOrQueriesId,
+) =>
+  useListener(
+    'ParamValue',
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    listener,
+    listenerDeps,
+    [queryId, paramId],
+  );
 const useSetParamValueCallback = (
   queryId,
   paramId,
@@ -8655,7 +8776,7 @@ const useCheckpoint = (checkpointId, checkpointsOrCheckpointsId) =>
   useListenable(
     CHECKPOINT,
     useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
-    3 /* CellOrValue */,
+    5 /* CellOrValue */,
     [checkpointId],
   );
 const useSetCheckpointCallback = (
@@ -8802,7 +8923,7 @@ const usePersisterStatus = (persisterOrPersisterId) =>
   useListenable(
     STATUS,
     usePersisterOrPersisterById(persisterOrPersisterId),
-    5 /* Number */,
+    7 /* Number */,
     [],
   );
 const usePersisterStatusListener = (
@@ -8857,7 +8978,7 @@ const useSynchronizerStatus = (synchronizerOrSynchronizerId) =>
   useListenable(
     STATUS,
     useSynchronizerOrSynchronizerById(synchronizerOrSynchronizerId),
-    5 /* Number */,
+    7 /* Number */,
     [],
   );
 const useSynchronizerStatusListener = (
@@ -11632,6 +11753,10 @@ export {
   useMetrics,
   useMetricsIds,
   useMetricsOrMetricsById,
+  useParamValue,
+  useParamValueListener,
+  useParamValues,
+  useParamValuesListener,
   usePersister,
   usePersisterIds,
   usePersisterOrPersisterById,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "7.2.0-beta.2",
+  "version": "7.2.0",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -22,10 +22,10 @@
   "sideEffects": false,
   "peerDependencies": {
     "@automerge/automerge-repo": "^2.5.1",
-    "@cloudflare/workers-types": "^4.20251210.0",
+    "@cloudflare/workers-types": "^4.20251212.0",
     "@electric-sql/pglite": "^0.3.14",
     "@libsql/client": "^0.15.15",
-    "@powersync/common": "^1.43.1",
+    "@powersync/common": "^1.44.0",
     "@sinclair/typebox": "^0.34.41",
     "@sqlite.org/sqlite-wasm": "^3.50.4-build1",
     "@vlcn.io/crsqlite-wasm": "^0.16.0",