@objectstack/objectql 3.0.9 → 3.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectstack/objectql",
-  "version": "3.0.9",
+  "version": "3.0.11",
   "license": "Apache-2.0",
   "description": "Isomorphic ObjectQL Engine for ObjectStack",
   "main": "dist/index.js",
@@ -13,9 +13,9 @@
     }
   },
   "dependencies": {
-    "@objectstack/core": "3.0.9",
-    "@objectstack/spec": "3.0.9",
-    "@objectstack/types": "3.0.9"
+    "@objectstack/core": "3.0.11",
+    "@objectstack/spec": "3.0.11",
+    "@objectstack/types": "3.0.11"
   },
   "devDependencies": {
     "typescript": "^5.0.0",

package/src/protocol.ts

@@ -10,6 +10,7 @@ import type {
 } from '@objectstack/spec/api';
 import type { MetadataCacheRequest, MetadataCacheResponse, ServiceInfo, ApiRoutes, WellKnownCapabilities } from '@objectstack/spec/api';
 import type { IFeedService } from '@objectstack/spec/contracts';
+import { parseFilterAST, isFilterAST } from '@objectstack/spec/data';
 
 // We import SchemaRegistry directly since this class lives in the same package
 import { SchemaRegistry } from './registry.js';
@@ -303,12 +304,22 @@ export class ObjectStackProtocolImplementation implements ObjectStackProtocol {
             delete options.orderBy;
         }
 
+        // Filter: normalize `filter`/`filters` (plural) → `filter` (singular, canonical)
+        // Accept both `filter` and `filters` for backward compatibility.
+        if (options.filters !== undefined && options.filter === undefined) {
+            options.filter = options.filters;
+        }
+        delete options.filters;
+
         // Filter: JSON string → object
         if (typeof options.filter === 'string') {
             try { options.filter = JSON.parse(options.filter); } catch { /* keep as-is */ }
         }
-        if (typeof options.filters === 'string') {
-            try { options.filter = JSON.parse(options.filters); delete options.filters; } catch { /* keep as-is */ }
+
+        // Filter AST array → FilterCondition object
+        // Converts ["and", ["field", "=", "val"], ...] to { $and: [{ field: "val" }, ...] }
+        if (isFilterAST(options.filter)) {
+            options.filter = parseFilterAST(options.filter);
         }
 
         // Populate: comma-separated string → array