cry-synced-db-client 0.1.150 → 0.1.151

package/dist/index.js

@@ -69,16 +69,13 @@ function matchesQuery(item, query) {
 function matchesCondition(item, key, condition) {
   const value = getNestedValue(item, key);
   if (condition === null || typeof condition !== "object") {
-    return value === condition;
+    return scalarMatches(value, condition);
   }
   if (condition instanceof Date) {
-    if (value instanceof Date) {
-      return value.getTime() === condition.getTime();
-    }
-    return false;
+    return scalarMatches(value, condition);
   }
   if (Array.isArray(condition)) {
-    return condition.includes(value);
+    return condition.some((c) => scalarMatches(value, c));
   }
   for (const [op, opValue] of Object.entries(condition)) {
     if (!matchesOperator(value, op, opValue)) {
@@ -90,29 +87,32 @@ function matchesCondition(item, key, condition) {
 function matchesOperator(value, operator, operand) {
   switch (operator) {
     case "$eq":
-      return equals(value, operand);
+      return scalarMatches(value, operand);
     case "$ne":
-      return !equals(value, operand);
+      return !scalarMatches(value, operand);
     case "$gt":
-      return value > operand;
+      return compareScalarOrArray(value, (v) => v > operand);
     case "$gte":
-      return value >= operand;
+      return compareScalarOrArray(value, (v) => v >= operand);
     case "$lt":
-      return value < operand;
+      return compareScalarOrArray(value, (v) => v < operand);
     case "$lte":
-      return value <= operand;
+      return compareScalarOrArray(value, (v) => v <= operand);
     case "$in":
       if (!Array.isArray(operand)) return false;
-      return operand.some((item) => equals(value, item));
+      return operand.some((item) => scalarMatches(value, item));
     case "$nin":
       if (!Array.isArray(operand)) return true;
-      return !operand.some((item) => equals(value, item));
+      return !operand.some((item) => scalarMatches(value, item));
     case "$exists":
       return operand ? value !== void 0 : value === void 0;
     case "$regex": {
-      if (typeof value !== "string") return false;
       const regex = operand instanceof RegExp ? operand : new RegExp(operand);
-      return regex.test(value);
+      if (typeof value === "string") return regex.test(value);
+      if (Array.isArray(value)) {
+        return value.some((v) => typeof v === "string" && regex.test(v));
+      }
+      return false;
     }
     case "$elemMatch":
       if (!Array.isArray(value)) return false;
@@ -152,6 +152,19 @@ function getNestedValue(obj, path) {
   }
   return current;
 }
+function scalarMatches(value, scalar) {
+  if (equals(value, scalar)) return true;
+  if (Array.isArray(value)) {
+    return value.some((elem) => equals(elem, scalar));
+  }
+  return false;
+}
+function compareScalarOrArray(value, predicate) {
+  if (Array.isArray(value)) {
+    return value.some((v) => predicate(v));
+  }
+  return predicate(value);
+}
 function equals(a, b) {
   var _a, _b;
   if (a === b) return true;

package/dist/src/utils/localQuery.d.ts

@@ -5,6 +5,10 @@ import type { DbEntity } from "../types/DbEntity";
  * Podpira polje-operatorje: $eq, $ne, $gt, $gte, $lt, $lte, $in, $nin,
  * $exists, $regex, $elemMatch, $size, $all — in logične operatorje
  * $and, $or, $nor na top-levelu.
+ *
+ * Skalarni operandi se ujemajo tudi z array-polji (MongoDB semantika):
+ * `{ a: "ok" }` matcha tako `{ a: "ok" }` kot `{ a: ["ok", "more"] }`.
+ * Velja za neposredno enakost, $eq, $ne, $in, $nin, $gt/$gte/$lt/$lte in $regex.
  */
 export declare function matchesQuery<T extends DbEntity>(item: T, query: QuerySpec<T>): boolean;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.150",
+  "version": "0.1.151",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",