Merge pull request #508 from zenstackhq/dev

ymc9 · web-flow · commit 3f3ffbe35b2a · 2025-12-16T22:40:14.000Z
merge dev to main (v3.0.0-beta.32)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "scripts": {
diff --git a/packages/cli/package.json b/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-beta.31",
+    "version": "3.0.0-beta.32",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/cli/src/actions/generate.ts b/packages/cli/src/actions/generate.ts
@@ -36,7 +36,7 @@ export async function run(options: Options) {
 
 \`\`\`ts
 import { ZenStackClient } from '@zenstackhq/orm';
-import { schema } from '${outputPath}/schema';
+import { schema } from '${path.relative('.', outputPath)}/schema';
 
 const client = new ZenStackClient(schema, {
     dialect: { ... }
diff --git a/packages/cli/src/actions/templates.ts b/packages/cli/src/actions/templates.ts
@@ -21,7 +21,7 @@ model Post {
     title     String   @length(1, 256)
     content   String
     published Boolean  @default(false)
-    author    User     @relation(fields: [authorId], references: [id])
+    author    User     @relation(fields: [authorId], references: [id], onDelete: Cascade)
     authorId  String
 }
 `;
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "main": "index.js",
     "type": "module",
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.0.14",
+    "version": "3.0.15",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/orm/package.json b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/orm/src/client/crud-types.ts b/packages/orm/src/client/crud-types.ts
@@ -139,50 +139,34 @@ type ModelSelectResult<
     Options extends QueryOptions<Schema>,
 > = {
     [Key in keyof Select as Select[Key] extends false | undefined
-        ? never
-        : Key extends keyof Omit
-          ? Omit[Key] extends true
-              ? never
-              : Key
-          : Key extends '_count'
-            ? Select[Key] extends SelectCount<Schema, Model>
-                ? Key
-                : never
+        ? // not selected
+          never
+        : Key extends '_count'
+          ? // select "_count"
+            Select[Key] extends SelectCount<Schema, Model>
+              ? Key
+              : never
+          : Key extends keyof Omit
+            ? Omit[Key] extends true
+                ? //   omit
+                  never
+                : Key
             : Key]: Key extends '_count'
-        ? SelectCountResult<Schema, Model, Select[Key]>
+        ? // select "_count" result
+          SelectCountResult<Schema, Model, Select[Key]>
         : Key extends NonRelationFields<Schema, Model>
-          ? MapModelFieldType<Schema, Model, Key>
+          ? // scalar field result
+            MapModelFieldType<Schema, Model, Key>
           : Key extends RelationFields<Schema, Model>
-            ? Select[Key] extends FindArgs<
+            ? // relation field result (recurse)
+              ModelResult<
                   Schema,
                   RelationFieldType<Schema, Model, Key>,
+                  Select[Key],
+                  Options,
+                  ModelFieldIsOptional<Schema, Model, Key>,
                   FieldIsArray<Schema, Model, Key>
               >
-                ? 'select' extends keyof Select[Key]
-                    ? ModelResult<
-                          Schema,
-                          RelationFieldType<Schema, Model, Key>,
-                          Pick<Select[Key], 'select'>,
-                          Options,
-                          ModelFieldIsOptional<Schema, Model, Key>,
-                          FieldIsArray<Schema, Model, Key>
-                      >
-                    : ModelResult<
-                          Schema,
-                          RelationFieldType<Schema, Model, Key>,
-                          Pick<Select[Key], 'include' | 'omit'>,
-                          Options,
-                          ModelFieldIsOptional<Schema, Model, Key>,
-                          FieldIsArray<Schema, Model, Key>
-                      >
-                : DefaultModelResult<
-                      Schema,
-                      RelationFieldType<Schema, Model, Key>,
-                      Omit,
-                      Options,
-                      ModelFieldIsOptional<Schema, Model, Key>,
-                      FieldIsArray<Schema, Model, Key>
-                  >
             : never;
 };
 
@@ -204,40 +188,29 @@ export type ModelResult<
     Array = false,
 > = WrapType<
     Args extends {
-        select: infer S;
-        omit?: infer O;
-    }
+        select: infer S extends object;
+        omit?: infer O extends object;
+    } & Record<string, unknown>
         ? ModelSelectResult<Schema, Model, S, O, Options>
         : Args extends {
-                include: infer I;
-                omit?: infer O;
-            }
-          ? DefaultModelResult<Schema, Model, O, Options, false, false> & {
+                include: infer I extends object;
+                omit?: infer O extends object;
+            } & Record<string, unknown>
+          ? // select all non-omitted scalar fields
+            DefaultModelResult<Schema, Model, O, Options, false, false> & {
+                // recurse for "include" relations
                 [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined
                     ? never
-                    : Key]: I[Key] extends FindArgs<
+                    : Key]: ModelResult<
                     Schema,
                     RelationFieldType<Schema, Model, Key>,
+                    I[Key],
+                    Options,
+                    ModelFieldIsOptional<Schema, Model, Key>,
                     FieldIsArray<Schema, Model, Key>
-                >
-                    ? ModelResult<
-                          Schema,
-                          RelationFieldType<Schema, Model, Key>,
-                          I[Key],
-                          Options,
-                          ModelFieldIsOptional<Schema, Model, Key>,
-                          FieldIsArray<Schema, Model, Key>
-                      >
-                    : DefaultModelResult<
-                          Schema,
-                          RelationFieldType<Schema, Model, Key>,
-                          undefined,
-                          Options,
-                          ModelFieldIsOptional<Schema, Model, Key>,
-                          FieldIsArray<Schema, Model, Key>
-                      >;
+                >;
             }
