merge dev to main

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "repository": {

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

packages/runtime/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

packages/runtime/src/enhancements/nested-write-vistor.ts

@@ -6,7 +6,7 @@ import { resolveField } from './model-meta';
 import { ModelMeta } from './types';
 import { enumerate, getModelFields } from './utils';
 
-type NestingPathItem = { field?: FieldInfo; where: any; unique: boolean };
+type NestingPathItem = { field?: FieldInfo; model: string; where: any; unique: boolean };
 
 /**
  * Context for visiting
@@ -113,7 +113,7 @@ export class NestedWriteVisitor {
         // visit payload
         switch (action) {
             case 'create':
-                context.nestingPath.push({ field, where: {}, unique: false });
+                context.nestingPath.push({ field, model, where: {}, unique: false });
                 for (const item of enumerate(data)) {
                     if (this.callback.create) {
                         await this.callback.create(model, item, context);
@@ -125,7 +125,7 @@ export class NestedWriteVisitor {
             case 'createMany':
                 // skip the 'data' layer so as to keep consistency with 'create'
                 if (data.data) {
-                    context.nestingPath.push({ field, where: {}, unique: false });
+                    context.nestingPath.push({ field, model, where: {}, unique: false });
                     for (const item of enumerate(data.data)) {
                         if (this.callback.create) {
                             await this.callback.create(model, item, context);
@@ -136,7 +136,7 @@ export class NestedWriteVisitor {
                 break;
 
             case 'connectOrCreate':
-                context.nestingPath.push({ field, where: data.where, unique: true });
+                context.nestingPath.push({ field, model, where: data.where, unique: true });
                 for (const item of enumerate(data)) {
                     if (this.callback.connectOrCreate) {
                         await this.callback.connectOrCreate(model, item, context);
@@ -150,7 +150,7 @@ export class NestedWriteVisitor {
                     for (const item of enumerate(data)) {
                         const newContext = {
                             ...context,
-                            nestingPath: [...context.nestingPath, { field, where: item, unique: true }],
+                            nestingPath: [...context.nestingPath, { field, model, where: item, unique: true }],
                         };
                         await this.callback.connect(model, item, newContext);
                     }
@@ -167,7 +167,7 @@ export class NestedWriteVisitor {
                             ...context,
                             nestingPath: [
                                 ...context.nestingPath,
-                                { field, where: item, unique: typeof item === 'object' },
+                                { field, model, where: item, unique: typeof item === 'object' },
                             ],
                         };
                         await this.callback.disconnect(model, item, newContext);
@@ -176,7 +176,7 @@ export class NestedWriteVisitor {
                 break;
 
             case 'update':
-                context.nestingPath.push({ field, where: data.where, unique: false });
+                context.nestingPath.push({ field, model, where: data.where, unique: false });
                 for (const item of enumerate(data)) {
                     if (this.callback.update) {
                         await this.callback.update(model, item, context);
@@ -187,7 +187,7 @@ export class NestedWriteVisitor {
                 break;
 
             case 'updateMany':
-                context.nestingPath.push({ field, where: data.where, unique: false });
+                context.nestingPath.push({ field, model, where: data.where, unique: false });
                 for (const item of enumerate(data)) {
                     if (this.callback.updateMany) {
                         await this.callback.updateMany(model, item, context);
@@ -197,7 +197,7 @@ export class NestedWriteVisitor {
                 break;
 
             case 'upsert': {
-                context.nestingPath.push({ field, where: data.where, unique: true });
+                context.nestingPath.push({ field, model, where: data.where, unique: true });
                 for (const item of enumerate(data)) {
                     if (this.callback.upsert) {
                         await this.callback.upsert(model, item, context);
@@ -210,7 +210,7 @@ export class NestedWriteVisitor {
 
             case 'delete': {
                 if (this.callback.delete) {
-                    context.nestingPath.push({ field, where: data.where, unique: false });
+                    context.nestingPath.push({ field, model, where: data.where, unique: false });
                     for (const item of enumerate(data)) {
                         await this.callback.delete(model, item, context);
                     }
@@ -220,7 +220,7 @@ export class NestedWriteVisitor {
 
             case 'deleteMany':
                 if (this.callback.deleteMany) {
-                    context.nestingPath.push({ field, where: data.where, unique: false });
+                    context.nestingPath.push({ field, model, where: data.where, unique: false });
                     for (const item of enumerate(data)) {
                         await this.callback.deleteMany(model, item, context);
                     }

packages/runtime/src/enhancements/policy/policy-utils.ts

@@ -443,11 +443,18 @@ export class PolicyUtil {
             let currField: FieldInfo | undefined;
 
             for (let i = context.nestingPath.length - 1; i >= 0; i--) {
-                const { field, where, unique } = context.nestingPath[i];
+                const { field, model, where, unique } = context.nestingPath[i];
+
+                // never modify the original where because it's shared in the structure
+                const visitWhere = { ...where };
+                if (model && where) {
+                    // make sure composite unique condition is flattened
+                    await this.flattenGeneratedUniqueField(model, visitWhere);
+                }
 
                 if (!result) {
                     // first segment (bottom), just use its where clause
-                    result = currQuery = { ...where };
+                    result = currQuery = { ...visitWhere };
                     currField = field;
                 } else {
                     if (!currField) {
@@ -456,7 +463,13 @@ export class PolicyUtil {
                     if (!currField.backLink) {
                         throw this.unknownError(`field ${currField.type}.${currField.name} doesn't have a backLink`);
                     }
-                    currQuery[currField.backLink] = { ...where };
+                    const backLinkField = this.getModelField(currField.type, currField.backLink);
+                    if (backLinkField?.isArray) {
+                        // many-side of relationship, wrap with "some" query
+                        currQuery[currField.backLink] = { some: { ...visitWhere } };
+                    } else {
+                        currQuery[currField.backLink] = { ...visitWhere };
+                    }
                     currQuery = currQuery[currField.backLink];
                     currField = field;
                 }
@@ -707,6 +720,11 @@ export class PolicyUtil {
         }
     }
 
+    private getModelField(model: string, backlinkField: string) {
+        model = lowerCaseFirst(model);
+        return this.modelMeta.fields[model]?.[backlinkField];
+    }
+
     private transaction(db: DbClientContract, action: (tx: Record<string, DbOperations>) => Promise<any>) {
         if (db.__zenstack_tx) {
             // already in transaction, don't nest

packages/schema/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "author": {
         "name": "ZenStack Team"
     },

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.0.0-beta.4",
+    "version": "1.0.0-beta.5",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",

packages/testtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "publishConfig": {

tests/integration/tests/regression/issues.test.ts

@@ -191,4 +191,113 @@ describe('GitHub issues regression', () => {
             `
         );
     });
+
+    it('issue 552', async () => {
+        const { withPolicy, prisma } = await loadSchema(
+            `
+            model Tenant {
+                id Int @id @default(autoincrement())
+                name String
+
+                created_at DateTime @default(now())
+                updated_at DateTime @updatedAt
+
+                users UserTenant[]
+
+                @@map("tenants")
+
+
+                @@allow('all', auth().is_super_admin == true)
+                @@allow('read', users?[user == auth() && status == 'ACTIVE' ])
+                @@allow('all', users?[user == auth() && status == 'ACTIVE'])
+            }
+
+            model User {
+                id Int @id @default(autoincrement())
+                name String
+                is_super_admin Boolean @default(false) @omit
+
+                created_at DateTime @default(now())
+                updated_at DateTime @updatedAt
+
+                associated_tenants UserTenant[]
+
+                @@map("users")
+
+                @@allow('read', auth().id == id)
+                @@allow('all', auth().is_super_admin == true )
+                @@allow('read', associated_tenants?[tenant.users?[user == auth() && status == 'ACTIVE']])
+                @@allow('all', associated_tenants?[tenant.users?[user == auth() && status == 'ACTIVE']] )
+                @@allow('create', associated_tenants?[tenant.users?[user == auth() && status == 'ACTIVE']] )
+                @@allow('update', associated_tenants?[tenant.users?[user == auth() && status == 'ACTIVE']] )
+            }
+
+            model UserTenant {
+                user_id Int
+                user User @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+
+                tenant_id Int
+                tenant Tenant @relation(fields: [tenant_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+
+                status String @default('INACTIVE')
+
+                @@map("user_tenants")
+
+                @@id([user_id, tenant_id])
+
+                @@index([user_id])
+                @@index([tenant_id])
+                @@index([user_id, tenant_id])
+
+                @@allow('all', auth().is_super_admin == true )
+                @@allow('read', tenant.users?[user == auth() && status == 'ACTIVE' ])
+                @@allow('all', tenant.users?[user == auth() && status == 'ACTIVE'])
+                @@allow('update', tenant.users?[user == auth() && status == 'ACTIVE'])
+                @@allow('delete', tenant.users?[user == auth() && status == 'ACTIVE'])
+                @@allow('create', tenant.users?[user == auth() && status == 'ACTIVE'])
+            }
+            `
+        );
+
+        await prisma.user.deleteMany();
+        await prisma.tenant.deleteMany();
+
+        await prisma.tenant.create({
+            data: {
+                id: 1,
+                name: 'tenant 1',
+            },
+        });
+
+        await prisma.user.create({
+            data: {
+                id: 1,
+                name: 'user 1',
+            },
+        });
+
+        await prisma.userTenant.create({
+            data: {
+                user_id: 1,
+                tenant_id: 1,
+            },
+        });
+
+        const db = withPolicy({ id: 1, is_super_admin: true });
+        await db.userTenant.update({
+            where: {
+                user_id_tenant_id: {
+                    user_id: 1,
+                    tenant_id: 1,
+                },
+            },
+            data: {
+                user: {
+                    update: {
+                        name: 'user 1 updated',
+                    },
+                },
+            },
+        });
+    });
 });