tinybase 7.2.0-beta.2 → 7.2.0

package/queries/index.js

@@ -28,8 +28,10 @@ const math = Math;
 const mathMax = math.max;
 const mathMin = math.min;
 const isFiniteNumber = isFinite;
+const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
 const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -42,6 +44,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 arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arraySum = (array) => arrayReduce(array, (i, j) => i + j, 0);
@@ -49,7 +55,11 @@ const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 
+const collSizeN = (collSizer) => (coll) =>
+  arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
 const collSize = (coll) => coll?.size ?? 0;
+const collSize2 = collSizeN(collSize);
+const collSize3 = collSizeN(collSize2);
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collValues = (coll) => [...(coll?.values() ?? [])];
@@ -58,14 +68,49 @@ const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
+const isObject = (obj) =>
+  !isNullish(obj) &&
+  ifNotNullish(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isNullish(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
+const objIds = object.keys;
 const objFreeze = object.freeze;
 const objNew = (entries = []) => object.fromEntries(entries);
+const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objToMap = (obj) => new Map(objEntries(obj));
 const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 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,
+  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 mapNew = (entries) => new Map(entries);
 const mapKeys = (map) => [...(map?.keys() ?? [])];
@@ -380,6 +425,8 @@ const createQueries = getCreateFunction((store) => {
   const preStore = createStore();
   const resultStore = createStore();
   const preStoreListenerIds = mapNew();
+  const paramValuesListeners = mapNew();
+  const paramValueListeners = mapNew();
   const {
     addListener,
     callListeners,
@@ -402,7 +449,7 @@ const createQueries = getCreateFunction((store) => {
     delStoreListeners,
   ] = getDefinableFunctions(
     store,
-    () => [() => {}, mapNew()],
+    () => [],
     getUndefined,
     addListener,
     callListeners,
@@ -442,8 +489,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 = [];
@@ -772,31 +821,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;
@@ -808,11 +902,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,
@@ -821,6 +921,8 @@ const createQueries = getCreateFunction((store) => {
     hasQuery,
     getTableId,
     addQueryIdsListener,
+    addParamValuesListener,
+    addParamValueListener,
     delListener,
     destroy,
     getListenerStats,

package/queries/with-schemas/index.js

@@ -28,8 +28,10 @@ const math = Math;
 const mathMax = math.max;
 const mathMin = math.min;
 const isFiniteNumber = isFinite;
+const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
 const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -42,6 +44,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 arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arraySum = (array) => arrayReduce(array, (i, j) => i + j, 0);
@@ -49,7 +55,11 @@ const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 
+const collSizeN = (collSizer) => (coll) =>
+  arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
 const collSize = (coll) => coll?.size ?? 0;
+const collSize2 = collSizeN(collSize);
+const collSize3 = collSizeN(collSize2);
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
 const collValues = (coll) => [...(coll?.values() ?? [])];
@@ -58,14 +68,49 @@ const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
+const isObject = (obj) =>
+  !isNullish(obj) &&
+  ifNotNullish(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isNullish(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
+const objIds = object.keys;
 const objFreeze = object.freeze;
 const objNew = (entries = []) => object.fromEntries(entries);
+const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objToMap = (obj) => new Map(objEntries(obj));
 const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 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,
+  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 mapNew = (entries) => new Map(entries);
 const mapKeys = (map) => [...(map?.keys() ?? [])];
@@ -380,6 +425,8 @@ const createQueries = getCreateFunction((store) => {
   const preStore = createStore();
   const resultStore = createStore();
   const preStoreListenerIds = mapNew();
+  const paramValuesListeners = mapNew();
+  const paramValueListeners = mapNew();
   const {
     addListener,
     callListeners,
@@ -402,7 +449,7 @@ const createQueries = getCreateFunction((store) => {
     delStoreListeners,
   ] = getDefinableFunctions(
     store,
-    () => [() => {}, mapNew()],
+    () => [],
     getUndefined,
     addListener,
     callListeners,
@@ -442,8 +489,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 = [];
@@ -772,31 +821,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;
@@ -808,11 +902,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,
@@ -821,6 +921,8 @@ const createQueries = getCreateFunction((store) => {
     hasQuery,
     getTableId,
     addQueryIdsListener,
+    addParamValuesListener,
+    addParamValueListener,
     delListener,
     destroy,
     getListenerStats,