merge dev to main (v1.10.3) (#1106)

Author: ymc9

package.json

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

packages/ide/jetbrains/build.gradle.kts

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

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jetbrains",
-    "version": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+  "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.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": "1.10.2",
+    "version": "1.10.3",
     "author": {
         "name": "ZenStack Team"
     },

packages/schema/src/language-server/validator/attribute-application-validator.ts

@@ -15,7 +15,7 @@ import {
     isEnum,
     isReferenceExpr,
 } from '@zenstackhq/language/ast';
-import { isFutureExpr, isRelationshipField, resolved } from '@zenstackhq/sdk';
+import { isDataModelFieldReference, isFutureExpr, isRelationshipField, resolved } from '@zenstackhq/sdk';
 import { ValidationAcceptor, streamAst } from 'langium';
 import pluralize from 'pluralize';
 import { AstValidator } from '../types';
@@ -151,6 +151,19 @@ export default class AttributeApplicationValidator implements AstValidator<Attri
         }
     }
 
+    @check('@@validate')
+    private _checkValidate(attr: AttributeApplication, accept: ValidationAcceptor) {
+        const condition = attr.args[0]?.value;
+        if (
+            condition &&
+            streamAst(condition).some(
+                (node) => isDataModelFieldReference(node) && isDataModel(node.$resolvedType?.decl)
+            )
+        ) {
+            accept('error', `\`@@validate\` condition cannot use relation fields`, { node: condition });
+        }
+    }
+
     private validatePolicyKinds(
         kind: string,
         candidates: string[],

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

@@ -3,16 +3,17 @@ import {
     Expression,
     ExpressionType,
     isDataModel,
+    isDataModelAttribute,
+    isDataModelField,
     isEnum,
+    isLiteralExpr,
     isMemberAccessExpr,
     isNullExpr,
     isThisExpr,
-    isDataModelField,
-    isLiteralExpr,
 } from '@zenstackhq/language/ast';
 import { isDataModelFieldReference, isEnumFieldReference } from '@zenstackhq/sdk';
-import { ValidationAcceptor } from 'langium';
-import { getContainingDataModel, isAuthInvocation, isCollectionPredicate } from '../../utils/ast-utils';
+import { AstNode, ValidationAcceptor } from 'langium';
+import { findUpAst, getContainingDataModel, isAuthInvocation, isCollectionPredicate } from '../../utils/ast-utils';
 import { AstValidator } from '../types';
 import { typeAssignable } from './utils';
 
@@ -123,6 +124,17 @@ export default class ExpressionValidator implements AstValidator<Expression> {
 
             case '==':
             case '!=': {
+                if (this.isInValidationContext(expr)) {
+                    // in validation context, all fields are optional, so we should allow
+                    // comparing any field against null
+                    if (
+                        (isDataModelFieldReference(expr.left) && isNullExpr(expr.right)) ||
+                        (isDataModelFieldReference(expr.right) && isNullExpr(expr.left))
+                    ) {
+                        return;
+                    }
+                }
+
                 if (!!expr.left.$resolvedType?.array !== !!expr.right.$resolvedType?.array) {
                     accept('error', 'incompatible operand types', { node: expr });
                     break;
@@ -132,18 +144,24 @@ export default class ExpressionValidator implements AstValidator<Expression> {
                 //   - foo.user.id == userId
                 // except:
                 //   - future().userId == userId
-                if(isMemberAccessExpr(expr.left) &&  isDataModelField(expr.left.member.ref) && expr.left.member.ref.$container != getContainingDataModel(expr)
-                || isMemberAccessExpr(expr.right) &&  isDataModelField(expr.right.member.ref) && expr.right.member.ref.$container != getContainingDataModel(expr))
-                {
+                if (
+                    (isMemberAccessExpr(expr.left) &&
+                        isDataModelField(expr.left.member.ref) &&
+                        expr.left.member.ref.$container != getContainingDataModel(expr)) ||
+                    (isMemberAccessExpr(expr.right) &&
+                        isDataModelField(expr.right.member.ref) &&
+                        expr.right.member.ref.$container != getContainingDataModel(expr))
+                ) {
                     // foo.user.id == auth().id
                     // foo.user.id == "123"
                     // foo.user.id == null
                     // foo.user.id == EnumValue
-                    if(!(this.isNotModelFieldExpr(expr.left) || this.isNotModelFieldExpr(expr.right)))
-                    {
-                        accept('error', 'comparison between fields of different models are not supported', { node: expr }); 
-                        break;  
-                    }                   
+                    if (!(this.isNotModelFieldExpr(expr.left) || this.isNotModelFieldExpr(expr.right))) {
+                        accept('error', 'comparison between fields of different models are not supported', {
+                            node: expr,
+                        });
+                        break;
+                    }
                 }
 
                 if (
@@ -205,14 +223,17 @@ export default class ExpressionValidator implements AstValidator<Expression> {
         }
     }
 
+    private isInValidationContext(node: AstNode) {
+        return findUpAst(node, (n) => isDataModelAttribute(n) && n.decl.$refText === '@@validate');
+    }
 
     private isNotModelFieldExpr(expr: Expression) {
-        return isLiteralExpr(expr) || isEnumFieldReference(expr) || isNullExpr(expr) || this.isAuthOrAuthMemberAccess(expr)
+        return (
+            isLiteralExpr(expr) || isEnumFieldReference(expr) || isNullExpr(expr) || this.isAuthOrAuthMemberAccess(expr)
+        );
     }
 
     private isAuthOrAuthMemberAccess(expr: Expression) {
         return isAuthInvocation(expr) || (isMemberAccessExpr(expr) && isAuthInvocation(expr.operand));
     }
-
 }
-

packages/schema/src/utils/ast-utils.ts

@@ -157,7 +157,6 @@ export function isCollectionPredicate(node: AstNode): node is BinaryExpr {
     return isBinaryExpr(node) && ['?', '!', '^'].includes(node.operator);
 }
 
-
 export function getContainingDataModel(node: Expression): DataModel | undefined {
     let curr: AstNode | undefined = node.$container;
     while (curr) {
@@ -167,4 +166,18 @@ export function getContainingDataModel(node: Expression): DataModel | undefined
         curr = curr.$container;
     }
     return undefined;
-}
+}
+
+/**
+ * Walk upward from the current AST node to find the first node that satisfies the predicate.
+ */
+export function findUpAst(node: AstNode, predicate: (node: AstNode) => boolean): AstNode | undefined {
+    let curr: AstNode | undefined = node;
+    while (curr) {
+        if (predicate(curr)) {
+            return curr;
+        }
+        curr = curr.$container;
+    }
+    return undefined;
+}