jexidb 2.1.2 → 2.1.4

package/src/SchemaManager.mjs

@@ -163,38 +163,10 @@ export default class SchemaManager {
     const obj = {}
     const idIndex = this.schema.indexOf('id')
     
-    // CRITICAL FIX: Handle schema migration where 'id' was first field in old schema
-    // but is not in current schema. Check if first element looks like an ID.
-    // Only do this if:
-    // 1. 'id' is not in current schema
-    // 2. Array has significantly more elements than current schema (2+ extra elements)
-    //    This suggests the old schema had more fields, and 'id' was likely the first
-    // 3. First element is a very short string (max 20 chars) that looks like a generated ID
-    //    (typically alphanumeric, often starting with letters like 'mit...' or similar patterns)
-    // 4. First field in current schema is not 'id' (to avoid false positives)
-    // 5. First element is not an array (to avoid false positives with array fields)
+    // DISABLED: Schema migration detection was causing field mapping corruption
+    // The logic was incorrectly assuming ID was in first position when it's appended at the end
+    // This caused fields to be shifted incorrectly during object-to-array-to-object conversion
     let arrayOffset = 0
-    if (idIndex === -1 && arr.length >= this.schema.length + 2 && this.schema.length > 0) {
-      // Only apply if array has at least 2 extra elements (suggests old schema had more fields)
-      const firstElement = arr[0]
-      const firstFieldName = this.schema[0]
-      
-      // Only apply shift if:
-      // - First field is not 'id'
-      // - First element is a very short string (max 20 chars) that looks like a generated ID
-      // - First element is not an array (to avoid false positives)
-      // - Array has at least 2 extra elements (strong indicator of schema migration)
-      if (firstFieldName !== 'id' && 
-          typeof firstElement === 'string' && 
-          !Array.isArray(firstElement) &&
-          firstElement.length > 0 && 
-          firstElement.length <= 20 && // Very conservative: max 20 chars (typical ID length)
-          /^[a-zA-Z0-9_-]+$/.test(firstElement)) {
-        // First element is likely the ID from old schema
-        obj.id = firstElement
-        arrayOffset = 1
-      }
-    }
     
     // Map array values to object properties
     // Only include fields that are in the schema

package/src/managers/IndexManager.mjs

@@ -1022,11 +1022,11 @@ export default class IndexManager {
         continue;
       }
 
-      if (typeof criteriaValue === 'object' && !Array.isArray(criteriaValue)) {
+      if (typeof criteriaValue === 'object' && !Array.isArray(criteriaValue) && criteriaValue !== null) {
         const fieldIndex = data[field];
-        
+
         // Handle $in operator for array queries
-        if (criteriaValue.$in !== undefined) {
+        if (criteriaValue.$in !== undefined && criteriaValue.$in !== null) {
           const inValues = Array.isArray(criteriaValue.$in) ? criteriaValue.$in : [criteriaValue.$in];
           
           // PERFORMANCE: Cache term mapping field check once
@@ -1969,6 +1969,14 @@ export default class IndexManager {
       return
     }
     
+    // Restore totalLines from saved data
+    if (index.totalLines !== undefined) {
+      this.totalLines = index.totalLines
+      if (this.opts.debugMode) {
+        console.log(`🔍 IndexManager.load: Restored totalLines=${this.totalLines}`)
+      }
+    }
+
     this.index = processedIndex
   }
 
@@ -2008,7 +2016,10 @@ export default class IndexManager {
    * This resolves the issue where Sets appear as empty objects in JSON.stringify
    */
   toJSON() {
-    const serializable = { data: {} }
+    const serializable = {
+      data: {},
+      totalLines: this.totalLines
+    }
     
     // Check if this is a term mapping field for conversion
     const isTermMappingField = (field) => {

package/src/managers/QueryManager.mjs

@@ -1215,7 +1215,7 @@ export class QueryManager {
         return false;
       }
       
-      if (typeof condition === 'object' && !Array.isArray(condition)) {
+      if (typeof condition === 'object' && !Array.isArray(condition) && condition !== null) {
         const operators = Object.keys(condition).map(op => normalizeOperator(op));
         if (this.opts.debugMode) {
           console.log(`🔍 Field '${field}' has operators:`, operators)
@@ -1532,8 +1532,8 @@ export class QueryManager {
       
       if (termMappingFields.includes(field)) {
         // For term mapping fields, simple equality or $in queries work well
-        if (typeof condition === 'string' || 
-            (typeof condition === 'object' && condition.$in && Array.isArray(condition.$in))) {
+        if (typeof condition === 'string' ||
+            (typeof condition === 'object' && condition !== null && condition.$in && Array.isArray(condition.$in))) {
           return true;
         }
       }