@object-ui/data-objectstack 4.0.11 → 4.2.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @object-ui/data-objectstack
 
+## 4.2.1
+
+### Patch Changes
+
+- @object-ui/types@4.2.1
+- @object-ui/core@4.2.1
+
+## 4.2.0
+
+### Patch Changes
+
+- @object-ui/types@4.2.0
+- @object-ui/core@4.2.0
+
+## 4.1.0
+
+### Patch Changes
+
+- @object-ui/types@4.1.0
+- @object-ui/core@4.1.0
+
+## 4.0.12
+
+### Patch Changes
+
+- @object-ui/types@4.0.12
+- @object-ui/core@4.0.12
+
 ## 4.0.11
 
 ### Patch Changes

package/dist/index.cjs

@@ -881,6 +881,26 @@ function objectFilterEntryToAST(entry) {
   if (!field || !op) return null;
   return [String(field), op, entry.value];
 }
+function translateFilterToAST(filter) {
+  if (filter === void 0 || filter === null) return void 0;
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return void 0;
+    const first = filter[0];
+    const isObjectForm = filter.length > 0 && typeof first === "object" && first !== null && !Array.isArray(first) && first.field !== void 0;
+    if (isObjectForm) {
+      const tuples = filter.map((entry) => objectFilterEntryToAST(entry)).filter((t) => t !== null);
+      if (tuples.length === 0) return void 0;
+      if (tuples.length === 1) return tuples[0];
+      return ["and", ...tuples];
+    }
+    return filter;
+  }
+  if (typeof filter === "object") {
+    if (Object.keys(filter).length === 0) return void 0;
+    return filter;
+  }
+  return void 0;
+}
 var discoveryCache = /* @__PURE__ */ new Map();
 async function getSharedDiscovery(baseUrl, fetcher) {
   const key = baseUrl || "<default>";
@@ -1387,9 +1407,9 @@ var ObjectStackAdapter = class {
       }
     }
     if (params.$filter !== void 0 && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter) ? params.$filter.length === 0 : typeof params.$filter === "object" && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set("filter", JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== void 0) {
+        queryParams.set("filter", JSON.stringify(translated));
       }
     }
     const baseUrl = this.baseUrl.replace(/\/$/, "");
