merge dev to main (v3.0.0-alpha.26)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "ZenStack",
     "packageManager": "[email protected]",
     "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.25",
+    "version": "3.0.0-alpha.26",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/common-helpers/package.json

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

packages/create-zenstack/package.json

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

packages/ide/vscode/package.json

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

packages/runtime/package.json

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

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

@@ -631,16 +631,15 @@ export type FindArgs<
           skip?: number;
           take?: number;
           orderBy?: OrArray<OrderBy<Schema, Model, true, false>>;
-      }
+      } & Distinct<Schema, Model> &
+          Cursor<Schema, Model>
     : {}) &
     (AllowFilter extends true
         ? {
               where?: WhereInput<Schema, Model>;
           }
         : {}) &
-    SelectIncludeOmit<Schema, Model, Collection> &
-    Distinct<Schema, Model> &
-    Cursor<Schema, Model>;
+    SelectIncludeOmit<Schema, Model, Collection>;
 
 export type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
 export type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;

packages/runtime/src/client/crud/operations/base.ts

@@ -68,6 +68,8 @@ export type CrudOperation =
     | 'aggregate'
     | 'groupBy';
 
+export type AllCrudOperation = CrudOperation | 'findUniqueOrThrow' | 'findFirstOrThrow';
+
 export type FromRelationContext<Schema extends SchemaDef> = {
     model: GetModels<Schema>;
     field: string;

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

@@ -44,7 +44,7 @@ export class InputValidator<Schema extends SchemaDef> {
         return this.validate<FindArgs<Schema, GetModels<Schema>, true>, Parameters<typeof this.makeFindSchema>[1]>(
             model,
             'find',
-            { unique, collection: true },
+            { unique },
             (model, options) => this.makeFindSchema(model, options),
             args,
         );
@@ -196,7 +196,7 @@ export class InputValidator<Schema extends SchemaDef> {
 
     // #region Find
 
-    private makeFindSchema(model: string, options: { unique: boolean; collection: boolean }) {
+    private makeFindSchema(model: string, options: { unique: boolean }) {
         const fields: Record<string, z.ZodSchema> = {};
         const where = this.makeWhereSchema(model, options.unique);
         if (options.unique) {
@@ -208,13 +208,13 @@ export class InputValidator<Schema extends SchemaDef> {
         fields['select'] = this.makeSelectSchema(model).optional();
         fields['include'] = this.makeIncludeSchema(model).optional();
         fields['omit'] = this.makeOmitSchema(model).optional();
-        fields['distinct'] = this.makeDistinctSchema(model).optional();
-        fields['cursor'] = this.makeCursorSchema(model).optional();
 
-        if (options.collection) {
+        if (!options.unique) {
             fields['skip'] = this.makeSkipSchema().optional();
             fields['take'] = this.makeTakeSchema().optional();
             fields['orderBy'] = this.orArray(this.makeOrderBySchema(model, true, false), true).optional();
+            fields['cursor'] = this.makeCursorSchema(model).optional();
+            fields['distinct'] = this.makeDistinctSchema(model).optional();
         }
 
         let result: ZodType = z.strictObject(fields);
@@ -589,15 +589,7 @@ export class InputValidator<Schema extends SchemaDef> {
         for (const field of Object.keys(modelDef.fields)) {
             const fieldDef = requireField(this.schema, model, field);
             if (fieldDef.relation) {
-                fields[field] = z
-                    .union([
-                        z.literal(true),
-                        z.strictObject({
-                            select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-                            include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-                        }),
-                    ])
-                    .optional();
+                fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
             } else {
                 fields[field] = z.boolean().optional();
             }
@@ -634,6 +626,33 @@ export class InputValidator<Schema extends SchemaDef> {
         return z.strictObject(fields);
     }
 
+    private makeRelationSelectIncludeSchema(fieldDef: FieldDef) {
+        return z.union([
+            z.boolean(),
+            z.strictObject({
+                ...(fieldDef.array || fieldDef.optional
+                    ? {
+                          // to-many relations and optional to-one relations are filterable
+                          where: z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional(),
+                      }
+                    : {}),
+                select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
+                include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
+                omit: z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+                ...(fieldDef.array
+                    ? {
+                          // to-many relations can be ordered, skipped, taken, and cursor-located
+                          orderBy: z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
+                          skip: this.makeSkipSchema().optional(),
+                          take: this.makeTakeSchema().optional(),
+                          cursor: this.makeCursorSchema(fieldDef.type).optional(),
+                          distinct: this.makeDistinctSchema(fieldDef.type).optional(),
+                      }
+                    : {}),
+            }),
+        ]);
+    }
+
     private makeOmitSchema(model: string) {
         const modelDef = requireModel(this.schema, model);
         const fields: Record<string, ZodType> = {};
@@ -652,21 +671,7 @@ export class InputValidator<Schema extends SchemaDef> {
         for (const field of Object.keys(modelDef.fields)) {
             const fieldDef = requireField(this.schema, model, field);
             if (fieldDef.relation) {
-                fields[field] = z
-                    .union([
-                        z.literal(true),
-                        z.strictObject({
-                            select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-                            include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-                            omit: z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
-                            where: z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional(),
-                            orderBy: z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
-                            skip: this.makeSkipSchema().optional(),
-                            take: this.makeTakeSchema().optional(),
-                            distinct: this.makeDistinctSchema(fieldDef.type).optional(),
-                        }),
-                    ])
-                    .optional();
+                fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
             }
         }
 

packages/runtime/src/client/plugin.ts

@@ -2,7 +2,7 @@ import type { OperationNode, QueryResult, RootOperationNode, UnknownRow } from '
 import type { ClientContract, ToKysely } from '.';
 import type { GetModels, SchemaDef } from '../schema';
 import type { MaybePromise } from '../utils/type-utils';
-import type { CrudOperation } from './crud/operations/base';
+import type { AllCrudOperation } from './crud/operations/base';
 
 /**
  * ZenStack runtime plugin.
@@ -61,7 +61,7 @@ type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
      * The operation that is being performed.
      */
-    operation: CrudOperation;
+    operation: AllCrudOperation;
 
     /**
      * The query arguments.

packages/runtime/test/client-api/find.test.ts

@@ -637,6 +637,97 @@ describe.each(createClientSpecs(PG_DB_NAME))('Client find tests for $provider',
         expect(r?.posts[0]?.createdAt).toBeInstanceOf(Date);
         expect(r?.posts[0]?.published).toBeTypeOf('boolean');
 
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                select: {
+                    posts: { where: { published: true }, select: { title: true }, orderBy: { createdAt: 'desc' } },
+                },
+            }),
+        ).resolves.toMatchObject({
+            posts: [expect.objectContaining({ title: 'Post1' })],
+        });
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                include: {
+                    posts: { where: { published: true }, select: { title: true }, orderBy: { createdAt: 'desc' } },
+                },
+            }),
+        ).resolves.toMatchObject({
+            posts: [expect.objectContaining({ title: 'Post1' })],
+        });
+
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                select: {
+                    posts: { orderBy: { title: 'asc' }, skip: 1, take: 1, distinct: ['title'] },
+                },
+            }),
+        ).resolves.toMatchObject({
+            posts: [expect.objectContaining({ title: 'Post2' })],
+        });
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                include: {
+                    posts: { orderBy: { title: 'asc' }, skip: 1, take: 1, distinct: ['title'] },
+                },
+            }),
+        ).resolves.toMatchObject({
+            posts: [expect.objectContaining({ title: 'Post2' })],
+        });
+
+        await expect(
+            client.post.findFirst({
+                select: { author: { select: { email: true } } },
+            }),
+        ).resolves.toMatchObject({
+            author: { email: expect.any(String) },
+        });
+        await expect(
+            client.post.findFirst({
+                include: { author: { select: { email: true } } },
+            }),
+        ).resolves.toMatchObject({
+            author: { email: expect.any(String) },
+        });
+
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                select: {
+                    profile: { where: { bio: 'My bio' } },
+                },
+            }),
+        ).resolves.toMatchObject({ profile: expect.any(Object) });
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                include: {
+                    profile: { where: { bio: 'My bio' } },
+                },
+            }),
+        ).resolves.toMatchObject({ profile: expect.any(Object) });
+
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                select: {
+                    profile: { where: { bio: 'Other bio' } },
+                },
+            }),
+        ).resolves.toMatchObject({ profile: null });
+        await expect(
+            client.user.findUnique({
+                where: { id: user.id },
+                include: {
+                    profile: { where: { bio: 'Other bio' } },
+                },
+            }),
+        ).resolves.toMatchObject({ profile: null });
+
         await expect(
             client.user.findUnique({
                 where: { id: user.id },
@@ -778,7 +869,7 @@ describe.each(createClientSpecs(PG_DB_NAME))('Client find tests for $provider',
                 // @ts-expect-error
                 include: { author: { where: { email: user.email } } },
             }),
-        ).rejects.toThrow(`Field "author" doesn't support filtering`);
+        ).rejects.toThrow(`Invalid find args`);
 
         // sorting
         let u = await client.user.findUniqueOrThrow({

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {

packages/tanstack-query/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "",
     "main": "index.js",
     "type": "module",

packages/testtools/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {

packages/typescript-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "private": true,
     "license": "MIT"
 }

packages/vitest-config/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "private": true,
     "license": "MIT",
     "exports": {

packages/zod/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "",
     "type": "module",
     "main": "index.js",

samples/blog/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-alpha.25",
+    "version": "3.0.0-alpha.26",
     "description": "",
     "main": "index.js",
     "scripts": {