jexidb 1.0.4 → 1.0.5

package/dist/Database.cjs

@@ -584,7 +584,7 @@ var Database = exports.Database = /*#__PURE__*/function (_EventEmitter) {
                 if (map instanceof Set) {
                   map = _toConsumableArray(map);
                 } else if (map && _typeof(map) === 'object') {
-                  map = _toConsumableArray(_this.indexManager.query(map, options.matchAny));
+                  map = _toConsumableArray(_this.indexManager.query(map, options));
                 } else {
                   map = _toConsumableArray(Array(_this.offsets.length).keys());
                 }
@@ -729,7 +729,7 @@ var Database = exports.Database = /*#__PURE__*/function (_EventEmitter) {
               return _context9.abrupt("return", results);
             case 19:
               _context9.next = 21;
-              return this.indexManager.query(criteria, options.matchAny);
+              return this.indexManager.query(criteria, options);
             case 21:
               matchingLines = _context9.sent;
               if (!(!matchingLines || !matchingLines.size)) {
@@ -801,7 +801,7 @@ var Database = exports.Database = /*#__PURE__*/function (_EventEmitter) {
               return this.save()["catch"](console.error);
             case 11:
               _context11.next = 13;
-              return this.indexManager.query(criteria, options.matchAny);
+              return this.indexManager.query(criteria, options);
             case 13:
               matchingLines = _context11.sent;
               if (!(!matchingLines || !matchingLines.size)) {
@@ -944,7 +944,7 @@ var Database = exports.Database = /*#__PURE__*/function (_EventEmitter) {
               return this.save()["catch"](console.error);
             case 11:
               _context12.next = 13;
-              return this.indexManager.query(criteria, options.matchAny);
+              return this.indexManager.query(criteria, options);
             case 13:
               matchingLines = _context12.sent;
               if (!(!matchingLines || !matchingLines.size)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jexidb",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "JexiDB is a pure JS NPM library for managing data on disk using JSONL efficiently, without the need for a server.",
   "main": "./dist/Database.cjs",
   "module": "./src/Database.mjs",

package/src/Database.mjs

@@ -217,7 +217,7 @@ export class Database extends EventEmitter {
       if (map instanceof Set) {
         map = [...map]
       } else if(map && typeof map === 'object') {
-        map = [...this.indexManager.query(map, options.matchAny)]
+        map = [...this.indexManager.query(map, options)]
       } else {
         map = [...Array(this.offsets.length).keys()]
       }
@@ -268,7 +268,7 @@ export class Database extends EventEmitter {
       }
       return results
     } else {
-      const matchingLines = await this.indexManager.query(criteria, options.matchAny)
+      const matchingLines = await this.indexManager.query(criteria, options)
       if (!matchingLines || !matchingLines.size) {
           return []
       }
@@ -284,7 +284,7 @@ export class Database extends EventEmitter {
     if(this.destroyed) throw new Error('Database is destroyed')
     if(!this.initialized) await this.init()
     this.shouldSave && await this.save().catch(console.error)
-    const matchingLines = await this.indexManager.query(criteria, options.matchAny)
+    const matchingLines = await this.indexManager.query(criteria, options)
     if (!matchingLines || !matchingLines.size) {
         return []
     }
@@ -331,7 +331,7 @@ export class Database extends EventEmitter {
     if(this.destroyed) throw new Error('Database is destroyed')
     if(!this.initialized) await this.init()
     this.shouldSave && await this.save().catch(console.error)
-    const matchingLines = await this.indexManager.query(criteria, options.matchAny)
+    const matchingLines = await this.indexManager.query(criteria, options)
     if (!matchingLines || !matchingLines.size) {
         return 0
     }

package/src/IndexManager.mjs

@@ -83,23 +83,29 @@ export default class IndexManager {
     }
   }
 
-  query(criteria, matchAny=false) {
-    if (!criteria) throw new Error('No query criteria provided')
-    const fields = Object.keys(criteria)
-    if (!fields.length) throw new Error('No valid query criteria provided')
-    let matchingLines = matchAny ? new Set() : null
+  query(criteria, options = {}) {
+    if (typeof options === 'boolean') {
+      options = { matchAny: options };
+    }
+    const { matchAny = false, caseInsensitive = false } = options;
+    if (!criteria) throw new Error('No query criteria provided');
+    const fields = Object.keys(criteria);
+    if (!fields.length) throw new Error('No valid query criteria provided');
+    let matchingLines = matchAny ? new Set() : null;
+  
     for (const field of fields) {
-      if (typeof(this.index.data[field]) == 'undefined') continue
-      const criteriaValue = criteria[field]
-      let lineNumbersForField = new Set()
-      const isNumericField = this.opts.indexes[field] === 'number'
-      if (typeof(criteriaValue) === 'object' && !Array.isArray(criteriaValue)) {
+      if (typeof this.index.data[field] === 'undefined') continue;
+      const criteriaValue = criteria[field];
+      let lineNumbersForField = new Set();
+      const isNumericField = this.opts.indexes[field] === 'number';
+  
+      if (typeof criteriaValue === 'object' && !Array.isArray(criteriaValue)) {
         const fieldIndex = this.index.data[field];
         for (const value in fieldIndex) {
-          let includeValue = true
+          let includeValue = true;
           if (isNumericField) {
             const numericValue = parseFloat(value);
-            if (!isNaN(numericValue)) { 
+            if (!isNaN(numericValue)) {
               if (criteriaValue['>'] !== undefined && numericValue <= criteriaValue['>']) {
                 includeValue = false;
               }
@@ -113,7 +119,9 @@ export default class IndexManager {
                 includeValue = false;
               }
               if (criteriaValue['!='] !== undefined) {
-                const excludeValues = Array.isArray(criteriaValue['!=']) ? criteriaValue['!='] : [criteriaValue['!=']];
+                const excludeValues = Array.isArray(criteriaValue['!='])
+                  ? criteriaValue['!=']
+                  : [criteriaValue['!=']];
                 if (excludeValues.includes(numericValue)) {
                   includeValue = false;
                 }
@@ -121,24 +129,45 @@ export default class IndexManager {
             }
           } else {
             if (criteriaValue['contains'] !== undefined && typeof value === 'string') {
-              if (!value.includes(criteriaValue['contains'])) {
-                includeValue = false;
+              const term = String(criteriaValue['contains']);
+              if (caseInsensitive) {
+                if (!value.toLowerCase().includes(term.toLowerCase())) {
+                  includeValue = false;
+                }
+              } else {
+                if (!value.includes(term)) {
+                  includeValue = false;
+                }
               }
             }
-            if (criteriaValue['regex'] !== undefined && typeof value === 'string') {
-              const regex = new RegExp(criteriaValue['regex']);
-              if (!regex.test(value)) {
+            if (criteriaValue['regex'] !== undefined) {
+              let regex;
+              if (typeof criteriaValue['regex'] === 'string') {
+                regex = new RegExp(criteriaValue['regex'], caseInsensitive ? 'i' : '');
+              } else if (criteriaValue['regex'] instanceof RegExp) {
+                if (caseInsensitive && !criteriaValue['regex'].ignoreCase) {
+                  const flags = criteriaValue['regex'].flags.includes('i')
+                    ? criteriaValue['regex'].flags
+                    : criteriaValue['regex'].flags + 'i';
+                  regex = new RegExp(criteriaValue['regex'].source, flags);
+                } else {
+                  regex = criteriaValue['regex'];
+                }
+              }
+              if (regex && !regex.test(value)) {
                 includeValue = false;
               }
             }
             if (criteriaValue['!='] !== undefined) {
-              const excludeValues = Array.isArray(criteriaValue['!=']) ? criteriaValue['!='] : [criteriaValue['!=']];
+              const excludeValues = Array.isArray(criteriaValue['!='])
+                ? criteriaValue['!=']
+                : [criteriaValue['!=']];
               if (excludeValues.includes(value)) {
                 includeValue = false;
               }
             }
           }
-
+  
           if (includeValue) {
             for (const lineNumber of fieldIndex[value]) {
               lineNumbersForField.add(lineNumber);
@@ -146,31 +175,46 @@ export default class IndexManager {
           }
         }
       } else {
+        // Comparação simples de igualdade
         const values = Array.isArray(criteriaValue) ? criteriaValue : [criteriaValue];
-        for (const value of values) {
-          if (this.index.data[field][value]) {
-            for (const lineNumber of this.index.data[field][value]) {
-              lineNumbersForField.add(lineNumber);
+        const fieldData = this.index.data[field];
+        for (const searchValue of values) {
+          for (const key in fieldData) {
+            let match = false;
+            if (isNumericField) {
+              // Converter ambas as partes para número
+              match = Number(key) === Number(searchValue);
+            } else {
+              match = caseInsensitive
+                ? key.toLowerCase() === String(searchValue).toLowerCase()
+                : key === searchValue;
+            }
+            if (match) {
+              for (const lineNumber of fieldData[key]) {
+                lineNumbersForField.add(lineNumber);
+              }
             }
           }
         }
       }
+  
+      // Consolida os resultados de cada campo
       if (matchAny) {
         matchingLines = new Set([...matchingLines, ...lineNumbersForField]);
       } else {
         if (matchingLines === null) {
-          matchingLines = lineNumbersForField
+          matchingLines = lineNumbersForField;
         } else {
           matchingLines = new Set([...matchingLines].filter(n => lineNumbersForField.has(n)));
         }
         if (!matchingLines.size) {
-          return new Set()
+          return new Set();
         }
       }
     }
     return matchingLines || new Set();
-  }
-
+  } 
+ 
   load(index) {
     for(const field in index.data) {
       for(const term in index.data[field]) {