npm - @abaplint/transpiler-cli - Versions diffs - 2.13.32 → 2.13.34 - Mend

@abaplint/transpiler-cli 2.13.32 → 2.13.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/build/bundle.js CHANGED Viewed

@@ -264,6 +264,7 @@ const path = __importStar(__webpack_require__(/*! path */ "path"));
 const glob = __importStar(__webpack_require__(/*! glob */ "./node_modules/glob/glob.js"));
 const childProcess = __importStar(__webpack_require__(/*! child_process */ "child_process"));
 const os = __importStar(__webpack_require__(/*! os */ "os"));
+const module_1 = __webpack_require__(/*! module */ "module");
 const progress_1 = __importDefault(__webpack_require__(/*! progress */ "./node_modules/progress/index.js"));
 const Transpiler = __importStar(__webpack_require__(/*! @abaplint/transpiler */ "./node_modules/@abaplint/transpiler/build/src/index.js"));
 const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
@@ -355,9 +356,28 @@ async function writeObjects(outputFiles, config, outputFolder, files) {
     }
     await file_operations_1.FileOperations.writeFiles(filesToWrite);
 }
+const PLUGIN_MODULE = "@abaplint/transpiler-extras";
+function loadPlugin() {
+    // createRequire so the plugin resolves from the project consuming the CLI, also after webpacking
+    const projectRequire = (0, module_1.createRequire)(path.join(process.cwd(), "package.json"));
+    try {
+        projectRequire.resolve(PLUGIN_MODULE);
+    }
+    catch {
+        // plugin package not installed
+        return undefined;
+    }
+    const plugin = projectRequire(PLUGIN_MODULE).plugin;
+    if (plugin === undefined) {
+        throw new Error(PLUGIN_MODULE + " does not export a plugin");
+    }
+    console.log("Plugin loaded: " + PLUGIN_MODULE + ", object types: " + plugin.objectTypes().join(", "));
+    console.log("Note this requires license for commercial use");
+    return plugin;
+}
 async function build(config, files) {
     const libFiles = await loadLib(config);
-    const t = new Transpiler.Transpiler(config.options);
+    const t = new Transpiler.Transpiler(config.options, loadPlugin());
     const reg = new abaplint.Registry();
     for (const f of files) {
         reg.addFile(new abaplint.MemoryFile(f.filename, f.contents));
@@ -2242,7 +2262,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();
@@ -11180,10 +11200,10 @@ const _derived_types_1 = __webpack_require__(/*! ./_derived_types */ "./node_mod
 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"));
     }
 }
@@ -53200,6 +53220,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;
         }
@@ -53225,12 +53251,10 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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;
@@ -53689,7 +53713,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;
@@ -53723,6 +53747,36 @@ exports.CDSDefineCustom = CDSDefineCustom;
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_external_entity.js"
+/*!*********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/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__(/*! . */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_hierarchy.js"
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_hierarchy.js ***!
@@ -53742,7 +53796,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)(";"));
     }
 }
@@ -53766,7 +53826,9 @@ const __1 = __webpack_require__(/*! ../.. */ "./node_modules/@abaplint/core/buil
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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;
@@ -53774,6 +53836,35 @@ exports.CDSDefineProjection = CDSDefineProjection;
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_table_entity.js"
+/*!******************************************************************************************!*\
+  !*** ./node_modules/@abaplint/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__(/*! . */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_table_function.js"
 /*!********************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_table_function.js ***!
@@ -53817,7 +53908,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;
@@ -53843,14 +53935,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));
     }
 }
@@ -53871,12 +53960,17 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CDSExtendView = void 0;
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
-const cds_name_1 = __webpack_require__(/*! ./cds_name */ "./node_modules/@abaplint/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;
@@ -53951,12 +54045,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);
     }
 }
@@ -54188,31 +54283,18 @@ const cds_integer_1 = __webpack_require__(/*! ./cds_integer */ "./node_modules/@
 const cds_string_1 = __webpack_require__(/*! ./cds_string */ "./node_modules/@abaplint/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));
     }
@@ -54235,7 +54317,7 @@ exports.CDSProviderContract = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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;
@@ -54284,10 +54366,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;
@@ -54309,13 +54394,14 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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;
@@ -54336,15 +54422,8 @@ exports.CDSString = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/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);
     }
