Merge branch 'main' of https://github.com/objectstack-ai/framework

Author: hotlong

content/docs/references/api/contract.mdx

@@ -150,7 +150,7 @@ const result = ApiError.parse(data);
 | **cursor** | `Record<string, any>` | optional | Cursor for keyset pagination |
 | **joins** | `Object[]` | optional | Explicit Table Joins |
 | **aggregations** | `Object[]` | optional | Aggregation functions |
-| **groupBy** | `string[]` | optional | GROUP BY fields |
+| **groupBy** | `string \| Object[]` | optional | GROUP BY targets (strings or ``{field, dateGranularity?}`` objects for date bucketing) |
 | **having** | `[__schema2](./__schema2)` | optional | HAVING clause for aggregation filtering |
 | **windowFunctions** | `Object[]` | optional | Window functions with OVER clause |
 | **distinct** | `boolean` | optional | SELECT DISTINCT flag |

content/docs/references/automation/approval.mdx

@@ -29,7 +29,7 @@ const result = ApprovalAction.parse(data);
 
 | Property | Type | Required | Description |
 | :--- | :--- | :--- | :--- |
-| **type** | `Enum<'field_update' \| 'email_alert' \| 'webhook' \| 'script' \| 'connector_action'>` | ✅ |  |
+| **type** | `Enum<'field_update' \| 'email_alert' \| 'webhook' \| 'script' \| 'connector_action' \| 'inbox_notify'>` | ✅ |  |
 | **name** | `string` | ✅ | Action name |
 | **config** | `Record<string, any>` | ✅ | Action configuration |
 | **connectorId** | `string` | optional |  |
@@ -47,6 +47,7 @@ const result = ApprovalAction.parse(data);
 * `webhook`
 * `script`
 * `connector_action`
+* `inbox_notify`
 
 
 ---
@@ -57,6 +58,8 @@ const result = ApprovalAction.parse(data);
 
 * `user`
 * `role`
+* `team`
+* `department`
 * `manager`
 * `field`
 * `queue`

content/docs/references/data/driver.mdx

@@ -43,6 +43,7 @@ const result = DriverCapabilities.parse(data);
 | **isolationLevels** | `Enum<'read_uncommitted' \| 'read_committed' \| 'repeatable_read' \| 'serializable' \| 'snapshot'>[]` | optional | Supported isolation levels |
 | **queryFilters** | `boolean` | ✅ | Supports WHERE clause filtering |
 | **queryAggregations** | `boolean` | ✅ | Supports GROUP BY and aggregation functions |
+| **queryDateGranularity** | `Record<string, boolean>` | optional | Per-granularity native date bucketing (day/week/month/quarter/year). Missing keys fall back to in-memory bucketing. |
 | **querySorting** | `boolean` | ✅ | Supports ORDER BY sorting |
 | **queryPagination** | `boolean` | ✅ | Supports LIMIT/OFFSET pagination |
 | **queryWindowFunctions** | `boolean` | ✅ | Supports window functions with OVER clause |

content/docs/references/data/query.mdx

