@abaplint/cli 2.119.54 → 2.119.55

package/build/cli.js

@@ -1839,7 +1839,7 @@ class Regex {
         return result;
     }
     railroad() {
-        return "Railroad.Terminal(\"" + this.regexp.source.replace(/\\/g, "\\\\") + "\")";
+        return "Railroad.Terminal(\"" + this.regexp.source.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\")";
     }
     toStr() {
         return this.regexp.toString();
@@ -10777,10 +10777,10 @@ const _derived_types_1 = __webpack_require__(/*! ./_derived_types */ "../core/bu
 class TypeStructure extends combi_1.Expression {
     getRunnable() {
         const entity = (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation);
-        const derivedTypes = (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v779, (0, combi_1.seq)("FUNCTION REQUEST", entity)), (0, combi_1.ver)(version_1.Release.v779, (0, combi_1.seq)("ACTION REQUEST", entity)), (0, combi_1.seq)("ACTION IMPORT", _1.Source), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL AUTHORIZATION REQUEST", entity)), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL AUTHORIZATION RESULT", entity)), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL FEATURES REQUEST", entity)), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL FEATURES RESULT", entity)), (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("AUTHORIZATION REQUEST", entity)), (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES REQUEST", entity)), (0, combi_1.seq)("PERMISSIONS REQUEST", _1.NamespaceSimpleName), (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("PERMISSIONS RESULT", entity)), (0, combi_1.seq)("READ LINK", _1.EntityAssociation), (0, combi_1.seq)("HIERARCHY", _1.NamespaceSimpleName), (0, combi_1.seq)("EVENT", _1.EventName));
-        const structure = (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("STRUCTURE FOR", derivedTypes));
-        const response = (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("RESPONSE FOR", (0, combi_1.altPrio)((0, combi_1.seq)("FAILED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("FAILED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("FAILED", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED", _1.NamespaceSimpleName))));
-        const request = (0, combi_1.ver)(version_1.Release.v778, (0, combi_1.seq)("REQUEST FOR", (0, combi_1.alt)("CHANGE", "DELETE"), _1.NamespaceSimpleName));
+        const derivedTypes = (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v779, (0, combi_1.seq)("FUNCTION REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v779, (0, combi_1.seq)("ACTION REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.seq)("ACTION IMPORT", _1.Source), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL AUTHORIZATION REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL AUTHORIZATION RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL FEATURES REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v781, (0, combi_1.seq)("GLOBAL FEATURES RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("AUTHORIZATION REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("FEATURES REQUEST", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.seq)("PERMISSIONS REQUEST", _1.NamespaceSimpleName), (0, combi_1.ver)(version_1.Release.v780, (0, combi_1.seq)("PERMISSIONS RESULT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.seq)("READ LINK", _1.EntityAssociation), (0, combi_1.seq)("HIERARCHY", _1.NamespaceSimpleName), (0, combi_1.seq)("EVENT", _1.EventName));
+        const structure = (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("STRUCTURE FOR", derivedTypes), { also: combi_1.AlsoIn.OpenABAP });
+        const response = (0, combi_1.ver)(version_1.Release.v776, (0, combi_1.seq)("RESPONSE FOR", (0, combi_1.altPrio)((0, combi_1.seq)("FAILED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("FAILED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("FAILED", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("MAPPED", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED EARLY", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED LATE", _1.NamespaceSimpleName), (0, combi_1.seq)("REPORTED", _1.NamespaceSimpleName))), { also: combi_1.AlsoIn.OpenABAP });
+        const request = (0, combi_1.ver)(version_1.Release.v778, (0, combi_1.seq)("REQUEST FOR", (0, combi_1.alt)("CHANGE", "DELETE"), _1.NamespaceSimpleName), { also: combi_1.AlsoIn.OpenABAP });
         return (0, combi_1.seq)("TYPE", (0, combi_1.altPrio)(structure, response, request), (0, combi_1.optPrio)("VALUE IS INITIAL"));
     }
 }
@@ -52797,6 +52797,12 @@ class CDSParser {
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSDefineHierarchy(), tokens, version_1.defaultRelease);
         }
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineExternalEntity(), tokens, version_1.defaultRelease);
+        }
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineTableEntity(), tokens, version_1.defaultRelease);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }
@@ -52822,12 +52828,10 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSAggregate extends combi_1.Expression {
     getRunnable() {
-        // CDSPrefixedName handles dotted paths with path filters e.g. a._Assoc[filter].Field
-        // CDSArithmetics handles expressions like sum(A + B), max(A * 100)
-        // fieldAsType handles avg(field AS type) / sum(field AS type) — SAP inline type coercion
         const fieldAsType = (0, combi_1.seq)(_1.CDSPrefixedName, "AS", _1.CDSType);
-        const value = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSCase, _1.CDSFunction, fieldAsType, _1.CDSPrefixedName, _1.CDSString, "*");
-        return (0, combi_1.seq)((0, combi_1.altPrio)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")), value, ")");
+        const funcAsType = (0, combi_1.seq)(_1.CDSFunction, "AS", _1.CDSType);
+        const value = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSCase, funcAsType, _1.CDSFunction, fieldAsType, _1.CDSPrefixedName, _1.CDSString, "*");
+        return (0, combi_1.seq)((0, combi_1.altPrio)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")), value, (0, combi_1.opt)((0, combi_1.seq)("AS", _1.CDSType)), ")");
     }
 }
 exports.CDSAggregate = CDSAggregate;
@@ -53286,7 +53290,7 @@ class CDSDefineAbstract extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", _1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "ABSTRACT", "ENTITY", cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.alt)(field, compsiOrAssoci)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "ABSTRACT", "ENTITY", cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.alt)(field, compsiOrAssoci)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineAbstract = CDSDefineAbstract;
@@ -53320,6 +53324,36 @@ exports.CDSDefineCustom = CDSDefineCustom;
 
 /***/ },
 
+/***/ "../core/build/src/cds/expressions/cds_define_external_entity.js"
+/*!***********************************************************************!*\
+  !*** ../core/build/src/cds/expressions/cds_define_external_entity.js ***!
+  \***********************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSDefineExternalEntity = void 0;
+const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+class CDSDefineExternalEntity extends combi_1.Expression {
+    getRunnable() {
+        const extNameValue = (0, combi_1.alt)(_1.CDSName, (0, combi_1.regex)(/^"[^"]*"$/));
+        const externalName = (0, combi_1.seq)("EXTERNAL", "NAME", extNameValue);
+        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability, (0, combi_1.optPrio)(externalName), ";");
+        const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
+        const body = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
+        const externalEntity = (0, combi_1.seq)((0, combi_1.opt)("WRITABLE"), "EXTERNAL", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName), (0, combi_1.opt)(_1.CDSWithParameters));
+        const staticEntity = (0, combi_1.seq)("STATIC", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.alt)(externalEntity, staticEntity), (0, combi_1.str)("{"), body, (0, combi_1.str)("}"), (0, combi_1.opt)((0, combi_1.seq)("WITH", "FEDERATED", "DATA", (0, combi_1.optPrio)((0, combi_1.alt)((0, combi_1.seq)("PROVIDED", "AT", "RUNTIME"), (0, combi_1.seq)("PROVIDED", "BY", _1.CDSName))))), (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineExternalEntity = CDSDefineExternalEntity;
+//# sourceMappingURL=cds_define_external_entity.js.map
+
+/***/ },
+
 /***/ "../core/build/src/cds/expressions/cds_define_hierarchy.js"
 /*!*****************************************************************!*\
   !*** ../core/build/src/cds/expressions/cds_define_hierarchy.js ***!
@@ -53339,7 +53373,13 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const siblingsOrderField = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(sortDirection));
         const siblingsOrder = (0, combi_1.seq)("SIBLINGS", "ORDER", "BY", siblingsOrderField, (0, combi_1.star)((0, combi_1.seq)(",", siblingsOrderField)));
         const directory = (0, combi_1.seq)("DIRECTORY", _1.CDSName, "FILTER", "BY", _1.CDSCondition);
-        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", _1.CDSInteger)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED"))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", "BREAKUP")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("FORCE", "NONE", "EMPTY", "OFF"))));
+        // DATE PERIOD: period from <field> to <field> [valid from :p to :p]
+        const datePeriod = (0, combi_1.seq)("PERIOD", "FROM", _1.CDSName, "TO", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("VALID", "FROM", _1.CDSPrefixedName, "TO", _1.CDSPrefixedName)));
+        // DEPTH accepts an integer literal or a parameter reference (:param)
+        const depthValue = (0, combi_1.altPrio)(_1.CDSInteger, _1.CDSPrefixedName);
+        // LOAD mode: BULK, INCREMENTAL, or a parameter reference ($parameters.p_load)
+        const loadMode = (0, combi_1.altPrio)("BULK", "INCREMENTAL", _1.CDSPrefixedName);
+        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)(datePeriod), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
     }
 }
@@ -53363,7 +53403,9 @@ const __1 = __webpack_require__(/*! ../.. */ "../core/build/src/index.js");
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSDefineProjection extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
+        // redefine association _Assoc redirected to [composition child | parent] Entity
+        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSName, "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, redefineAssoc)), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;
@@ -53371,6 +53413,35 @@ exports.CDSDefineProjection = CDSDefineProjection;
 
 /***/ },
 
