tinybase 7.2.0-beta.2 → 7.2.0

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,
@@ -145,6 +149,7 @@ const isObject = (obj) =>
 const objIds = object.keys;
 const objFreeze = object.freeze;
 const objNew = (entries = []) => object.fromEntries(entries);
+const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
@@ -159,6 +164,26 @@ 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;
+
+/* 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)
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
+          ? objIsEqual(obj2[index], value1)
+          : false
+        : isEqual(value1, obj2[index]),
+    )
+  );
+};
 const objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
     obj[id] = getDefaultValue();
@@ -3221,6 +3246,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 +3270,7 @@ const createQueries = getCreateFunction((store) => {
     delStoreListeners,
   ] = getDefinableFunctions(
     store,
-    () => [() => {}, mapNew()],
+    () => [],
     getUndefined,
     addListener,
     callListeners,
@@ -3283,8 +3310,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 = [];
@@ -3613,31 +3642,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;
@@ -3649,11 +3723,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 +3742,8 @@ const createQueries = getCreateFunction((store) => {
     hasQuery,
     getTableId,
     addQueryIdsListener,
+    addParamValuesListener,
+    addParamValueListener,
     delListener,
     destroy,
     getListenerStats,