@@ -16,8 +16,8 @@ Represents "Order By".
 ## TypeScript Usage
 
 ```typescript
-import { AggregationFunction, AggregationNode, FieldNode, FullTextSearch, JoinNode, JoinStrategy, JoinType, Query, SortNode, WindowFunction, WindowFunctionNode, WindowSpec } from '@objectstack/spec/data';
-import type { AggregationFunction, AggregationNode, FieldNode, FullTextSearch, JoinNode, JoinStrategy, JoinType, Query, SortNode, WindowFunction, WindowFunctionNode, WindowSpec } from '@objectstack/spec/data';
+import { AggregationFunction, AggregationNode, DateGranularity, FieldNode, FullTextSearch, GroupByNode, JoinNode, JoinStrategy, JoinType, Query, SortNode, WindowFunction, WindowFunctionNode, WindowSpec } from '@objectstack/spec/data';
+import type { AggregationFunction, AggregationNode, DateGranularity, FieldNode, FullTextSearch, GroupByNode, JoinNode, JoinStrategy, JoinType, Query, SortNode, WindowFunction, WindowFunctionNode, WindowSpec } from '@objectstack/spec/data';
 
 // Validate data
 const result = AggregationFunction.parse(data);
@@ -54,6 +54,19 @@ const result = AggregationFunction.parse(data);
 | **filter** | `[__schema0](./__schema0)` | optional | Filter/Condition to apply to the aggregation (FILTER WHERE clause) |
 
 
+---
+
+## DateGranularity
+
+### Allowed Values
+
+* `day`
+* `week`
+* `month`
+* `quarter`
+* `year`
+
+
 ---
 
 ## FieldNode
@@ -99,6 +112,33 @@ Type: `string`
 | **highlight** | `boolean` | ✅ | Enable search result highlighting |
 
 
+---
+
+## GroupByNode
+
+### Union Options
+
+This schema accepts one of the following structures:
+
+#### Option 1
+
+Type: `string`
+
+---
+
+#### Option 2
+
+### Properties
+
+| Property | Type | Required | Description |
+| :--- | :--- | :--- | :--- |
+| **field** | `string` | ✅ | Field to group by |
+| **dateGranularity** | `Enum<'day' \| 'week' \| 'month' \| 'quarter' \| 'year'>` | optional | Bucket date values into uniform periods (day/week/month/quarter/year) |
+| **alias** | `string` | optional | Alias for the projected group value |
+
+---
+
+
 ---
 
 ## JoinNode
@@ -158,7 +198,7 @@ Type: `string`
 | **cursor** | `Record<string, any>` | optional | Cursor for keyset pagination |
 | **joins** | `Object[]` | optional | Explicit Table Joins |
 | **aggregations** | `Object[]` | optional | Aggregation functions |
-| **groupBy** | `string[]` | optional | GROUP BY fields |
+| **groupBy** | `string \| Object[]` | optional | GROUP BY targets (strings or ``{field, dateGranularity?}`` objects for date bucketing) |
 | **having** | `[__schema1](./__schema1)` | optional | HAVING clause for aggregation filtering |
 | **windowFunctions** | `Object[]` | optional | Window functions with OVER clause |
 | **distinct** | `boolean` | optional | SELECT DISTINCT flag |

content/docs/references/ui/report.mdx

@@ -14,13 +14,33 @@ Report Type Enum
 ## TypeScript Usage
 
 ```typescript
-import { Report, ReportChart, ReportColumn, ReportGrouping, ReportType } from '@objectstack/spec/ui';
-import type { Report, ReportChart, ReportColumn, ReportGrouping, ReportType } from '@objectstack/spec/ui';
+import { JoinedReportBlock, Report, ReportChart, ReportColumn, ReportGrouping, ReportType } from '@objectstack/spec/ui';
+import type { JoinedReportBlock, Report, ReportChart, ReportColumn, ReportGrouping, ReportType } from '@objectstack/spec/ui';
 
 // Validate data
