@object-ui/data-objectstack 3.1.5 → 3.3.0

package/dist/index.cjs

@@ -213,9 +213,9 @@ var ObjectStackError = class extends Error {
    */
   constructor(message, code, statusCode, details) {
     super(message);
-    this.code = code;
-    this.statusCode = statusCode;
-    this.details = details;
+    __publicField(this, "code", code);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "details", details);
     this.name = "ObjectStackError";
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, this.constructor);
@@ -269,9 +269,9 @@ var BulkOperationError = class extends ObjectStackError {
         ...details
       }
     );
-    this.successCount = successCount;
-    this.failureCount = failureCount;
-    this.errors = errors;
+    __publicField(this, "successCount", successCount);
+    __publicField(this, "failureCount", failureCount);
+    __publicField(this, "errors", errors);
     this.name = "BulkOperationError";
   }
   /**
@@ -298,7 +298,7 @@ var ConnectionError = class extends ObjectStackError {
       statusCode || 503,
       { url, ...details }
     );
-    this.url = url;
+    __publicField(this, "url", url);
     this.name = "ConnectionError";
   }
 };
@@ -333,8 +333,8 @@ var ValidationError = class extends ObjectStackError {
         ...details
       }
     );
-    this.field = field;
-    this.validationErrors = validationErrors;
+    __publicField(this, "field", field);
+    __publicField(this, "validationErrors", validationErrors);
     this.name = "ValidationError";
   }
   /**
@@ -391,7 +391,7 @@ function isErrorType(error, errorClass) {
 // src/cloud.ts
 var CloudOperations = class {
   constructor(getClient) {
-    this.getClient = getClient;
+    __publicField(this, "getClient", getClient);
   }
   /**
    * Deploy an application to the cloud.
@@ -1318,19 +1318,26 @@ var ObjectStackAdapter = class {
   async aggregate(resource, params) {
     await this.connect();
     try {
+      const measureName = params.function === "count" ? "count" : `${params.field}_${params.function}`;
       const payload = {
-        object: resource,
-        measures: [{ field: params.field, function: params.function }],
-        dimensions: [params.groupBy]
+        cube: resource,
+        measures: [measureName],
+        // When groupBy is '_all' no dimensions are needed (single-bucket).
+        dimensions: params.groupBy && params.groupBy !== "_all" ? [params.groupBy] : []
       };
       if (params.filter) {
         payload.filters = params.filter;
       }
       const data = await this.client.analytics.query(payload);
-      if (Array.isArray(data)) return data;
-      if (data?.data && Array.isArray(data.data)) return data.data;
-      if (data?.results && Array.isArray(data.results)) return data.results;
-      return [];
+      const rawRows = Array.isArray(data) ? data : data?.rows && Array.isArray(data.rows) ? data.rows : data?.data && Array.isArray(data.data) ? data.data : data?.data?.rows && Array.isArray(data.data.rows) ? data.data.rows : data?.results && Array.isArray(data.results) ? data.results : [];
+      return rawRows.map((row) => {
+        const mapped = { ...row };
+        if (measureName !== params.field && measureName in mapped) {
+          mapped[params.field] = mapped[measureName];
+          delete mapped[measureName];
+        }
+        return mapped;
+      });
     } catch {
       const result = await this.find(resource);
       const records = result.data || [];

package/dist/index.js

@@ -173,9 +173,9 @@ var ObjectStackError = class extends Error {
    */
   constructor(message, code, statusCode, details) {
     super(message);
-    this.code = code;
-    this.statusCode = statusCode;
-    this.details = details;
+    __publicField(this, "code", code);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "details", details);
     this.name = "ObjectStackError";
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, this.constructor);
@@ -229,9 +229,9 @@ var BulkOperationError = class extends ObjectStackError {
         ...details
       }
     );
