@zenstackhq/language 3.8.0-beta.1 → 3.8.0-beta.3

package/dist/index.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_ast = require("./ast-Clidp86c.cjs");
+const require_ast = require("./ast-DHvua30v.cjs");
 const require_ast$1 = require("./ast.cjs");
-const require_utils = require("./utils-b3dJKmYr.cjs");
+const require_utils = require("./utils-C731YIwp.cjs");
 let _zenstackhq_common_helpers = require("@zenstackhq/common-helpers");
 let langium = require("langium");
 let node_fs = require("node:fs");
@@ -57,11 +57,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -92,12 +89,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -170,12 +164,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -230,12 +221,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -290,12 +278,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -341,12 +326,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -401,12 +383,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -471,12 +450,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -488,12 +464,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
         },
         "arguments": []
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -510,12 +483,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "arguments": []
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -532,12 +502,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "arguments": []
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -554,12 +521,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "arguments": []
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -590,12 +554,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -653,12 +614,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -702,12 +660,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -752,11 +707,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -794,12 +746,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -881,12 +830,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -917,12 +863,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -936,12 +879,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "value": "this"
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -955,12 +895,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "value": "null"
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -984,7 +921,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                 },
                 "arguments": []
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -1010,12 +948,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1060,11 +995,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1102,12 +1034,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1170,12 +1099,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1225,12 +1151,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1247,7 +1170,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
               "type": {
                 "$ref": "#/rules@47"
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -1268,12 +1192,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1320,7 +1241,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                       "type": {
                         "$ref": "#/types@1"
                       },
-                      "deprecatedSyntax": false
+                      "deprecatedSyntax": false,
+                      "isMulti": false
                     }
                   }
                 ]
@@ -1330,12 +1252,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1366,12 +1285,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1471,12 +1387,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1493,12 +1406,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "arguments": []
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1555,12 +1465,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1634,12 +1541,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1705,12 +1609,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1776,12 +1677,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1871,12 +1769,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1921,11 +1816,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -1942,12 +1834,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           "arguments": []
         }
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2118,12 +2007,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2145,7 +2031,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
               "type": {
                 "$ref": "#/rules@43"
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -2165,7 +2052,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                   "type": {
                     "$ref": "#/rules@43"
                   },
-                  "deprecatedSyntax": false
+                  "deprecatedSyntax": false,
+                  "isMulti": false
                 }
               }
             ],
@@ -2173,11 +2061,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2199,16 +2084,14 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
               "type": {
                 "$ref": "#/rules@38"
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2268,12 +2151,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2324,7 +2204,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                     },
                     "arguments": []
                   },
-                  "deprecatedSyntax": false
+                  "deprecatedSyntax": false,
+                  "isMulti": false
                 }
               }
             ]
@@ -2360,12 +2241,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2450,12 +2328,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2489,12 +2364,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2571,12 +2443,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2624,12 +2493,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2761,12 +2627,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2822,12 +2685,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2866,7 +2726,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                     },
                     "arguments": []
                   },
-                  "deprecatedSyntax": false
+                  "deprecatedSyntax": false,
+                  "isMulti": false
                 }
               }
             ]
@@ -2892,12 +2753,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -2953,12 +2811,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3079,12 +2934,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3142,12 +2994,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3221,12 +3070,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3345,12 +3191,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3424,12 +3267,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3485,7 +3325,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                     },
                     "arguments": []
                   },
-                  "deprecatedSyntax": false
+                  "deprecatedSyntax": false,
+                  "isMulti": false
                 }
               }
             ]
@@ -3521,12 +3362,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3550,7 +3388,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                 },
                 "arguments": []
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -3577,12 +3416,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3614,7 +3450,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                 },
                 "arguments": []
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -3641,12 +3478,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3670,7 +3504,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
                 },
                 "arguments": []
               },
-              "deprecatedSyntax": false
+              "deprecatedSyntax": false,
+              "isMulti": false
             }
           },
           {
@@ -3697,12 +3532,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3747,11 +3579,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3795,12 +3624,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3871,12 +3697,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3923,12 +3746,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "ParserRule",
@@ -3947,12 +3767,9 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
           }
         ]
       },
-      "definesHiddenTokens": false,
       "entry": false,
       "fragment": false,