+/***/ "../core/build/src/cds/expressions/cds_define_table_entity.js"
+/*!********************************************************************!*\
+  !*** ../core/build/src/cds/expressions/cds_define_table_entity.js ***!
+  \********************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CDSDefineTableEntity = void 0;
+const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+class CDSDefineTableEntity extends combi_1.Expression {
+    getRunnable() {
+        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability, ";");
+        const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
+        const inlineBody = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
+        const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
+        const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
+        const selectBody = (0, combi_1.seq)("AS", "SELECT", "FROM", _1.CDSSource, (0, combi_1.star)(_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, _1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "TABLE", "ENTITY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.str)("{"), inlineBody, (0, combi_1.str)("}")), selectBody), (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineTableEntity = CDSDefineTableEntity;
+//# sourceMappingURL=cds_define_table_entity.js.map
+
+/***/ },
+
 /***/ "../core/build/src/cds/expressions/cds_define_table_function.js"
 /*!**********************************************************************!*\
   !*** ../core/build/src/cds/expressions/cds_define_table_function.js ***!
@@ -53414,7 +53485,8 @@ const cds_with_parameters_1 = __webpack_require__(/*! ./cds_with_parameters */ "
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
         const columnAlias = (0, combi_1.seq)("(", cds_name_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", cds_name_1.CDSName)), ")");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), // post-select WITH HIERARCHY clause
+        (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;
@@ -53440,14 +53512,11 @@ class CDSElement extends combi_1.Expression {
     getRunnable() {
         const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
         const colonThing = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
-        // $extension.* — extension field wildcard
         const extensionWildcard = (0, combi_1.seq)("$extension", ".", "*");
-        const body = (0, combi_1.altPrio)(extensionWildcard, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
-        // KEY/VIRTUAL keyword handling via altPrio:
-        // - Try keyword form first: if keyword consumed but body fails (e.g. "virtual.Field"),
-        //   altPrio backtracks to plain body (which handles "virtual" as a datasource alias prefix).
-        // - This gives exactly 1 state in all cases (no exponential blowup from opt()).
-        const elementBody = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.altPrio)("KEY", "VIRTUAL"), body), body);
+        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName);
+        const typedVirtual = (0, combi_1.seq)("VIRTUAL", _1.CDSName, ":", _1.CDSType);
+        const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
+        const elementBody = (0, combi_1.altPrio)(typedVirtual, (0, combi_1.seq)((0, combi_1.altPrio)("KEY", "VIRTUAL"), body), body);
         return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs));
     }
 }
@@ -53468,12 +53537,17 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CDSExtendView = void 0;
 const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index.js");
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
-const cds_name_1 = __webpack_require__(/*! ./cds_name */ "../core/build/src/cds/expressions/cds_name.js");
 class CDSExtendView extends combi_1.Expression {
     getRunnable() {
-        const namedot = (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", cds_name_1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
+        const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
         const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), cds_name_1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(cds_name_1.CDSName), valueNested, (0, combi_1.opt)(";"));
+        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.seq)("[", _1.CDSCondition, "]")), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
+        const extendView = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), valueNested, (0, combi_1.opt)(";"));
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, ";");
+        const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
+        const entityBody = (0, combi_1.seq)("{", (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp)), "}");
+        const extendAbstractOrCustom = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "EXTEND", (0, combi_1.alt)("ABSTRACT", "CUSTOM"), "ENTITY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "WITH", entityBody, (0, combi_1.opt)(";"));
+        return (0, combi_1.alt)(extendAbstractOrCustom, extendView);
     }
 }
 exports.CDSExtendView = CDSExtendView;