-    this.successCount = successCount;
-    this.failureCount = failureCount;
-    this.errors = errors;
+    __publicField(this, "successCount", successCount);
+    __publicField(this, "failureCount", failureCount);
+    __publicField(this, "errors", errors);
     this.name = "BulkOperationError";
   }
   /**
@@ -258,7 +258,7 @@ var ConnectionError = class extends ObjectStackError {
       statusCode || 503,
       { url, ...details }
     );
-    this.url = url;
+    __publicField(this, "url", url);
     this.name = "ConnectionError";
   }
 };
@@ -293,8 +293,8 @@ var ValidationError = class extends ObjectStackError {
         ...details
       }
     );
-    this.field = field;
-    this.validationErrors = validationErrors;
+    __publicField(this, "field", field);
+    __publicField(this, "validationErrors", validationErrors);
     this.name = "ValidationError";
   }
   /**
@@ -351,7 +351,7 @@ function isErrorType(error, errorClass) {
 // src/cloud.ts
 var CloudOperations = class {
   constructor(getClient) {
-    this.getClient = getClient;
+    __publicField(this, "getClient", getClient);
   }
   /**
    * Deploy an application to the cloud.
@@ -1278,19 +1278,26 @@ var ObjectStackAdapter = class {
   async aggregate(resource, params) {
     await this.connect();
     try {
+      const measureName = params.function === "count" ? "count" : `${params.field}_${params.function}`;
       const payload = {
-        object: resource,
-        measures: [{ field: params.field, function: params.function }],
-        dimensions: [params.groupBy]
+        cube: resource,
+        measures: [measureName],
+        // When groupBy is '_all' no dimensions are needed (single-bucket).
+        dimensions: params.groupBy && params.groupBy !== "_all" ? [params.groupBy] : []
       };
       if (params.filter) {
         payload.filters = params.filter;
       }
       const data = await this.client.analytics.query(payload);
-      if (Array.isArray(data)) return data;
-      if (data?.data && Array.isArray(data.data)) return data.data;
-      if (data?.results && Array.isArray(data.results)) return data.results;
-      return [];
+      const rawRows = Array.isArray(data) ? data : data?.rows && Array.isArray(data.rows) ? data.rows : data?.data && Array.isArray(data.data) ? data.data : data?.data?.rows && Array.isArray(data.data.rows) ? data.data.rows : data?.results && Array.isArray(data.results) ? data.results : [];
+      return rawRows.map((row) => {
+        const mapped = { ...row };
+        if (measureName !== params.field && measureName in mapped) {
+          mapped[params.field] = mapped[measureName];
+          delete mapped[measureName];
+        }
+        return mapped;
+      });
     } catch {
       const result = await this.find(resource);
       const records = result.data || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/data-objectstack",
-  "version": "3.1.5",
+  "version": "3.3.0",
   "description": "ObjectStack Data Adapter for Object UI",
   "license": "MIT",
   "type": "module",
@@ -20,14 +20,14 @@
     "README.md"
   ],
   "dependencies": {
-    "@objectstack/client": "^3.3.0",
-    "@object-ui/core": "3.1.5",
-    "@object-ui/types": "3.1.5"
+    "@objectstack/client": "^4.0.3",
+    "@object-ui/core": "3.3.0",
+    "@object-ui/types": "3.3.0"
   },
   "devDependencies": {
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.0"
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.4"
   },
   "publishConfig": {
     "access": "public"

package/src/aggregate.test.ts

@@ -0,0 +1,277 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { ObjectStackAdapter } from './index';
+
+/**
+ * Tests for ObjectStackAdapter.aggregate() — verifies that the analytics
+ * query payload uses the correct string-based measure/dimension format
+ * expected by the backend analytics service (MemoryAnalyticsService).
+ *
+ * See: https://github.com/objectstack-ai/objectui/issues (measures format bug)
+ */
+describe('ObjectStackAdapter aggregate()', () => {
+  let adapter: ObjectStackAdapter;
+  let mockAnalyticsQuery: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    mockAnalyticsQuery = vi.fn().mockResolvedValue({ data: [] });
+
+    adapter = new ObjectStackAdapter({
+      baseUrl: 'http://localhost:3000',
+      autoReconnect: false,
+    });
+
+    // Inject mock client and mark as connected to bypass connect()
+    (adapter as any).client = {
+      data: {
+        find: vi.fn().mockResolvedValue({ records: [], total: 0 }),
+      },
+      analytics: {
+        query: mockAnalyticsQuery,
+      },
+      connect: vi.fn().mockResolvedValue(undefined),
+      discover: vi.fn().mockResolvedValue({ status: 'ok' }),
+    };
+    (adapter as any).connected = true;
+  });
+
+  it('should send measures as string array with field_function format for sum', async () => {
+    mockAnalyticsQuery.mockResolvedValue({ data: [] });
+
+    await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(mockAnalyticsQuery).toHaveBeenCalledWith({
+      cube: 'opportunity',
+      measures: ['amount_sum'],
+      dimensions: ['stage'],
+    });
+  });
+
+  it('should send measures as ["count"] for count aggregation', async () => {
+    mockAnalyticsQuery.mockResolvedValue({ data: [] });
+
+    await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'count',
+      groupBy: 'stage',
+    });
+
+    expect(mockAnalyticsQuery).toHaveBeenCalledWith({
+      cube: 'opportunity',
+      measures: ['count'],
+      dimensions: ['stage'],
+    });
+  });
+
+  it('should send measures as string for avg aggregation', async () => {
+    mockAnalyticsQuery.mockResolvedValue({ data: [] });
+
+    await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'avg',
+      groupBy: 'stage',
+    });
+
+    expect(mockAnalyticsQuery).toHaveBeenCalledWith({
+      cube: 'opportunity',
+      measures: ['amount_avg'],
+      dimensions: ['stage'],
+    });
+  });
+
+  it('should send empty dimensions when groupBy is _all', async () => {
+    mockAnalyticsQuery.mockResolvedValue({ data: [] });
+
+    await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: '_all',
+    });
+
+    expect(mockAnalyticsQuery).toHaveBeenCalledWith({
+      cube: 'opportunity',
+      measures: ['amount_sum'],
+      dimensions: [],
+    });
+  });
+
+  it('should include filters in payload when provided', async () => {
+    const filter = [{ member: 'stage', operator: 'equals', values: ['Closed Won'] }];
+    mockAnalyticsQuery.mockResolvedValue({ data: [] });
+
+    await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: 'stage',
+      filter,
+    });
+
+    expect(mockAnalyticsQuery).toHaveBeenCalledWith({
+      cube: 'opportunity',
+      measures: ['amount_sum'],
+      dimensions: ['stage'],
+      filters: filter,
+    });
+  });
+
+  it('should map measure key back to field name in response', async () => {
+    mockAnalyticsQuery.mockResolvedValue({
+      data: [
+        { stage: 'Prospect', amount_sum: 300 },
+        { stage: 'Closed Won', amount_sum: 500 },
+      ],
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'Prospect', amount: 300 },
+      { stage: 'Closed Won', amount: 500 },
+    ]);
+  });
+
+  it('should map count measure back to field name in response', async () => {
+    mockAnalyticsQuery.mockResolvedValue({
+      data: [
+        { stage: 'Prospect', count: 5 },
+        { stage: 'Closed Won', count: 3 },
+      ],
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'count',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'Prospect', amount: 5 },
+      { stage: 'Closed Won', amount: 3 },
+    ]);
+  });
+
+  it('should handle direct array response from analytics', async () => {
+    mockAnalyticsQuery.mockResolvedValue([
+      { stage: 'Prospect', amount_sum: 300 },
+    ]);
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'Prospect', amount: 300 },
+    ]);
+  });
+
+  it('should handle results wrapper in response', async () => {
+    mockAnalyticsQuery.mockResolvedValue({
+      results: [
+        { stage: 'Prospect', amount_avg: 150 },
+      ],
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'avg',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'Prospect', amount: 150 },
+    ]);
+  });
+
+  it('should extract rows from { rows: [...] } envelope (SDK unwraps outer success/data)', async () => {
+    mockAnalyticsQuery.mockResolvedValue({
+      rows: [
+        { stage: 'closed_won', expected_revenue_sum: 225000 },
+        { stage: 'negotiation', expected_revenue_sum: 36000 },
+      ],
+      fields: [
+        { name: 'stage', type: 'string' },
+        { name: 'expected_revenue_sum', type: 'number' },
+      ],
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'expected_revenue',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'closed_won', expected_revenue: 225000 },
+      { stage: 'negotiation', expected_revenue: 36000 },
+    ]);
+  });
+
+  it('should extract rows from { data: { rows: [...] } } envelope (SDK does not unwrap)', async () => {
+    mockAnalyticsQuery.mockResolvedValue({
+      success: true,
+      data: {
+        rows: [
+          { stage: 'closed_won', expected_revenue_sum: 225000 },
+          { stage: 'negotiation', expected_revenue_sum: 36000 },
+        ],
+        fields: [
+          { name: 'stage', type: 'string' },
+          { name: 'expected_revenue_sum', type: 'number' },
+        ],
+        sql: '-- MongoDB Aggregation Pipeline',
+      },
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'expected_revenue',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(result).toEqual([
+      { stage: 'closed_won', expected_revenue: 225000 },
+      { stage: 'negotiation', expected_revenue: 36000 },
+    ]);
+  });
+
+  it('should fall back to client-side aggregation when analytics endpoint fails', async () => {
+    mockAnalyticsQuery.mockRejectedValue(new Error('Analytics not available'));
+
+    // Mock find() to return records for client-side aggregation
+    (adapter as any).client.data.find = vi.fn().mockResolvedValue({
+      records: [
+        { stage: 'Prospect', amount: 100 },
+        { stage: 'Prospect', amount: 200 },
+        { stage: 'Closed Won', amount: 500 },
+      ],
+      total: 3,
+    });
+
+    const result = await adapter.aggregate('opportunity', {
+      field: 'amount',
+      function: 'sum',
+      groupBy: 'stage',
+    });
+
+    expect(result).toHaveLength(2);
+    expect(result.find((r: any) => r.stage === 'Prospect')?.amount).toBe(300);
+    expect(result.find((r: any) => r.stage === 'Closed Won')?.amount).toBe(500);
+  });
+});

