inibase 1.1.18 → 1.1.19

package/dist/index.js

@@ -947,6 +947,7 @@ export default class Inibase {
         if (Object.keys(criteria).length > 0) {
             if (allTrue === undefined)
                 allTrue = true;
+            criteria = Utils.toDotNotation(criteria, ["or", "and"]);
             let index = -1;
             for await (const [key, value] of Object.entries(criteria)) {
                 const field = Utils.getField(key, this.tablesMap.get(tableName).schema);
@@ -1038,7 +1039,8 @@ export default class Inibase {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
                 if (!Object.keys(RETURN).length)
                     RETURN = {};
-                RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).filter((key) => Object.keys(criteriaOR).includes(key)).length));
+                RETURN = Object.fromEntries(Object.entries(RETURN).filter(([_index, item]) => Object.keys(item).filter((key) => Object.keys(criteriaOR).includes(key) ||
+                    Object.keys(criteriaOR).some((criteriaKey) => criteriaKey.startsWith(`${key}.`))).length));
                 if (!Object.keys(RETURN).length)
                     RETURN = {};
                 searchIn = lineNumbers;

package/dist/utils.d.ts

@@ -200,3 +200,4 @@ export declare const setField: (keyPath: string, schema: Schema, field: Omit<Fie
  * @param {Schema} schema
  */
 export declare const unsetField: (keyPath: string, schema: Schema) => Field;
+export declare function toDotNotation(obj: Record<string, any>, skipKeys?: string[], currentPath?: string): Record<string, any>;

package/dist/utils.js

@@ -554,3 +554,28 @@ export const unsetField = (keyPath, schema) => {
         }
     }
 };
+export function toDotNotation(obj, skipKeys, currentPath = "") {
+    const result = {};
+    for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            const value = obj[key];
+            const newKey = currentPath ? `${currentPath}.${key}` : key;
+            if (skipKeys?.includes(key.toLowerCase())) {
+                // Preserve "or" and "and" keys with their exact values
+                result[newKey] = value;
+            }
+            else if (typeof value === "object" &&
+                value !== null &&
+                !Array.isArray(value)) {
+                // Recursively process nested objects
+                const nested = toDotNotation(value, skipKeys, newKey);
+                Object.assign(result, nested);
+            }
+            else {
+                // Add primitive values directly
+                result[newKey] = value;
+            }
+        }
+    }
+    return result;
+}

package/package.json

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