@@ -53548,12 +53622,13 @@ class CDSFunction extends combi_1.Expression {
         const occurrencesRegexpr = (0, combi_1.seq)("OCCURRENCES_REGEXPR", "(", conversionInputs, ")");
         const substrRegexpr = (0, combi_1.seq)("SUBSTR_REGEXPR", "(", conversionInputs, ")");
         const locateRegexpr = (0, combi_1.seq)("LOCATE_REGEXPR", "(", conversionInputs, ")");
-        // Generic fallback: user-defined/extension functions like GET_NUMERIC_VALUE(arg).
-        // Use a regex that excludes CDS keywords that would otherwise be matched by CDSName.
-        // Must contain at least one underscore to distinguish from keywords (e.g. GET_NUMERIC_VALUE).
         const extFuncName = (0, combi_1.regex)(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)+$/i);
         const genericArgs = (0, combi_1.seq)(_1.CDSFunctionInput, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSFunctionInput)));
-        const genericFunc = (0, combi_1.seq)(extFuncName, "(", genericArgs, ")");
+        const namedArgValue = (0, combi_1.altPrio)((0, combi_1.seq)("INTERVAL", _1.CDSFunctionInput, _1.CDSName), _1.CDSFunctionInput, _1.CDSName);
+        const namedArgArrow = (0, combi_1.seq)(_1.CDSName, "=", ">", namedArgValue);
+        const namedArgColon = (0, combi_1.seq)(_1.CDSName, ":", namedArgValue);
+        const namedArgs = (0, combi_1.seq)((0, combi_1.altPrio)(namedArgArrow, namedArgColon), (0, combi_1.starPrio)((0, combi_1.seq)(",", (0, combi_1.altPrio)(namedArgArrow, namedArgColon))));
+        const genericFunc = (0, combi_1.seq)(extFuncName, "(", (0, combi_1.optPrio)((0, combi_1.altPrio)(namedArgs, genericArgs)), ")");
         return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, concat_with_space, dats_is_valid, tims_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, utcl_current, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod, left, right, lpad, rpad, instr, length, ltrim, rtrim, replace, unitConversion, currencyConversion, decimalShift, fltp_to_dec, ratioOf, replaceRegexpr, matchesRegexpr, occurrencesRegexpr, substrRegexpr, locateRegexpr, curr_to_decfloat_amount, genericFunc);
     }
 }
@@ -53785,31 +53860,18 @@ const cds_integer_1 = __webpack_require__(/*! ./cds_integer */ "../core/build/sr
 const cds_string_1 = __webpack_require__(/*! ./cds_string */ "../core/build/src/cds/expressions/cds_string.js");
 class CDSPrefixedName extends combi_1.Expression {
     getRunnable() {
-        // Path filter variants:
-        //   [inner], [left outer], [cross]              — join-type redirect
-        //   [1:left outer], [1:inner]                   — cardinality + join-type
-        //   [1: condition]                              — cardinality + filter condition
-        //   [condition]                                 — filter condition only
         const joinType = (0, combi_1.altPrio)("LEFT OUTER", "INNER", "CROSS");
         const joinRedirect = (0, combi_1.seq)("[", joinType, "]");
-        // Cardinality spec: integer or * (e.g. [*:inner], [1:inner])
         const cardSpec = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
         const cardinalityJoin = (0, combi_1.seq)("[", cardSpec, ":", joinType, "]");
-        // [1: left outer where condition] — cardinality + join-type + WHERE filter
         const cardinalityJoinWhere = (0, combi_1.seq)("[", cardSpec, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        // [left outer where condition] — join-type + WHERE filter (no cardinality prefix)
         const joinWhere = (0, combi_1.seq)("[", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        // Text cardinality forms: [to one: cond], [to many: cond]
-        const textCard = (0, combi_1.altPrio)("TO ONE", "TO MANY");
-        const textCardFilter = (0, combi_1.seq)("[", textCard, ":", cds_condition_1.CDSCondition, "]");
-        // Numeric range cardinality: [0..1: cond], [1..1: cond], [0..*: cond], [n..m: cond]
+        const textCard = (0, combi_1.altPrio)("TO EXACT ONE", "TO ONE", "TO MANY");
+        const textCardFilter = (0, combi_1.seq)("[", textCard, (0, combi_1.optPrio)((0, combi_1.seq)(":", (0, combi_1.altPrio)((0, combi_1.seq)(joinType, "WHERE", cds_condition_1.CDSCondition), joinType, cds_condition_1.CDSCondition))), "]");
         const cardNum = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
         const rangeCard = (0, combi_1.seq)(cds_integer_1.CDSInteger, ".", ".", cardNum);
         const rangeCardFilter = (0, combi_1.seq)("[", rangeCard, ":", cds_condition_1.CDSCondition, "]");
         const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, joinWhere, cardinalityJoin, joinRedirect, textCardFilter, rangeCardFilter, (0, combi_1.seq)("[", cardSpec, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
-        // Each dotted segment may have its own path filter: A[cond].B[cond].C
-        // The final segment may also be a string literal: #enum.'value'
-        // A segment may have a parameterized call: _Assoc( P_Key : value ) or _Assoc[filter]
         const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
         return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.optPrio)(pathFilter), (0, combi_1.star)(segment));
     }
@@ -53832,7 +53894,7 @@ exports.CDSProviderContract = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSProviderContract extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("PROVIDER CONTRACT", (0, combi_1.alt)("TRANSACTIONAL_QUERY", "TRANSACTIONAL_INTERFACE", "ANALYTICAL_QUERY"));
+        return (0, combi_1.seq)("PROVIDER CONTRACT", (0, combi_1.alt)("TRANSACTIONAL_QUERY", "TRANSACTIONAL_INTERFACE", "ANALYTICAL_QUERY", "SQL_QUERY", "STRUCTURED_QUERY"));
     }
 }
 exports.CDSProviderContract = CDSProviderContract;
@@ -53881,10 +53943,13 @@ class CDSSelect extends combi_1.Expression {
     getRunnable() {
         const fields = (0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement);
         const distinct = (0, combi_1.str)("DISTINCT");
-        // elem (,elem)* [,] — handles separator commas and optional trailing comma
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
-        return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)((0, combi_1.altPrio)("*", fields)), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, cds_association_1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), CDSSelect), (0, combi_1.seq)("EXCEPT", CDSSelect), (0, combi_1.seq)("INTERSECT", CDSSelect))));
+        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", _1.CDSPrefixedName);
+        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")");
+        const parenSelect = (0, combi_1.seq)("(", CDSSelect, ")");
+        const unionBranch = (0, combi_1.altPrio)(parenSelect, CDSSelect);
+        return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)((0, combi_1.altPrio)("*", fields)), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, cds_association_1.CDSAssociation)), (0, combi_1.optPrio)(bindAspect), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch))));
     }
 }
 exports.CDSSelect = CDSSelect;
