@abaplint/core 2.113.26 → 2.113.28

package/build/abaplint.d.ts

@@ -881,6 +881,10 @@ export declare class CDSParser {
     parse(file: IFile | undefined): ExpressionNode | undefined;
 }
 
+declare class CDSPrefixedName extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSProviderContract extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2407,6 +2411,7 @@ declare namespace ExpressionsCDS {
         CDSName,
         CDSParametersSelect,
         CDSParameters,
+        CDSPrefixedName,
         CDSProviderContract,
         CDSRelation,
         CDSSelect,
@@ -6588,7 +6593,7 @@ export { Structures }
 declare class StructureType extends AbstractType {
     private readonly indexed;
     private readonly components;
-    constructor(components: IStructureComponent[], qualifiedName?: string, ddicName?: string);
+    constructor(components: IStructureComponent[], qualifiedName?: string, ddicName?: string, description?: string);
     getComponents(): IStructureComponent[];
     getComponentByName(name: string): AbstractType | undefined;
     toText(level: number): string;
@@ -6751,7 +6756,7 @@ declare class TableType extends AbstractObject {
 declare class TableType_2 extends AbstractType {
     private readonly rowType;
     private readonly options;
-    constructor(rowType: AbstractType, options: ITableOptions, qualifiedName?: string);
+    constructor(rowType: AbstractType, options: ITableOptions, qualifiedName?: string, description?: string);
     getOptions(): ITableOptions;
     isWithHeader(): boolean;
     getAccessType(): TableAccessType | undefined;

package/build/src/abap/types/basic/structure_type.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureType = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class StructureType extends _abstract_type_1.AbstractType {
-    constructor(components, qualifiedName, ddicName) {
+    constructor(components, qualifiedName, ddicName, description) {
         super({
             qualifiedName: qualifiedName,
             ddicName: ddicName,
+            description: description,
         });
         if (components.length === 0) {
             throw new Error("Structure does not contain any components");

package/build/src/abap/types/basic/table_type.js

@@ -17,9 +17,12 @@ var TableKeyType;
     TableKeyType["empty"] = "EMPTY";
 })(TableKeyType || (exports.TableKeyType = TableKeyType = {}));
 class TableType extends _abstract_type_1.AbstractType {
-    constructor(rowType, options, qualifiedName) {
+    constructor(rowType, options, qualifiedName, description) {
         var _a;
-        super({ qualifiedName: qualifiedName });
+        super({
+            qualifiedName: qualifiedName,
+            description: description,
+        });
         this.rowType = rowType;
         this.options = options;
         if (((_a = options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === TableAccessType.standard && options.primaryKey.isUnique === true) {

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

@@ -7,7 +7,7 @@ const cds_as_1 = require("./cds_as");
 const cds_cast_1 = require("./cds_cast");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), _1.CDSPrefixedName, (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSPrefixedName = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("./cds_name");
+const cds_parameters_1 = require("./cds_parameters");
+class CDSPrefixedName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)(cds_parameters_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", cds_name_1.CDSName, (0, combi_1.opt)(cds_parameters_1.CDSParameters))));
+    }
+}
+exports.CDSPrefixedName = CDSPrefixedName;
+//# sourceMappingURL=cds_prefixed_name.js.map

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

@@ -10,7 +10,7 @@ class CDSSelect extends combi_1.Expression {
         const fields = (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement));
         const distinct = (0, combi_1.str)("DISTINCT");
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"));
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)(distinct), (0, combi_1.opt)(fields), "FROM", _1.CDSSource, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.opt)(elements), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSHaving), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)(distinct), (0, combi_1.opt)(fields), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.opt)(elements), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSHaving), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;

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

@@ -5,7 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSAs));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSSource = CDSSource;

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

@@ -42,6 +42,7 @@ __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
 __exportStar(require("./cds_parameters_select"), exports);
 __exportStar(require("./cds_parameters"), exports);
+__exportStar(require("./cds_prefixed_name"), exports);
 __exportStar(require("./cds_provider_contract"), exports);
 __exportStar(require("./cds_relation"), exports);
 __exportStar(require("./cds_select"), exports);

package/build/src/objects/data_definition.js

@@ -110,7 +110,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
     }
     findDescription() {
         var _a;
-        const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@EndUserText\.label: '([\w ]+)'/);
+        const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@EndUserText\.label: '([\w,.: ]+)'/);
         if (match) {
             return match[1];
         }
@@ -128,7 +128,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         for (const e of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressions(expressions_1.CDSElement)) || []) {
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
-                const list = e.findDirectExpressions(expressions_1.CDSName);
+                const list = e.findAllExpressions(expressions_1.CDSName);
                 if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
                     found = list[0];
                 }
@@ -158,7 +158,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         var _a, _b, _c, _d, _e, _f, _g;
         for (const e of tree.findAllExpressions(expressions_1.CDSSource)) {
             const name = ((_a = e.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase().replace(/ /g, "")) || "ERROR";
-            const as = (_c = (_b = e.findDirectExpression(expressions_1.CDSAs)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(expressions_1.CDSName)) === null || _c === void 0 ? void 0 : _c.getFirstToken().getStr();
+            const as = (_c = (_b = e.findDirectExpression(expressions_1.CDSAs)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(expressions_1.CDSName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
             this.parsedData.sources.push({ name, as });
         }
         for (const e of tree.findAllExpressions(expressions_1.CDSRelation)) {

package/build/src/objects/table.js

@@ -247,7 +247,7 @@ class Table extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Table/Structure " + this.getName() + " does not contain any components");
         }
         reg.getDDICReferences().setUsing(this, references);
-        return new Types.StructureType(components, this.getName(), this.getName());
+        return new Types.StructureType(components, this.getName(), this.getName(), this.getDescription());
     }
     getTableCategory() {
         var _a;

package/build/src/objects/table_type.js

@@ -103,34 +103,34 @@ class TableType extends _abstract_object_1.AbstractObject {
         }
         else if (this.parsedXML.rowkind === "S") {
             const lookup = ddic.lookupTableOrView(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "E") {
             const lookup = ddic.lookupDataElement(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "L") {
             const lookup = ddic.lookupTableType(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "OBJECT") {
-            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), tableOptions, this.getName());
+            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), tableOptions, this.getName(), this.getDescription());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "DATA") {
-            type = new Types.TableType(new basic_1.DataReference(new Types.DataType()), tableOptions, this.getName());
+            type = new Types.TableType(new basic_1.DataReference(new Types.DataType()), tableOptions, this.getName(), this.getDescription());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype !== undefined) {
             const lookup = ddic.lookupObject(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, tableOptions, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName(), this.getDescription());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
@@ -146,7 +146,7 @@ class TableType extends _abstract_object_1.AbstractObject {
                     decimals: this.parsedXML.decimals,
                     infoText: this.getName(),
                 });
-                type = new Types.TableType(row, tableOptions, this.getName());
+                type = new Types.TableType(row, tableOptions, this.getName(), this.getDescription());
             }
         }
         else {

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.26";
+        return "2.113.28";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.26",
+    "version": "2.113.28",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.47.11",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.9",
-        "@types/node": "^22.7.7",
+        "@types/node": "^22.7.8",
         "chai": "^4.5.0",
         "eslint": "^9.13.0",
         "mocha": "^10.7.3",