@joystick.js/db-canary 0.0.0-canary.2249 → 0.0.0-canary.2251

package/dist/server/lib/operations/find.js

@@ -1 +1 @@
-import{get_database as D,build_collection_key as A}from"../query_engine.js";import{can_use_index as J,find_documents_by_index as v}from"../index_manager.js";import{record_query as N,record_index_usage as F}from"../auto_index_manager.js";import S from"../logger.js";const{create_context_logger:R}=S("find"),C=(n,t)=>{const o=t.split(".");let r=n;for(const e of o){if(r==null)return;r=r[e]}return r},P=(n,t)=>{const o=t.split(".");let r=n;for(let e=0;e<o.length;e++){if(r==null||typeof r!="object")return!1;if(e===o.length-1)return r.hasOwnProperty(o[e]);r=r[o[e]]}return!1},$=(n,t)=>{if(!t||Object.keys(t).length===0)return!0;for(const[o,r]of Object.entries(t)){const e=C(n,o);if(typeof r=="object"&&r!==null&&!Array.isArray(r))for(const[i,s]of Object.entries(r))switch(i){case"$eq":if(e!==s)return!1;break;case"$ne":if(e===s)return!1;break;case"$gt":if(e<=s)return!1;break;case"$gte":if(e<s)return!1;break;case"$lt":if(e>=s)return!1;break;case"$lte":if(e>s)return!1;break;case"$in":if(!Array.isArray(s)||!s.includes(e))return!1;break;case"$nin":if(!Array.isArray(s)||s.includes(e))return!1;break;case"$exists":const c=P(n,o);if(s&&!c||!s&&c)return!1;break;case"$regex":const u=r.$options||"";if(!new RegExp(s,u).test(e))return!1;break;case"$options":break;default:throw new Error(`Unsupported query operator: ${i}`)}else if(e!==r)return!1}return!0},U=(n,t)=>{if(!t||Object.keys(t).length===0)return n;const o=Object.values(t).some(e=>e===1||e===!0),r={};if(o){r._id=n._id;for(const[e,i]of Object.entries(t))e==="_id"&&(i===0||i===!1)?delete r._id:(i===1||i===!0)&&(r[e]=n[e])}else{Object.assign(r,n);for(const[e,i]of Object.entries(t))(i===0||i===!1)&&delete r[e]}return r},z=(n,t)=>!t||Object.keys(t).length===0?n:n.sort((o,r)=>{for(const[e,i]of Object.entries(t)){const s=o[e],c=r[e];if(s===c)continue;if(s===void 0)return 1;if(c===void 0)return-1;const u=s<c?-1:s>c?1:0;return i===-1?-u:u}return 0}),B=async(n,t,o={},r={})=>{const e=R();if(!n)throw new Error("Database name is required");if(!t)throw new Error("Collection name is required");const i=D(),{projection:s,sort:c,limit:u,skip:h=0}=r,E=Date.now();try{let d=[],_=!1,k=null;const O=J(n,t,o);if(O){const{field:f,operators:b}=O,a=o[f];if(k=f,typeof a=="object"&&a!==null&&!Array.isArray(a)){for(const l of b)if(a[l]!==void 0){const p=v(n,t,f,l,a[l]);if(p){_=!0,F(n,t,f);for(const m of p){const x=A(n,t,m),y=i.get(x);if(y){const q=JSON.parse(y);$(q,o)&&d.push(q)}}break}}}else if(b.includes("eq")){const l=v(n,t,f,"eq",a);if(l){_=!0,F(n,t,f);for(const p of l){const m=A(n,t,p),x=i.get(m);if(x){const y=JSON.parse(x);$(y,o)&&d.push(y)}}}}}if(!_){const f=`${n}:${t}:`,b=i.getRange({start:f,end:f+"\xFF"});for(const{key:a,value:l}of b){const p=JSON.parse(l);$(p,o)&&d.push(p)}}let g=z(d,c);h>0&&(g=g.slice(h)),u&&u>0&&(g=g.slice(0,u));const j=g.map(f=>U(f,s)),w=Date.now()-E;try{N(t,o,w,_,k)}catch(f){e.warn("Failed to record query for auto-indexing",{error:f.message})}return e.info("Find operation completed",{database:n,collection:t,documents_found:j.length,total_matching:d.length,used_index:_,indexed_field:k,execution_time_ms:w}),j}catch(d){throw e.error("Failed to find documents",{database:n,collection:t,error:d.message}),d}};var L=B;export{L as default};
+import{get_database as J,build_collection_key as q}from"../query_engine.js";import{can_use_index as N,find_documents_by_index as F}from"../index_manager.js";import{record_query as S,record_index_usage as E}from"../auto_index_manager.js";import R from"../logger.js";const{create_context_logger:C}=R("find"),D=(i,t)=>{const o=t.split(".");let r=i;for(let e=0;e<o.length;e++){const l=o[e];if(r==null)return;if(r=r[l],Array.isArray(r)&&e<o.length-1){const n=o.slice(e+1).join("."),u=[];for(let c=0;c<r.length;c++){const d=r[c];if(typeof d=="object"&&d!==null){const f=D(d,n);f!==void 0&&(Array.isArray(f)?u.push(...f):u.push(f))}}return u.length>0?u:void 0}}return r},P=(i,t)=>{const o=t.split(".");let r=i;for(let e=0;e<o.length;e++){if(r==null||typeof r!="object")return!1;if(e===o.length-1)return r.hasOwnProperty(o[e]);r=r[o[e]]}return!1},b=(i,t)=>{if(!t||Object.keys(t).length===0)return!0;if(t.$or&&Array.isArray(t.$or)){const o=t.$or;let r=!1;for(let l=0;l<o.length;l++)if(b(i,o[l])){r=!0;break}if(!r)return!1;const e={...t};return delete e.$or,Object.keys(e).length>0?b(i,e):!0}for(const[o,r]of Object.entries(t)){const e=D(i,o);if(typeof r=="object"&&r!==null&&!Array.isArray(r))for(const[l,n]of Object.entries(r))switch(l){case"$eq":if(Array.isArray(e)){if(!e.includes(n))return!1}else if(e!==n)return!1;break;case"$ne":if(Array.isArray(e)){if(e.includes(n))return!1}else if(e===n)return!1;break;case"$gt":if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(e[s]>n){f=!0;break}if(!f)return!1}else if(e<=n)return!1;break;case"$gte":if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(e[s]>=n){f=!0;break}if(!f)return!1}else if(e<n)return!1;break;case"$lt":if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(e[s]<n){f=!0;break}if(!f)return!1}else if(e>=n)return!1;break;case"$lte":if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(e[s]<=n){f=!0;break}if(!f)return!1}else if(e>n)return!1;break;case"$in":if(!Array.isArray(n))return!1;if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(n.includes(e[s])){f=!0;break}if(!f)return!1}else if(!n.includes(e))return!1;break;case"$nin":if(!Array.isArray(n))return!1;if(Array.isArray(e)){for(let f=0;f<e.length;f++)if(n.includes(e[f]))return!1}else if(n.includes(e))return!1;break;case"$exists":const u=P(i,o);if(n&&!u||!n&&u)return!1;break;case"$regex":const c=r.$options||"",d=new RegExp(n,c);if(Array.isArray(e)){let f=!1;for(let s=0;s<e.length;s++)if(typeof e[s]=="string"&&d.test(e[s])){f=!0;break}if(!f)return!1}else if(!d.test(e))return!1;break;case"$options":break;default:throw new Error(`Unsupported query operator: ${l}`)}else if(Array.isArray(e)){if(!e.includes(r))return!1}else if(e!==r)return!1}return!0},U=(i,t)=>{if(!t||Object.keys(t).length===0)return i;const o=Object.values(t).some(e=>e===1||e===!0),r={};if(o){r._id=i._id;for(const[e,l]of Object.entries(t))e==="_id"&&(l===0||l===!1)?delete r._id:(l===1||l===!0)&&(r[e]=i[e])}else{Object.assign(r,i);for(const[e,l]of Object.entries(t))(l===0||l===!1)&&delete r[e]}return r},z=(i,t)=>!t||Object.keys(t).length===0?i:i.sort((o,r)=>{for(const[e,l]of Object.entries(t)){const n=o[e],u=r[e];if(n===u)continue;if(n===void 0)return 1;if(u===void 0)return-1;const c=n<u?-1:n>u?1:0;return l===-1?-c:c}return 0}),B=async(i,t,o={},r={})=>{const e=C();if(!i)throw new Error("Database name is required");if(!t)throw new Error("Collection name is required");const l=J(),{projection:n,sort:u,limit:c,skip:d=0}=r,f=Date.now();try{let s=[],_=!1,$=null;const m=N(i,t,o);if(m){const{field:a,operators:k}=m,g=o[a];if($=a,typeof g=="object"&&g!==null&&!Array.isArray(g)){for(const y of k)if(g[y]!==void 0){const p=F(i,t,a,y,g[y]);if(p){_=!0,E(i,t,a);for(const j of p){const x=q(i,t,j),A=l.get(x);if(A){const v=JSON.parse(A);b(v,o)&&s.push(v)}}break}}}else if(k.includes("eq")){const y=F(i,t,a,"eq",g);if(y){_=!0,E(i,t,a);for(const p of y){const j=q(i,t,p),x=l.get(j);if(x){const A=JSON.parse(x);b(A,o)&&s.push(A)}}}}}if(!_){const a=`${i}:${t}:`,k=l.getRange({start:a,end:a+"\xFF"});for(const{key:g,value:y}of k){const p=JSON.parse(y);b(p,o)&&s.push(p)}}let h=z(s,u);d>0&&(h=h.slice(d)),c&&c>0&&(h=h.slice(0,c));const O=h.map(a=>U(a,n)),w=Date.now()-f;try{S(t,o,w,_,$)}catch(a){e.warn("Failed to record query for auto-indexing",{error:a.message})}return e.info("Find operation completed",{database:i,collection:t,documents_found:O.length,total_matching:s.length,used_index:_,indexed_field:$,execution_time_ms:w}),O}catch(s){throw e.error("Failed to find documents",{database:i,collection:t,error:s.message}),s}};var L=B;export{L as default};

