@zenstackhq/language 3.0.0-alpha.9 → 3.0.0-beta.2

package/dist/ast.d.ts

@@ -20,7 +20,7 @@ declare const ZModelTerminals: {
     SL_COMMENT: RegExp;
 };
 type ZModelTerminalNames = keyof typeof ZModelTerminals;
-type ZModelKeywordNames = "!" | "!=" | "&&" | "(" | ")" | "," | "." | ":" | ";" | "<" | "<=" | "=" | "==" | ">" | ">=" | "?" | "Any" | "BigInt" | "Boolean" | "Bytes" | "ContextType" | "DateTime" | "Decimal" | "FieldReference" | "Float" | "Int" | "Json" | "Null" | "Object" | "String" | "TransitiveFieldReference" | "Unsupported" | "[" | "]" | "^" | "_" | "abstract" | "attribute" | "datasource" | "enum" | "extends" | "false" | "function" | "generator" | "import" | "in" | "model" | "mutation" | "null" | "plugin" | "procedure" | "this" | "true" | "type" | "view" | "{" | "||" | "}";
+type ZModelKeywordNames = "!" | "!=" | "&&" | "(" | ")" | "," | "." | ":" | ";" | "<" | "<=" | "=" | "==" | ">" | ">=" | "?" | "Any" | "BigInt" | "Boolean" | "Bytes" | "ContextType" | "DateTime" | "Decimal" | "FieldReference" | "Float" | "Int" | "Json" | "Null" | "Object" | "String" | "TransitiveFieldReference" | "Unsupported" | "[" | "]" | "^" | "_" | "abstract" | "attribute" | "datasource" | "enum" | "extends" | "false" | "function" | "generator" | "import" | "in" | "model" | "mutation" | "null" | "plugin" | "procedure" | "this" | "true" | "type" | "view" | "with" | "{" | "||" | "}";
 type ZModelTokenNames = ZModelTerminalNames | ZModelKeywordNames;
 type AbstractDeclaration = Attribute | DataModel | DataSource | Enum | FunctionDecl | GeneratorDecl | Plugin | Procedure | TypeDef;
 declare const AbstractDeclaration = "AbstractDeclaration";
@@ -40,10 +40,10 @@ declare function isExpressionType(item: unknown): item is ExpressionType;
 type LiteralExpr = BooleanLiteral | NumberLiteral | StringLiteral;
 declare const LiteralExpr = "LiteralExpr";
 declare function isLiteralExpr(item: unknown): item is LiteralExpr;
-type MemberAccessTarget = DataModelField | TypeDefField;
+type MemberAccessTarget = DataField;
 declare const MemberAccessTarget = "MemberAccessTarget";
 declare function isMemberAccessTarget(item: unknown): item is MemberAccessTarget;
-type ReferenceTarget = DataModelField | EnumField | FunctionParam | TypeDefField;
+type ReferenceTarget = DataField | EnumField | FunctionParam;
 declare const ReferenceTarget = "ReferenceTarget";
 declare function isReferenceTarget(item: unknown): item is ReferenceTarget;
 type RegularID = 'abstract' | 'attribute' | 'datasource' | 'enum' | 'import' | 'in' | 'model' | 'plugin' | 'type' | 'view' | string;
@@ -53,9 +53,6 @@ declare function isRegularIDWithTypeNames(item: unknown): item is RegularIDWithT
 type TypeDeclaration = DataModel | Enum | TypeDef;
 declare const TypeDeclaration = "TypeDeclaration";
 declare function isTypeDeclaration(item: unknown): item is TypeDeclaration;
-type TypeDefFieldTypes = Enum | TypeDef;
-declare const TypeDefFieldTypes = "TypeDefFieldTypes";
-declare function isTypeDefFieldTypes(item: unknown): item is TypeDefFieldTypes;
 interface Argument extends langium.AstNode {
     readonly $container: InvocationExpr;
     readonly $type: 'Argument';
@@ -81,7 +78,7 @@ interface Attribute extends langium.AstNode {
 declare const Attribute = "Attribute";
 declare function isAttribute(item: unknown): item is Attribute;
 interface AttributeArg extends langium.AstNode {
-    readonly $container: DataModelAttribute | DataModelFieldAttribute | InternalAttribute;
+    readonly $container: DataFieldAttribute | DataModelAttribute | InternalAttribute;
     readonly $type: 'AttributeArg';
     name?: RegularID;
     value: Expression;
@@ -156,16 +153,45 @@ interface ConfigInvocationExpr extends langium.AstNode {
 }
 declare const ConfigInvocationExpr = "ConfigInvocationExpr";
 declare function isConfigInvocationExpr(item: unknown): item is ConfigInvocationExpr;
+interface DataField extends langium.AstNode {
+    readonly $container: DataModel | TypeDef;
+    readonly $type: 'DataField';
+    attributes: Array<DataFieldAttribute>;
+    comments: Array<string>;
+    name: RegularIDWithTypeNames;
+    type: DataFieldType;
+}
+declare const DataField = "DataField";
+declare function isDataField(item: unknown): item is DataField;
+interface DataFieldAttribute extends langium.AstNode {
+    readonly $container: DataField | EnumField;
+    readonly $type: 'DataFieldAttribute';
+    args: Array<AttributeArg>;
+    decl: langium.Reference<Attribute>;
+}
+declare const DataFieldAttribute = "DataFieldAttribute";
+declare function isDataFieldAttribute(item: unknown): item is DataFieldAttribute;
+interface DataFieldType extends langium.AstNode {
+    readonly $container: DataField;
+    readonly $type: 'DataFieldType';
+    array: boolean;
+    optional: boolean;
+    reference?: langium.Reference<TypeDeclaration>;
+    type?: BuiltinType;
+    unsupported?: UnsupportedFieldType;
+}
+declare const DataFieldType = "DataFieldType";
+declare function isDataFieldType(item: unknown): item is DataFieldType;
 interface DataModel extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'DataModel';
     attributes: Array<DataModelAttribute>;
+    baseModel?: langium.Reference<DataModel>;
     comments: Array<string>;
-    fields: Array<DataModelField>;
-    isAbstract: boolean;
+    fields: Array<DataField>;
     isView: boolean;
+    mixins: Array<langium.Reference<TypeDef>>;
     name: RegularID;
-    superTypes: Array<langium.Reference<DataModel>>;
 }
 declare const DataModel = "DataModel";
 declare function isDataModel(item: unknown): item is DataModel;
@@ -177,35 +203,6 @@ interface DataModelAttribute extends langium.AstNode {
 }
 declare const DataModelAttribute = "DataModelAttribute";
 declare function isDataModelAttribute(item: unknown): item is DataModelAttribute;
-interface DataModelField extends langium.AstNode {
-    readonly $container: DataModel;
-    readonly $type: 'DataModelField';
-    attributes: Array<DataModelFieldAttribute>;
-    comments: Array<string>;
-    name: RegularIDWithTypeNames;
-    type: DataModelFieldType;
-}
-declare const DataModelField = "DataModelField";
-declare function isDataModelField(item: unknown): item is DataModelField;
-interface DataModelFieldAttribute extends langium.AstNode {
-    readonly $container: DataModelField | EnumField | TypeDefField;
-    readonly $type: 'DataModelFieldAttribute';
-    args: Array<AttributeArg>;
-    decl: langium.Reference<Attribute>;
-}
-declare const DataModelFieldAttribute = "DataModelFieldAttribute";
-declare function isDataModelFieldAttribute(item: unknown): item is DataModelFieldAttribute;
-interface DataModelFieldType extends langium.AstNode {
-    readonly $container: DataModelField;
-    readonly $type: 'DataModelFieldType';
-    array: boolean;
-    optional: boolean;
-    reference?: langium.Reference<TypeDeclaration>;
-    type?: BuiltinType;
-    unsupported?: UnsupportedFieldType;
-}
-declare const DataModelFieldType = "DataModelFieldType";
-declare function isDataModelFieldType(item: unknown): item is DataModelFieldType;
 interface DataSource extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'DataSource';
@@ -227,7 +224,7 @@ declare function isEnum(item: unknown): item is Enum;
 interface EnumField extends langium.AstNode {
     readonly $container: Enum;
     readonly $type: 'EnumField';
-    attributes: Array<DataModelFieldAttribute>;
+    attributes: Array<DataFieldAttribute>;
     comments: Array<string>;
     name: RegularIDWithTypeNames;
 }
@@ -408,31 +405,12 @@ interface TypeDef extends langium.AstNode {
     readonly $type: 'TypeDef';
     attributes: Array<DataModelAttribute>;
     comments: Array<string>;
-    fields: Array<TypeDefField>;
+    fields: Array<DataField>;
+    mixins: Array<langium.Reference<TypeDef>>;
     name: RegularID;
 }
 declare const TypeDef = "TypeDef";
 declare function isTypeDef(item: unknown): item is TypeDef;
-interface TypeDefField extends langium.AstNode {
-    readonly $container: TypeDef;
-    readonly $type: 'TypeDefField';
-    attributes: Array<DataModelFieldAttribute>;
-    comments: Array<string>;
-    name: RegularIDWithTypeNames;
-    type: TypeDefFieldType;
-}
-declare const TypeDefField = "TypeDefField";
-declare function isTypeDefField(item: unknown): item is TypeDefField;
-interface TypeDefFieldType extends langium.AstNode {
-    readonly $container: TypeDefField;
-    readonly $type: 'TypeDefFieldType';
-    array: boolean;
-    optional: boolean;
-    reference?: langium.Reference<TypeDefFieldTypes>;
-    type?: BuiltinType;
-}
-declare const TypeDefFieldType = "TypeDefFieldType";
-declare function isTypeDefFieldType(item: unknown): item is TypeDefFieldType;
 interface UnaryExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'UnaryExpr';
@@ -442,7 +420,7 @@ interface UnaryExpr extends langium.AstNode {
 declare const UnaryExpr = "UnaryExpr";
 declare function isUnaryExpr(item: unknown): item is UnaryExpr;
 interface UnsupportedFieldType extends langium.AstNode {
-    readonly $container: DataModelFieldType;
+    readonly $container: DataFieldType;
     readonly $type: 'UnsupportedFieldType';
     value: LiteralExpr;
 }
@@ -463,11 +441,11 @@ type ZModelAstType = {
     ConfigField: ConfigField;
     ConfigInvocationArg: ConfigInvocationArg;
     ConfigInvocationExpr: ConfigInvocationExpr;
+    DataField: DataField;
+    DataFieldAttribute: DataFieldAttribute;
+    DataFieldType: DataFieldType;
     DataModel: DataModel;
     DataModelAttribute: DataModelAttribute;
-    DataModelField: DataModelField;
-    DataModelFieldAttribute: DataModelFieldAttribute;
-    DataModelFieldType: DataModelFieldType;
     DataSource: DataSource;
     Enum: Enum;
     EnumField: EnumField;
@@ -498,9 +476,6 @@ type ZModelAstType = {
     ThisExpr: ThisExpr;
     TypeDeclaration: TypeDeclaration;
     TypeDef: TypeDef;
-    TypeDefField: TypeDefField;
-    TypeDefFieldType: TypeDefFieldType;
-    TypeDefFieldTypes: TypeDefFieldTypes;
     UnaryExpr: UnaryExpr;
     UnsupportedFieldType: UnsupportedFieldType;
 };
@@ -532,21 +507,11 @@ declare module './ast' {
          */
         $resolvedParam?: AttributeParam;
     }
-    interface DataModelField {
-        $inheritedFrom?: DataModel;
-    }
-    interface DataModelAttribute {
-        $inheritedFrom?: DataModel;
-    }
     interface DataModel {
-        /**
-         * Indicates whether the model is already merged with the base types
-         */
-        $baseMerged?: boolean;
         /**
          * All fields including those marked with `@ignore`
          */
-        $allFields?: DataModelField[];
+        $allFields?: DataField[];
     }
 }
 interface InheritableNode extends AstNode {
@@ -564,4 +529,4 @@ declare module 'langium' {
     }
 }
 
-export { AbstractDeclaration, Argument, ArrayExpr, Attribute, AttributeArg, AttributeParam$1 as AttributeParam, AttributeParamType, BinaryExpr, BinaryExprOperatorPriority, type Boolean, BooleanLiteral, type BuiltinType, ConfigArrayExpr, ConfigExpr, ConfigField, ConfigInvocationArg, ConfigInvocationExpr, DataModel, DataModelAttribute, DataModelField, DataModelFieldAttribute, DataModelFieldType, DataSource, Enum, EnumField, Expression, type ExpressionType, FieldInitializer, FunctionDecl, FunctionParam, FunctionParamType, GeneratorDecl, type InheritableNode, InternalAttribute, InvocationExpr, LiteralExpr, MemberAccessExpr, MemberAccessTarget, Model, ModelImport, NullExpr, NumberLiteral, ObjectExpr, Plugin, PluginField, Procedure, ProcedureParam, ReferenceArg, ReferenceExpr, ReferenceTarget, type RegularID, type RegularIDWithTypeNames, type ResolvedShape, type ResolvedType, StringLiteral, ThisExpr, TypeDeclaration, TypeDef, TypeDefField, TypeDefFieldType, TypeDefFieldTypes, UnaryExpr, UnsupportedFieldType, ZModelAstReflection, type ZModelAstType, type ZModelKeywordNames, type ZModelTerminalNames, ZModelTerminals, type ZModelTokenNames, isAbstractDeclaration, isArgument, isArrayExpr, isAttribute, isAttributeArg, isAttributeParam, isAttributeParamType, isBinaryExpr, isBoolean, isBooleanLiteral, isBuiltinType, isConfigArrayExpr, isConfigExpr, isConfigField, isConfigInvocationArg, isConfigInvocationExpr, isDataModel, isDataModelAttribute, isDataModelField, isDataModelFieldAttribute, isDataModelFieldType, isDataSource, isEnum, isEnumField, isExpression, isExpressionType, isFieldInitializer, isFunctionDecl, isFunctionParam, isFunctionParamType, isGeneratorDecl, isInternalAttribute, isInvocationExpr, isLiteralExpr, isMemberAccessExpr, isMemberAccessTarget, isModel, isModelImport, isNullExpr, isNumberLiteral, isObjectExpr, isPlugin, isPluginField, isProcedure, isProcedureParam, isReferenceArg, isReferenceExpr, isReferenceTarget, isRegularID, isRegularIDWithTypeNames, isStringLiteral, isThisExpr, isTypeDeclaration, isTypeDef, isTypeDefField, isTypeDefFieldType, isTypeDefFieldTypes, isUnaryExpr, isUnsupportedFieldType, reflection };
+export { AbstractDeclaration, Argument, ArrayExpr, Attribute, AttributeArg, AttributeParam$1 as AttributeParam, AttributeParamType, BinaryExpr, BinaryExprOperatorPriority, type Boolean, BooleanLiteral, type BuiltinType, ConfigArrayExpr, ConfigExpr, ConfigField, ConfigInvocationArg, ConfigInvocationExpr, DataField, DataFieldAttribute, DataFieldType, DataModel, DataModelAttribute, DataSource, Enum, EnumField, Expression, type ExpressionType, FieldInitializer, FunctionDecl, FunctionParam, FunctionParamType, GeneratorDecl, type InheritableNode, InternalAttribute, InvocationExpr, LiteralExpr, MemberAccessExpr, MemberAccessTarget, Model, ModelImport, NullExpr, NumberLiteral, ObjectExpr, Plugin, PluginField, Procedure, ProcedureParam, ReferenceArg, ReferenceExpr, ReferenceTarget, type RegularID, type RegularIDWithTypeNames, type ResolvedShape, type ResolvedType, StringLiteral, ThisExpr, TypeDeclaration, TypeDef, UnaryExpr, UnsupportedFieldType, ZModelAstReflection, type ZModelAstType, type ZModelKeywordNames, type ZModelTerminalNames, ZModelTerminals, type ZModelTokenNames, isAbstractDeclaration, isArgument, isArrayExpr, isAttribute, isAttributeArg, isAttributeParam, isAttributeParamType, isBinaryExpr, isBoolean, isBooleanLiteral, isBuiltinType, isConfigArrayExpr, isConfigExpr, isConfigField, isConfigInvocationArg, isConfigInvocationExpr, isDataField, isDataFieldAttribute, isDataFieldType, isDataModel, isDataModelAttribute, isDataSource, isEnum, isEnumField, isExpression, isExpressionType, isFieldInitializer, isFunctionDecl, isFunctionParam, isFunctionParamType, isGeneratorDecl, isInternalAttribute, isInvocationExpr, isLiteralExpr, isMemberAccessExpr, isMemberAccessTarget, isModel, isModelImport, isNullExpr, isNumberLiteral, isObjectExpr, isPlugin, isPluginField, isProcedure, isProcedureParam, isReferenceArg, isReferenceExpr, isReferenceTarget, isRegularID, isRegularIDWithTypeNames, isStringLiteral, isThisExpr, isTypeDeclaration, isTypeDef, isUnaryExpr, isUnsupportedFieldType, reflection };

package/dist/ast.js

@@ -70,11 +70,6 @@ function isTypeDeclaration(item) {
   return reflection.isInstance(item, TypeDeclaration);
 }
 __name(isTypeDeclaration, "isTypeDeclaration");
-var TypeDefFieldTypes = "TypeDefFieldTypes";
-function isTypeDefFieldTypes(item) {
-  return reflection.isInstance(item, TypeDefFieldTypes);
-}
-__name(isTypeDefFieldTypes, "isTypeDefFieldTypes");
 var Argument = "Argument";
 function isArgument(item) {
   return reflection.isInstance(item, Argument);
@@ -135,6 +130,21 @@ function isConfigInvocationExpr(item) {
   return reflection.isInstance(item, ConfigInvocationExpr);
 }
 __name(isConfigInvocationExpr, "isConfigInvocationExpr");
+var DataField = "DataField";
+function isDataField(item) {
+  return reflection.isInstance(item, DataField);
+}
+__name(isDataField, "isDataField");
+var DataFieldAttribute = "DataFieldAttribute";
+function isDataFieldAttribute(item) {
+  return reflection.isInstance(item, DataFieldAttribute);
+}
+__name(isDataFieldAttribute, "isDataFieldAttribute");
+var DataFieldType = "DataFieldType";
+function isDataFieldType(item) {
+  return reflection.isInstance(item, DataFieldType);
+}
+__name(isDataFieldType, "isDataFieldType");
 var DataModel = "DataModel";
 function isDataModel(item) {
   return reflection.isInstance(item, DataModel);
@@ -145,21 +155,6 @@ function isDataModelAttribute(item) {
   return reflection.isInstance(item, DataModelAttribute);
 }
 __name(isDataModelAttribute, "isDataModelAttribute");
-var DataModelField = "DataModelField";
-function isDataModelField(item) {
-  return reflection.isInstance(item, DataModelField);
-}
-__name(isDataModelField, "isDataModelField");
-var DataModelFieldAttribute = "DataModelFieldAttribute";
-function isDataModelFieldAttribute(item) {
-  return reflection.isInstance(item, DataModelFieldAttribute);
-}
-__name(isDataModelFieldAttribute, "isDataModelFieldAttribute");
-var DataModelFieldType = "DataModelFieldType";
-function isDataModelFieldType(item) {
-  return reflection.isInstance(item, DataModelFieldType);
-}
-__name(isDataModelFieldType, "isDataModelFieldType");
 var DataSource = "DataSource";
 function isDataSource(item) {
   return reflection.isInstance(item, DataSource);
@@ -285,16 +280,6 @@ function isTypeDef(item) {
   return reflection.isInstance(item, TypeDef);
 }
 __name(isTypeDef, "isTypeDef");
-var TypeDefField = "TypeDefField";
-function isTypeDefField(item) {
-  return reflection.isInstance(item, TypeDefField);
-}
-__name(isTypeDefField, "isTypeDefField");
-var TypeDefFieldType = "TypeDefFieldType";
-function isTypeDefFieldType(item) {
-  return reflection.isInstance(item, TypeDefFieldType);
-}
-__name(isTypeDefFieldType, "isTypeDefFieldType");
 var UnaryExpr = "UnaryExpr";
 function isUnaryExpr(item) {
   return reflection.isInstance(item, UnaryExpr);
@@ -325,11 +310,11 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
       ConfigField,
       ConfigInvocationArg,
       ConfigInvocationExpr,
+      DataField,
+      DataFieldAttribute,
+      DataFieldType,
       DataModel,
       DataModelAttribute,
-      DataModelField,
-      DataModelFieldAttribute,
-      DataModelFieldType,
       DataSource,
       Enum,
       EnumField,
@@ -360,9 +345,6 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
       ThisExpr,
       TypeDeclaration,
       TypeDef,
-      TypeDefField,
-      TypeDefFieldType,
-      TypeDefFieldTypes,
       UnaryExpr,
       UnsupportedFieldType
     ];
@@ -395,16 +377,13 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
       case ConfigArrayExpr: {
         return this.isSubtype(ConfigExpr, supertype);
       }
-      case DataModel: {
-        return this.isSubtype(AbstractDeclaration, supertype) || this.isSubtype(TypeDeclaration, supertype);
-      }
-      case DataModelField:
-      case TypeDefField: {
+      case DataField: {
         return this.isSubtype(MemberAccessTarget, supertype) || this.isSubtype(ReferenceTarget, supertype);
       }
+      case DataModel:
       case Enum:
       case TypeDef: {
-        return this.isSubtype(AbstractDeclaration, supertype) || this.isSubtype(TypeDeclaration, supertype) || this.isSubtype(TypeDefFieldTypes, supertype);
+        return this.isSubtype(AbstractDeclaration, supertype) || this.isSubtype(TypeDeclaration, supertype);
       }
       case EnumField:
       case FunctionParam: {
@@ -423,18 +402,22 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
     const referenceId = `${refInfo.container.$type}:${refInfo.property}`;
     switch (referenceId) {
       case "AttributeParamType:reference":
-      case "DataModelFieldType:reference":
+      case "DataFieldType:reference":
       case "FunctionParamType:reference": {
         return TypeDeclaration;
       }
-      case "DataModel:superTypes": {
-        return DataModel;
-      }
+      case "DataFieldAttribute:decl":
       case "DataModelAttribute:decl":
-      case "DataModelFieldAttribute:decl":
       case "InternalAttribute:decl": {
         return Attribute;
       }
+      case "DataModel:baseModel": {
+        return DataModel;
+      }
+      case "DataModel:mixins":
+      case "TypeDef:mixins": {
+        return TypeDef;
+      }
       case "InvocationExpr:function": {
         return FunctionDecl;
       }
@@ -444,9 +427,6 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
       case "ReferenceExpr:target": {
         return ReferenceTarget;
       }
-      case "TypeDefFieldType:reference": {
-        return TypeDefFieldTypes;
-      }
       default: {
         throw new Error(`${referenceId} is not a valid reference id.`);
       }
@@ -633,9 +613,9 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
           ]
         };
       }
-      case DataModel: {
+      case DataField: {
         return {
-          name: DataModel,
+          name: DataField,
           properties: [
             {
               name: "attributes",
@@ -645,31 +625,18 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
               name: "comments",
               defaultValue: []
             },
-            {
-              name: "fields",
-              defaultValue: []
-            },
-            {
-              name: "isAbstract",
-              defaultValue: false
-            },
-            {
-              name: "isView",
-              defaultValue: false
-            },
             {
               name: "name"
             },
             {
-              name: "superTypes",
-              defaultValue: []
+              name: "type"
             }
           ]
         };
       }
-      case DataModelAttribute: {
+      case DataFieldAttribute: {
         return {
-          name: DataModelAttribute,
+          name: DataFieldAttribute,
           properties: [
             {
               name: "args",
@@ -681,61 +648,73 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
           ]
         };
       }
-      case DataModelField: {
+      case DataFieldType: {
         return {
-          name: DataModelField,
+          name: DataFieldType,
           properties: [
             {
-              name: "attributes",
-              defaultValue: []
+              name: "array",
+              defaultValue: false
             },
             {
-              name: "comments",
-              defaultValue: []
+              name: "optional",
+              defaultValue: false
             },
             {
-              name: "name"
+              name: "reference"
             },
             {
               name: "type"
+            },
+            {
+              name: "unsupported"
             }
           ]
         };
       }
-      case DataModelFieldAttribute: {
+      case DataModel: {
         return {
-          name: DataModelFieldAttribute,
+          name: DataModel,
           properties: [
             {
-              name: "args",
+              name: "attributes",
               defaultValue: []
             },
             {
-              name: "decl"
-            }
-          ]
-        };
-      }
-      case DataModelFieldType: {
-        return {
-          name: DataModelFieldType,
-          properties: [
+              name: "baseModel"
+            },
             {
-              name: "array",
-              defaultValue: false
+              name: "comments",
+              defaultValue: []
             },
             {
-              name: "optional",
+              name: "fields",
+              defaultValue: []
+            },
+            {
+              name: "isView",
               defaultValue: false
             },
             {
-              name: "reference"
+              name: "mixins",
+              defaultValue: []
             },
             {
-              name: "type"
+              name: "name"
+            }
+          ]
+        };
+      }
+      case DataModelAttribute: {
+        return {
+          name: DataModelAttribute,
+          properties: [
+            {
+              name: "args",
+              defaultValue: []
             },
             {
-              name: "unsupported"
+              name: "decl"
             }
           ]
         };
@@ -1109,49 +1088,11 @@ var ZModelAstReflection = class extends langium.AbstractAstReflection {
               defaultValue: []
             },
             {
-              name: "name"
-            }
-          ]
-        };
-      }
-      case TypeDefField: {
-        return {
-          name: TypeDefField,
-          properties: [
-            {
-              name: "attributes",
-              defaultValue: []
-            },
-            {
-              name: "comments",
+              name: "mixins",
               defaultValue: []
             },
             {
               name: "name"
-            },
-            {
-              name: "type"
-            }
-          ]
-        };
-      }
-      case TypeDefFieldType: {
-        return {
-          name: TypeDefFieldType,
-          properties: [
-            {
-              name: "array",
-              defaultValue: false
-            },
-            {
-              name: "optional",
-              defaultValue: false
-            },
-            {
-              name: "reference"
-            },
-            {
-              name: "type"
             }
           ]
         };
@@ -1225,11 +1166,11 @@ export {
   ConfigField,
   ConfigInvocationArg,
   ConfigInvocationExpr,
+  DataField,
+  DataFieldAttribute,
+  DataFieldType,
   DataModel,
   DataModelAttribute,
-  DataModelField,
-  DataModelFieldAttribute,
-  DataModelFieldType,
   DataSource,
   Enum,
   EnumField,
@@ -1260,9 +1201,6 @@ export {
   ThisExpr,
   TypeDeclaration,
   TypeDef,
-  TypeDefField,
-  TypeDefFieldType,
-  TypeDefFieldTypes,
   UnaryExpr,
   UnsupportedFieldType,
   ZModelAstReflection,
@@ -1283,11 +1221,11 @@ export {
   isConfigField,
   isConfigInvocationArg,
   isConfigInvocationExpr,
+  isDataField,
+  isDataFieldAttribute,
+  isDataFieldType,
   isDataModel,
   isDataModelAttribute,
-  isDataModelField,
-  isDataModelFieldAttribute,
-  isDataModelFieldType,
   isDataSource,
   isEnum,
   isEnumField,
@@ -1321,9 +1259,6 @@ export {
   isThisExpr,
   isTypeDeclaration,
   isTypeDef,
-  isTypeDefField,
-  isTypeDefFieldType,
-  isTypeDefFieldTypes,
   isUnaryExpr,
   isUnsupportedFieldType,
   reflection