merge dev to main

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "description": "ZenStack",
     "packageManager": "pnpm@10.12.1",
     "scripts": {

packages/cli/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
@@ -50,7 +50,7 @@
         "@zenstackhq/testtools": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
-        "better-sqlite3": "^11.8.1",
+        "better-sqlite3": "^12.2.0",
         "tmp": "catalog:"
     }
 }

packages/common-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {

packages/create-zenstack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {

packages/dialects/sql.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,

packages/language/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [

packages/language/src/validators/datamodel-validator.ts

@@ -107,7 +107,7 @@ export default class DataModelValidator implements AstValidator<DataModel> {
         if (field.type.array && !isDataModel(field.type.reference?.ref)) {
             const provider = this.getDataSourceProvider(AstUtils.getContainerOfType(field, isModel)!);
             if (provider === 'sqlite') {
-                accept('error', `Array type is not supported for "${provider}" provider.`, { node: field.type });
+                accept('error', `List type is not supported for "${provider}" provider.`, { node: field.type });
             }
         }
 

packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.19",
+    "version": "3.0.0-alpha.20",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {
@@ -89,7 +89,7 @@
         }
     },
     "devDependencies": {
-        "@types/better-sqlite3": "^7.0.0",
+        "@types/better-sqlite3": "^7.6.13",
         "@types/pg": "^8.0.0",
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/language": "workspace:*",

packages/runtime/src/client/client-impl.ts

@@ -556,7 +556,12 @@ function createModelCrudHandler<Schema extends SchemaDef, Model extends GetModel
         },
 
         groupBy: (args: unknown) => {
-            return createPromise('groupBy', args, new GroupByOperationHandler<Schema>(client, model, inputValidator));
+            return createPromise(
+                'groupBy',
+                args,
+                new GroupByOperationHandler<Schema>(client, model, inputValidator),
+                true,
+            );
         },
     } as ModelOperations<Schema, Model>;
 }

packages/runtime/src/client/constants.ts

@@ -17,3 +17,14 @@ export const TRANSACTION_UNSUPPORTED_METHODS = ['$transaction', '$disconnect', '
  * Prefix for JSON field used to store joined delegate rows.
  */
 export const DELEGATE_JOINED_FIELD_PREFIX = '$delegate$';
+
+/**
+ * Logical combinators used in filters.
+ */
+export const LOGICAL_COMBINATORS = ['AND', 'OR', 'NOT'] as const;
+
+/**
+ * Aggregation operators.
+ */
+export const AGGREGATE_OPERATORS = ['_count', '_sum', '_avg', '_min', '_max'] as const;
+export type AGGREGATE_OPERATORS = (typeof AGGREGATE_OPERATORS)[number];

packages/runtime/src/client/contract.ts

@@ -752,17 +752,18 @@ export type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sc
          *     _count: true
          * }); // result: `Array<{ country: string, city: string, _count: number }>`
          *
-         * // group by with sorting, the `orderBy` fields must be in the `by` list
+         * // group by with sorting, the `orderBy` fields must be either an aggregation
+         * // or a field used in the `by` list
          * await db.profile.groupBy({
          *     by: 'country',
          *     orderBy: { country: 'desc' }
          * });
          *
-         * // group by with having (post-aggregation filter), the `having` fields must
-         * // be in the `by` list
+         * // group by with having (post-aggregation filter), the fields used in `having` must
+         * // be either an aggregation, or a field used in the `by` list
          * await db.profile.groupBy({
          *     by: 'country',
-         *     having: { country: 'US' }
+         *     having: { country: 'US', age: { _avg: { gte: 18 } } }
          * });
          */
         groupBy<T extends GroupByArgs<Schema, Model>>(