@@ -1802,6 +1822,19 @@ var ObjectStackAdapter = class {
    */
   async aggregate(resource, params) {
     await this.connect();
+    const looksLikeSpecShape = params != null && (Array.isArray(params.groupBy) || Array.isArray(params.aggregations) || params.where !== void 0);
+    if (looksLikeSpecShape) {
+      const queryAst = {};
+      if (Array.isArray(params.groupBy)) queryAst.groupBy = params.groupBy;
+      if (Array.isArray(params.aggregations)) queryAst.aggregations = params.aggregations;
+      if (params.where !== void 0) queryAst.where = params.where;
+      if (typeof params.limit === "number") queryAst.limit = params.limit;
+      const result = await this.client.data.query(resource, queryAst);
+      if (Array.isArray(result)) return result;
+      if (Array.isArray(result?.records)) return result.records;
+      if (Array.isArray(result?.data)) return result.data;
+      return [];
+    }
     try {
       const measureName = params.function === "count" ? "count" : `${params.field}_${params.function}`;
       const payload = {

package/dist/index.d.cts

@@ -968,12 +968,7 @@ declare class ObjectStackAdapter<T = unknown> implements DataSource<T> {
      * Falls back to client-side aggregation via find() if the analytics endpoint
      * is not available.
      */
-    aggregate(resource: string, params: {
-        field: string;
-        function: string;
-        groupBy: string;
-        filter?: any;
-    }): Promise<any[]>;
+    aggregate(resource: string, params: any): Promise<any[]>;
     /** Client-side aggregation fallback */
     private aggregateClientSide;
     /**

package/dist/index.d.ts

@@ -968,12 +968,7 @@ declare class ObjectStackAdapter<T = unknown> implements DataSource<T> {
      * Falls back to client-side aggregation via find() if the analytics endpoint
      * is not available.
      */
-    aggregate(resource: string, params: {
-        field: string;
-        function: string;
-        groupBy: string;
-        filter?: any;
-    }): Promise<any[]>;
+    aggregate(resource: string, params: any): Promise<any[]>;
     /** Client-side aggregation fallback */
     private aggregateClientSide;
     /**

package/dist/index.js

@@ -838,6 +838,26 @@ function objectFilterEntryToAST(entry) {
   if (!field || !op) return null;
   return [String(field), op, entry.value];
 }
+function translateFilterToAST(filter) {
+  if (filter === void 0 || filter === null) return void 0;
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return void 0;
+    const first = filter[0];
+    const isObjectForm = filter.length > 0 && typeof first === "object" && first !== null && !Array.isArray(first) && first.field !== void 0;
+    if (isObjectForm) {
+      const tuples = filter.map((entry) => objectFilterEntryToAST(entry)).filter((t) => t !== null);
+      if (tuples.length === 0) return void 0;
+      if (tuples.length === 1) return tuples[0];
+      return ["and", ...tuples];
+    }
+    return filter;
+  }
+  if (typeof filter === "object") {
+    if (Object.keys(filter).length === 0) return void 0;
+    return filter;
+  }
+  return void 0;
+}
 var discoveryCache = /* @__PURE__ */ new Map();
 async function getSharedDiscovery(baseUrl, fetcher) {
   const key = baseUrl || "<default>";
@@ -1344,9 +1364,9 @@ var ObjectStackAdapter = class {
       }
     }
     if (params.$filter !== void 0 && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter) ? params.$filter.length === 0 : typeof params.$filter === "object" && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set("filter", JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== void 0) {
+        queryParams.set("filter", JSON.stringify(translated));
       }
     }
     const baseUrl = this.baseUrl.replace(/\/$/, "");
@@ -1759,6 +1779,19 @@ var ObjectStackAdapter = class {
    */
   async aggregate(resource, params) {
     await this.connect();
+    const looksLikeSpecShape = params != null && (Array.isArray(params.groupBy) || Array.isArray(params.aggregations) || params.where !== void 0);
+    if (looksLikeSpecShape) {
+      const queryAst = {};
+      if (Array.isArray(params.groupBy)) queryAst.groupBy = params.groupBy;
+      if (Array.isArray(params.aggregations)) queryAst.aggregations = params.aggregations;
+      if (params.where !== void 0) queryAst.where = params.where;
+      if (typeof params.limit === "number") queryAst.limit = params.limit;
+      const result = await this.client.data.query(resource, queryAst);
+      if (Array.isArray(result)) return result;
+      if (Array.isArray(result?.records)) return result.records;
+      if (Array.isArray(result?.data)) return result.data;
+      return [];
+    }
     try {
       const measureName = params.function === "count" ? "count" : `${params.field}_${params.function}`;
       const payload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/data-objectstack",
-  "version": "4.0.11",
+  "version": "4.2.1",
   "description": "ObjectStack Data Adapter for Object UI",
   "license": "MIT",
   "type": "module",
@@ -23,8 +23,8 @@
   ],
   "dependencies": {
     "@objectstack/client": "^4.0.5",
-    "@object-ui/core": "4.0.11",
-    "@object-ui/types": "4.0.11"
+    "@object-ui/core": "4.2.1",
+    "@object-ui/types": "4.2.1"
   },
   "devDependencies": {
     "tsup": "^8.5.1",

package/src/index.ts

@@ -78,6 +78,54 @@ function objectFilterEntryToAST(entry: any): [string, string, any] | null {
   return [String(field), op, entry.value];
 }
 
+/**
+ * Translate any of the filter shapes accepted by ObjectUI into the AST format
+ * understood by the ObjectStack server's `parseFilterAST()`.
+ *
+ * Accepted inputs:
+ *   - `[{ field, operator, value }, ...]` — ViewFilterRule[] from view configs
+ *   - `[field, op, value]`                — single AST tuple (passed through)
+ *   - `['and'|'or', ...children]`         — logical AST node (passed through)
+ *   - `[[...], [...]]`                    — legacy nested AST (passed through)
+ *   - `{ field: value }` / `{ field: { $op: value } }` — MongoDB-style object
+ *
+ * Returns `undefined` when the input is empty/unrecognized so callers can
+ * skip emitting `?filter=` entirely.
+ */
+function translateFilterToAST(filter: unknown): unknown | undefined {
+  if (filter === undefined || filter === null) return undefined;
+
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return undefined;
+
+    // Object form: [{ field, operator, value }, ...]
+    const first = filter[0];
+    const isObjectForm = filter.length > 0
+      && typeof first === 'object'
+      && first !== null
+      && !Array.isArray(first)
+      && (first as any).field !== undefined;
+    if (isObjectForm) {
+      const tuples = (filter as any[])
+        .map(entry => objectFilterEntryToAST(entry))
+        .filter((t): t is [string, string, any] => t !== null);
+      if (tuples.length === 0) return undefined;
+      if (tuples.length === 1) return tuples[0];
+      return ['and', ...tuples];
+    }
+
+    // Already AST — pass through.
+    return filter;
+  }
+
+  if (typeof filter === 'object') {
+    if (Object.keys(filter as Record<string, unknown>).length === 0) return undefined;
+    return filter;
+  }
+
+  return undefined;
+}
+
 // Module-level discovery cache. Multiple ObjectStackAdapter instances pointed
 // at the same baseUrl (e.g. ConditionalAuthWrapper's throwaway adapter +
 // AdapterProvider's main adapter) would otherwise each fire `/discovery`. By
@@ -844,13 +892,15 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
       }
     }
 
-    // Filter — drop empty arrays/objects so we don't send `?filter=%5B%5D`
+    // Filter — translate ViewFilterRule[] (`[{field, operator, value}]`)
+    // and other shapes into AST tuples the server understands. Without this,
+    // server-driven views (e.g. `at_risk_accounts`, `hot_leads`) ship raw
+    // `[{field,operator,value}]` arrays which `parseFilterAST` silently
+    // discards, returning every record instead of the filtered subset.
     if (params.$filter !== undefined && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter)
-        ? params.$filter.length === 0
-        : typeof params.$filter === 'object' && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set('filter', JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== undefined) {
+        queryParams.set('filter', JSON.stringify(translated));
       }
     }
 
@@ -1384,9 +1434,32 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
    * Falls back to client-side aggregation via find() if the analytics endpoint
    * is not available.
    */
-  async aggregate(resource: string, params: { field: string; function: string; groupBy: string; filter?: any }): Promise<any[]> {
+  async aggregate(resource: string, params: any): Promise<any[]> {
     await this.connect();
 
+    // Spec-shape aggregation: `{ groupBy: GroupByNode[], aggregations: AggregationNode[], where?, limit? }`
+    // per spec/data/query.zod.ts. Sent directly to the server's POST
+    // /data/:object/query endpoint, which routes through engine.aggregate
+    // and returns bucketed rows with the requested aliases.
+    const looksLikeSpecShape =
+      params != null &&
+      (Array.isArray((params as any).groupBy) ||
+        Array.isArray((params as any).aggregations) ||
+        (params as any).where !== undefined);
+    if (looksLikeSpecShape) {
+      const queryAst: Record<string, unknown> = {};
+      if (Array.isArray(params.groupBy)) queryAst.groupBy = params.groupBy;
+      if (Array.isArray(params.aggregations)) queryAst.aggregations = params.aggregations;
+      if (params.where !== undefined) queryAst.where = params.where;
+      if (typeof params.limit === 'number') queryAst.limit = params.limit;
+      const result: any = await this.client.data.query(resource, queryAst as any);
+      // client.data.query returns { object, records, total, hasMore }
+      if (Array.isArray(result)) return result;
+      if (Array.isArray(result?.records)) return result.records;
+      if (Array.isArray(result?.data)) return result.data;
+      return [];
+    }
+
     try {
       // Build measure name in the format expected by the backend analytics
       // service (memory-analytics / cube).  For 'count' the measure key is