@@ -53906,13 +53971,14 @@ const _1 = __webpack_require__(/*! . */ "../core/build/src/cds/expressions/index
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
-        // Static where filter in FROM: SomeTable [Field = 'Value']
         const staticFilter = (0, combi_1.seq)("[", _1.CDSCondition, "]");
-        const singleSource = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
-        // FROM ( src [JOIN src ON cond]* ) — parenthesized join chain, arbitrarily nested
-        // CDSSource is self-referential here to handle: (((T1 join T2) join T3) join T4)
+        // Dotted path: T._Assoc — association path as FROM source
+        const dottedName = (0, combi_1.seq)(_1.CDSName, ".", _1.CDSName);
+        const namedSource = (0, combi_1.altPrio)(dottedName, _1.CDSName);
+        const singleSource = (0, combi_1.seq)(namedSource, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
+        const funcSingleSource = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
         const parenSource = (0, combi_1.seq)("(", (0, combi_1.altPrio)(CDSSource, singleSource), (0, combi_1.star)(_1.CDSJoin), ")");
-        return (0, combi_1.altPrio)(parenSource, singleSource);
+        return (0, combi_1.altPrio)(parenSource, funcSingleSource, singleSource);
     }
 }
 exports.CDSSource = CDSSource;
@@ -53933,15 +53999,8 @@ exports.CDSString = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        // Allow any character except unescaped single quote; escape sequences:
-        //   ''  — escaped single quote (doubling)
-        //   \'  — escaped single quote (backslash form)
-        //   \\  — escaped backslash (e.g. '\\' in ltrim/rtrim calls)
-        //   \x  — other backslash sequences not followed by '
         const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'$/);
-        // Typed literal: abap.int4'1', abap.char'X', abap.numc(3)'123', etc.
-        // Lexed as tokens: abap, ., typename, 'value'
-        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|sstring|char|numc|dats|tims|fltp|decfloat\d+|dec|string|raw|xstring|clnt|lang|unit|cuky|curr|quan|d|t|p|n|c|x|f)$/i);
+        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|d|t|p|n|c|x|f)$/i);
         const abap = (0, combi_1.seq)("abap", ".", abapTypeName, (0, combi_1.optPrio)((0, combi_1.seq)("(", (0, combi_1.regex)(/^\d+$/), ")")), reg);
         return (0, combi_1.altPrio)(abap, reg);
     }
