Merge pull request #489 from zenstackhq/dev

ymc9 · web-flow · commit 39fb7d34d5da · 2025-12-14T03:52:23.000Z
merge dev to main (v3.0.0-beta.30)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
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.29",
+    "version": "3.0.0-beta.30",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/language/src/utils.ts b/packages/language/src/utils.ts
@@ -561,14 +561,20 @@ export function getAllAttributes(
 
     if (isDataModel(decl) && decl.baseModel) {
         if (decl.baseModel.ref) {
-            attributes.push(...getAllAttributes(decl.baseModel.ref, seen));
+            const attrs = getAllAttributes(decl.baseModel.ref, seen).filter((attr) => !isNonInheritableAttribute(attr));
+            attributes.push(...attrs);
         }
     }
 
     attributes.push(...decl.attributes);
     return attributes;
 }
 
+function isNonInheritableAttribute(attr: DataModelAttribute) {
+    const attrName = attr.decl.ref?.name ?? attr.decl.$refText;
+    return ['@@map', '@@unique', '@@index'].includes(attrName);
+}
+
 /**
  * Retrieve the document in which the given AST node is contained. A reference to the document is
  * usually held by the root node of the AST.
diff --git a/packages/language/src/validators/datamodel-validator.ts b/packages/language/src/validators/datamodel-validator.ts
@@ -250,7 +250,7 @@ export default class DataModelValidator implements AstValidator<DataModel> {
             return;
         }
 
-        if (this.isFieldInheritedFromDelegateModel(field)) {
+        if (this.isFieldInheritedFromDelegateModel(field, contextModel)) {
             // relation fields inherited from delegate model don't need opposite relation
             return;
         }
@@ -431,8 +431,8 @@ export default class DataModelValidator implements AstValidator<DataModel> {
     }
 
     // checks if the given field is inherited directly or indirectly from a delegate model
-    private isFieldInheritedFromDelegateModel(field: DataField) {
-        return isDelegateModel(field.$container);
+    private isFieldInheritedFromDelegateModel(field: DataField, contextModel: DataModel) {
+        return field.$container !== contextModel && isDelegateModel(field.$container);
     }
 
     private validateInherits(model: DataModel, accept: ValidationAcceptor) {
diff --git a/packages/language/test/delegate.test.ts b/packages/language/test/delegate.test.ts
@@ -114,4 +114,54 @@ describe('Delegate Tests', () => {
             'can only be applied once',
         );
     });
+
+    it('rejects relation missing the opposite side', async () => {
+        await loadSchemaWithError(
+            `
+        datasource db {
+            provider = 'sqlite'
+            url      = 'file:./dev.db'
+        }
+        
+        model A {
+            id Int @id @default(autoincrement())
+            b B @relation(fields: [bId], references: [id])
+            bId Int
+            type String
+            @@delegate(type)
+        }
+
+        model B {
+            id Int @id @default(autoincrement())
+        }
+        `,
+            'missing an opposite relation',
+        );
+
+        await loadSchema(
+            `
+        datasource db {
+            provider = 'sqlite'
+            url      = 'file:./dev.db'
+        }
+        
+        model A {
+            id Int @id @default(autoincrement())
+            b B @relation(fields: [bId], references: [id])
+            bId Int
+            type String
+            @@delegate(type)
+        }
+
+        model B {
+            id Int @id @default(autoincrement())
+            a A[]
+        }
+
+        model C extends A {
+            c String
+        }
+        `,
+        );
+    });
 });
diff --git a/packages/orm/package.json b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/src/prisma/prisma-schema-generator.ts b/packages/sdk/src/prisma/prisma-schema-generator.ts
@@ -196,9 +196,7 @@ export class PrismaSchemaGenerator {
             }
         }
 
-        const allAttributes = getAllAttributes(decl).filter(
-            (attr) => this.isPrismaAttribute(attr) && !this.isInheritedMapAttribute(attr, decl),
-        );
+        const allAttributes = getAllAttributes(decl).filter((attr) => this.isPrismaAttribute(attr));
 
         for (const attr of allAttributes) {
             this.generateContainerAttribute(model, attr);
@@ -241,15 +239,6 @@ export class PrismaSchemaGenerator {
         return getStringLiteral(defaultSchemaField?.value) ?? 'public';
     }
 
-    private isInheritedMapAttribute(attr: DataModelAttribute, contextModel: DataModel) {
-        if (attr.$container === contextModel) {
-            return false;
-        }
-
-        const attrName = attr.decl.ref?.name ?? attr.decl.$refText;
-        return attrName === '@@map';
-    }
-
     private isPrismaAttribute(attr: DataModelAttribute | DataFieldAttribute) {
         if (!attr.decl.ref) {
             return false;
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "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.29",
+    "version": "3.0.0-beta.30",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/tests/e2e/orm/schemas/delegate/schema.ts b/tests/e2e/orm/schemas/delegate/schema.ts
@@ -145,6 +145,7 @@ export class SchemaType implements SchemaDef {
                 }
             },
             attributes: [
+                { name: "@@index", args: [{ name: "fields", value: ExpressionUtils.array([ExpressionUtils.field("ownerId")]) }] },
                 { name: "@@delegate", args: [{ name: "discriminator", value: ExpressionUtils.field("assetType") }] }
             ],
             idFields: ["id"],
diff --git a/tests/e2e/orm/schemas/delegate/schema.zmodel b/tests/e2e/orm/schemas/delegate/schema.zmodel
@@ -28,6 +28,8 @@ model Asset {
     comments  Comment[]
     assetType String
 
+    @@index([ownerId])
+
     @@delegate(assetType)
 }
 
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
@@ -1,6 +1,6 @@
 {
     "name": "regression",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/test/v2-migrated/issue-1243.test.ts b/tests/regression/test/v2-migrated/issue-1243.test.ts
@@ -24,7 +24,7 @@ describe('Regression for issue 1243', () => {
         }
         `;
 
-        await createTestClient(schema);
+        await createTestClient(schema, { usePrismaPush: true });
     });
 
     it('multiple id fields', async () => {
@@ -47,6 +47,6 @@ describe('Regression for issue 1243', () => {
         }
         `;
 
-        await createTestClient(schema);
+        await createTestClient(schema, { usePrismaPush: true });
     });
 });
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bun-e2e",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "edge-runtime-e2e",
-    "version": "3.0.0-beta.29",
+    "version": "3.0.0-beta.30",
     "private": true,
     "type": "module",
     "scripts": {

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.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "[email protected]",`
`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.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`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
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`		`- "version": "3.0.0-beta.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`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.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`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.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`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.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`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.29",`
	`4`	`+ "version": "3.0.0-beta.30",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"exports": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-zenstack",`
`3`		`- "version": "3.0.0-beta.29",`
	`3`	`+ "version": "3.0.0-beta.30",`
`4`	`4`	`"description": "Create a new ZenStack project",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-beta.29",`
	`4`	`+ "version": "3.0.0-beta.30",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`