merge dev to main (v2.2.3) (#1514)

Author: ymc9

README.md

@@ -234,6 +234,7 @@ Thank you for your support!
 
 <table>
   <tr>
+   <td align="center"><a href="https://github.com/Mermaid-Chart"><img src="https://avatars.githubusercontent.com/u/117662492?s=200&v=4" width="100" style="border-radius:50%" alt="Mermaid Chart"/><br />Mermaid Chart</a></td>
    <td align="center"><a href="https://github.com/coderabbitai"><img src="https://avatars.githubusercontent.com/u/132028505?v=4" width="100" style="border-radius:50%" alt="CodeRabbit"/><br />CodeRabbit</a></td>
    <td align="center"><a href="https://github.com/j0hannr"><img src="https://avatars.githubusercontent.com/u/52762073?v=4" width="100" style="border-radius:50%" alt="Johann Rohn"/><br />Johann Rohn</a></td>
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/ide/jetbrains/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.2.2"
+version = "2.2.3"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

packages/language/package.json

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

packages/misc/redwood/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "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": "2.2.2",
+    "version": "2.2.3",
     "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": "2.2.2",
+    "version": "2.2.3",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "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": "2.2.2",
+    "version": "2.2.3",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

packages/schema/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "Build scalable web apps with minimum code by defining authorization and validation rules inside the data schema that closer to the database",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "author": {
         "name": "ZenStack Team"
     },

packages/schema/src/language-server/validator/expression-validator.ts

@@ -140,7 +140,9 @@ export default class ExpressionValidator implements AstValidator<Expression> {
                     accept('error', 'incompatible operand types', { node: expr });
                 }
 
-                this.validateCrossModelFieldComparison(expr, accept);
+                if (expr.operator !== '&&' && expr.operator !== '||') {
+                    this.validateCrossModelFieldComparison(expr, accept);
+                }
                 break;
             }
 

packages/sdk/package.json

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

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "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": "2.2.2",
+  "version": "2.2.3",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,

tests/integration/tests/enhancements/with-policy/cross-model-field-comparison.test.ts

@@ -1,4 +1,4 @@
-import { loadSchema } from '@zenstackhq/testtools';
+import { loadModel, loadSchema } from '@zenstackhq/testtools';
 
 describe('Cross-model field comparison', () => {
     it('to-one relation', async () => {
@@ -997,4 +997,33 @@ describe('Cross-model field comparison', () => {
             dbTeam2.asset.update({ where: { id: asset.id }, data: { name: 'Asset2' } })
         ).toBeRejectedByPolicy();
     });
+
+    it('with auth case 4', async () => {
+        await loadModel(`
+        model User {
+            id Int @id @default(autoincrement())
+            foos Foo[]
+            bars Bar[]
+            @@allow('all', true)
+        }    
+
+        model Foo {
+            id Int @id @default(autoincrement())
+            user User @relation(fields: [userId], references: [id])
+            userId Int
+            bar Bar @relation(fields: [barId], references: [id])
+            barId Int @unique
+            @@allow('all', bar.private && bar.user == auth())
+        }
+
+        model Bar {
+            id Int @id @default(autoincrement())
+            user User @relation(fields: [userId], references: [id])
+            userId Int
+            foo Foo?
+            private Boolean
+            @@allow('all', true)
+        }
+        `);
+    });
 });