@@ -54059,8 +54118,10 @@ __exportStar(__webpack_require__(/*! ./cds_composition */ "../core/build/src/cds
 __exportStar(__webpack_require__(/*! ./cds_condition */ "../core/build/src/cds/expressions/cds_condition.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_abstract */ "../core/build/src/cds/expressions/cds_define_abstract.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_custom */ "../core/build/src/cds/expressions/cds_define_custom.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_define_external_entity */ "../core/build/src/cds/expressions/cds_define_external_entity.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_hierarchy */ "../core/build/src/cds/expressions/cds_define_hierarchy.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_projection */ "../core/build/src/cds/expressions/cds_define_projection.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_define_table_entity */ "../core/build/src/cds/expressions/cds_define_table_entity.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_table_function */ "../core/build/src/cds/expressions/cds_define_table_function.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_view */ "../core/build/src/cds/expressions/cds_define_view.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_element */ "../core/build/src/cds/expressions/cds_element.js"), exports);
@@ -54143,7 +54204,10 @@ class Config {
         for (const rule of sorted) {
             rules[rule.getMetadata().key] = rule.getConfig();
         }
-        const version = ver;
+        const version = ver !== null && ver !== void 0 ? ver : {
+            release: version_1.Release.Newest.name,
+            language: langVer !== null && langVer !== void 0 ? langVer : version_1.LanguageVersion.Normal,
+        };
         // defaults: dont skip anything, report everything. The user can decide to skip stuff
         // its difficult to debug errors not being reported
         const config = {
@@ -54270,12 +54334,14 @@ class Config {
         return v;
     }
     getLanguageVersion() {
-        var _a;
+        if (this.config.syntax.languageVersion !== undefined) {
+            return this.config.syntax.languageVersion;
+        }
         const v = this.config.syntax.version;
         if (v !== undefined && typeof v !== "string") {
             return v.language;
         }
-        return (_a = this.config.syntax.languageVersion) !== null && _a !== void 0 ? _a : version_1.LanguageVersion.Normal;
+        return version_1.LanguageVersion.Normal;
     }
     checkVersion() {
         const version = this.config.syntax.version;
@@ -54879,49 +54945,6 @@ exports.DDICReferences = DDICReferences;
 
 /***/ },
 
-/***/ "../core/build/src/ddl/ddl_lexer.js"
-/*!******************************************!*\
-  !*** ../core/build/src/ddl/ddl_lexer.js ***!
-  \******************************************/
-(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DDLLexer = void 0;
-const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
-const position_1 = __webpack_require__(/*! ../position */ "../core/build/src/position.js");
-class DDLLexer {
-    static run(file) {
-        const step1 = [];
-        const lines = file.getRaw().replace(/\r/g, "").split("\n");
-        for (const l of lines) {
-            if (l.startsWith("@")) {
-                continue; // skip annotations for now
-            }
-            step1.push(...l.split(" "));
-        }
-        const step2 = [];
-        for (const t of step1) {
-            if (t === "") {
-                continue;
-            }
-            else if (t.endsWith(";")) {
-                step2.push(t.substr(0, t.length - 1));
-                step2.push(";");
-            }
-            else {
-                step2.push(t);
-            }
-        }
-        return step2.map(t => new tokens_1.Identifier(new position_1.Position(1, 1), t));
-    }
-}
-exports.DDLLexer = DDLLexer;
-//# sourceMappingURL=ddl_lexer.js.map
-
-/***/ },
-
 /***/ "../core/build/src/ddl/ddl_parser.js"
 /*!*******************************************!*\
   !*** ../core/build/src/ddl/ddl_parser.js ***!
@@ -54965,67 +54988,250 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLParser = exports.DDLKind = void 0;
+const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 const combi_1 = __webpack_require__(/*! ../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "../core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../version */ "../core/build/src/version.js");
-const ddl_lexer_1 = __webpack_require__(/*! ./ddl_lexer */ "../core/build/src/ddl/ddl_lexer.js");
+const cds_lexer_1 = __webpack_require__(/*! ../cds/cds_lexer */ "../core/build/src/cds/cds_lexer.js");
 const Expressions = __importStar(__webpack_require__(/*! ./expressions */ "../core/build/src/ddl/expressions/index.js"));
 var DDLKind;
 (function (DDLKind) {
     DDLKind["Structure"] = "structure";
     DDLKind["Table"] = "table";
+    DDLKind["Aspect"] = "aspect";
+    DDLKind["ExtendType"] = "extend-type";
 })(DDLKind || (exports.DDLKind = DDLKind = {}));
 class DDLParser {
     parse(file) {
-        const tokens = ddl_lexer_1.DDLLexer.run(file);
+        let tokens = cds_lexer_1.CDSLexer.run(file);
+        tokens = tokens.filter(t => !(t instanceof tokens_1.Comment));
         let res = combi_1.Combi.run(new Expressions.DDLStructure(), tokens, version_1.defaultRelease);
         if (res === undefined) {
             res = combi_1.Combi.run(new Expressions.DDLTable(), tokens, version_1.defaultRelease);
         }
+        if (res === undefined) {
+            res = combi_1.Combi.run(new Expressions.DDLAspect(), tokens, version_1.defaultRelease);
+        }
+        if (res === undefined) {
+            res = combi_1.Combi.run(new Expressions.DDLExtendType(), tokens, version_1.defaultRelease);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }
         return this.parsedToResult(res[0]);
     }
     parsedToResult(node) {
-        var _a, _b;
         const fields = [];
-        let found = node.findDirectExpressions(Expressions.DDLStructureField);
-        found = found.concat(node.findDirectExpressions(Expressions.DDLTableField));
-        found = found.concat(node.findDirectExpressions(Expressions.DDLInclude));
-        for (const f of found) {
-            const name = ((_a = f.findDirectExpression(Expressions.DDLName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (f.get() instanceof Expressions.DDLInclude) {
-                fields.push({
-                    name: ".INCLUDE",
-                    type: name,
-                    key: false,
-                    notNull: false,
-                });
+        for (const child of node.getChildren()) {
+            if (!(child instanceof nodes_1.ExpressionNode)) {
+                continue;
+            }
+            const expr = child.get();
+            const isField = expr instanceof Expressions.DDLStructureField
+                || expr instanceof Expressions.DDLTableField
+                || expr instanceof Expressions.DDLInclude
+                || expr instanceof Expressions.DDLNamedInclude;
+            if (!isField) {
+                continue;
+            }
+            const key = this.hasKey(child);
+            const notNull = this.hasNotNull(child);
+            if (expr instanceof Expressions.DDLInclude) {
+                const target = this.compactTokens(child.findDirectExpression(Expressions.DDLName));
+                fields.push({ name: ".INCLUDE", type: target, key, notNull });
+            }
+            else if (expr instanceof Expressions.DDLNamedInclude) {
+                const names = child.findDirectExpressions(Expressions.DDLName);
+                const alias = this.compactTokens(names[0]);
+                const target = this.compactTokens(names[1]);
+                fields.push({ name: alias, type: target, key, notNull });
             }
             else {
-                const type = ((_b = f.findDirectExpression(Expressions.DDLType)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
-                fields.push({
-                    name,
-                    type,
-                    key: false,
-                    notNull: false,
-                });
+                const name = this.compactTokens(child.findDirectExpression(Expressions.DDLName));
+                const type = this.compactTokens(child.findDirectExpression(Expressions.DDLType));
+                fields.push({ name, type, key, notNull });
             }
         }
         const result = {
-            name: node.findDirectExpression(Expressions.DDLName).concatTokens(),
-            kind: node.get() instanceof Expressions.DDLStructure ? DDLKind.Structure : DDLKind.Table,
+            name: this.compactTokens(node.findDirectExpression(Expressions.DDLName)),
+            kind: this.kindOf(node),
             fields,
         };
         return result;
     }
+    compactTokens(node) {
+        if (node === undefined) {
+            return "";
+        }
+        return node.concatTokens().replace(/\s+/g, "");
+    }
+    hasKey(node) {
+        var _a, _b, _c;
+        for (const c of node.getChildren()) {
+            const expr = (_b = (_a = c).get) === null || _b === void 0 ? void 0 : _b.call(_a);
+            const ctor = (_c = expr === null || expr === void 0 ? void 0 : expr.constructor) === null || _c === void 0 ? void 0 : _c.name;
+            if (ctor === "CDSAnnotation") {
+                continue;
+            }
+            const tok = c.concatTokens().toUpperCase().trim();
+            if (tok === "KEY") {
+                return true;
+            }
+            if (tok !== "") {
+                return false;
+            }
+        }
+        return false;
+    }
+    hasNotNull(node) {
+        var _a, _b, _c, _d;
+        const children = node.getChildren();
+        for (let i = 0; i < children.length - 1; i++) {
+            const a = (_b = (_a = children[i]).concatTokens) === null || _b === void 0 ? void 0 : _b.call(_a).toUpperCase().trim();
+            const b = (_d = (_c = children[i + 1]).concatTokens) === null || _d === void 0 ? void 0 : _d.call(_c).toUpperCase().trim();
+            if (a === "NOT" && b === "NULL") {
+                return true;
+            }
+        }
+        return false;
+    }
+    kindOf(node) {
+        const expr = node.get();
+        if (expr instanceof Expressions.DDLStructure) {
+            return DDLKind.Structure;
+        }
+        if (expr instanceof Expressions.DDLAspect) {
+            return DDLKind.Aspect;
+        }
+        if (expr instanceof Expressions.DDLExtendType) {
+            return DDLKind.ExtendType;
+        }
+        return DDLKind.Table;
+    }
 }
 exports.DDLParser = DDLParser;
 //# sourceMappingURL=ddl_parser.js.map
 
 /***/ },
 
+/***/ "../core/build/src/ddl/expressions/ddl_aspect.js"
+/*!*******************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_aspect.js ***!
+  \*******************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLAspect = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_extend_1 = __webpack_require__(/*! ./ddl_extend */ "../core/build/src/ddl/expressions/ddl_extend.js");
+const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "../core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "../core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "../core/build/src/ddl/expressions/ddl_table_field.js");
+class DDLAspect extends combi_1.Expression {
+    getRunnable() {
+        const entry = (0, combi_1.altPrio)(ddl_named_include_1.DDLNamedInclude, ddl_include_1.DDLInclude, ddl_table_field_1.DDLTableField, ddl_extend_1.DDLExtend);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), "DEFINE", "ASPECT", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)(entry), "}", (0, combi_1.optPrio)(";"));
+    }
+}
+exports.DDLAspect = DDLAspect;
+//# sourceMappingURL=ddl_aspect.js.map
+
+/***/ },
+
+/***/ "../core/build/src/ddl/expressions/ddl_clauses.js"
+/*!********************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_clauses.js ***!
+  \********************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLValueHelp = exports.DDLForeignKey = exports.DDLForeignKeyTarget = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const ddl_literal_1 = __webpack_require__(/*! ./ddl_literal */ "../core/build/src/ddl/expressions/ddl_literal.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const ddl_where_1 = __webpack_require__(/*! ./ddl_where */ "../core/build/src/ddl/expressions/ddl_where.js");
+class DDLForeignKeyTarget extends combi_1.Expression {
+    getRunnable() {
+        const cardinality = (0, combi_1.seq)("[", ddl_literal_1.DDLCardinalityValue, ".", ".", ddl_literal_1.DDLCardinalityValue, (0, combi_1.optPrio)((0, combi_1.seq)(",", ddl_literal_1.DDLCardinalityValue)), "]");
+        return (0, combi_1.seq)((0, combi_1.optPrio)(cardinality), ddl_name_1.DDLName);
+    }
+}
+exports.DDLForeignKeyTarget = DDLForeignKeyTarget;
+class DDLForeignKey extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("WITH", "FOREIGN", "KEY", DDLForeignKeyTarget, (0, combi_1.optPrio)(ddl_where_1.DDLWhere));
+    }
+}
+exports.DDLForeignKey = DDLForeignKey;
+class DDLValueHelp extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("WITH", "VALUE", "HELP", ddl_name_1.DDLName, (0, combi_1.optPrio)(ddl_where_1.DDLWhere));
+    }
+}
+exports.DDLValueHelp = DDLValueHelp;
+//# sourceMappingURL=ddl_clauses.js.map
+
+/***/ },
+
+/***/ "../core/build/src/ddl/expressions/ddl_extend.js"
+/*!*******************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_extend.js ***!
+  \*******************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLExtend = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "../core/build/src/ddl/expressions/ddl_clauses.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+class DDLExtend extends combi_1.Expression {
+    getRunnable() {
+        const clause = (0, combi_1.alt)(ddl_clauses_1.DDLForeignKey, ddl_clauses_1.DDLValueHelp);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), "EXTEND", ddl_name_1.DDLName, ":", (0, combi_1.plus)(clause), ";");
+    }
+}
+exports.DDLExtend = DDLExtend;
+//# sourceMappingURL=ddl_extend.js.map
+
+/***/ },
+
+/***/ "../core/build/src/ddl/expressions/ddl_extend_type.js"
+/*!************************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_extend_type.js ***!
+  \************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLExtendType = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "../core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "../core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "../core/build/src/ddl/expressions/ddl_structure_field.js");
+const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "../core/build/src/ddl/expressions/ddl_table_field.js");
+class DDLExtendType extends combi_1.Expression {
+    getRunnable() {
+        const entry = (0, combi_1.altPrio)(ddl_named_include_1.DDLNamedInclude, ddl_include_1.DDLInclude, ddl_table_field_1.DDLTableField, ddl_structure_field_1.DDLStructureField);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), "EXTEND", "TYPE", ddl_name_1.DDLName, "WITH", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)(entry), "}", (0, combi_1.optPrio)(";"));
+    }
+}
+exports.DDLExtendType = DDLExtendType;
+//# sourceMappingURL=ddl_extend_type.js.map
+
+/***/ },
+
 /***/ "../core/build/src/ddl/expressions/ddl_include.js"
 /*!********************************************************!*\
   !*** ../core/build/src/ddl/expressions/ddl_include.js ***!
@@ -55037,10 +55243,13 @@ exports.DDLParser = DDLParser;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLInclude = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "../core/build/src/ddl/expressions/ddl_clauses.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
 class DDLInclude extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("INCLUDE", ddl_name_1.DDLName, ";");
+        const trailingClause = (0, combi_1.alt)(ddl_clauses_1.DDLForeignKey, ddl_clauses_1.DDLValueHelp);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), "INCLUDE", ddl_name_1.DDLName, (0, combi_1.optPrio)((0, combi_1.seq)("WITH", "SUFFIX", ddl_name_1.DDLName)), (0, combi_1.optPrio)("NOT NULL"), (0, combi_1.star)(trailingClause), ";");
     }
 }
 exports.DDLInclude = DDLInclude;
@@ -55048,6 +55257,34 @@ exports.DDLInclude = DDLInclude;
 
 /***/ },
 