-          : Args extends { omit: infer O }
+          : Args extends { omit: infer O } & Record<string, unknown>
             ? DefaultModelResult<Schema, Model, O, Options, false, false>
             : DefaultModelResult<Schema, Model, undefined, Options, false, false>,
     Optional,
diff --git a/packages/orm/src/client/query-utils.ts b/packages/orm/src/client/query-utils.ts
@@ -232,26 +232,30 @@ export function getManyToManyRelation(schema: SchemaDef, model: string, field: s
     if (!fieldDef.array || !fieldDef.relation?.opposite) {
         return undefined;
     }
+
+    // in case the m2m relation field is inherited from a delegate base, get the base model
+    const realModel = fieldDef.originModel ?? model;
+
     const oppositeFieldDef = requireField(schema, fieldDef.type, fieldDef.relation.opposite);
     if (oppositeFieldDef.array) {
         // Prisma's convention for many-to-many relation:
         // - model are sorted alphabetically by name
         // - join table is named _<model1>To<model2>, unless an explicit name is provided by `@relation`
         // - foreign keys are named A and B (based on the order of the model)
-        const sortedModelNames = [model, fieldDef.type].sort();
+        const sortedModelNames = [realModel, fieldDef.type].sort();
 
         let orderedFK: [string, string];
-        if (model !== fieldDef.type) {
+        if (realModel !== fieldDef.type) {
             // not a self-relation, model name's sort order determines fk order
-            orderedFK = sortedModelNames[0] === model ? ['A', 'B'] : ['B', 'A'];
+            orderedFK = sortedModelNames[0] === realModel ? ['A', 'B'] : ['B', 'A'];
         } else {
             // for self-relations, since model names are identical, relation field name's
             // sort order determines fk order
             const sortedFieldNames = [field, oppositeFieldDef.name].sort();
             orderedFK = sortedFieldNames[0] === field ? ['A', 'B'] : ['B', 'A'];
         }
 
-        const modelIdFields = requireIdFields(schema, model);
+        const modelIdFields = requireIdFields(schema, realModel);
         invariant(modelIdFields.length === 1, 'Only single-field ID is supported for many-to-many relation');
         const otherIdFields = requireIdFields(schema, fieldDef.type);
         invariant(otherIdFields.length === 1, 'Only single-field ID is supported for many-to-many relation');
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/samples/next.js/package.json b/samples/next.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "next.js",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "private": true,
     "scripts": {
         "generate": "zen generate --lite",
diff --git a/samples/orm/package.json b/samples/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/tests/e2e/orm/schemas/typing/typecheck.ts b/tests/e2e/orm/schemas/typing/typecheck.ts
@@ -167,6 +167,7 @@ async function find() {
             select: {
                 posts: {
                     where: { title: 'Foo' },
+                    take: 1,
                     select: {
                         author: {
                             select: {
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
@@ -1,12 +1,12 @@
 {
     "name": "regression",
-    "version": "3.0.0-beta.31",
+    "version": "3.0.0-beta.32",
     "private": true,
     "type": "module",
     "scripts": {
-        "build": "pnpm run generate",
-        "generate": "tsx ../../scripts/test-generate.ts ./test",
-        "test": "pnpm generate && tsc && vitest run"
+        "build": "pnpm run test:generate",
+        "test:generate": "tsx ../../scripts/test-generate.ts ./test",
+        "test": "pnpm test:generate && tsc && vitest run"
     },
     "dependencies": {
         "@zenstackhq/testtools": "workspace:*",
diff --git a/tests/regression/test/issue-503/input.ts b/tests/regression/test/issue-503/input.ts
diff --git a/tests/regression/test/issue-503/models.ts b/tests/regression/test/issue-503/models.ts
diff --git a/tests/regression/test/issue-503/regression.test.ts b/tests/regression/test/issue-503/regression.test.ts
diff --git a/tests/regression/test/issue-503/schema.ts b/tests/regression/test/issue-503/schema.ts
diff --git a/tests/regression/test/issue-503/schema.zmodel b/tests/regression/test/issue-503/schema.zmodel
diff --git a/tests/regression/test/issue-505.test.ts b/tests/regression/test/issue-505.test.ts
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "pnpm@10.23.0",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/better-auth",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ model Post {`
`21`	`21`	`title String @length(1, 256)`
`22`	`22`	`content String`
`23`	`23`	`published Boolean @default(false)`
`24`		`- author User @relation(fields: [authorId], references: [id])`
	`24`	`+ author User @relation(fields: [authorId], references: [id], onDelete: Cascade)`
`25`	`25`	`authorId String`
`26`	`26`	`}`
`27`	`27`	`;
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"description": "TanStack Query Client for consuming ZenStack v3's CRUD service",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/typescript-config",`
`3`		`- "version": "3.0.0-beta.31",`
	`3`	`+ "version": "3.0.0-beta.32",`
`4`	`4`	`"private": true,`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/vitest-config",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "3.0.0-beta.31",`
	`4`	`+ "version": "3.0.0-beta.32",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"exports": {`