jexidb 2.1.1 → 2.1.3

package/src/managers/QueryManager.mjs

@@ -337,9 +337,26 @@ export class QueryManager {
       }
     }
     
+    // Handle $not operator - include it if it can be processed by IndexManager
+    if (criteria.$not && typeof criteria.$not === 'object') {
+      // Check if $not condition contains only indexable fields
+      const notFields = Object.keys(criteria.$not);
+      const allNotFieldsIndexed = notFields.every(field => 
+        this.indexManager.opts.indexes && this.indexManager.opts.indexes[field]
+      );
+      
+      if (allNotFieldsIndexed && notFields.length > 0) {
+        // Extract indexable criteria from $not condition
+        const indexableNotCriteria = this._extractIndexableCriteria(criteria.$not);
+        if (Object.keys(indexableNotCriteria).length > 0) {
+          indexableCriteria.$not = indexableNotCriteria;
+        }
+      }
+    }
+    
     // Handle regular field conditions
     for (const [field, condition] of Object.entries(criteria)) {
-      if (field.startsWith('$')) continue; // Skip logical operators
+      if (field.startsWith('$')) continue; // Skip logical operators (already handled above)
       
       // RegExp conditions cannot be pre-filtered using indices
       if (condition instanceof RegExp) {
@@ -690,30 +707,69 @@ export class QueryManager {
     // Read specific records using the line numbers
     if (lineNumbers.size > 0) {
       const lineNumbersArray = Array.from(lineNumbers)
-      const ranges = this.database.getRanges(lineNumbersArray)
-      const groupedRanges = await this.database.fileHandler.groupedRanges(ranges)
+      const persistedCount = Array.isArray(this.database.offsets) ? this.database.offsets.length : 0
       
-      const fs = await import('fs')
-      const fd = await fs.promises.open(this.database.fileHandler.file, 'r')
+      // Separate lineNumbers into file records and writeBuffer records
+      const fileLineNumbers = []
+      const writeBufferLineNumbers = []
       
-      try {
-        for (const groupedRange of groupedRanges) {
-          for await (const row of this.database.fileHandler.readGroupedRange(groupedRange, fd)) {
-            try {
-              const record = this.database.serializer.deserialize(row.line)
+      for (const lineNumber of lineNumbersArray) {
+        if (lineNumber >= persistedCount) {
+          // This lineNumber points to writeBuffer
+          writeBufferLineNumbers.push(lineNumber)
+        } else {
+          // This lineNumber points to file
+          fileLineNumbers.push(lineNumber)
+        }
+      }
+      
+      // Read records from file
+      if (fileLineNumbers.length > 0) {
+        const ranges = this.database.getRanges(fileLineNumbers)
+        if (ranges.length > 0) {
+          const groupedRanges = await this.database.fileHandler.groupedRanges(ranges)
+          
+          const fs = await import('fs')
+          const fd = await fs.promises.open(this.database.fileHandler.file, 'r')
+          
+          try {
+            for (const groupedRange of groupedRanges) {
+              for await (const row of this.database.fileHandler.readGroupedRange(groupedRange, fd)) {
+                try {
+                  const record = this.database.serializer.deserialize(row.line)
+                  const recordWithTerms = options.restoreTerms !== false ? 
+                    this.database.restoreTermIdsAfterDeserialization(record) : 
+                    record
+                  results.push(recordWithTerms)
+                  if (limit && results.length >= limit) break
+                } catch (error) {
+                  // Skip invalid lines
+                }
+              }
+              if (limit && results.length >= limit) break
+            }
+          } finally {
+            await fd.close()
+          }
+        }
+      }
+      
+      // Read records from writeBuffer
+      if (writeBufferLineNumbers.length > 0 && this.database.writeBuffer) {
+        for (const lineNumber of writeBufferLineNumbers) {
+          if (limit && results.length >= limit) break
+          
+          const writeBufferIndex = lineNumber - persistedCount
+          if (writeBufferIndex >= 0 && writeBufferIndex < this.database.writeBuffer.length) {
+            const record = this.database.writeBuffer[writeBufferIndex]
+            if (record) {
               const recordWithTerms = options.restoreTerms !== false ? 
                 this.database.restoreTermIdsAfterDeserialization(record) : 
                 record
               results.push(recordWithTerms)
-              if (limit && results.length >= limit) break
-            } catch (error) {
-              // Skip invalid lines
             }
           }
-          if (limit && results.length >= limit) break
         }
-      } finally {
-        await fd.close()
       }
     }
     
@@ -1138,8 +1194,8 @@ export class QueryManager {
     }
     
     const allFieldsIndexed = Object.keys(criteria).every(field => {
-      // Skip $and as it's handled separately above
-      if (field === '$and') return true;
+      // Skip $and and $not as they're handled separately above
+      if (field === '$and' || field === '$not') return true;
       
       if (!this.opts.indexes || !this.opts.indexes[field]) {
         if (this.opts.debugMode) {

package/.babelrc

@@ -1,13 +0,0 @@
-
-{
-  "presets": [
-    ["@babel/preset-env", {
-      "targets": {
-        "node": "current"
-      }
-    }]
-  ],
-  "plugins": [
-    "@babel/plugin-transform-async-generator-functions"
-  ]
-}

package/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

package/CHANGELOG.md

@@ -1,140 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [2.1.0] - 2024-12-19
-
-### ⚠️ BREAKING CHANGES
-
-This version is **NOT backward compatible** with databases created with previous versions.
-
-### 🚀 Major Features
-
-#### **Term Mapping Auto-Detection**
-
-- **BREAKING**: `termMapping` is now `true` by default (was `false`)
-- **BREAKING**: `termMappingFields` is now auto-detected from `indexes` (was manual configuration)
-- **NEW**: Automatic detection of `string` and `array:string` fields for term mapping
-- **NEW**: Zero-configuration term mapping for optimal performance
-
-#### **Schema Requirements**
-
-- **BREAKING**: `fields` option is now **MANDATORY** (was optional)
-- **NEW**: Clear distinction between `fields` (schema definition) and `indexes` (performance optimization)
-- **NEW**: Enhanced schema validation and error messages
-
-#### **Index Management**
-
-- **BREAKING**: `array:string` fields now use term IDs in indexes (was string values)
-- **BREAKING**: `array:number` fields use direct numeric values (was incorrectly term-mapped)
-- **NEW**: Improved index performance for array fields
-- **NEW**: Better memory usage for repetitive string data
-
-### 🔧 Improvements
-
-#### **Database Constructor**
-
-- **BREAKING**: `fields` parameter is now required
-- **NEW**: Auto-detection of term mapping fields
-- **NEW**: Enhanced error messages for missing schema
-- **NEW**: Better validation of field types
-
-#### **Query Performance**
-
-- **NEW**: Optimized query processing for term-mapped fields
-- **NEW**: Improved `$in` operator handling for arrays
-- **NEW**: Better support for mixed field types in queries
-
-#### **Documentation**
-
-- **NEW**: Complete API documentation overhaul
-- **NEW**: Practical examples with proper schema usage
-- **NEW**: Performance optimization guidelines
-- **NEW**: Migration guide for version 2.x
-
-### 🐛 Bug Fixes
-
-- Fixed `array:string` fields incorrectly using string values instead of term IDs
-- Fixed `array:number` fields being incorrectly term-mapped
-- Fixed term mapping not being enabled by default
-- Fixed missing `termMappingFields` property on TermManager
-- Fixed IndexManager not correctly identifying term mapping fields
-
-### 📚 Documentation Updates
-
-- **NEW**: Comprehensive API reference with examples
-- **NEW**: Schema vs Indexes distinction clearly explained
-- **NEW**: Performance tips and best practices
-- **NEW**: Migration guide for existing users
-- **NEW**: `beginInsertSession()` documentation
-
-### 🔄 Migration Guide
-
-#### **For Existing Users (1.x.x → 2.1.0)**
-
-1. **Update your database initialization:**
-
-   ```javascript
-   // ❌ OLD (1.x.x)
-   const db = new Database('db.jdb', {
-     indexes: { name: 'string', tags: 'array:string' }
-   })
-
-   // ✅ NEW (2.1.0)
-   const db = new Database('db.jdb', {
-     fields: {                    // REQUIRED - Define schema
-       id: 'number',
-       name: 'string',
-       tags: 'array:string'
-     },
-     indexes: {                   // OPTIONAL - Performance optimization
-       name: 'string',
-       tags: 'array:string'
-     }
-   })
-   ```
-2. **Database files are NOT compatible:**
-
-   - Existing `.jdb` files from 1.x.x will not work with 2.1.0
-   - You need to export data from 1.x.x and re-import to 2.1.0
-   - Consider this a fresh start for your database files
-3. **Term mapping is now automatic:**
-
-   - No need to manually configure `termMapping: true`
-   - No need to specify `termMappingFields`
-   - Fields are auto-detected from your `indexes` configuration
-
-### 🎯 Performance Improvements
-
-- **Up to 77% reduction** in database size for repetitive string data
-- **Faster queries** on term-mapped fields
-- **Better memory usage** for large datasets
-- **Optimized indexing** for array fields
-
-### 🧪 Testing
-
-- **NEW**: Comprehensive test suite for term mapping
-- **NEW**: Performance benchmarks for large datasets
-- **NEW**: Migration compatibility tests
-- **NEW**: Edge case testing for array fields
-
----
-
-## [1.1.0] - Previous Version
-
-### Features
-
-- Basic database functionality
-- Manual term mapping configuration
-- Optional schema definition
-- Basic indexing support
-
-### Limitations
-
-- Term mapping required manual configuration
-- Schema was optional, leading to confusion
-- Array fields had indexing issues
-- Performance not optimized for repetitive data

package/babel.config.json

@@ -1,5 +0,0 @@
-{
-  "presets": ["@babel/preset-env"],
-  "plugins": ["@babel/plugin-transform-async-generator-functions"]    
-}
-