+/***/ "../core/build/src/ddl/expressions/ddl_literal.js"
+/*!********************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_literal.js ***!
+  \********************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLStringLiteral = exports.DDLCardinalityValue = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const cds_integer_1 = __webpack_require__(/*! ../../cds/expressions/cds_integer */ "../core/build/src/cds/expressions/cds_integer.js");
+class DDLCardinalityValue extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
+    }
+}
+exports.DDLCardinalityValue = DDLCardinalityValue;
+class DDLStringLiteral extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^'[^']*'$/);
+    }
+}
+exports.DDLStringLiteral = DDLStringLiteral;
+//# sourceMappingURL=ddl_literal.js.map
+
+/***/ },
+
 /***/ "../core/build/src/ddl/expressions/ddl_name.js"
 /*!*****************************************************!*\
   !*** ../core/build/src/ddl/expressions/ddl_name.js ***!
@@ -55059,9 +55296,10 @@ exports.DDLInclude = DDLInclude;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLName = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const cds_name_1 = __webpack_require__(/*! ../../cds/expressions/cds_name */ "../core/build/src/cds/expressions/cds_name.js");
 class DDLName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\w+$/);
+        return (0, combi_1.alt)(cds_name_1.CDSName, (0, combi_1.regex)(/^"[^"]*"$/));
     }
 }
 exports.DDLName = DDLName;
@@ -55069,6 +55307,53 @@ exports.DDLName = DDLName;
 
 /***/ },
 
+/***/ "../core/build/src/ddl/expressions/ddl_named_include.js"
+/*!**************************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_named_include.js ***!
+  \**************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLNamedInclude = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "../core/build/src/ddl/expressions/ddl_clauses.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+class DDLNamedInclude extends combi_1.Expression {
+    getRunnable() {
+        const trailingClause = (0, combi_1.alt)(ddl_clauses_1.DDLForeignKey, ddl_clauses_1.DDLValueHelp);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), ddl_name_1.DDLName, ":", "INCLUDE", ddl_name_1.DDLName, (0, combi_1.optPrio)((0, combi_1.seq)("WITH", "SUFFIX", ddl_name_1.DDLName)), (0, combi_1.optPrio)("NOT NULL"), (0, combi_1.star)(trailingClause), ";");
+    }
+}
+exports.DDLNamedInclude = DDLNamedInclude;
+//# sourceMappingURL=ddl_named_include.js.map
+
+/***/ },
+
+/***/ "../core/build/src/ddl/expressions/ddl_qualified_name.js"
+/*!***************************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_qualified_name.js ***!
+  \***************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLQualifiedName = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+class DDLQualifiedName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)(ddl_name_1.DDLName, (0, combi_1.optPrio)((0, combi_1.seq)(".", ddl_name_1.DDLName)));
+    }
+}
+exports.DDLQualifiedName = DDLQualifiedName;
+//# sourceMappingURL=ddl_qualified_name.js.map
+
+/***/ },
+
 /***/ "../core/build/src/ddl/expressions/ddl_structure.js"
 /*!**********************************************************!*\
   !*** ../core/build/src/ddl/expressions/ddl_structure.js ***!
@@ -55080,12 +55365,15 @@ exports.DDLName = DDLName;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLStructure = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
-const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "../core/build/src/ddl/expressions/ddl_structure_field.js");
-const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
 const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "../core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "../core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "../core/build/src/ddl/expressions/ddl_structure_field.js");
 class DDLStructure extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("DEFINE STRUCTURE", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)((0, combi_1.altPrio)(ddl_structure_field_1.DDLStructureField, ddl_include_1.DDLInclude)), "}");
+        const entry = (0, combi_1.altPrio)(ddl_named_include_1.DDLNamedInclude, ddl_include_1.DDLInclude, ddl_structure_field_1.DDLStructureField);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), "DEFINE", "STRUCTURE", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)(entry), "}", (0, combi_1.optPrio)(";"));
     }
 }
 exports.DDLStructure = DDLStructure;
@@ -55104,11 +55392,12 @@ exports.DDLStructure = DDLStructure;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLStructureField = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
 const ddl_type_1 = __webpack_require__(/*! ./ddl_type */ "../core/build/src/ddl/expressions/ddl_type.js");
 class DDLStructureField extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(ddl_name_1.DDLName, ":", ddl_type_1.DDLType, ";");
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), ddl_name_1.DDLName, ":", ddl_type_1.DDLType, (0, combi_1.optPrio)("NOT NULL"), ";");
     }
 }
 exports.DDLStructureField = DDLStructureField;
@@ -55127,12 +55416,16 @@ exports.DDLStructureField = DDLStructureField;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLTable = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_extend_1 = __webpack_require__(/*! ./ddl_extend */ "../core/build/src/ddl/expressions/ddl_extend.js");
 const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "../core/build/src/ddl/expressions/ddl_include.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "../core/build/src/ddl/expressions/ddl_named_include.js");
 const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "../core/build/src/ddl/expressions/ddl_table_field.js");
 class DDLTable extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("DEFINE TABLE", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)((0, combi_1.altPrio)(ddl_table_field_1.DDLTableField, ddl_include_1.DDLInclude)), "}");
+        const entry = (0, combi_1.altPrio)(ddl_named_include_1.DDLNamedInclude, ddl_include_1.DDLInclude, ddl_table_field_1.DDLTableField, ddl_extend_1.DDLExtend);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), "DEFINE", "TABLE", ddl_name_1.DDLName, "{", (0, combi_1.plusPrio)(entry), "}", (0, combi_1.optPrio)(";"));
     }
 }
 exports.DDLTable = DDLTable;
@@ -55151,11 +55444,14 @@ exports.DDLTable = DDLTable;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLTableField = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "../core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "../core/build/src/ddl/expressions/ddl_clauses.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
 const ddl_type_1 = __webpack_require__(/*! ./ddl_type */ "../core/build/src/ddl/expressions/ddl_type.js");
 class DDLTableField extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.optPrio)("KEY"), ddl_name_1.DDLName, ":", ddl_type_1.DDLType, (0, combi_1.optPrio)("NOT NULL"), ";");
+        const trailingClause = (0, combi_1.alt)(ddl_clauses_1.DDLForeignKey, ddl_clauses_1.DDLValueHelp);
+        return (0, combi_1.seq)((0, combi_1.star)(expressions_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), ddl_name_1.DDLName, ":", ddl_type_1.DDLType, (0, combi_1.optPrio)("NOT NULL"), (0, combi_1.star)(trailingClause), ";");
     }
 }
 exports.DDLTableField = DDLTableField;
@@ -55174,9 +55470,15 @@ exports.DDLTableField = DDLTableField;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLType = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const cds_integer_1 = __webpack_require__(/*! ../../cds/expressions/cds_integer */ "../core/build/src/cds/expressions/cds_integer.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js");
 class DDLType extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^(abap\.)?\w+(\(\d+\))?$/);