package/src/errors.ts

@@ -28,8 +28,8 @@ export class ObjectStackError extends Error {
     this.name = 'ObjectStackError';
     
     // Maintains proper stack trace for where error was thrown (only in V8)
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
+    if ((Error as any).captureStackTrace) {
+      (Error as any).captureStackTrace(this, this.constructor);
     }
   }
 

package/src/index.ts

@@ -829,20 +829,44 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
     await this.connect();
 
     try {
+      // Build measure name in the format expected by the backend analytics
+      // service (memory-analytics / cube).  For 'count' the measure key is
+      // simply 'count'; for other aggregation functions it follows the
+      // convention `${field}_${function}` (e.g. 'amount_sum').
+      const measureName = params.function === 'count'
+        ? 'count'
+        : `${params.field}_${params.function}`;
+
       const payload: Record<string, unknown> = {
-        object: resource,
-        measures: [{ field: params.field, function: params.function }],
-        dimensions: [params.groupBy],
+        cube: resource,
+        measures: [measureName],
+        // When groupBy is '_all' no dimensions are needed (single-bucket).
+        dimensions: params.groupBy && params.groupBy !== '_all' ? [params.groupBy] : [],
       };
       if (params.filter) {
         payload.filters = params.filter;
       }
 
       const data = await this.client.analytics.query(payload);
-      if (Array.isArray(data)) return data;
-      if (data?.data && Array.isArray(data.data)) return data.data;
-      if (data?.results && Array.isArray(data.results)) return data.results;
-      return [];
+      const rawRows: any[] = Array.isArray(data) ? data
+        : data?.rows && Array.isArray(data.rows) ? data.rows
+        : data?.data && Array.isArray(data.data) ? data.data
+        : data?.data?.rows && Array.isArray(data.data.rows) ? data.data.rows
+        : data?.results && Array.isArray(data.results) ? data.results
+        : [];
+
+      // Map measure keys back to the original field name so that consumers
+      // (ObjectChart, DashboardRenderer, etc.) can access values by field name.
+      // This includes count → field (e.g. 'count' → 'amount') to match the
+      // output format of aggregateClientSide() which always uses params.field.
+      return rawRows.map((row: any) => {
+        const mapped = { ...row };
+        if (measureName !== params.field && measureName in mapped) {
+          mapped[params.field] = mapped[measureName];
+          delete mapped[measureName];
+        }
+        return mapped;
+      });
     } catch {
       // If the analytics endpoint is not available, fall back to
       // find() + client-side aggregation