@zenstackhq/language 3.0.0-alpha.2 → 3.0.0-alpha.21

package/dist/ast.d.ts

@@ -1,8 +1,9 @@
-import { AstNode, Reference, AbstractAstReflection, ReferenceInfo, TypeMetaData } from 'langium';
+import * as langium from 'langium';
+import { AstNode } from 'langium';
 export { AstNode, Reference } from 'langium';
 
 /******************************************************************************
- * This file was generated by langium-cli 3.3.0.
+ * This file was generated by langium-cli 3.5.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -19,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";
@@ -39,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;
@@ -52,24 +53,21 @@ 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 AstNode {
+interface Argument extends langium.AstNode {
     readonly $container: InvocationExpr;
     readonly $type: 'Argument';
     value: Expression;
 }
 declare const Argument = "Argument";
 declare function isArgument(item: unknown): item is Argument;
-interface ArrayExpr extends AstNode {
+interface ArrayExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr;
     readonly $type: 'ArrayExpr';
     items: Array<Expression>;
 }
 declare const ArrayExpr = "ArrayExpr";
 declare function isArrayExpr(item: unknown): item is ArrayExpr;
-interface Attribute extends AstNode {
+interface Attribute extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'Attribute';
     attributes: Array<InternalAttribute>;
@@ -79,15 +77,15 @@ interface Attribute extends AstNode {
 }
 declare const Attribute = "Attribute";
 declare function isAttribute(item: unknown): item is Attribute;
-interface AttributeArg extends AstNode {
-    readonly $container: DataModelAttribute | DataModelFieldAttribute | InternalAttribute;
+interface AttributeArg extends langium.AstNode {
+    readonly $container: DataFieldAttribute | DataModelAttribute | InternalAttribute;
     readonly $type: 'AttributeArg';
     name?: RegularID;
     value: Expression;
 }
 declare const AttributeArg = "AttributeArg";
 declare function isAttributeArg(item: unknown): item is AttributeArg;
-interface AttributeParam$1 extends AstNode {
+interface AttributeParam$1 extends langium.AstNode {
     readonly $container: Attribute;
     readonly $type: 'AttributeParam';
     attributes: Array<InternalAttribute>;
@@ -98,17 +96,17 @@ interface AttributeParam$1 extends AstNode {
 }
 declare const AttributeParam$1 = "AttributeParam";
 declare function isAttributeParam(item: unknown): item is AttributeParam$1;
-interface AttributeParamType extends AstNode {
+interface AttributeParamType extends langium.AstNode {
     readonly $container: AttributeParam$1;
     readonly $type: 'AttributeParamType';
     array: boolean;
     optional: boolean;
-    reference?: Reference<TypeDeclaration>;
+    reference?: langium.Reference<TypeDeclaration>;
     type?: 'ContextType' | 'FieldReference' | 'TransitiveFieldReference' | ExpressionType;
 }
 declare const AttributeParamType = "AttributeParamType";
 declare function isAttributeParamType(item: unknown): item is AttributeParamType;
-interface BinaryExpr extends AstNode {
+interface BinaryExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'BinaryExpr';
     left: Expression;
@@ -117,21 +115,21 @@ interface BinaryExpr extends AstNode {
 }
 declare const BinaryExpr = "BinaryExpr";
 declare function isBinaryExpr(item: unknown): item is BinaryExpr;
-interface BooleanLiteral extends AstNode {
+interface BooleanLiteral extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'BooleanLiteral';
     value: Boolean;
 }
 declare const BooleanLiteral = "BooleanLiteral";
 declare function isBooleanLiteral(item: unknown): item is BooleanLiteral;
-interface ConfigArrayExpr extends AstNode {
+interface ConfigArrayExpr extends langium.AstNode {
     readonly $container: ConfigField;
     readonly $type: 'ConfigArrayExpr';
     items: Array<ConfigInvocationExpr | LiteralExpr>;
 }
 declare const ConfigArrayExpr = "ConfigArrayExpr";
 declare function isConfigArrayExpr(item: unknown): item is ConfigArrayExpr;
-interface ConfigField extends AstNode {
+interface ConfigField extends langium.AstNode {
     readonly $container: DataSource | GeneratorDecl;
     readonly $type: 'ConfigField';
     name: RegularID;
@@ -139,7 +137,7 @@ interface ConfigField extends AstNode {
 }
 declare const ConfigField = "ConfigField";
 declare function isConfigField(item: unknown): item is ConfigField;
-interface ConfigInvocationArg extends AstNode {
+interface ConfigInvocationArg extends langium.AstNode {
     readonly $container: ConfigInvocationExpr;
     readonly $type: 'ConfigInvocationArg';
     name: string;
@@ -147,7 +145,7 @@ interface ConfigInvocationArg extends AstNode {
 }
 declare const ConfigInvocationArg = "ConfigInvocationArg";
 declare function isConfigInvocationArg(item: unknown): item is ConfigInvocationArg;
-interface ConfigInvocationExpr extends AstNode {
+interface ConfigInvocationExpr extends langium.AstNode {
     readonly $container: ConfigArrayExpr;
     readonly $type: 'ConfigInvocationExpr';
     args: Array<ConfigInvocationArg>;
@@ -155,57 +153,57 @@ interface ConfigInvocationExpr extends AstNode {
 }
 declare const ConfigInvocationExpr = "ConfigInvocationExpr";
 declare function isConfigInvocationExpr(item: unknown): item is ConfigInvocationExpr;
-interface DataModel extends AstNode {
+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<Reference<DataModel>>;
 }
 declare const DataModel = "DataModel";
 declare function isDataModel(item: unknown): item is DataModel;
-interface DataModelAttribute extends AstNode {
+interface DataModelAttribute extends langium.AstNode {
     readonly $container: DataModel | Enum | TypeDef;
     readonly $type: 'DataModelAttribute';
     args: Array<AttributeArg>;
-    decl: Reference<Attribute>;
+    decl: langium.Reference<Attribute>;
 }
 declare const DataModelAttribute = "DataModelAttribute";
 declare function isDataModelAttribute(item: unknown): item is DataModelAttribute;
-interface DataModelField extends 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 AstNode {
-    readonly $container: DataModelField | EnumField | TypeDefField;
-    readonly $type: 'DataModelFieldAttribute';
-    args: Array<AttributeArg>;
-    decl: Reference<Attribute>;
-}
-declare const DataModelFieldAttribute = "DataModelFieldAttribute";
-declare function isDataModelFieldAttribute(item: unknown): item is DataModelFieldAttribute;
-interface DataModelFieldType extends AstNode {
-    readonly $container: DataModelField;
-    readonly $type: 'DataModelFieldType';
-    array: boolean;
-    optional: boolean;
-    reference?: Reference<TypeDeclaration>;
-    type?: BuiltinType;
-    unsupported?: UnsupportedFieldType;
-}
-declare const DataModelFieldType = "DataModelFieldType";
-declare function isDataModelFieldType(item: unknown): item is DataModelFieldType;
-interface DataSource extends AstNode {
+interface DataSource extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'DataSource';
     fields: Array<ConfigField>;
@@ -213,7 +211,7 @@ interface DataSource extends AstNode {
 }
 declare const DataSource = "DataSource";
 declare function isDataSource(item: unknown): item is DataSource;
-interface Enum extends AstNode {
+interface Enum extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'Enum';
     attributes: Array<DataModelAttribute>;
@@ -223,16 +221,16 @@ interface Enum extends AstNode {
 }
 declare const Enum = "Enum";
 declare function isEnum(item: unknown): item is Enum;
-interface EnumField extends AstNode {
+interface EnumField extends langium.AstNode {
     readonly $container: Enum;
     readonly $type: 'EnumField';
-    attributes: Array<DataModelFieldAttribute>;
+    attributes: Array<DataFieldAttribute>;
     comments: Array<string>;
     name: RegularIDWithTypeNames;
 }
 declare const EnumField = "EnumField";
 declare function isEnumField(item: unknown): item is EnumField;
-interface FieldInitializer extends AstNode {
+interface FieldInitializer extends langium.AstNode {
     readonly $container: ObjectExpr;
     readonly $type: 'FieldInitializer';
     name: RegularID | string;
@@ -240,7 +238,7 @@ interface FieldInitializer extends AstNode {
 }
 declare const FieldInitializer = "FieldInitializer";
 declare function isFieldInitializer(item: unknown): item is FieldInitializer;
-interface FunctionDecl extends AstNode {
+interface FunctionDecl extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'FunctionDecl';
     attributes: Array<InternalAttribute>;
@@ -251,7 +249,7 @@ interface FunctionDecl extends AstNode {
 }
 declare const FunctionDecl = "FunctionDecl";
 declare function isFunctionDecl(item: unknown): item is FunctionDecl;
-interface FunctionParam extends AstNode {
+interface FunctionParam extends langium.AstNode {
     readonly $container: FunctionDecl | Procedure;
     readonly $type: 'FunctionParam';
     name: RegularID;
@@ -260,16 +258,16 @@ interface FunctionParam extends AstNode {
 }
 declare const FunctionParam = "FunctionParam";
 declare function isFunctionParam(item: unknown): item is FunctionParam;
-interface FunctionParamType extends AstNode {
+interface FunctionParamType extends langium.AstNode {
     readonly $container: FunctionDecl | FunctionParam | Procedure | ProcedureParam;
     readonly $type: 'FunctionParamType';
     array: boolean;
-    reference?: Reference<TypeDeclaration>;
+    reference?: langium.Reference<TypeDeclaration>;
     type?: ExpressionType;
 }
 declare const FunctionParamType = "FunctionParamType";
 declare function isFunctionParamType(item: unknown): item is FunctionParamType;
-interface GeneratorDecl extends AstNode {
+interface GeneratorDecl extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'GeneratorDecl';
     fields: Array<ConfigField>;
@@ -277,66 +275,66 @@ interface GeneratorDecl extends AstNode {
 }
 declare const GeneratorDecl = "GeneratorDecl";
 declare function isGeneratorDecl(item: unknown): item is GeneratorDecl;
-interface InternalAttribute extends AstNode {
+interface InternalAttribute extends langium.AstNode {
     readonly $container: Attribute | AttributeParam$1 | FunctionDecl | Procedure;
     readonly $type: 'InternalAttribute';
     args: Array<AttributeArg>;
-    decl: Reference<Attribute>;
+    decl: langium.Reference<Attribute>;
 }
 declare const InternalAttribute = "InternalAttribute";
 declare function isInternalAttribute(item: unknown): item is InternalAttribute;
-interface InvocationExpr extends AstNode {
+interface InvocationExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigField | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'InvocationExpr';
     args: Array<Argument>;
-    function: Reference<FunctionDecl>;
+    function: langium.Reference<FunctionDecl>;
 }
 declare const InvocationExpr = "InvocationExpr";
 declare function isInvocationExpr(item: unknown): item is InvocationExpr;
-interface MemberAccessExpr extends AstNode {
+interface MemberAccessExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'MemberAccessExpr';
-    member: Reference<MemberAccessTarget>;
+    member: langium.Reference<MemberAccessTarget>;
     operand: Expression;
 }
 declare const MemberAccessExpr = "MemberAccessExpr";
 declare function isMemberAccessExpr(item: unknown): item is MemberAccessExpr;
-interface Model extends AstNode {
+interface Model extends langium.AstNode {
     readonly $type: 'Model';
     declarations: Array<AbstractDeclaration>;
     imports: Array<ModelImport>;
 }
 declare const Model = "Model";
 declare function isModel(item: unknown): item is Model;
-interface ModelImport extends AstNode {
+interface ModelImport extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'ModelImport';
     path: string;
 }
 declare const ModelImport = "ModelImport";
 declare function isModelImport(item: unknown): item is ModelImport;
-interface NullExpr extends AstNode {
+interface NullExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'NullExpr';
     value: 'null';
 }
 declare const NullExpr = "NullExpr";
 declare function isNullExpr(item: unknown): item is NullExpr;
-interface NumberLiteral extends AstNode {
+interface NumberLiteral extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'NumberLiteral';
     value: string;
 }
 declare const NumberLiteral = "NumberLiteral";
 declare function isNumberLiteral(item: unknown): item is NumberLiteral;
-interface ObjectExpr extends AstNode {
+interface ObjectExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr;
     readonly $type: 'ObjectExpr';
     fields: Array<FieldInitializer>;
 }
 declare const ObjectExpr = "ObjectExpr";
 declare function isObjectExpr(item: unknown): item is ObjectExpr;
-interface Plugin extends AstNode {
+interface Plugin extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'Plugin';
     fields: Array<PluginField>;
@@ -344,7 +342,7 @@ interface Plugin extends AstNode {
 }
 declare const Plugin = "Plugin";
 declare function isPlugin(item: unknown): item is Plugin;
-interface PluginField extends AstNode {
+interface PluginField extends langium.AstNode {
     readonly $container: Plugin;
     readonly $type: 'PluginField';
     name: RegularID;
@@ -352,7 +350,7 @@ interface PluginField extends AstNode {
 }
 declare const PluginField = "PluginField";
 declare function isPluginField(item: unknown): item is PluginField;
-interface Procedure extends AstNode {
+interface Procedure extends langium.AstNode {
     readonly $container: Model;
     readonly $type: 'Procedure';
     attributes: Array<InternalAttribute>;
@@ -363,7 +361,7 @@ interface Procedure extends AstNode {
 }
 declare const Procedure = "Procedure";
 declare function isProcedure(item: unknown): item is Procedure;
-interface ProcedureParam extends AstNode {
+interface ProcedureParam extends langium.AstNode {
     readonly $container: Procedure;
     readonly $type: 'ProcedureParam';
     name: RegularID;
@@ -372,7 +370,7 @@ interface ProcedureParam extends AstNode {
 }
 declare const ProcedureParam = "ProcedureParam";
 declare function isProcedureParam(item: unknown): item is ProcedureParam;
-interface ReferenceArg extends AstNode {
+interface ReferenceArg extends langium.AstNode {
     readonly $container: ReferenceExpr;
     readonly $type: 'ReferenceArg';
     name: string;
@@ -380,59 +378,40 @@ interface ReferenceArg extends AstNode {
 }
 declare const ReferenceArg = "ReferenceArg";
 declare function isReferenceArg(item: unknown): item is ReferenceArg;
-interface ReferenceExpr extends AstNode {
+interface ReferenceExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'ReferenceExpr';
     args: Array<ReferenceArg>;
-    target: Reference<ReferenceTarget>;
+    target: langium.Reference<ReferenceTarget>;
 }
 declare const ReferenceExpr = "ReferenceExpr";
 declare function isReferenceExpr(item: unknown): item is ReferenceExpr;
-interface StringLiteral extends AstNode {
+interface StringLiteral extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'StringLiteral';
     value: string;
 }
 declare const StringLiteral = "StringLiteral";
 declare function isStringLiteral(item: unknown): item is StringLiteral;
-interface ThisExpr extends AstNode {
+interface ThisExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'ThisExpr';
     value: 'this';
 }
 declare const ThisExpr = "ThisExpr";
 declare function isThisExpr(item: unknown): item is ThisExpr;
-interface TypeDef extends AstNode {
+interface TypeDef extends langium.AstNode {
     readonly $container: Model;
     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 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 AstNode {
-    readonly $container: TypeDefField;
-    readonly $type: 'TypeDefFieldType';
-    array: boolean;
-    optional: boolean;
-    reference?: Reference<TypeDefFieldTypes>;
-    type?: BuiltinType;
-}
-declare const TypeDefFieldType = "TypeDefFieldType";
-declare function isTypeDefFieldType(item: unknown): item is TypeDefFieldType;
-interface UnaryExpr extends AstNode {
+interface UnaryExpr extends langium.AstNode {
     readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | FieldInitializer | FunctionDecl | MemberAccessExpr | ReferenceArg | UnaryExpr;
     readonly $type: 'UnaryExpr';
     operand: Expression;
@@ -440,8 +419,8 @@ interface UnaryExpr extends AstNode {
 }
 declare const UnaryExpr = "UnaryExpr";
 declare function isUnaryExpr(item: unknown): item is UnaryExpr;
-interface UnsupportedFieldType extends AstNode {
-    readonly $container: DataModelFieldType;
+interface UnsupportedFieldType extends langium.AstNode {
+    readonly $container: DataFieldType;
     readonly $type: 'UnsupportedFieldType';
     value: LiteralExpr;
 }
@@ -462,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;
@@ -497,17 +476,14 @@ type ZModelAstType = {
     ThisExpr: ThisExpr;
     TypeDeclaration: TypeDeclaration;
     TypeDef: TypeDef;
-    TypeDefField: TypeDefField;
-    TypeDefFieldType: TypeDefFieldType;
-    TypeDefFieldTypes: TypeDefFieldTypes;
     UnaryExpr: UnaryExpr;
     UnsupportedFieldType: UnsupportedFieldType;
 };
-declare class ZModelAstReflection extends AbstractAstReflection {
+declare class ZModelAstReflection extends langium.AbstractAstReflection {
     getAllTypes(): string[];
     protected computeIsSubtype(subtype: string, supertype: string): boolean;
-    getReferenceType(refInfo: ReferenceInfo): string;
-    getTypeMetaData(type: string): TypeMetaData;
+    getReferenceType(refInfo: langium.ReferenceInfo): string;
+    getTypeMetaData(type: string): langium.TypeMetaData;
 }
 declare const reflection: ZModelAstReflection;
 
@@ -531,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 {
@@ -563,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 };