+        const decimals = (0, combi_1.seq)(",", cds_integer_1.CDSInteger);
+        const lenSpec = (0, combi_1.seq)("(", cds_integer_1.CDSInteger, (0, combi_1.optPrio)(decimals), ")");
+        const dotted = (0, combi_1.seq)(ddl_name_1.DDLName, ".", ddl_name_1.DDLName, (0, combi_1.optPrio)(lenSpec));
+        const plain = (0, combi_1.seq)(ddl_name_1.DDLName, (0, combi_1.optPrio)(lenSpec));
+        return (0, combi_1.altPrio)(dotted, plain);
     }
 }
 exports.DDLType = DDLType;
@@ -55184,6 +55486,31 @@ exports.DDLType = DDLType;
 
 /***/ },
 
+/***/ "../core/build/src/ddl/expressions/ddl_where.js"
+/*!******************************************************!*\
+  !*** ../core/build/src/ddl/expressions/ddl_where.js ***!
+  \******************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DDLWhere = void 0;
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
+const ddl_qualified_name_1 = __webpack_require__(/*! ./ddl_qualified_name */ "../core/build/src/ddl/expressions/ddl_qualified_name.js");
+const ddl_literal_1 = __webpack_require__(/*! ./ddl_literal */ "../core/build/src/ddl/expressions/ddl_literal.js");
+class DDLWhere extends combi_1.Expression {
+    getRunnable() {
+        const value = (0, combi_1.alt)(ddl_qualified_name_1.DDLQualifiedName, ddl_literal_1.DDLStringLiteral);
+        const condition = (0, combi_1.seq)(ddl_qualified_name_1.DDLQualifiedName, "=", value);
+        return (0, combi_1.seq)("WHERE", condition, (0, combi_1.star)((0, combi_1.seq)("AND", condition)));
+    }
+}
+exports.DDLWhere = DDLWhere;
+//# sourceMappingURL=ddl_where.js.map
+
+/***/ },
+
 /***/ "../core/build/src/ddl/expressions/index.js"
 /*!**************************************************!*\
   !*** ../core/build/src/ddl/expressions/index.js ***!
@@ -55207,13 +55534,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./ddl_aspect */ "../core/build/src/ddl/expressions/ddl_aspect.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_clauses */ "../core/build/src/ddl/expressions/ddl_clauses.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_extend */ "../core/build/src/ddl/expressions/ddl_extend.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_extend_type */ "../core/build/src/ddl/expressions/ddl_extend_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_include */ "../core/build/src/ddl/expressions/ddl_include.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_literal */ "../core/build/src/ddl/expressions/ddl_literal.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_name */ "../core/build/src/ddl/expressions/ddl_name.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_named_include */ "../core/build/src/ddl/expressions/ddl_named_include.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_qualified_name */ "../core/build/src/ddl/expressions/ddl_qualified_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_structure_field */ "../core/build/src/ddl/expressions/ddl_structure_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_structure */ "../core/build/src/ddl/expressions/ddl_structure.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_table_field */ "../core/build/src/ddl/expressions/ddl_table_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_table */ "../core/build/src/ddl/expressions/ddl_table.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_type */ "../core/build/src/ddl/expressions/ddl_type.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_where */ "../core/build/src/ddl/expressions/ddl_where.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ },
@@ -55605,8 +55940,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.AbstractFile = exports.ABAPFile = exports.MemoryFile = exports.Edits = exports.ReferenceType = exports.NativeSQL = exports.MacroContent = exports.MacroCall = exports.SpaghettiScopeNode = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.FormLengthStats = exports.FunctionLengthStats = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.versionToABAPRelease = exports.releaseAtLeast = exports.Release = exports.LanguageVersion = exports.Version = exports.Config = exports.Issue = void 0;
-exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Diagnostics = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.RulesRunner = exports.SpaghettiScope = void 0;
+exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLKind = exports.DDLParser = exports.AbstractFile = exports.ABAPFile = exports.MemoryFile = exports.Edits = exports.ReferenceType = exports.NativeSQL = exports.MacroContent = exports.MacroCall = exports.SpaghettiScopeNode = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.FormLengthStats = exports.FunctionLengthStats = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.versionToABAPRelease = exports.releaseAtLeast = exports.Release = exports.LanguageVersion = exports.Version = exports.Config = exports.Issue = void 0;
+exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Diagnostics = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = void 0;
 const issue_1 = __webpack_require__(/*! ./issue */ "../core/build/src/issue.js");
 Object.defineProperty(exports, "Issue", ({ enumerable: true, get: function () { return issue_1.Issue; } }));
 const config_1 = __webpack_require__(/*! ./config */ "../core/build/src/config.js");
@@ -55700,6 +56035,7 @@ const severity_1 = __webpack_require__(/*! ./severity */ "../core/build/src/seve
 Object.defineProperty(exports, "Severity", ({ enumerable: true, get: function () { return severity_1.Severity; } }));
 const ddl_parser_1 = __webpack_require__(/*! ./ddl/ddl_parser */ "../core/build/src/ddl/ddl_parser.js");
 Object.defineProperty(exports, "DDLParser", ({ enumerable: true, get: function () { return ddl_parser_1.DDLParser; } }));
+Object.defineProperty(exports, "DDLKind", ({ enumerable: true, get: function () { return ddl_parser_1.DDLKind; } }));
 const cds_parser_1 = __webpack_require__(/*! ./cds/cds_parser */ "../core/build/src/cds/cds_parser.js");
 Object.defineProperty(exports, "CDSParser", ({ enumerable: true, get: function () { return cds_parser_1.CDSParser; } }));
 const rules_runner_1 = __webpack_require__(/*! ./rules_runner */ "../core/build/src/rules_runner.js");
@@ -60838,6 +61174,13 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
                     }
                 }
             }
+            if (found === undefined) {
+                // typed virtual element: VIRTUAL <name> : <type>
+                const names = e.findAllExpressions(expressions_1.CDSName);
+                if (e.findDirectTokenByText("VIRTUAL") !== undefined && names.length > 0) {
+                    found = names[0];
+                }
+            }
             if (found === undefined) {
                 continue;
             }
@@ -68126,7 +68469,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.54";
+        return "2.119.55";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.119.54",
+    "version": "2.119.55",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.54",
+        "@abaplint/core": "^2.119.55",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",