merge dev to main

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",
@@ -22,11 +22,11 @@
     "devDependencies": {
         "concurrently": "^7.4.0",
         "copyfiles": "^2.4.1",
-        "langium-cli": "1.1.0",
+        "langium-cli": "1.2.0",
         "rimraf": "^3.0.2",
         "typescript": "^4.9.4"
     },
     "dependencies": {
-        "langium": "1.1.0"
+        "langium": "1.2.0"
     }
 }

packages/language/src/generated/ast.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -16,14 +16,34 @@ export function isAbstractDeclaration(item: unknown): item is AbstractDeclaratio
 
 export type AttributeAttributeName = string;
 
+export function isAttributeAttributeName(item: unknown): item is AttributeAttributeName {
+    return typeof item === 'string';
+}
+
 export type AttributeName = AttributeAttributeName | DataModelAttributeName | DataModelFieldAttributeName;
 
+export function isAttributeName(item: unknown): item is AttributeName {
+    return isDataModelAttributeName(item) || isDataModelFieldAttributeName(item) || isAttributeAttributeName(item);
+}
+
 export type BuiltinType = 'BigInt' | 'Boolean' | 'Bytes' | 'DateTime' | 'Decimal' | 'Float' | 'Int' | 'Json' | 'String';
 
+export function isBuiltinType(item: unknown): item is BuiltinType {
+    return item === 'String' || item === 'Boolean' || item === 'Int' || item === 'BigInt' || item === 'Float' || item === 'Decimal' || item === 'DateTime' || item === 'Json' || item === 'Bytes';
+}
+
 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';
@@ -34,8 +54,16 @@ export function isExpression(item: unknown): item is Expression {
 
 export type ExpressionType = 'Any' | 'Boolean' | 'DateTime' | 'Float' | 'Int' | 'Null' | 'Object' | 'String' | 'Unsupported';
 
+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 QualifiedName = string;
 
+export function isQualifiedName(item: unknown): item is QualifiedName {
+    return typeof item === 'string';
+}
+
 export type ReferenceTarget = DataModelField | EnumField | FunctionParam;
 
 export const ReferenceTarget = 'ReferenceTarget';
@@ -46,6 +74,10 @@ export function isReferenceTarget(item: unknown): item is ReferenceTarget {
 
 export type RegularID = 'abstract' | 'attribute' | 'datasource' | 'enum' | 'in' | 'model' | 'plugin' | 'sort' | string;
 
+export function isRegularID(item: unknown): item is RegularID {
+    return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'sort' || (typeof item === 'string' && (/[_a-zA-Z][\w_]*/.test(item)));
+}
+
 export type TypeDeclaration = DataModel | Enum;
 
 export const TypeDeclaration = 'TypeDeclaration';
@@ -548,7 +580,7 @@ export function isUnsupportedFieldType(item: unknown): item is UnsupportedFieldT
     return reflection.isInstance(item, UnsupportedFieldType);
 }
 
-export interface ZModelAstType {
+export type ZModelAstType = {
     AbstractDeclaration: AbstractDeclaration
     Argument: Argument
     ArrayExpr: ArrayExpr

packages/language/src/generated/grammar.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

packages/language/src/generated/module.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

packages/next/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/next",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "displayName": "ZenStack Next.js integration",
     "description": "ZenStack Next.js integration",
     "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-alpha.115",
+  "version": "1.0.0-alpha.116",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/react/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/react",
     "displayName": "ZenStack plugin and runtime for ReactJS",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "description": "ZenStack plugin and runtime for ReactJS",
     "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-alpha.115",
+    "version": "1.0.0-alpha.116",
     "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-alpha.115",
+    "version": "1.0.0-alpha.116",
     "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": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "author": {
         "name": "ZenStack Team"
     },
@@ -89,11 +89,10 @@
         "@zenstackhq/sdk": "workspace:*",
         "async-exit-hook": "^2.0.1",
         "change-case": "^4.1.2",
-        "chevrotain": "^9.1.0",
         "colors": "1.4.0",
         "commander": "^8.3.0",
         "get-latest-version": "^5.0.1",
-        "langium": "1.1.0",
+        "langium": "1.2.0",
         "lower-case-first": "^2.0.2",
         "mixpanel": "^0.17.0",
         "node-machine-id": "^1.1.12",

packages/sdk/package.json

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

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.0.0-alpha.115",
+    "version": "1.0.0-alpha.116",
     "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-alpha.115",
+  "version": "1.0.0-alpha.116",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "publishConfig": {