@forestadmin/agent-client 1.4.21 → 1.4.22

package/dist/query-serializer.d.ts

@@ -2,7 +2,28 @@ import type { SelectOptions } from './types';
 export default class QuerySerializer {
     static serialize(query: SelectOptions, collectionName: string): Record<string, unknown>;
     private static formatSort;
+    /**
+     * Serialize filters to JSON with snake_case operators and aggregators.
+     *
+     * Internally, operators use PascalCase (e.g. `Equal`, `GreaterThan`) to match
+     * the datasource-toolkit convention. However, HTTP backends expect snake_case:
+     * - Ruby (forest_liana): requires `equal`, `greater_than`, etc.
+     * - Node (@forestadmin/agent): accepts snake_case via ConditionTreeParser.toPascalCase()
+     *
+     * Converting to snake_case here ensures compatibility with both backends.
+     */
     private static formatFilters;
+    /**
+     * Recursively walk the condition tree and convert operators/aggregators to snake_case.
+     */
+    private static toSnakeCaseOperators;
+    /**
+     * Convert PascalCase to snake_case.
+     * Two passes handle different patterns:
+     * - Pass 1: lowercase→uppercase boundaries (e.g. `greaterThan` → `greater_Than`)
+     * - Pass 2: uppercase sequences (e.g. `IContains` → `I_Contains`, `PreviousXDays` → `PreviousX_Days`)
+     */
+    private static toSnakeCase;
     private static formatFields;
 }
 //# sourceMappingURL=query-serializer.d.ts.map

package/dist/query-serializer.js

@@ -10,7 +10,6 @@ class QuerySerializer {
             return {};
         return {
             ...query,
-            ...query.filters,
             sort: QuerySerializer.formatSort(query.sort),
             filters: QuerySerializer.formatFilters(query.filters),
             searchExtended: !!query.shouldSearchInRelation,
@@ -24,10 +23,53 @@ class QuerySerializer {
             return undefined;
         return sort.ascending ? sort.field : `-${sort.field}`;
     }
+    /**
+     * Serialize filters to JSON with snake_case operators and aggregators.
+     *
+     * Internally, operators use PascalCase (e.g. `Equal`, `GreaterThan`) to match
+     * the datasource-toolkit convention. However, HTTP backends expect snake_case:
+     * - Ruby (forest_liana): requires `equal`, `greater_than`, etc.
+     * - Node (@forestadmin/agent): accepts snake_case via ConditionTreeParser.toPascalCase()
+     *
+     * Converting to snake_case here ensures compatibility with both backends.
+     */
     static formatFilters(filters) {
         if (!filters)
             return undefined;
-        return JSON.stringify(filters);
+        return JSON.stringify(QuerySerializer.toSnakeCaseOperators(filters));
+    }
+    /**
+     * Recursively walk the condition tree and convert operators/aggregators to snake_case.
+     */
+    static toSnakeCaseOperators(node) {
+        if (!node || typeof node !== 'object')
+            return node;
+        const obj = node;
+        if ('operator' in obj) {
+            return {
+                ...obj,
+                operator: QuerySerializer.toSnakeCase(obj.operator),
+            };
+        }
+        if ('aggregator' in obj && Array.isArray(obj.conditions)) {
+            return {
+                aggregator: obj.aggregator.toLowerCase(),
+                conditions: obj.conditions.map(c => QuerySerializer.toSnakeCaseOperators(c)),
+            };
+        }
+        return obj;
+    }
+    /**
+     * Convert PascalCase to snake_case.
+     * Two passes handle different patterns:
+     * - Pass 1: lowercase→uppercase boundaries (e.g. `greaterThan` → `greater_Than`)
+     * - Pass 2: uppercase sequences (e.g. `IContains` → `I_Contains`, `PreviousXDays` → `PreviousX_Days`)
+     */
+    static toSnakeCase(value) {
+        return value
+            .replace(/([a-z])([A-Z])/g, '$1_$2')
+            .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2')
+            .toLowerCase();
     }
     static formatFields(collectionName, fields) {
         if (!fields)
@@ -74,4 +116,4 @@ class QuerySerializer {
     }
 }
 exports.default = QuerySerializer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktc2VyaWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9xdWVyeS1zZXJpYWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0Esc0VBQTZDO0FBRTdDLE1BQXFCLGVBQWU7SUFDbEMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFvQixFQUFFLGNBQXNCO1FBQzNELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTyxFQUFFLENBQUM7UUFFdEIsT0FBTztZQUNMLEdBQUcsS0FBSztZQUNSLEdBQUcsS0FBSyxDQUFDLE9BQU87WUFDaEIsSUFBSSxFQUFFLGVBQWUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQztZQUM1QyxPQUFPLEVBQUUsZUFBZSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQ3JELGNBQWMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLHNCQUFzQjtZQUM5QyxZQUFZLEVBQUUsS0FBSyxDQUFDLFVBQVUsRUFBRSxJQUFJO1lBQ3BDLGNBQWMsRUFBRSxLQUFLLENBQUMsVUFBVSxFQUFFLE1BQU07WUFDeEMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztTQUM1RixDQUFDO0lBQ0osQ0FBQztJQUVPLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBcUI7UUFDN0MsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUU1QixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3hELENBQUM7SUFFTyxNQUFNLENBQUMsYUFBYSxDQUFDLE9BQXFDO1FBQ2hF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktc2VyaWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9xdWVyeS1zZXJpYWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0Esc0VBQTZDO0FBRTdDLE1BQXFCLGVBQWU7SUFDbEMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFvQixFQUFFLGNBQXNCO1FBQzNELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTyxFQUFFLENBQUM7UUFFdEIsT0FBTztZQUNMLEdBQUcsS0FBSztZQUNSLElBQUksRUFBRSxlQUFlLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUM7WUFDNUMsT0FBTyxFQUFFLGVBQWUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQztZQUNyRCxjQUFjLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxzQkFBc0I7WUFDOUMsWUFBWSxFQUFFLEtBQUssQ0FBQyxVQUFVLEVBQUUsSUFBSTtZQUNwQyxjQUFjLEVBQUUsS0FBSyxDQUFDLFVBQVUsRUFBRSxNQUFNO1lBQ3hDLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxjQUFjLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDNUYsQ0FBQztJQUNKLENBQUM7SUFFTyxNQUFNLENBQUMsVUFBVSxDQUFDLElBQXFCO1FBQzdDLElBQUksQ0FBQyxJQUFJO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFFNUIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN4RCxDQUFDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ssTUFBTSxDQUFDLGFBQWEsQ0FBQyxPQUFxQztRQUNoRSxJQUFJLENB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/agent-client",
-  "version": "1.4.21",
+  "version": "1.4.22",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {