@object-ui/data-objectstack 4.0.12 → 4.2.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @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

package/dist/index.cjs

@@ -1822,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

@@ -1779,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.12",
+  "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.12",
-    "@object-ui/types": "4.0.12"
+    "@object-ui/core": "4.2.1",
+    "@object-ui/types": "4.2.1"
   },
   "devDependencies": {
     "tsup": "^8.5.1",

package/src/index.ts

@@ -1434,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