package/dist/server/lib/operations/find_one.js

@@ -1 +1 @@
-import{get_database as A,build_collection_key as j}from"../query_engine.js";import{can_use_index as v,find_documents_by_index as m}from"../index_manager.js";import{record_query as D,record_index_usage as q}from"../auto_index_manager.js";import E from"../logger.js";const{create_context_logger:F}=E("find_one"),N=(o,t)=>{const n=t.split(".");let r=o;for(const e of n){if(r==null)return;r=r[e]}return r},J=(o,t)=>{const n=t.split(".");let r=o;for(let e=0;e<n.length;e++){if(r==null||typeof r!="object")return!1;if(e===n.length-1)return r.hasOwnProperty(n[e]);r=r[n[e]]}return!1},w=(o,t)=>{if(!t||Object.keys(t).length===0)return!0;for(const[n,r]of Object.entries(t)){const e=N(o,n);if(typeof r=="object"&&r!==null&&!Array.isArray(r))for(const[i,s]of Object.entries(r))switch(i){case"$eq":if(e!==s)return!1;break;case"$ne":if(e===s)return!1;break;case"$gt":if(e<=s)return!1;break;case"$gte":if(e<s)return!1;break;case"$lt":if(e>=s)return!1;break;case"$lte":if(e>s)return!1;break;case"$in":if(!Array.isArray(s)||!s.includes(e))return!1;break;case"$nin":if(!Array.isArray(s)||s.includes(e))return!1;break;case"$exists":const x=J(o,n);if(s&&!x||!s&&x)return!1;break;case"$regex":const b=r.$options||"";if(!new RegExp(s,b).test(e))return!1;break;case"$options":break;default:throw new Error(`Unsupported query operator: ${i}`)}else if(e!==r)return!1}return!0},S=(o,t)=>{if(!t||Object.keys(t).length===0)return o;const n=Object.values(t).some(e=>e===1||e===!0),r={};if(n){r._id=o._id;for(const[e,i]of Object.entries(t))e==="_id"&&(i===0||i===!1)?delete r._id:(i===1||i===!0)&&(r[e]=o[e])}else{Object.assign(r,o);for(const[e,i]of Object.entries(t))(i===0||i===!1)&&delete r[e]}return r},R=async(o,t,n={},r={})=>{const e=F();if(!o)throw new Error("Database name is required");if(!t)throw new Error("Collection name is required");const i=A(),{projection:s,sort:x}=r,b=Date.now();try{let c=null,a=!1,_=null;const O=v(o,t,n);if(O){const{field:f,operators:g}=O,d=n[f];if(_=f,typeof d=="object"&&d!==null&&!Array.isArray(d)){for(const u of g)if(d[u]!==void 0){const l=m(o,t,f,u,d[u]);if(l&&l.length>0){a=!0,q(o,t,f);for(const h of l){const y=j(o,t,h),p=i.get(y);if(p)try{const $=JSON.parse(p);if(w($,n)){c=$;break}}catch{continue}}break}}}else if(g.includes("eq")){const u=m(o,t,f,"eq",d);if(u&&u.length>0){a=!0,q(o,t,f);for(const l of u){const h=j(o,t,l),y=i.get(h);if(y)try{const p=JSON.parse(y);if(w(p,n)){c=p;break}}catch{continue}}}}}if(!a){const f=`${o}:${t}:`,g=i.getRange({start:f,end:f+"\xFF"});for(const{key:d,value:u}of g)try{const l=JSON.parse(u);if(w(l,n)){c=l;break}}catch{continue}}const k=Date.now()-b;try{D(t,n,k,a,_)}catch(f){e.warn("Failed to record query for auto-indexing",{error:f.message})}if(c){const f=S(c,s);return e.info("Document found",{database:o,collection:t,document_id:c._id,used_index:a,indexed_field:_,execution_time_ms:k}),f}return e.info("No document found",{database:o,collection:t,used_index:a,indexed_field:_,execution_time_ms:k}),null}catch(c){throw e.error("Failed to find document",{database:o,collection:t,error:c.message}),c}};var B=R;export{B as default};
+import{get_database as q,build_collection_key as w}from"../query_engine.js";import{can_use_index as D,find_documents_by_index as O}from"../index_manager.js";import{record_query as E,record_index_usage as m}from"../auto_index_manager.js";import F from"../logger.js";const{create_context_logger:N}=F("find_one"),v=(i,s)=>{const o=s.split(".");let r=i;for(let e=0;e<o.length;e++){const l=o[e];if(r==null)return;if(r=r[l],Array.isArray(r)&&e<o.length-1){const f=o.slice(e+1).join("."),y=[];for(let g=0;g<r.length;g++){const u=r[g];if(typeof u=="object"&&u!==null){const t=v(u,f);t!==void 0&&(Array.isArray(t)?y.push(...t):y.push(t))}}return y.length>0?y:void 0}}return r},J=(i,s)=>{const o=s.split(".");let r=i;for(let e=0;e<o.length;e++){if(r==null||typeof r!="object")return!1;if(e===o.length-1)return r.hasOwnProperty(o[e]);r=r[o[e]]}return!1},h=(i,s)=>{if(!s||Object.keys(s).length===0)return!0;if(s.$or&&Array.isArray(s.$or)){const o=s.$or;let r=!1;for(let l=0;l<o.length;l++)if(h(i,o[l])){r=!0;break}if(!r)return!1;const e={...s};return delete e.$or,Object.keys(e).length>0?h(i,e):!0}for(const[o,r]of Object.entries(s)){const e=v(i,o);if(typeof r=="object"&&r!==null&&!Array.isArray(r))for(const[l,f]of Object.entries(r))switch(l){case"$eq":if(Array.isArray(e)){if(!e.includes(f))return!1}else if(e!==f)return!1;break;case"$ne":if(Array.isArray(e)){if(e.includes(f))return!1}else if(e===f)return!1;break;case"$gt":if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(e[n]>f){t=!0;break}if(!t)return!1}else if(e<=f)return!1;break;case"$gte":if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(e[n]>=f){t=!0;break}if(!t)return!1}else if(e<f)return!1;break;case"$lt":if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(e[n]<f){t=!0;break}if(!t)return!1}else if(e>=f)return!1;break;case"$lte":if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(e[n]<=f){t=!0;break}if(!t)return!1}else if(e>f)return!1;break;case"$in":if(!Array.isArray(f))return!1;if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(f.includes(e[n])){t=!0;break}if(!t)return!1}else if(!f.includes(e))return!1;break;case"$nin":if(!Array.isArray(f))return!1;if(Array.isArray(e)){for(let t=0;t<e.length;t++)if(f.includes(e[t]))return!1}else if(f.includes(e))return!1;break;case"$exists":const y=J(i,o);if(f&&!y||!f&&y)return!1;break;case"$regex":const g=r.$options||"",u=new RegExp(f,g);if(Array.isArray(e)){let t=!1;for(let n=0;n<e.length;n++)if(typeof e[n]=="string"&&u.test(e[n])){t=!0;break}if(!t)return!1}else if(!u.test(e))return!1;break;case"$options":break;default:throw new Error(`Unsupported query operator: ${l}`)}else if(Array.isArray(e)){if(!e.includes(r))return!1}else if(e!==r)return!1}return!0},S=(i,s)=>{if(!s||Object.keys(s).length===0)return i;const o=Object.values(s).some(e=>e===1||e===!0),r={};if(o){r._id=i._id;for(const[e,l]of Object.entries(s))e==="_id"&&(l===0||l===!1)?delete r._id:(l===1||l===!0)&&(r[e]=i[e])}else{Object.assign(r,i);for(const[e,l]of Object.entries(s))(l===0||l===!1)&&delete r[e]}return r},R=async(i,s,o={},r={})=>{const e=N();if(!i)throw new Error("Database name is required");if(!s)throw new Error("Collection name is required");const l=q(),{projection:f,sort:y}=r,g=Date.now();try{let u=null,t=!1,n=null;const j=D(i,s,o);if(j){const{field:a,operators:A}=j,p=o[a];if(n=a,typeof p=="object"&&p!==null&&!Array.isArray(p)){for(const c of A)if(p[c]!==void 0){const d=O(i,s,a,c,p[c]);if(d&&d.length>0){t=!0,m(i,s,a);for(const x of d){const b=w(i,s,x),_=l.get(b);if(_)try{const $=JSON.parse(_);if(h($,o)){u=$;break}}catch{continue}}break}}}else if(A.includes("eq")){const c=O(i,s,a,"eq",p);if(c&&c.length>0){t=!0,m(i,s,a);for(const d of c){const x=w(i,s,d),b=l.get(x);if(b)try{const _=JSON.parse(b);if(h(_,o)){u=_;break}}catch{continue}}}}}if(!t){const a=`${i}:${s}:`,A=l.getRange({start:a,end:a+"\xFF"});for(const{key:p,value:c}of A)try{const d=JSON.parse(c);if(h(d,o)){u=d;break}}catch{continue}}const k=Date.now()-g;try{E(s,o,k,t,n)}catch(a){e.warn("Failed to record query for auto-indexing",{error:a.message})}if(u){const a=S(u,f);return e.info("Document found",{database:i,collection:s,document_id:u._id,used_index:t,indexed_field:n,execution_time_ms:k}),a}return e.info("No document found",{database:i,collection:s,used_index:t,indexed_field:n,execution_time_ms:k}),null}catch(u){throw e.error("Failed to find document",{database:i,collection:s,error:u.message}),u}};var B=R;export{B as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/db-canary",
   "type": "module",
-  "version": "0.0.0-canary.2249",
-  "canary_version": "0.0.0-canary.2248",
+  "version": "0.0.0-canary.2251",
+  "canary_version": "0.0.0-canary.2250",
   "description": "JoystickDB - A minimalist database server for the Joystick framework",
   "main": "./dist/server/index.js",
   "scripts": {

package/src/server/lib/operations/find.js

@@ -13,19 +13,48 @@ const { create_context_logger } = create_logger('find');
 
 /**
  * Extracts field value from document using dot notation path.
+ * Handles nested array object queries like 'reviews.rating' where reviews is an array of objects.
  * @param {Object} document - Document to extract value from
- * @param {string} field_path - Dot-separated field path (e.g., 'user.profile.name')
- * @returns {*} Field value or undefined if path doesn't exist
+ * @param {string} field_path - Dot-separated field path (e.g., 'user.profile.name', 'reviews.rating')
+ * @returns {*} Field value, array of values for nested array queries, or undefined if path doesn't exist
  */
 const get_field_value = (document, field_path) => {
   const parts = field_path.split('.');
   let value = document;
   
-  for (const part of parts) {
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i];
+    
     if (value === null || value === undefined) {
       return undefined;
     }
+    
     value = value[part];
+    
+    // If we got an array and there are more parts to traverse
+    if (Array.isArray(value) && i < parts.length - 1) {
+      // Extract the remaining path
+      const remaining_path = parts.slice(i + 1).join('.');
+      
+      // Collect all matching values from array elements
+      const nested_values = [];
+      for (let j = 0; j < value.length; j++) {
+        const item = value[j];
+        if (typeof item === 'object' && item !== null) {
+          const nested_value = get_field_value(item, remaining_path);
+          if (nested_value !== undefined) {
+            if (Array.isArray(nested_value)) {
+              nested_values.push(...nested_value);
+            } else {
+              nested_values.push(nested_value);
+            }
+          }
+        }
+      }
+      
+      // Return array of values for nested array queries
+      return nested_values.length > 0 ? nested_values : undefined;
+    }
   }
   
   return value;
@@ -58,7 +87,7 @@ const field_exists = (document, field_path) => {
 
 /**
  * Checks if a document matches the provided filter criteria.
- * Supports MongoDB-like query operators including $eq, $ne, $gt, $gte, $lt, $lte, $in, $nin, $exists, $regex.
+ * Supports MongoDB-like query operators with optimized array field matching.
  * @param {Object} document - Document to test against filter
  * @param {Object} filter - Filter criteria with field names and values/operators
  * @returns {boolean} True if document matches filter, false otherwise
@@ -69,6 +98,27 @@ const matches_filter = (document, filter) => {
     return true;
   }
   
+  // Handle $or operator at the top level
+  if (filter.$or && Array.isArray(filter.$or)) {
+    const or_conditions = filter.$or;
+    let or_match = false;
+    for (let i = 0; i < or_conditions.length; i++) {
+      if (matches_filter(document, or_conditions[i])) {
+        or_match = true;
+        break;
+      }
+    }
+    if (!or_match) return false;
+    
+    // Continue checking other conditions (if any) outside of $or
+    const remaining_filter = { ...filter };
+    delete remaining_filter.$or;
+    if (Object.keys(remaining_filter).length > 0) {
+      return matches_filter(document, remaining_filter);
+    }
+    return true;
+  }
+  
   for (const [field, value] of Object.entries(filter)) {
     const field_value = get_field_value(document, field);
     
@@ -76,28 +126,105 @@ const matches_filter = (document, filter) => {
       for (const [operator, operand] of Object.entries(value)) {
         switch (operator) {
           case '$eq':
-            if (field_value !== operand) return false;
+            // Handle array field matching for $eq
+            if (Array.isArray(field_value)) {
+              if (!field_value.includes(operand)) return false;
+            } else if (field_value !== operand) {
+              return false;
+            }
             break;
           case '$ne':
-            if (field_value === operand) return false;
+            // Handle array field matching for $ne
+            if (Array.isArray(field_value)) {
+              if (field_value.includes(operand)) return false;
+            } else if (field_value === operand) {
+              return false;
+            }
             break;
           case '$gt':
-            if (field_value <= operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] > operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value <= operand) {
+              return false;
+            }
             break;
           case '$gte':
-            if (field_value < operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] >= operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value < operand) {
+              return false;
+            }
             break;
           case '$lt':
-            if (field_value >= operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] < operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value >= operand) {
+              return false;
+            }
             break;
           case '$lte':
-            if (field_value > operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] <= operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value > operand) {
+              return false;
+            }
             break;
           case '$in':
-            if (!Array.isArray(operand) || !operand.includes(field_value)) return false;
+            if (!Array.isArray(operand)) return false;
+            if (Array.isArray(field_value)) {
+              // Check if any array element is in the operand array
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (operand.includes(field_value[i])) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (!operand.includes(field_value)) {
+              return false;
+            }
             break;
           case '$nin':
-            if (!Array.isArray(operand) || operand.includes(field_value)) return false;
+            if (!Array.isArray(operand)) return false;
+            if (Array.isArray(field_value)) {
+              // Check if any array element is in the operand array
+              for (let i = 0; i < field_value.length; i++) {
+                if (operand.includes(field_value[i])) {
+                  return false;
+                }
+              }
+            } else if (operand.includes(field_value)) {
+              return false;
+            }
             break;
           case '$exists':
             const exists = field_exists(document, field);
@@ -108,7 +235,18 @@ const matches_filter = (document, filter) => {
             // Handle $options parameter for regex flags
             const regex_options = value.$options || '';
             const regex = new RegExp(operand, regex_options);
-            if (!regex.test(field_value)) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (typeof field_value[i] === 'string' && regex.test(field_value[i])) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (!regex.test(field_value)) {
+              return false;
+            }
             break;
           case '$options':
             // $options is handled as part of $regex, skip it here
@@ -118,7 +256,12 @@ const matches_filter = (document, filter) => {
         }
       }
     } else {
-      if (field_value !== value) return false;
+      // Direct field matching with array support
+      if (Array.isArray(field_value)) {
+        if (!field_value.includes(value)) return false;
+      } else if (field_value !== value) {
+        return false;
+      }
     }
   }
   

package/src/server/lib/operations/find_one.js

@@ -15,19 +15,48 @@ const { create_context_logger } = create_logger('find_one');
 
 /**
  * Gets the value of a nested field from a document using dot notation.
+ * Handles nested array object queries like 'reviews.rating' where reviews is an array of objects.
  * @param {Object} document - Document to extract field value from
- * @param {string} field_path - Dot-separated field path (e.g., 'user.name')
- * @returns {any} Field value or undefined if not found
+ * @param {string} field_path - Dot-separated field path (e.g., 'user.name', 'reviews.rating')
+ * @returns {any} Field value, array of values for nested array queries, or undefined if not found
  */
 const get_field_value = (document, field_path) => {
   const parts = field_path.split('.');
   let value = document;
   
-  for (const part of parts) {
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i];
+    
     if (value === null || value === undefined) {
       return undefined;
     }
+    
     value = value[part];
+    
+    // If we got an array and there are more parts to traverse
+    if (Array.isArray(value) && i < parts.length - 1) {
+      // Extract the remaining path
+      const remaining_path = parts.slice(i + 1).join('.');
+      
+      // Collect all matching values from array elements
+      const nested_values = [];
+      for (let j = 0; j < value.length; j++) {
+        const item = value[j];
+        if (typeof item === 'object' && item !== null) {
+          const nested_value = get_field_value(item, remaining_path);
+          if (nested_value !== undefined) {
+            if (Array.isArray(nested_value)) {
+              nested_values.push(...nested_value);
+            } else {
+              nested_values.push(nested_value);
+            }
+          }
+        }
+      }
+      
+      // Return array of values for nested array queries
+      return nested_values.length > 0 ? nested_values : undefined;
+    }
   }
   
   return value;
@@ -60,6 +89,7 @@ const field_exists = (document, field_path) => {
 
 /**
  * Checks if a document matches the given filter criteria.
+ * Supports MongoDB-like query operators with optimized array field matching.
  * @param {Object} document - Document to test
  * @param {Object} filter - Filter criteria with MongoDB-style operators
  * @returns {boolean} True if document matches filter
@@ -70,6 +100,27 @@ const matches_filter = (document, filter) => {
     return true;
   }
   
+  // Handle $or operator at the top level
+  if (filter.$or && Array.isArray(filter.$or)) {
+    const or_conditions = filter.$or;
+    let or_match = false;
+    for (let i = 0; i < or_conditions.length; i++) {
+      if (matches_filter(document, or_conditions[i])) {
+        or_match = true;
+        break;
+      }
+    }
+    if (!or_match) return false;
+    
+    // Continue checking other conditions (if any) outside of $or
+    const remaining_filter = { ...filter };
+    delete remaining_filter.$or;
+    if (Object.keys(remaining_filter).length > 0) {
+      return matches_filter(document, remaining_filter);
+    }
+    return true;
+  }
+  
   for (const [field, value] of Object.entries(filter)) {
     const field_value = get_field_value(document, field);
     
@@ -77,28 +128,105 @@ const matches_filter = (document, filter) => {
       for (const [operator, operand] of Object.entries(value)) {
         switch (operator) {
           case '$eq':
-            if (field_value !== operand) return false;
+            // Handle array field matching for $eq
+            if (Array.isArray(field_value)) {
+              if (!field_value.includes(operand)) return false;
+            } else if (field_value !== operand) {
+              return false;
+            }
             break;
           case '$ne':
-            if (field_value === operand) return false;
+            // Handle array field matching for $ne
+            if (Array.isArray(field_value)) {
+              if (field_value.includes(operand)) return false;
+            } else if (field_value === operand) {
+              return false;
+            }
             break;
           case '$gt':
-            if (field_value <= operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] > operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value <= operand) {
+              return false;
+            }
             break;
           case '$gte':
-            if (field_value < operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] >= operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value < operand) {
+              return false;
+            }
             break;
           case '$lt':
-            if (field_value >= operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] < operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value >= operand) {
+              return false;
+            }
             break;
           case '$lte':
-            if (field_value > operand) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (field_value[i] <= operand) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (field_value > operand) {
+              return false;
+            }
             break;
           case '$in':
-            if (!Array.isArray(operand) || !operand.includes(field_value)) return false;
+            if (!Array.isArray(operand)) return false;
+            if (Array.isArray(field_value)) {
+              // Check if any array element is in the operand array
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (operand.includes(field_value[i])) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (!operand.includes(field_value)) {
+              return false;
+            }
             break;
           case '$nin':
-            if (!Array.isArray(operand) || operand.includes(field_value)) return false;
+            if (!Array.isArray(operand)) return false;
+            if (Array.isArray(field_value)) {
+              // Check if any array element is in the operand array
+              for (let i = 0; i < field_value.length; i++) {
+                if (operand.includes(field_value[i])) {
+                  return false;
+                }
+              }
+            } else if (operand.includes(field_value)) {
+              return false;
+            }
             break;
           case '$exists':
             const exists = field_exists(document, field);
@@ -109,7 +237,18 @@ const matches_filter = (document, filter) => {
             // Handle $options parameter for regex flags
             const regex_options = value.$options || '';
             const regex = new RegExp(operand, regex_options);
-            if (!regex.test(field_value)) return false;
+            if (Array.isArray(field_value)) {
+              let found = false;
+              for (let i = 0; i < field_value.length; i++) {
+                if (typeof field_value[i] === 'string' && regex.test(field_value[i])) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) return false;
+            } else if (!regex.test(field_value)) {
+              return false;
+            }
             break;
           case '$options':
             // $options is handled as part of $regex, skip it here
@@ -119,7 +258,12 @@ const matches_filter = (document, filter) => {
         }
       }
     } else {
-      if (field_value !== value) return false;
+      // Direct field matching with array support
+      if (Array.isArray(field_value)) {
+        if (!field_value.includes(value)) return false;
+      } else if (field_value !== value) {
+        return false;
+      }
     }
   }