merge dev to main (v1.7.0) (#951)

Author: ymc9

README.md

@@ -9,6 +9,9 @@
     <a href="https://www.npmjs.com/package/zenstack">
         <img src="https://img.shields.io/npm/v/zenstack">
     </a>
+    <a href="https://www.npmjs.com/package/zenstack">
+        <img src="https://img.shields.io/npm/dm/zenstack">
+    </a>
     <img src="https://github.com/zenstackhq/zenstack/actions/workflows/build-test.yml/badge.svg">
     <a href="https://twitter.com/zenstackhq">
         <img src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fgithub.com%2Fzenstackhq%2Fzenstack">

package.json

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

packages/ide/jetbrains/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "1.6.2"
+version = "1.7.0"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jetbrains",
-    "version": "1.6.2",
+    "version": "1.7.0",
     "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.6.2",
+    "version": "1.7.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/language/src/generated/ast.ts

@@ -14,12 +14,6 @@ export function isAbstractDeclaration(item: unknown): item is AbstractDeclaratio
     return reflection.isInstance(item, AbstractDeclaration);
 }
 
-export type AttributeName = DataModelAttributeName | DataModelFieldAttributeName | InternalAttributeName;
-
-export function isAttributeName(item: unknown): item is AttributeName {
-    return isDataModelAttributeName(item) || isDataModelFieldAttributeName(item) || isInternalAttributeName(item);
-}
-
 export type Boolean = boolean;
 
 export function isBoolean(item: unknown): item is Boolean {
@@ -40,18 +34,6 @@ export function isConfigExpr(item: unknown): item is ConfigExpr {
     return reflection.isInstance(item, ConfigExpr);
 }
 
-export type DataModelAttributeName = string;
-
-export function isDataModelAttributeName(item: unknown): item is DataModelAttributeName {
-    return typeof item === 'string';
-}
-
-export type DataModelFieldAttributeName = string;
-
-export function isDataModelFieldAttributeName(item: unknown): item is DataModelFieldAttributeName {
-    return typeof item === 'string';
-}
-
 export type Expression = ArrayExpr | BinaryExpr | InvocationExpr | LiteralExpr | MemberAccessExpr | NullExpr | ObjectExpr | ReferenceExpr | ThisExpr | UnaryExpr;
 
 export const Expression = 'Expression';
@@ -66,12 +48,6 @@ export function isExpressionType(item: unknown): item is ExpressionType {
     return item === 'String' || item === 'Int' || item === 'Float' || item === 'Boolean' || item === 'DateTime' || item === 'Null' || item === 'Object' || item === 'Any' || item === 'Unsupported';
 }
 
-export type InternalAttributeName = string;
-
-export function isInternalAttributeName(item: unknown): item is InternalAttributeName {
-    return typeof item === 'string';
-}
-
 export type LiteralExpr = BooleanLiteral | NumberLiteral | StringLiteral;
 
 export const LiteralExpr = 'LiteralExpr';
@@ -80,12 +56,6 @@ export function isLiteralExpr(item: unknown): item is LiteralExpr {
     return reflection.isInstance(item, LiteralExpr);
 }
 
-export type QualifiedName = string;
-
-export function isQualifiedName(item: unknown): item is QualifiedName {
-    return typeof item === 'string';
-}
-
 export type ReferenceTarget = DataModelField | EnumField | FunctionParam;
 
 export const ReferenceTarget = 'ReferenceTarget';
@@ -137,7 +107,8 @@ export interface Attribute extends AstNode {
     readonly $container: Model;
     readonly $type: 'Attribute';
     attributes: Array<InternalAttribute>
-    name: AttributeName
+    comments: Array<string>
+    name: string
     params: Array<AttributeParam>
 }
 
@@ -163,6 +134,8 @@ export function isAttributeArg(item: unknown): item is AttributeArg {
 export interface AttributeParam extends AstNode {
     readonly $container: Attribute;
     readonly $type: 'AttributeParam';
+    attributes: Array<InternalAttribute>
+    comments: Array<string>
     default: boolean
     name: RegularID
     type: AttributeParamType
@@ -454,7 +427,7 @@ export function isGeneratorDecl(item: unknown): item is GeneratorDecl {
 }
 
 export interface InternalAttribute extends AstNode {
-    readonly $container: Attribute | FunctionDecl;
+    readonly $container: Attribute | AttributeParam | FunctionDecl;
     readonly $type: 'InternalAttribute';
     args: Array<AttributeArg>
     decl: Reference<Attribute>
@@ -519,7 +492,7 @@ export function isModelImport(item: unknown): item is ModelImport {
 export interface NullExpr extends AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'NullExpr';
-    value: string
+    value: 'null'
 }
 
 export const NullExpr = 'NullExpr';
@@ -619,7 +592,7 @@ export function isStringLiteral(item: unknown): item is StringLiteral {
 export interface ThisExpr extends AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ThisExpr';
-    value: string
+    value: 'this'
 }
 
 export const ThisExpr = 'ThisExpr';
@@ -801,6 +774,7 @@ export class ZModelAstReflection extends AbstractAstReflection {
                     name: 'Attribute',
                     mandatory: [
                         { name: 'attributes', type: 'array' },
+                        { name: 'comments', type: 'array' },
                         { name: 'params', type: 'array' }
                     ]
                 };
@@ -809,6 +783,8 @@ export class ZModelAstReflection extends AbstractAstReflection {
                 return {
                     name: 'AttributeParam',
                     mandatory: [
+                        { name: 'attributes', type: 'array' },
+                        { name: 'comments', type: 'array' },
                         { name: 'default', type: 'boolean' }
                     ]
                 };