tinybase 7.2.0-beta.3 → 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;
@@ -66,15 +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 objHas = (obj, id) => id in obj;
+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() ?? [])];
@@ -91,17 +127,12 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   }
   return mapGet(map, key);
 };
-const mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
-  mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
-  return map;
-};
 const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
   collForEach(map, (mapValue, id) => {
-    if (!excludeMapValue?.(mapValue, id)) {
-      const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      if (!excludeObjValue?.(objValue)) {
+    {
+      const objValue = mapValue;
+      {
         obj[id] = objValue;
       }
     }
@@ -458,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 = [];
@@ -788,32 +821,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,
@@ -822,21 +859,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) =>

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;
@@ -66,15 +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 objHas = (obj, id) => id in obj;
+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() ?? [])];
@@ -91,17 +127,12 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   }
   return mapGet(map, key);
 };
-const mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
-  mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
-  return map;
-};
 const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   const obj = {};
   collForEach(map, (mapValue, id) => {
-    if (!excludeMapValue?.(mapValue, id)) {
-      const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      if (!excludeObjValue?.(objValue)) {
+    {
+      const objValue = mapValue;
+      {
         obj[id] = objValue;
       }
     }
@@ -458,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 = [];
@@ -788,32 +821,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,
@@ -822,21 +859,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) =>