-const result = Report.parse(data);
+const result = JoinedReportBlock.parse(data);
 ```
 
+---
+
+## JoinedReportBlock
+
+### Properties
+
+| Property | Type | Required | Description |
+| :--- | :--- | :--- | :--- |
+| **name** | `string` | ✅ | Snake case identifier (lowercase with underscores only) |
+| **label** | `string` | optional | Display label (plain string; i18n keys are auto-generated by the framework) |
+| **description** | `string` | optional | Display label (plain string; i18n keys are auto-generated by the framework) |
+| **type** | `Enum<'tabular' \| 'summary' \| 'matrix'>` | ✅ |  |
+| **objectName** | `string` | optional |  |
+| **columns** | `Object[]` | ✅ |  |
+| **groupingsDown** | `Object[]` | optional |  |
+| **groupingsAcross** | `Object[]` | optional |  |
+| **filter** | `[__schema0](./__schema0)` | optional |  |
+| **chart** | `Object` | optional |  |
+
+
 ---
 
 ## Report
@@ -41,6 +61,7 @@ const result = Report.parse(data);
 | **chart** | `Object` | optional | Embedded chart configuration |
 | **aria** | `Object` | optional | ARIA accessibility attributes |
 | **performance** | `Object` | optional | Performance optimization settings |
+| **blocks** | `Object[]` | optional | Sub-reports for type=joined |
 
 
 ---

packages/plugins/driver-memory/src/memory-driver.ts

@@ -874,13 +874,18 @@ export class InMemoryDriver implements IDataDriver {
     const { groupBy, aggregations } = query;
     const groups: Map<string, any[]> = new Map();
 
+    const normalizeGroupBy = (node: any): { field: string; alias: string } => {
+      if (typeof node === 'string') return { field: node, alias: node };
+      return { field: node.field, alias: node.alias ?? node.field };
+    };
+
     // 1. Group records
     if (groupBy && groupBy.length > 0) {
         for (const record of records) {
             // Create a composite key from group values
-            const keyParts = groupBy.map(g => {
-                const fieldPath = typeof g === 'string' ? g : g.field;
-                const val = getValueByPath(record, fieldPath);
+            const keyParts = groupBy.map(node => {
+                const { field } = normalizeGroupBy(node);
+                const val = getValueByPath(record, field);
                 return val === undefined || val === null ? 'null' : String(val);
             });
             const key = JSON.stringify(keyParts);
@@ -904,10 +909,9 @@ export class InMemoryDriver implements IDataDriver {
         if (groupBy && groupBy.length > 0) {
              if (groupRecords.length > 0) {
                 const firstRecord = groupRecords[0];
-                for (const g of groupBy) {
-                     const fieldPath = typeof g === 'string' ? g : (g.alias ?? g.field);
-                     const sourcePath = typeof g === 'string' ? g : g.field;
-                     this.setValueByPath(row, fieldPath, getValueByPath(firstRecord, sourcePath));
+                for (const node of groupBy) {
+                     const { field, alias } = normalizeGroupBy(node);
+                     this.setValueByPath(row, alias, getValueByPath(firstRecord, field));
                 }
              }
         }

packages/plugins/driver-mongodb/src/mongodb-driver.test.ts

@@ -13,11 +13,11 @@ describe('MongoDBDriver', () => {
     const uri = mongod.getUri();
     driver = new MongoDBDriver({ url: uri, database: 'test_db' });
     await driver.connect();
-  });
+  }, 60_000);
 
   afterAll(async () => {
-    await driver.disconnect();
-    await mongod.stop();
+    if (driver) await driver.disconnect();
+    if (mongod) await mongod.stop();
   });
 
   beforeEach(async () => {

packages/plugins/driver-turso/src/turso-driver.ts

@@ -169,51 +169,51 @@ export class TursoDriver extends SqlDriver {
 
   public override get supports() {
     return {
-    // Basic CRUD Operations
-    create: true,
-    read: true,
-    update: true,
-    delete: true,
-
-    // Bulk Operations
-    bulkCreate: true,
-    bulkUpdate: true,
-    bulkDelete: true,
-
-    // Transaction & Connection Management
-    transactions: true,
-    savepoints: true,
-
-    // Query Operations
-    queryFilters: true,
-    queryAggregations: true,
-    querySorting: true,
-    queryPagination: true,
-    queryWindowFunctions: true,
-    querySubqueries: true,
-    queryCTE: true,
-    joins: true,
-    queryDateGranularity: this.dateGranularityCapabilities,
-
-    // Advanced Features — Turso/libSQL native capabilities
-    fullTextSearch: true,  // FTS5
-    jsonQuery: true,       // JSON1 extension
-    geospatialQuery: false,
-    streaming: false,
-    jsonFields: true,
-    arrayFields: true,
-    vectorSearch: false,
-
-    // Schema Management
-    schemaSync: true,
-    batchSchemaSync: true,
-    migrations: false,
-    indexes: true,
-
-    // Performance & Optimization
-    connectionPooling: false, // Turso uses concurrency limits, not connection pools
-    preparedStatements: true,
-    queryCache: false,
+      // Basic CRUD Operations
+      create: true,
+      read: true,
+      update: true,
+      delete: true,
+
+      // Bulk Operations
+      bulkCreate: true,
+      bulkUpdate: true,
+      bulkDelete: true,
+
+      // Transaction & Connection Management
+      transactions: true,
+      savepoints: true,
+
+      // Query Operations
+      queryFilters: true,
+      queryAggregations: true,
+      queryDateGranularity: this.dateGranularityCapabilities,
+      querySorting: true,
+      queryPagination: true,
+      queryWindowFunctions: true,
+      querySubqueries: true,
+      queryCTE: true,
+      joins: true,
+
+      // Advanced Features — Turso/libSQL native capabilities
+      fullTextSearch: true,  // FTS5
+      jsonQuery: true,       // JSON1 extension
+      geospatialQuery: false,
+      streaming: false,
+      jsonFields: true,
+      arrayFields: true,
+      vectorSearch: false,
+
+      // Schema Management
+      schemaSync: true,
+      batchSchemaSync: true,
+      migrations: false,
+      indexes: true,
+
+      // Performance & Optimization
+      connectionPooling: false, // Turso uses concurrency limits, not connection pools
+      preparedStatements: true,
+      queryCache: false,
     };
   }