merge dev to main

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.30",
+    "version": "3.0.0-alpha.31",
     "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.30",
+    "version": "3.0.0-alpha.31",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/common-helpers/package.json

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

packages/create-zenstack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.30",
+    "version": "3.0.0-alpha.31",
     "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.30",
+    "version": "3.0.0-alpha.31",
     "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.30",
+    "version": "3.0.0-alpha.31",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.30",
+    "version": "3.0.0-alpha.31",
     "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.30",
+    "version": "3.0.0-alpha.31",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [

packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.30",
+    "version": "3.0.0-alpha.31",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {

packages/runtime/src/client/crud-types.ts

@@ -221,7 +221,12 @@ export type WhereInput<
           ? ArrayFilter<Schema, GetModelFieldType<Schema, Model, Key>>
           : // enum
             GetModelFieldType<Schema, Model, Key> extends GetEnums<Schema>
-            ? EnumFilter<Schema, GetModelFieldType<Schema, Model, Key>, ModelFieldIsOptional<Schema, Model, Key>>
+            ? EnumFilter<
+                  Schema,
+                  GetModelFieldType<Schema, Model, Key>,
+                  ModelFieldIsOptional<Schema, Model, Key>,
+                  WithAggregations
+              >
             : // primitive
               PrimitiveFilter<
                   Schema,
@@ -237,14 +242,25 @@ export type WhereInput<
     NOT?: OrArray<WhereInput<Schema, Model, ScalarOnly>>;
 };
 
-type EnumFilter<Schema extends SchemaDef, T extends GetEnums<Schema>, Nullable extends boolean> =
+type EnumFilter<
+    Schema extends SchemaDef,
+    T extends GetEnums<Schema>,
+    Nullable extends boolean,
+    WithAggregations extends boolean,
+> =
     | NullableIf<keyof GetEnum<Schema, T>, Nullable>
-    | {
+    | ({
           equals?: NullableIf<keyof GetEnum<Schema, T>, Nullable>;
           in?: (keyof GetEnum<Schema, T>)[];
           notIn?: (keyof GetEnum<Schema, T>)[];
-          not?: EnumFilter<Schema, T, Nullable>;
-      };
+          not?: EnumFilter<Schema, T, Nullable, WithAggregations>;
+      } & (WithAggregations extends true
+          ? {
+                _count?: NumberFilter<Schema, 'Int', false, false>;
+                _min?: EnumFilter<Schema, T, false, false>;
+                _max?: EnumFilter<Schema, T, false, false>;
+            }
+          : {}));
 
 type ArrayFilter<Schema extends SchemaDef, T extends string> = {
     equals?: MapScalarType<Schema, T>[] | null;

packages/runtime/src/client/crud/validator.ts

@@ -1256,11 +1256,15 @@ export class InputValidator<Schema extends SchemaDef> {
     private makeGroupBySchema(model: GetModels<Schema>) {
         const modelDef = requireModel(this.schema, model);
         const nonRelationFields = Object.keys(modelDef.fields).filter((field) => !modelDef.fields[field]?.relation);
+        const bySchema =
+            nonRelationFields.length > 0
+                ? this.orArray(z.enum(nonRelationFields as [string, ...string[]]), true)
+                : z.never();
 
         let schema: z.ZodSchema = z.strictObject({
             where: this.makeWhereSchema(model, false).optional(),
             orderBy: this.orArray(this.makeOrderBySchema(model, false, true), true).optional(),
-            by: this.orArray(z.enum(nonRelationFields as [string, ...string[]]), true),
+            by: bySchema,
             having: this.makeHavingSchema(model).optional(),
             skip: this.makeSkipSchema().optional(),
             take: this.makeTakeSchema().optional(),