inibase 1.5.2 → 1.5.4

package/dist/index.js

@@ -1041,16 +1041,6 @@ export default class Inibase {
                         delete value[logic];
                     }
                 }
-                else if (Array.isArray(value)) {
-                    const crit = value
-                        .map((v) => typeof v === "string"
-                        ? Utils.FormatObjectCriteriaValue(v)
-                        : ["=", v])
-                        .filter(Boolean);
-                    searchOperator = crit.map((c) => c[0]);
-                    searchComparedAtValue = crit.map((c) => c[1]);
-                    searchLogicalOperator = "or";
-                }
                 else if (typeof value === "string") {
                     const [op, val] = Utils.FormatObjectCriteriaValue(value);
                     searchOperator = op;

package/dist/utils.server.d.ts

@@ -38,14 +38,6 @@ export declare const hashString: (str: string) => string;
  * Note: Handles various data types and comparison logic, including special handling for passwords and regex patterns.
  */
 export declare const compare: (operator: ComparisonOperator, originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType | FieldType[]) => boolean;
-/**
- * Helper function to check equality based on the field type.
- *
- * @param originalValue - The original value.
- * @param comparedValue - The value to compare against.
- * @param field - Field object config.
- * @returns boolean - Result of the equality check.
- */
 export declare const isEqual: (originalValue: string | number | boolean | null | (string | number | boolean | null)[], comparedValue: string | number | boolean | null | (string | number | boolean | null)[], fieldType?: FieldType) => boolean;
 /**
  * Helper function to check array equality.

package/dist/utils.server.js

@@ -137,19 +137,41 @@ export const compare = (operator, originalValue, comparedValue, fieldType) => {
 /**
  * Helper function to handle non-null comparisons.
  */
-const compareNonNullValues = (originalValue, comparedValue, comparator) => {
-    return (originalValue !== null &&
-        comparedValue !== null &&
-        comparator(originalValue, comparedValue));
+const isComparablePrimitive = (value) => typeof value === "string" ||
+    typeof value === "number" ||
+    typeof value === "boolean";
+const compareNonNullValues = (originalValue, comparedValue, comparator) => originalValue !== null &&
+    comparedValue !== null &&
+    isComparablePrimitive(originalValue) &&
+    isComparablePrimitive(comparedValue) &&
+    comparator(originalValue, comparedValue);
+const serializeArrayItem = (value) => {
+    if (Array.isArray(value))
+        return `array:${Inison.stringify(value)}`;
+    const type = value === null ? "null" : typeof value;
+    const valueStr = value === null ? "null" : String(value);
+    return `${type}:${valueStr}`;
+};
+const haveSameArrayValues = (first, second) => {
+    if (first.length !== second.length)
+        return false;
+    const counts = new Map();
+    for (const value of first) {
+        const key = serializeArrayItem(value);
+        counts.set(key, (counts.get(key) ?? 0) + 1);
+    }
+    for (const value of second) {
+        const key = serializeArrayItem(value);
+        const remaining = (counts.get(key) ?? 0) - 1;
+        if (remaining < 0)
+            return false;
+        if (remaining === 0)
+            counts.delete(key);
+        else
+            counts.set(key, remaining);
+    }
+    return counts.size === 0;
 };
-/**
- * Helper function to check equality based on the field type.
- *
- * @param originalValue - The original value.
- * @param comparedValue - The value to compare against.
- * @param field - Field object config.
- * @returns boolean - Result of the equality check.
- */
 export const isEqual = (originalValue, comparedValue, fieldType) => {
     switch (fieldType) {
         case "password":
@@ -170,11 +192,8 @@ export const isEqual = (originalValue, comparedValue, fieldType) => {
             if (isOriginalNullLike && isComparedNullLike)
                 return true;
             // If both are arrays
-            if (Array.isArray(originalValue)) {
-                if (Array.isArray(comparedValue))
-                    return (JSON.stringify(originalValue) === JSON.stringify(comparedValue));
-                return Inison.stringify(originalValue) === comparedValue;
-            }
+            if (Array.isArray(originalValue) && Array.isArray(comparedValue))
+                return haveSameArrayValues(originalValue, comparedValue);
             // If both are number-like
             if (isNumber(originalValue) && isNumber(comparedValue))
                 return Number(originalValue) === Number(comparedValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",