-      "hiddenTokens": [],
-      "parameters": [],
-      "wildcard": false
+      "parameters": []
     },
     {
       "$type": "TerminalRule",
@@ -3960,7 +3777,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "WS",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/\\\\s+/"
+        "regex": "/\\\\s+/",
+        "parenthesized": false
       },
       "fragment": false
     },
@@ -3969,7 +3787,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "INTERNAL_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/@@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
+        "regex": "/@@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -3979,7 +3798,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "MODEL_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
+        "regex": "/@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -3989,7 +3809,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "FIELD_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
+        "regex": "/@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -3999,7 +3820,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "ID",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/[_a-zA-Z][\\\\w_]*/"
+        "regex": "/[_a-zA-Z][\\\\w_]*/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -4009,7 +3831,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "STRING",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/\\"(\\\\\\\\.|[^\\"\\\\\\\\])*\\"|'(\\\\\\\\.|[^'\\\\\\\\])*'/"
+        "regex": "/\\"(\\\\\\\\.|[^\\"\\\\\\\\])*\\"|'(\\\\\\\\.|[^'\\\\\\\\])*'/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -4019,7 +3842,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "NUMBER",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/[+-]?[0-9]+(\\\\.[0-9]+)?/"
+        "regex": "/[+-]?[0-9]+(\\\\.[0-9]+)?/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -4029,7 +3853,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "TRIPLE_SLASH_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/\\\\/\\\\/\\\\/[^\\\\n\\\\r]*/"
+        "regex": "/\\\\/\\\\/\\\\/[^\\\\n\\\\r]*/",
+        "parenthesized": false
       },
       "fragment": false,
       "hidden": false
@@ -4040,7 +3865,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "ML_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\//"
+        "regex": "/\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\//",
+        "parenthesized": false
       },
       "fragment": false
     },
@@ -4050,7 +3876,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       "name": "SL_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "/\\\\/\\\\/[^\\\\n\\\\r]*/"
+        "regex": "/\\\\/\\\\/[^\\\\n\\\\r]*/",
+        "parenthesized": false
       },
       "fragment": false
     }
@@ -4127,11 +3954,8 @@ const ZModelGrammar = () => loadedZModelGrammar ?? (loadedZModelGrammar = (0, la
       }
     }
   ],
-  "definesHiddenTokens": false,
-  "hiddenTokens": [],
   "imports": [],
