tinybase 7.2.0-beta.1 → 7.2.0-beta.3

package/with-schemas/index.js

@@ -78,6 +78,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,
@@ -3221,6 +3225,8 @@ const createQueries = getCreateFunction((store) => {
   const preStore = createStore();
   const resultStore = createStore();
   const preStoreListenerIds = mapNew();
+  const paramValuesListeners = mapNew();
+  const paramValueListeners = mapNew();
   const {
     addListener,
     callListeners,
@@ -3243,7 +3249,7 @@ const createQueries = getCreateFunction((store) => {
     delStoreListeners,
   ] = getDefinableFunctions(
     store,
-    () => [() => {}, mapNew()],
+    () => [],
     getUndefined,
     addListener,
     callListeners,
@@ -3614,21 +3620,45 @@ const createQueries = getCreateFunction((store) => {
     return queries;
   };
   const delQueryDefinition = (queryId) => {
+    const oldParamValues = getQueryArgs(queryId)?.[1];
     resetPreStores(queryId);
     delDefinition(queryId);
+    ifNotUndefined(oldParamValues, (paramValues) => {
+      mapForEach(paramValues, (paramId) =>
+        callListeners(paramValueListeners, [queryId, paramId], void 0),
+      );
+      callListeners(paramValuesListeners, [queryId], {});
+    });
     return queries;
   };
   const setParamValues = (queryId, paramValues) => {
-    ifNotUndefined(getQueryArgs(queryId), (definition) =>
-      resultStore.transaction(() =>
-        setQueryDefinition(
-          queryId,
-          getTableId(queryId),
-          definition[0],
-          paramValues,
-        ),
-      ),
-    );
+    ifNotUndefined(getQueryArgs(queryId), ([definition, oldParamValues]) => {
+      const changedParamValues = mapNew();
+      mapMatch(
+        oldParamValues,
+        paramValues,
+        (_, paramId, newValue) => {
+          if (!arrayOrValueEqual(newValue, mapGet(oldParamValues, paramId))) {
+            mapSet(changedParamValues, paramId, newValue);
+          }
+        },
+        (_, paramId) => mapSet(changedParamValues, paramId, void 0),
+      );
+      if (!collIsEmpty(changedParamValues)) {
+        resultStore.transaction(() =>
+          setQueryDefinition(
+            queryId,
+            getTableId(queryId),
+            definition,
+            paramValues,
+          ),
+        );
+        mapForEach(changedParamValues, (paramId, value) =>
+          callListeners(paramValueListeners, [queryId, paramId], value),
+        );
+        callListeners(paramValuesListeners, [queryId], {...paramValues});
+      }
+    });
     return queries;
   };
   const setParamValue = (queryId, paramId, value) =>
@@ -3636,8 +3666,25 @@ const createQueries = getCreateFunction((store) => {
       ...mapToObj(getQueryArgs(queryId)?.[1]),
       [paramId]: value,
     });
+  const getParamValues = (queryId) =>
+    ifNotUndefined(getQueryArgs(queryId)?.[1], mapToObj) ?? {};
+  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;
@@ -3649,11 +3696,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,
@@ -3662,6 +3715,8 @@ const createQueries = getCreateFunction((store) => {
     hasQuery,
     getTableId,
     addQueryIdsListener,
+    addParamValuesListener,
+    addParamValueListener,
     delListener,
     destroy,
     getListenerStats,