@abaplint/core 2.119.53 → 2.119.55

package/build/src/cds/expressions/cds_provider_contract.js

@@ -4,7 +4,7 @@ exports.CDSProviderContract = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 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;

package/build/src/cds/expressions/cds_select.js

@@ -9,10 +9,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;

package/build/src/cds/expressions/cds_source.js

@@ -5,13 +5,14 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 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;

package/build/src/cds/expressions/cds_string.js

@@ -4,15 +4,8 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 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);
     }

package/build/src/cds/expressions/index.js

@@ -31,8 +31,10 @@ __exportStar(require("./cds_composition"), exports);
 __exportStar(require("./cds_condition"), exports);
 __exportStar(require("./cds_define_abstract"), exports);
 __exportStar(require("./cds_define_custom"), exports);
+__exportStar(require("./cds_define_external_entity"), exports);
 __exportStar(require("./cds_define_hierarchy"), exports);
 __exportStar(require("./cds_define_projection"), exports);
+__exportStar(require("./cds_define_table_entity"), exports);
 __exportStar(require("./cds_define_table_function"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);

package/build/src/config.js

@@ -47,7 +47,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 = {
@@ -174,12 +177,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;

package/build/src/ddl/ddl_parser.js

@@ -34,61 +34,126 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLParser = exports.DDLKind = void 0;
+const tokens_1 = require("../abap/1_lexer/tokens");
 const combi_1 = require("../abap/2_statements/combi");
 const nodes_1 = require("../abap/nodes");
 const version_1 = require("../version");
-const ddl_lexer_1 = require("./ddl_lexer");
+const cds_lexer_1 = require("../cds/cds_lexer");
 const Expressions = __importStar(require("./expressions"));
 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

package/build/src/ddl/expressions/ddl_aspect.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLAspect = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_extend_1 = require("./ddl_extend");
+const ddl_include_1 = require("./ddl_include");
+const ddl_name_1 = require("./ddl_name");
+const ddl_named_include_1 = require("./ddl_named_include");
+const ddl_table_field_1 = require("./ddl_table_field");
+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

package/build/src/ddl/expressions/ddl_clauses.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLValueHelp = exports.DDLForeignKey = exports.DDLForeignKeyTarget = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const ddl_literal_1 = require("./ddl_literal");
+const ddl_name_1 = require("./ddl_name");
+const ddl_where_1 = require("./ddl_where");
+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

package/build/src/ddl/expressions/ddl_extend.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLExtend = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_clauses_1 = require("./ddl_clauses");
+const ddl_name_1 = require("./ddl_name");
+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

package/build/src/ddl/expressions/ddl_extend_type.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLExtendType = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_include_1 = require("./ddl_include");
+const ddl_name_1 = require("./ddl_name");
+const ddl_named_include_1 = require("./ddl_named_include");
+const ddl_structure_field_1 = require("./ddl_structure_field");
+const ddl_table_field_1 = require("./ddl_table_field");
+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

package/build/src/ddl/expressions/ddl_include.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLInclude = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_clauses_1 = require("./ddl_clauses");
 const ddl_name_1 = require("./ddl_name");
 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;

package/build/src/ddl/expressions/ddl_literal.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLStringLiteral = exports.DDLCardinalityValue = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("../../cds/expressions/cds_integer");
+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

package/build/src/ddl/expressions/ddl_name.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLName = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("../../cds/expressions/cds_name");
 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;

package/build/src/ddl/expressions/ddl_named_include.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLNamedInclude = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_clauses_1 = require("./ddl_clauses");
+const ddl_name_1 = require("./ddl_name");
+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

package/build/src/ddl/expressions/ddl_qualified_name.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLQualifiedName = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const ddl_name_1 = require("./ddl_name");
+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

package/build/src/ddl/expressions/ddl_structure.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLStructure = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
-const ddl_structure_field_1 = require("./ddl_structure_field");
-const ddl_name_1 = require("./ddl_name");
+const expressions_1 = require("../../cds/expressions");
 const ddl_include_1 = require("./ddl_include");
+const ddl_name_1 = require("./ddl_name");
+const ddl_named_include_1 = require("./ddl_named_include");
+const ddl_structure_field_1 = require("./ddl_structure_field");
 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;

package/build/src/ddl/expressions/ddl_structure_field.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLStructureField = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
 const ddl_name_1 = require("./ddl_name");
 const ddl_type_1 = require("./ddl_type");
 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;

package/build/src/ddl/expressions/ddl_table.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLTable = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_extend_1 = require("./ddl_extend");
 const ddl_include_1 = require("./ddl_include");
 const ddl_name_1 = require("./ddl_name");
+const ddl_named_include_1 = require("./ddl_named_include");
 const ddl_table_field_1 = require("./ddl_table_field");
 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;

package/build/src/ddl/expressions/ddl_table_field.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLTableField = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const expressions_1 = require("../../cds/expressions");
+const ddl_clauses_1 = require("./ddl_clauses");
 const ddl_name_1 = require("./ddl_name");
 const ddl_type_1 = require("./ddl_type");
 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;

package/build/src/ddl/expressions/ddl_type.js

@@ -2,9 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DDLType = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("../../cds/expressions/cds_integer");
+const ddl_name_1 = require("./ddl_name");
 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;

package/build/src/ddl/expressions/ddl_where.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DDLWhere = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const ddl_qualified_name_1 = require("./ddl_qualified_name");
+const ddl_literal_1 = require("./ddl_literal");
+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

package/build/src/ddl/expressions/index.js

@@ -14,11 +14,19 @@ 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(require("./ddl_aspect"), exports);
+__exportStar(require("./ddl_clauses"), exports);
+__exportStar(require("./ddl_extend"), exports);
+__exportStar(require("./ddl_extend_type"), exports);
 __exportStar(require("./ddl_include"), exports);
+__exportStar(require("./ddl_literal"), exports);
 __exportStar(require("./ddl_name"), exports);
+__exportStar(require("./ddl_named_include"), exports);
+__exportStar(require("./ddl_qualified_name"), exports);
 __exportStar(require("./ddl_structure_field"), exports);
 __exportStar(require("./ddl_structure"), exports);
 __exportStar(require("./ddl_table_field"), exports);
 __exportStar(require("./ddl_table"), exports);
 __exportStar(require("./ddl_type"), exports);
+__exportStar(require("./ddl_where"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/index.js

@@ -33,8 +33,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 = require("./issue");
 Object.defineProperty(exports, "Issue", { enumerable: true, get: function () { return issue_1.Issue; } });
 const config_1 = require("./config");
@@ -128,6 +128,7 @@ const severity_1 = require("./severity");
 Object.defineProperty(exports, "Severity", { enumerable: true, get: function () { return severity_1.Severity; } });
 const ddl_parser_1 = require("./ddl/ddl_parser");
 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 = require("./cds/cds_parser");
 Object.defineProperty(exports, "CDSParser", { enumerable: true, get: function () { return cds_parser_1.CDSParser; } });
 const rules_runner_1 = require("./rules_runner");

package/build/src/objects/data_definition.js

@@ -153,6 +153,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;
             }

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.53";
+        return "2.119.55";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.53",
+    "version": "2.119.55",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",