-  "interfaces": [],
-  "usedGrammars": []
+  "interfaces": []
 }`));
 //#endregion
 //#region src/generated/module.ts
@@ -5282,43 +5106,43 @@ var FunctionInvocationValidator = class {
 __decorate([
 	func("uuid"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref$1 = "InvocationExpr") === "function" ? _ref$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkUuid", null);
 __decorate([
 	func("cuid"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref2$1 = "InvocationExpr") === "function" ? _ref2$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref2$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref2$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkCuid", null);
 __decorate([
 	func("nanoid"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref3$1 = "InvocationExpr") === "function" ? _ref3$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref3$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref3$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkNanoid", null);
 __decorate([
 	func("auth"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref4$1 = "InvocationExpr") === "function" ? _ref4$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref4$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref4$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkAuth", null);
 __decorate([
 	func("length"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref5$1 = "InvocationExpr") === "function" ? _ref5$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref5$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref5$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkLength", null);
 __decorate([
 	func("regex"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref6$1 = "InvocationExpr") === "function" ? _ref6$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref6$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref6$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkRegex", null);
 __decorate([
 	func("check"),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref7$1 = "InvocationExpr") === "function" ? _ref7$1 : Object, Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref7$1 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref7$1 : Object, Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkCheck", null);
 //#endregion
@@ -5471,9 +5295,9 @@ var ZModelCommentProvider = class extends langium.DefaultCommentProvider {
 //#region src/zmodel-code-generator.ts
 var _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _ref23, _ref24, _ref25, _ref26, _ref27, _ref28, _ref29, _ref30, _ref31, _ref32, _ref33, _ref34;
 const generationHandlers = /* @__PURE__ */ new Map();
-function gen(name) {
+function gen(type) {
 	return function(_target, _propertyKey, descriptor) {
-		if (!generationHandlers.get(name)) generationHandlers.set(name, descriptor);
+		if (!generationHandlers.get(type.$type)) generationHandlers.set(type.$type, descriptor);
 		return descriptor;
 	};
 }
@@ -5668,12 +5492,12 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join("\n")}${ast.attribu
 		const operator = ast.operator;
 		const isCollectionPredicate = this.isCollectionPredicateOperator(operator);
 		const currentPriority = require_ast$1.BinaryExprOperatorPriority[operator];
-		if (ast.left.$type === "BinaryExpr" && require_ast$1.BinaryExprOperatorPriority[ast.left["operator"]] < currentPriority) result.left = true;
+		if (ast.left.$type === require_ast.BinaryExpr.$type && require_ast$1.BinaryExprOperatorPriority[ast.left["operator"]] < currentPriority) result.left = true;
 		/**
 		*  1 collection predicate operator has [] around the right operand, no need to add parenthesis.
 		*  2 grammar is left associative, so if the right operand has the same priority still need to add parenthesis.
 		**/
-		if (!isCollectionPredicate && ast.right.$type === "BinaryExpr" && require_ast$1.BinaryExprOperatorPriority[ast.right["operator"]] <= currentPriority) result.right = true;
+		if (!isCollectionPredicate && ast.right.$type === require_ast.BinaryExpr.$type && require_ast$1.BinaryExprOperatorPriority[ast.right["operator"]] <= currentPriority) result.right = true;
 		return result;
 	}
 	isCollectionPredicateOperator(op) {
@@ -5687,163 +5511,163 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join("\n")}${ast.attribu
 __decorate([
 	gen(require_ast.Model),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref = "Model") === "function" ? _ref : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref = typeof require_ast.Model !== "undefined" && require_ast.Model) === "function" ? _ref : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateModel", null);
 __decorate([
 	gen(require_ast.DataSource),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref2 = "DataSource") === "function" ? _ref2 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref2 = typeof require_ast.DataSource !== "undefined" && require_ast.DataSource) === "function" ? _ref2 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateDataSource", null);
 __decorate([
 	gen(require_ast.ModelImport),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref3 = "ModelImport") === "function" ? _ref3 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref3 = typeof require_ast.ModelImport !== "undefined" && require_ast.ModelImport) === "function" ? _ref3 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateModelImport", null);
 __decorate([
 	gen(require_ast.Enum),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref4 = "Enum") === "function" ? _ref4 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref4 = typeof require_ast.Enum !== "undefined" && require_ast.Enum) === "function" ? _ref4 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateEnum", null);
 __decorate([
 	gen(require_ast.EnumField),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref5 = "EnumField") === "function" ? _ref5 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref5 = typeof require_ast.EnumField !== "undefined" && require_ast.EnumField) === "function" ? _ref5 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateEnumField", null);
 __decorate([
 	gen(require_ast.GeneratorDecl),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref6 = "GeneratorDecl") === "function" ? _ref6 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref6 = typeof require_ast.GeneratorDecl !== "undefined" && require_ast.GeneratorDecl) === "function" ? _ref6 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateGenerator", null);
 __decorate([
 	gen(require_ast.ConfigField),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref7 = "ConfigField") === "function" ? _ref7 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref7 = typeof require_ast.ConfigField !== "undefined" && require_ast.ConfigField) === "function" ? _ref7 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateConfigField", null);
 __decorate([
 	gen(require_ast.ConfigArrayExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref8 = "ConfigArrayExpr") === "function" ? _ref8 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref8 = typeof require_ast.ConfigArrayExpr !== "undefined" && require_ast.ConfigArrayExpr) === "function" ? _ref8 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateConfigArrayExpr", null);
 __decorate([
 	gen(require_ast.ConfigInvocationExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref9 = "ConfigInvocationExpr") === "function" ? _ref9 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref9 = typeof require_ast.ConfigInvocationExpr !== "undefined" && require_ast.ConfigInvocationExpr) === "function" ? _ref9 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateConfigInvocationExpr", null);
 __decorate([
 	gen(require_ast.Plugin),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref10 = "Plugin") === "function" ? _ref10 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref10 = typeof require_ast.Plugin !== "undefined" && require_ast.Plugin) === "function" ? _ref10 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generatePlugin", null);
 __decorate([
 	gen(require_ast.PluginField),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref11 = "PluginField") === "function" ? _ref11 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref11 = typeof require_ast.PluginField !== "undefined" && require_ast.PluginField) === "function" ? _ref11 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generatePluginField", null);
 __decorate([
 	gen(require_ast.DataModel),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref12 = "DataModel") === "function" ? _ref12 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref12 = typeof require_ast.DataModel !== "undefined" && require_ast.DataModel) === "function" ? _ref12 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateDataModel", null);
 __decorate([
 	gen(require_ast.DataField),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref13 = "DataField") === "function" ? _ref13 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref13 = typeof require_ast.DataField !== "undefined" && require_ast.DataField) === "function" ? _ref13 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateDataField", null);
 __decorate([
 	gen(require_ast.DataModelAttribute),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref14 = "DataModelAttribute") === "function" ? _ref14 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref14 = typeof require_ast.DataModelAttribute !== "undefined" && require_ast.DataModelAttribute) === "function" ? _ref14 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateDataModelAttribute", null);
 __decorate([
 	gen(require_ast.DataFieldAttribute),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref15 = "DataFieldAttribute") === "function" ? _ref15 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref15 = typeof require_ast.DataFieldAttribute !== "undefined" && require_ast.DataFieldAttribute) === "function" ? _ref15 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateDataFieldAttribute", null);
 __decorate([
 	gen(require_ast.AttributeArg),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref16 = "AttributeArg") === "function" ? _ref16 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref16 = typeof require_ast.AttributeArg !== "undefined" && require_ast.AttributeArg) === "function" ? _ref16 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateAttributeArg", null);
 __decorate([
 	gen(require_ast.ObjectExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref17 = "ObjectExpr") === "function" ? _ref17 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref17 = typeof require_ast.ObjectExpr !== "undefined" && require_ast.ObjectExpr) === "function" ? _ref17 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateObjectExpr", null);
 __decorate([
 	gen(require_ast.ArrayExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref18 = "ArrayExpr") === "function" ? _ref18 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref18 = typeof require_ast.ArrayExpr !== "undefined" && require_ast.ArrayExpr) === "function" ? _ref18 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateArrayExpr", null);
 __decorate([
 	gen(require_ast.StringLiteral),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref19 = "LiteralExpr") === "function" ? _ref19 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref19 = typeof require_ast.LiteralExpr !== "undefined" && require_ast.LiteralExpr) === "function" ? _ref19 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateLiteralExpr", null);
 __decorate([
 	gen(require_ast.NumberLiteral),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref20 = "NumberLiteral") === "function" ? _ref20 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref20 = typeof require_ast.NumberLiteral !== "undefined" && require_ast.NumberLiteral) === "function" ? _ref20 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateNumberLiteral", null);
 __decorate([
 	gen(require_ast.BooleanLiteral),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref21 = "BooleanLiteral") === "function" ? _ref21 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref21 = typeof require_ast.BooleanLiteral !== "undefined" && require_ast.BooleanLiteral) === "function" ? _ref21 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateBooleanLiteral", null);
 __decorate([
 	gen(require_ast.UnaryExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref22 = "UnaryExpr") === "function" ? _ref22 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref22 = typeof require_ast.UnaryExpr !== "undefined" && require_ast.UnaryExpr) === "function" ? _ref22 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateUnaryExpr", null);
 __decorate([
 	gen(require_ast.BinaryExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref23 = "BinaryExpr") === "function" ? _ref23 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref23 = typeof require_ast.BinaryExpr !== "undefined" && require_ast.BinaryExpr) === "function" ? _ref23 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateBinaryExpr", null);
 __decorate([
 	gen(require_ast.ReferenceExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref24 = "ReferenceExpr") === "function" ? _ref24 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref24 = typeof require_ast.ReferenceExpr !== "undefined" && require_ast.ReferenceExpr) === "function" ? _ref24 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateReferenceExpr", null);
 __decorate([
 	gen(require_ast.ReferenceArg),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref25 = "ReferenceArg") === "function" ? _ref25 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref25 = typeof require_ast.ReferenceArg !== "undefined" && require_ast.ReferenceArg) === "function" ? _ref25 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateReferenceArg", null);
 __decorate([
 	gen(require_ast.MemberAccessExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref26 = "MemberAccessExpr") === "function" ? _ref26 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref26 = typeof require_ast.MemberAccessExpr !== "undefined" && require_ast.MemberAccessExpr) === "function" ? _ref26 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateMemberExpr", null);
 __decorate([
 	gen(require_ast.InvocationExpr),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref27 = "InvocationExpr") === "function" ? _ref27 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref27 = typeof require_ast.InvocationExpr !== "undefined" && require_ast.InvocationExpr) === "function" ? _ref27 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateInvocationExpr", null);
 __decorate([
@@ -5861,43 +5685,43 @@ __decorate([
 __decorate([
 	gen(require_ast.Attribute),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref28 = "Attribute") === "function" ? _ref28 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref28 = typeof require_ast.Attribute !== "undefined" && require_ast.Attribute) === "function" ? _ref28 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateAttribute", null);
 __decorate([
 	gen(require_ast.AttributeParam),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref29 = "AttributeParam") === "function" ? _ref29 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref29 = typeof require_ast.AttributeParam !== "undefined" && require_ast.AttributeParam) === "function" ? _ref29 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateAttributeParam", null);
 __decorate([
 	gen(require_ast.AttributeParamType),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref30 = "AttributeParamType") === "function" ? _ref30 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref30 = typeof require_ast.AttributeParamType !== "undefined" && require_ast.AttributeParamType) === "function" ? _ref30 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateAttributeParamType", null);
 __decorate([
 	gen(require_ast.FunctionDecl),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref31 = "FunctionDecl") === "function" ? _ref31 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref31 = typeof require_ast.FunctionDecl !== "undefined" && require_ast.FunctionDecl) === "function" ? _ref31 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateFunctionDecl", null);
 __decorate([
 	gen(require_ast.FunctionParam),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref32 = "FunctionParam") === "function" ? _ref32 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref32 = typeof require_ast.FunctionParam !== "undefined" && require_ast.FunctionParam) === "function" ? _ref32 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateFunctionParam", null);
 __decorate([
 	gen(require_ast.FunctionParamType),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref33 = "FunctionParamType") === "function" ? _ref33 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref33 = typeof require_ast.FunctionParamType !== "undefined" && require_ast.FunctionParamType) === "function" ? _ref33 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateFunctionParamType", null);
 __decorate([
 	gen(require_ast.TypeDef),
 	__decorateMetadata("design:type", Function),
-	__decorateMetadata("design:paramtypes", [typeof (_ref34 = "TypeDef") === "function" ? _ref34 : Object]),
+	__decorateMetadata("design:paramtypes", [typeof (_ref34 = typeof require_ast.TypeDef !== "undefined" && require_ast.TypeDef) === "function" ? _ref34 : Object]),
 	__decorateMetadata("design:returntype", void 0)
 ], ZModelCodeGenerator.prototype, "_generateTypeDef", null);
 //#endregion
@@ -6288,8 +6112,9 @@ var ZModelLinker = class extends langium.DefaultLinker {
 		document.state = langium.DocumentState.Linked;
 	}
 	linkReference(refInfo, document, extraScopes) {
-		if (refInfo.reference._ref) return;
-		if (this.resolveFromScopeProviders(refInfo.reference, document, extraScopes)) return;
+		const defaultRef = refInfo.reference;
+		if (defaultRef._ref) return;
+		if (this.resolveFromScopeProviders(defaultRef, document, extraScopes)) return;
 		this.doLink(refInfo, document);
 	}
 	resolveFromScopeProviders(reference, document, providers) {
@@ -6306,45 +6131,45 @@ var ZModelLinker = class extends langium.DefaultLinker {
 	}
 	resolve(node, document, extraScopes = []) {
 		switch (node.$type) {
-			case require_ast.StringLiteral:
-			case require_ast.NumberLiteral:
-			case require_ast.BooleanLiteral:
+			case require_ast.StringLiteral.$type:
+			case require_ast.NumberLiteral.$type:
+			case require_ast.BooleanLiteral.$type:
 				this.resolveLiteral(node);
 				break;
-			case require_ast.InvocationExpr:
+			case require_ast.InvocationExpr.$type:
 				this.resolveInvocation(node, document, extraScopes);
 				break;
-			case require_ast.ArrayExpr:
+			case require_ast.ArrayExpr.$type:
 				this.resolveArray(node, document, extraScopes);
 				break;
-			case require_ast.ReferenceExpr:
+			case require_ast.ReferenceExpr.$type:
 				this.resolveReference(node, document, extraScopes);
 				break;
-			case require_ast.MemberAccessExpr:
+			case require_ast.MemberAccessExpr.$type:
 				this.resolveMemberAccess(node, document, extraScopes);
 				break;
-			case require_ast.UnaryExpr:
+			case require_ast.UnaryExpr.$type:
 				this.resolveUnary(node, document, extraScopes);
 				break;
-			case require_ast.BinaryExpr:
+			case require_ast.BinaryExpr.$type:
 				this.resolveBinary(node, document, extraScopes);
 				break;
-			case require_ast.ObjectExpr:
+			case require_ast.ObjectExpr.$type:
 				this.resolveObject(node, document, extraScopes);
 				break;
-			case require_ast.ThisExpr:
+			case require_ast.ThisExpr.$type:
 				this.resolveThis(node, document, extraScopes);
 				break;
-			case require_ast.NullExpr:
+			case require_ast.NullExpr.$type:
 				this.resolveNull(node, document, extraScopes);
 				break;
-			case require_ast.AttributeArg:
+			case require_ast.AttributeArg.$type:
 				this.resolveAttributeArg(node, document, extraScopes);
 				break;
-			case require_ast.DataModel:
+			case require_ast.DataModel.$type:
 				this.resolveDataModel(node, document, extraScopes);
 				break;
-			case require_ast.DataField:
+			case require_ast.DataField.$type:
 				this.resolveDataField(node, document, extraScopes);
 				break;
 			default:
@@ -6566,8 +6391,8 @@ var ZModelScopeComputation = class extends langium.DefaultScopeComputation {
 		super(services);
 		this.services = services;
 	}
-	async computeExports(document, cancelToken) {
-		const result = await super.computeExports(document, cancelToken);
+	async collectExportedSymbols(document, cancelToken) {
+		const result = await super.collectExportedSymbols(document, cancelToken);
 		for (const node of langium.AstUtils.streamAllContents(document.parseResult.value)) {
 			if (cancelToken) await (0, langium.interruptAndCheck)(cancelToken);
 			if (require_ast.isEnumField(node)) {
@@ -6577,11 +6402,11 @@ var ZModelScopeComputation = class extends langium.DefaultScopeComputation {
 		}
 		return result;
 	}
-	processNode(node, document, scopes) {
-		super.processNode(node, document, scopes);
+	addLocalSymbol(node, document, symbols) {
+		super.addLocalSymbol(node, document, symbols);
 		if (require_ast.isDataModel(node) || require_ast.isTypeDef(node)) {
 			const bases = require_utils.getRecursiveBases(node, true, this.services.shared.workspace.LangiumDocuments);
-			for (const base of bases) for (const field of base.fields) scopes.add(node, this.descriptions.createDescription(field, this.nameProvider.getName(field)));
+			for (const base of bases) for (const field of base.fields) symbols.add(node, this.descriptions.createDescription(field, this.nameProvider.getName(field)));
 		}
 	}
 };
@@ -6985,7 +6810,7 @@ function validationAfterImportMerge(model) {
 */
 async function formatDocument(content) {
 	const services = createZModelServices().ZModelLanguage;
-	const document = services.shared.workspace.LangiumDocuments.createDocument(langium.URI.parse("memory://schema.zmodel"), content);
+	const document = services.shared.workspace.LangiumDocuments.createDocument(langium.URI.parse("memory:///schema.zmodel"), content);
 	const formatter = services.lsp.Formatter;
 	const identifier = { uri: document.uri.toString() };
 	const options = formatter.getFormatOptions() ?? {