tinybase 7.2.0-beta.3 → 7.2.0

package/ui-react/index.js

@@ -91,6 +91,8 @@ const objDel = (obj, id) => {
   return obj;
 };
 const objSize = (obj) => size(objIds(obj));
+
+/* istanbul ignore next */
 const objIsEqual = (
   obj1,
   obj2,
@@ -101,7 +103,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

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

@@ -91,6 +91,8 @@ const objDel = (obj, id) => {
   return obj;
 };
 const objSize = (obj) => size(objIds(obj));
+
+/* istanbul ignore next */
 const objIsEqual = (
   obj1,
   obj2,
@@ -101,7 +103,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

package/ui-react-dom/index.js

@@ -89,6 +89,8 @@ const objToArray = (obj, cb) =>
 const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
+
+/* istanbul ignore next */
 const objIsEqual = (
   obj1,
   obj2,
@@ -99,7 +101,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

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

@@ -89,6 +89,8 @@ const objToArray = (obj, cb) =>
 const objMap = (obj, cb) =>
   objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objSize = (obj) => size(objIds(obj));
+
+/* istanbul ignore next */
 const objIsEqual = (
   obj1,
   obj2,
@@ -99,7 +101,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

package/ui-react-inspector/index.js

@@ -164,6 +164,8 @@ 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,
@@ -174,7 +176,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

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

@@ -164,6 +164,8 @@ 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,
@@ -174,7 +176,8 @@ const objIsEqual = (
     size(entries1) === objSize(obj2) &&
     arrayEvery(entries1, ([index, value1]) =>
       isObject(value1)
-        ? isObject(obj2[index])
+        ? /* istanbul ignore next */
+          isObject(obj2[index])
           ? objIsEqual(obj2[index], value1)
           : false
         : isEqual(value1, obj2[index]),

package/with-schemas/index.js

@@ -149,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];
@@ -163,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();
@@ -3289,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 = [];
@@ -3619,32 +3642,36 @@ 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 = getQueryArgs(queryId)?.[1];
+    const oldParamValues = getParamValues(queryId);
     resetPreStores(queryId);
     delDefinition(queryId);
-    ifNotUndefined(oldParamValues, (paramValues) => {
-      mapForEach(paramValues, (paramId) =>
-        callListeners(paramValueListeners, [queryId, paramId], void 0),
-      );
-      callListeners(paramValuesListeners, [queryId], {});
-    });
+    callParamListeners(queryId, oldParamValues, {});
     return queries;
   };
-  const setParamValues = (queryId, paramValues) => {
+  const setParamValues = (queryId, paramValues, force = 0) => {
     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)) {
+      if (
+        force ||
+        !objIsEqual(mapToObj(oldParamValues), paramValues, arrayOrValueEqual)
+      ) {
         resultStore.transaction(() =>
           setQueryDefinition(
             queryId,
@@ -3653,21 +3680,21 @@ const createQueries = getCreateFunction((store) => {
             paramValues,
           ),
         );
-        mapForEach(changedParamValues, (paramId, value) =>
-          callListeners(paramValueListeners, [queryId, paramId], value),
-        );
-        callListeners(paramValuesListeners, [queryId], {...paramValues});
       }
     });
     return queries;
   };
-  const setParamValue = (queryId, paramId, value) =>
-    setParamValues(queryId, {
-      ...mapToObj(getQueryArgs(queryId)?.[1]),
-      [paramId]: value,
-    });
-  const getParamValues = (queryId) =>
-    ifNotUndefined(getQueryArgs(queryId)?.[1], mapToObj) ?? {};
+  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) =>