@@ -54462,8 +54541,10 @@ __exportStar(__webpack_require__(/*! ./cds_composition */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./cds_condition */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_condition.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_abstract */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_abstract.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_custom */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_custom.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_define_external_entity */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_external_entity.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_hierarchy */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_hierarchy.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_projection */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_projection.js"), exports);
+__exportStar(__webpack_require__(/*! ./cds_define_table_entity */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_table_entity.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_table_function */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_table_function.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_define_view */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_define_view.js"), exports);
 __exportStar(__webpack_require__(/*! ./cds_element */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_element.js"), exports);
@@ -54546,7 +54627,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 = {
@@ -54673,12 +54757,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;
@@ -55282,49 +55368,6 @@ exports.DDICReferences = DDICReferences;
 /***/ },
-/***/ "./node_modules/@abaplint/core/build/src/ddl/ddl_lexer.js"
-/*!****************************************************************!*\
-  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
-const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/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
-/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/ddl/ddl_parser.js"
 /*!*****************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/ddl/ddl_parser.js ***!
@@ -55368,67 +55411,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 */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const combi_1 = __webpack_require__(/*! ../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
-const ddl_lexer_1 = __webpack_require__(/*! ./ddl_lexer */ "./node_modules/@abaplint/core/build/src/ddl/ddl_lexer.js");
+const cds_lexer_1 = __webpack_require__(/*! ../cds/cds_lexer */ "./node_modules/@abaplint/core/build/src/cds/cds_lexer.js");
 const Expressions = __importStar(__webpack_require__(/*! ./expressions */ "./node_modules/@abaplint/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
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_aspect.js"
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_extend_1 = __webpack_require__(/*! ./ddl_extend */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend.js");
+const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "./node_modules/@abaplint/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
+/***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js"
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const ddl_literal_1 = __webpack_require__(/*! ./ddl_literal */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_literal.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const ddl_where_1 = __webpack_require__(/*! ./ddl_where */ "./node_modules/@abaplint/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
+/***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend.js"
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/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
+/***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend_type.js"
+/*!**********************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure_field.js");
+const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js"
 /*!******************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js ***!
@@ -55440,10 +55666,13 @@ exports.DDLParser = DDLParser;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLInclude = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/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;
@@ -55451,6 +55680,34 @@ exports.DDLInclude = DDLInclude;
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_literal.js"
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const cds_integer_1 = __webpack_require__(/*! ../../cds/expressions/cds_integer */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js"
 /*!***************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js ***!
@@ -55462,9 +55719,10 @@ exports.DDLInclude = DDLInclude;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLName = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const cds_name_1 = __webpack_require__(/*! ../../cds/expressions/cds_name */ "./node_modules/@abaplint/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;
@@ -55472,6 +55730,53 @@ exports.DDLName = DDLName;
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js"
+/*!************************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/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
+/***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_qualified_name.js"
+/*!*************************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure.js"
 /*!********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure.js ***!
@@ -55483,12 +55788,15 @@ exports.DDLName = DDLName;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLStructure = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
-const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure_field.js");
-const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
 const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js");
+const ddl_structure_field_1 = __webpack_require__(/*! ./ddl_structure_field */ "./node_modules/@abaplint/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;
@@ -55507,11 +55815,12 @@ exports.DDLStructure = DDLStructure;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLStructureField = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
 const ddl_type_1 = __webpack_require__(/*! ./ddl_type */ "./node_modules/@abaplint/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;
@@ -55530,12 +55839,16 @@ exports.DDLStructureField = DDLStructureField;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLTable = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_extend_1 = __webpack_require__(/*! ./ddl_extend */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend.js");
 const ddl_include_1 = __webpack_require__(/*! ./ddl_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
+const ddl_named_include_1 = __webpack_require__(/*! ./ddl_named_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js");
 const ddl_table_field_1 = __webpack_require__(/*! ./ddl_table_field */ "./node_modules/@abaplint/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;
@@ -55554,11 +55867,14 @@ exports.DDLTable = DDLTable;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLTableField = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const expressions_1 = __webpack_require__(/*! ../../cds/expressions */ "./node_modules/@abaplint/core/build/src/cds/expressions/index.js");
+const ddl_clauses_1 = __webpack_require__(/*! ./ddl_clauses */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js");
 const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js");
 const ddl_type_1 = __webpack_require__(/*! ./ddl_type */ "./node_modules/@abaplint/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;
@@ -55577,9 +55893,15 @@ exports.DDLTableField = DDLTableField;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DDLType = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const cds_integer_1 = __webpack_require__(/*! ../../cds/expressions/cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js");
+const ddl_name_1 = __webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/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;
@@ -55587,6 +55909,31 @@ exports.DDLType = DDLType;
 /***/ },
+/***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_where.js"
+/*!****************************************************************************!*\
+  !*** ./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const ddl_qualified_name_1 = __webpack_require__(/*! ./ddl_qualified_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_qualified_name.js");
+const ddl_literal_1 = __webpack_require__(/*! ./ddl_literal */ "./node_modules/@abaplint/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
+/***/ },
 /***/ "./node_modules/@abaplint/core/build/src/ddl/expressions/index.js"
 /*!************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/ddl/expressions/index.js ***!
@@ -55610,13 +55957,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 */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_aspect.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_clauses */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_clauses.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_extend */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_extend_type */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_extend_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_include.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_literal */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_literal.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_name.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_named_include */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_named_include.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_qualified_name */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_qualified_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_structure_field */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_structure */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_structure.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_table_field */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_table_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_table */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_table.js"), exports);
 __exportStar(__webpack_require__(/*! ./ddl_type */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_type.js"), exports);
+__exportStar(__webpack_require__(/*! ./ddl_where */ "./node_modules/@abaplint/core/build/src/ddl/expressions/ddl_where.js"), exports);
 //# sourceMappingURL=index.js.map
 /***/ },
@@ -56008,8 +56363,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 */ "./node_modules/@abaplint/core/build/src/issue.js");
 Object.defineProperty(exports, "Issue", ({ enumerable: true, get: function () { return issue_1.Issue; } }));
 const config_1 = __webpack_require__(/*! ./config */ "./node_modules/@abaplint/core/build/src/config.js");
@@ -56103,6 +56458,7 @@ const severity_1 = __webpack_require__(/*! ./severity */ "./node_modules/@abapli
 Object.defineProperty(exports, "Severity", ({ enumerable: true, get: function () { return severity_1.Severity; } }));
 const ddl_parser_1 = __webpack_require__(/*! ./ddl/ddl_parser */ "./node_modules/@abaplint/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 */ "./node_modules/@abaplint/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 */ "./node_modules/@abaplint/core/build/src/rules_runner.js");
@@ -61241,6 +61597,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;
             }
@@ -68529,7 +68892,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.54";
+        return "2.119.55";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -105690,13 +106053,15 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Transpiler = exports.UnknownTypesEnum = exports.config = void 0;
+exports.Transpiler = exports.Chunk = exports.UnknownTypesEnum = exports.config = void 0;
 const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
 const validation_1 = __webpack_require__(/*! ./validation */ "./node_modules/@abaplint/transpiler/build/src/validation.js");
 Object.defineProperty(exports, "config", ({ enumerable: true, get: function () { return validation_1.config; } }));
 const unit_test_1 = __webpack_require__(/*! ./unit_test */ "./node_modules/@abaplint/transpiler/build/src/unit_test.js");
 const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
 Object.defineProperty(exports, "UnknownTypesEnum", ({ enumerable: true, get: function () { return types_1.UnknownTypesEnum; } }));
+const chunk_1 = __webpack_require__(/*! ./chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+Object.defineProperty(exports, "Chunk", ({ enumerable: true, get: function () { return chunk_1.Chunk; } }));
 const db_1 = __webpack_require__(/*! ./db */ "./node_modules/@abaplint/transpiler/build/src/db/index.js");
 const handle_table_1 = __webpack_require__(/*! ./handlers/handle_table */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_table.js");
 const handle_abap_1 = __webpack_require__(/*! ./handlers/handle_abap */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_abap.js");
@@ -105713,8 +106078,10 @@ const handle_fugr_1 = __webpack_require__(/*! ./handlers/handle_fugr */ "./node_
 const initialization_1 = __webpack_require__(/*! ./initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
 class Transpiler {
     options;
-    constructor(options) {
+    plugin;
+    constructor(options, plugin) {
         this.options = options;
+        this.plugin = plugin;
         if (this.options === undefined) {
             this.options = {};
         }
@@ -105732,15 +106099,17 @@ class Transpiler {
         reg.parse();
         this.validate(reg);
         const dbSetup = new db_1.DatabaseSetup(reg).run(this.options);
+        this.plugin?.amendDatabaseSetup?.(dbSetup, reg, this.options || {});
         const output = {
             objects: [],
             unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, this.options?.skip),
             unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, this.options?.skip),
-            initializationScript: new initialization_1.Initialization().script(reg, dbSetup, this.options),
-            initializationScript2: new initialization_1.Initialization().script(reg, dbSetup, this.options, true),
+            initializationScript: "",
+            initializationScript2: "",
             databaseSetup: dbSetup,
             reg: reg,
         };
+        const pluginOutputs = [];
         progress?.set(reg.getObjectCount().total, "Building");
         for (const obj of reg.getObjects()) {
             await progress?.tick("Building, " + obj.getName());
@@ -105780,12 +106149,22 @@ class Transpiler {
             else if (obj instanceof abaplint.Objects.MessageClass) {
                 output.objects.push(...new handle_msag_1.HandleMSAG().runObject(obj, reg));
             }
+            else if (this.plugin !== undefined) {
+                const handled = this.plugin.handleObject(obj, reg, this.options || {});
+                if (handled !== undefined) {
+                    output.objects.push(...handled);
+                    pluginOutputs.push(...handled);
+                }
+            }
         }
+        // after the object loop, plugin output files are imported by the initialization scripts
+        output.initializationScript = new initialization_1.Initialization().script(reg, dbSetup, this.options, false, pluginOutputs);
+        output.initializationScript2 = new initialization_1.Initialization().script(reg, dbSetup, this.options, true, pluginOutputs);
         return output;
     }
     // ///////////////////////////////
     validate(reg) {
-        const issues = new validation_1.Validation(this.options).run(reg);
+        const issues = new validation_1.Validation(this.options, this.plugin).run(reg);
         if (issues.length > 0) {
             const messages = issues.map(i => i.getKey() + ", " +
                 i.getMessage() + ", " +
@@ -105852,7 +106231,7 @@ function escapeNamespaceFilename(filename) {
     return filename.replace(/\//g, "%23");
 }
 class Initialization {
-    script(reg, dbSetup, options, useImport) {
+    script(reg, dbSetup, options, useImport, pluginOutputs) {
         let ret = "";
         if (useImport === true) {
             ret = `/* eslint-disable import/newline-after-import */
@@ -105895,13 +106274,13 @@ globalThis.abap = new runtime.ABAP();\n`;
         }
         ret += `}\n\n`;
         ret += `await initializeABAP();\n\n`;
-        ret += `${this.buildImports(reg, useImport, options)}`;
+        ret += `${this.buildImports(reg, useImport, options, pluginOutputs)}`;
         if (options?.setup?.postFunction !== undefined) {
             ret += `\n\nawait setup.${options?.setup?.postFunction}();\n`;
         }
         return ret;
     }
-    buildImports(reg, useImport, options) {
+    buildImports(reg, useImport, options, pluginOutputs) {
         // note: ES modules are hoised, so use the dynamic import(), due to setting of globalThis.abap
         // some sorting required: eg. a class constructor using constant from interface
         const list = [];
@@ -105914,6 +106293,9 @@ globalThis.abap = new runtime.ABAP();\n`;
                 return `await import("./${filename}.mjs");`;
             }
         };
+        for (const pluginOutput of pluginOutputs || []) {
+            list.push(imp(pluginOutput.filename.replace(/\.mjs$/i, "")));
+        }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.Table
                 || obj instanceof abaplint.Objects.DataElement
@@ -118893,6 +119275,74 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Validation = exports.config = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
+const defaultAllowedObjectTypes = [
+    "APIS",
+    "AUTH",
+    "CLAS",
+    "DEVC",
+    "DOMA",
+    "DTEL",
+    "ENHO",
+    "ENHS",
+    "ENQU",
+    "FUGR",
+    "HTTP",
+    "INTF",
+    "IWMO",
+    "IWOM",
+    "IWPR",
+    "IWSG",
+    "IWSV",
+    "MSAG",
+    "NROB",
+    "NSPC",
+    "OA2P",
+    "PARA",
+    "PINF",
+    "PROG",
+    "WAPA",
+    "SHLP",
+    "SHMA",
+    "SICF",
+    "SMIM",
+    "SPLO",
+    "SRFC",
+    "SUSC",
+    "SUSH",
+    "SUSO",
+    "SXCI",
+    "TABL",
+    "TOBJ",
+    "TRAN",
+    "TTYP",
+    "TYPE",
+    "VCLS",
+    "VIEW",
+    "W3MI",
+    "XSLT",
+    "ZN01",
+    "ZN02",
+    "ZN03",
+    "ZN04",
+    "ZN05",
+    "ZN06",
+    "ZN07",
+    "ZN08",
+    "ZN09",
+    "ZN10",
+    "ZN11",
+    "ZN12",
+    "ZN13",
+    "ZN14",
+    "ZN15",
+    "ZN16",
+    "ZN17",
+    "ZN18",
+    "ZN19",
+    "ZN20",
+    "ZN21",
+    "ZN22",
+];
 exports.config = {
     "global": {
         "files": "/**/*.*",
@@ -118915,75 +119365,7 @@ exports.config = {
         },
         "parser_error": true,
         "allowed_object_types": {
-            "allowed": [
-                "APIS",
-                "AUTH",
-                "CLAS",
-                "DEVC",
-                "DOMA",
-                "DTEL",
-                "ENHO",
-                "ENHS",
-                "ENQU",
-                "FUGR",
-                "HTTP",
-                "INTF",
-                "IWMO",
-                "IWOM",
-                "IWPR",
-                "IWSG",
-                "IWSV",
-                "MSAG",
-                "NROB",
-                "NSPC",
-                "OA2P",
-                "PARA",
-                "PINF",
-                "PROG",
-                "WAPA",
-                "SHLP",
-                "SHMA",
-                "SICF",
-                "SMIM",
-                "SMIM",
-                "SPLO",
-                "SRFC",
-                "SUSC",
-                "SUSH",
-                "SUSO",
-                "SXCI",
-                "TABL",
-                "TOBJ",
-                "TRAN",
-                "TTYP",
-                "TYPE",
-                "VCLS",
-                "VIEW",
-                "W3MI",
-                "XSLT",
-                "ZN01",
-                "ZN02",
-                "ZN03",
-                "ZN04",
-                "ZN05",
-                "ZN06",
-                "ZN07",
-                "ZN08",
-                "ZN09",
-                "ZN10",
-                "ZN11",
-                "ZN12",
-                "ZN13",
-                "ZN14",
-                "ZN15",
-                "ZN16",
-                "ZN17",
-                "ZN18",
-                "ZN19",
-                "ZN20",
-                "ZN21",
-                "ZN22",
-            ],
+            "allowed": defaultAllowedObjectTypes,
         },
         "unknown_types": true,
         "ambiguous_statement": true,
@@ -119000,8 +119382,10 @@ exports.config = {
 // hmm this ^ is okay? since lines will be prefixed with "abap.builtin"?
 class Validation {
     options;
-    constructor(options) {
+    plugin;
+    constructor(options, plugin) {
         this.options = options;
+        this.plugin = plugin;
     }
     run(reg) {
         if (this.options?.ignoreSyntaxCheck === true) {
@@ -119011,6 +119395,13 @@ class Validation {
             exports.config.rules.check_syntax = true;
         }
         exports.config.rules.forbidden_identifier.check = ["^unique\\d+$"];
+        const allowed = [...defaultAllowedObjectTypes];
+        for (const type of this.plugin?.objectTypes() || []) {
+            if (allowed.includes(type.toUpperCase()) === false) {
+                allowed.push(type.toUpperCase());
+            }
+        }
+        exports.config.rules.allowed_object_types.allowed = allowed;
         if (this.options?.unknownTypes === types_1.UnknownTypesEnum.runtimeError) {
             // this is not a constant, just a regex that happens to not match anything
             exports.config.syntax.errorNamespace = "VOID_EVERYTHING";
@@ -126121,6 +126512,17 @@ module.exports = require("fs");
 /***/ },
+/***/ "module"
+/*!*************************!*\
+  !*** external "module" ***!
+  \*************************/
+(module) {
+"use strict";
+module.exports = require("module");
+/***/ },
 /***/ "node:fs/promises"
 /*!***********************************!*\
   !*** external "node:fs/promises" ***!