@abaplint/core 2.83.2 → 2.83.3

package/build/abaplint.d.ts

@@ -1114,6 +1114,9 @@ declare class DataControl extends AbstractObject {
 
 declare class DataDefinition extends AbstractObject {
     private sqlViewName;
+    private parserError;
+    private fieldNames;
+    private sources;
     getType(): string;
     getAllowedNaming(): {
         maxLength: number;
@@ -1122,10 +1125,16 @@ declare class DataDefinition extends AbstractObject {
     getSQLViewName(): string | undefined;
     getDescription(): string | undefined;
     parseType(_reg: IRegistry): AbstractType;
+    listSources(): {
+        name: string;
+        as: string | undefined;
+    }[];
     setDirty(): void;
     findSourceFile(): IFile | undefined;
-    temporaryParse(): ExpressionNode | undefined;
+    hasParserError(): boolean | undefined;
     parse(): IParseResult;
+    private findFieldNames;
+    private findSources;
 }
 
 declare class DataDefinition_2 extends Expression {

package/build/src/cds/cds_lexer.js

@@ -88,11 +88,13 @@ class CDSLexer {
                     col = 0;
                     break;
                 case ";":
+                case ":":
                 case ",":
                 case ".":
                 case "{":
-                case ":":
                 case "}":
+                case "(":
+                case ")":
                 case "[":
                 case "]":
                     build = result.add(build, row, col);

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

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSAnnotation = void 0;
+const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSAnnotation extends combi_1.Expression {
     getRunnable() {
         // todo: add all the known annotations
-        const value = (0, combi_1.alt)((0, combi_1.regex)(/^'[\w ]+'$/), "true", "false", (0, combi_1.regex)(/^#\w+$/));
+        const value = (0, combi_1.alt)((0, combi_1.regex)(/^'[\w ]+'$/), "true", "false", (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^#\w+$/));
         const valueList = (0, combi_1.seq)("[", value, (0, combi_1.star)((0, combi_1.seq)(",", value)), "]");
-        return (0, combi_1.seq)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.plus)((0, combi_1.seq)(".", (0, combi_1.regex)(/^\w+$/))), (0, combi_1.opt)(":"), (0, combi_1.opt)((0, combi_1.alt)(valueList, value)));
+        const valueNested = (0, combi_1.seq)("{", _1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)), ":", value, "}");
+        return (0, combi_1.seq)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.star)((0, combi_1.seq)(".", (0, combi_1.regex)(/^\w+$/))), (0, combi_1.opt)(":"), (0, combi_1.opt)((0, combi_1.alt)(valueList, valueNested, value)));
     }
 }
 exports.CDSAnnotation = CDSAnnotation;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSAs = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSAs extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("AS", _1.CDSName);
+    }
+}
+exports.CDSAs = CDSAs;
+//# sourceMappingURL=cds_as.js.map

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

@@ -5,8 +5,12 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSAssociation extends combi_1.Expression {
     getRunnable() {
-        const cardinality = (0, combi_1.alt)("[0..1]", "[0..*]");
-        return (0, combi_1.seq)("ASSOCIATION", cardinality, "TO", _1.CDSName);
+        const cardinality = (0, combi_1.seq)("[", (0, combi_1.alt)("0", "1"), ".", ".", (0, combi_1.alt)("0", "1", "*"), "]");
+        const as = (0, combi_1.seq)("AS", _1.CDSName);
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.plus)((0, combi_1.seq)(".", _1.CDSName)));
+        const cond = (0, combi_1.seq)(name, "=", name);
+        const and = (0, combi_1.seq)("AND", cond);
+        return (0, combi_1.seq)("ASSOCIATION", cardinality, "TO", _1.CDSName, (0, combi_1.opt)(as), "ON", cond, (0, combi_1.star)(and));
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSCast = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSCast extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction), "AS", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
+    }
+}
+exports.CDSCast = CDSCast;
+//# sourceMappingURL=cds_cast.js.map

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

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSElement = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+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.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), _1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.alt)(_1.CDSName, cds_cast_1.CDSCast), (0, combi_1.optPrio)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSFunction = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSFunction extends combi_1.Expression {
+    getRunnable() {
+        const input = (0, combi_1.alt)(_1.CDSName, (0, combi_1.regex)(/^\d+$/));
+        const coalesce = (0, combi_1.seq)("COALESCE", "(", input, ",", input, ")");
+        const concat = (0, combi_1.seq)("CONCAT", "(", input, ",", input, ")");
+        const concat_with_space = (0, combi_1.seq)("CONCAT_WITH_SPACE", "(", input, ",", input, ",", input, ")");
+        const substring = (0, combi_1.seq)("SUBSTRING", "(", input, ",", input, ",", input, ")");
+        return (0, combi_1.alt)(substring, coalesce, concat, concat_with_space);
+    }
+}
+exports.CDSFunction = CDSFunction;
+//# sourceMappingURL=cds_function.js.map

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

@@ -5,7 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSJoin extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("INNER JOIN", _1.CDSName);
+        const name = (0, combi_1.seq)(_1.CDSName, ".", _1.CDSName);
+        return (0, combi_1.seq)("INNER JOIN", _1.CDSSource, "ON", name, "=", name);
     }
 }
 exports.CDSJoin = CDSJoin;

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

@@ -8,7 +8,7 @@ const cds_element_1 = require("./cds_element");
 const cds_join_1 = require("./cds_join");
 class CDSSelect extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.str)("SELECT FROM"), _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("AS", _1.CDSName)), (0, combi_1.opt)(cds_join_1.CDSJoin), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.plus)(cds_element_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", cds_element_1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere));
+        return (0, combi_1.seq)((0, combi_1.str)("SELECT FROM"), _1.CDSSource, (0, combi_1.opt)(cds_join_1.CDSJoin), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.plus)(cds_element_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", cds_element_1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere));
     }
 }
 exports.CDSSelect = CDSSelect;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSSource = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSSource extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)((0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
+    }
+}
+exports.CDSSource = CDSSource;
+//# sourceMappingURL=cds_source.js.map

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

@@ -5,7 +5,10 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSWhere extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("WHERE", _1.CDSName, "=", _1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
+        const constant = (0, combi_1.regex)(/^'[\w ]+'$/);
+        const field = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
+        const condition = (0, combi_1.seq)(field, "=", (0, combi_1.alt)(constant, field));
+        return (0, combi_1.seq)("WHERE", condition, (0, combi_1.star)((0, combi_1.seq)("AND", condition)));
     }
 }
 exports.CDSWhere = CDSWhere;

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

@@ -11,11 +11,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cds_annotation"), exports);
+__exportStar(require("./cds_as"), exports);
 __exportStar(require("./cds_association"), exports);
+__exportStar(require("./cds_cast"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
+__exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
 __exportStar(require("./cds_select"), exports);
+__exportStar(require("./cds_source"), exports);
 __exportStar(require("./cds_where"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/objects/data_definition.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataDefinition = void 0;
 const basic_1 = require("../abap/types/basic");
 const cds_parser_1 = require("../cds/cds_parser");
+const expressions_1 = require("../cds/expressions");
 const _abstract_object_1 = require("./_abstract_object");
 class DataDefinition extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
         this.sqlViewName = undefined;
+        this.parserError = undefined;
+        this.fieldNames = [];
+        this.sources = [];
     }
     getType() {
         return "DDLS";
@@ -26,18 +30,36 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         return undefined;
     }
     parseType(_reg) {
-        // todo
-        return new basic_1.VoidType("DDLS:todo");
+        this.parse();
+        if (this.fieldNames.length === 0) {
+            return new basic_1.VoidType("DDLS:todo");
+        }
+        else {
+            const components = [];
+            for (const f of this.fieldNames) {
+                components.push({
+                    name: f,
+                    type: new basic_1.VoidType("DDLS:fieldname"),
+                });
+            }
+            return new basic_1.StructureType(components);
+        }
+    }
+    listSources() {
+        return this.sources;
     }
     setDirty() {
         this.sqlViewName = undefined;
+        this.parserError = undefined;
+        this.fieldNames = [];
+        this.sources = [];
         super.setDirty();
     }
     findSourceFile() {
         return this.getFiles().find(f => f.getFilename().endsWith(".asddls"));
     }
-    temporaryParse() {
-        return new cds_parser_1.CDSParser().parse(this.findSourceFile());
+    hasParserError() {
+        return this.parserError;
     }
     parse() {
         var _a;
@@ -49,8 +71,40 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         if (match) {
             this.sqlViewName = match[1].toUpperCase();
         }
+        const tree = new cds_parser_1.CDSParser().parse(this.findSourceFile());
+        if (tree) {
+            this.findFieldNames(tree);
+            this.findSources(tree);
+        }
+        else {
+            this.parserError = true;
+        }
+        this.dirty = false;
         return { updated: true, runtime: 0 };
     }
+    findFieldNames(tree) {
+        var _a;
+        this.fieldNames = [];
+        for (const e of tree.findAllExpressions(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) {
+                found = e.findDirectExpression(expressions_1.CDSName);
+            }
+            if (found === undefined) {
+                continue;
+            }
+            this.fieldNames.push(found === null || found === void 0 ? void 0 : found.concatTokens());
+        }
+    }
+    findSources(tree) {
+        var _a, _b;
+        this.sources = [];
+        for (const e of tree.findAllExpressions(expressions_1.CDSSource)) {
+            const name = e.getFirstToken().getStr();
+            const as = (_b = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            this.sources.push({ name, as });
+        }
+    }
 }
 exports.DataDefinition = DataDefinition;
 //# sourceMappingURL=data_definition.js.map

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.83.2";
+        return "2.83.3";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/cds_parser_error.js

@@ -33,9 +33,9 @@ class CDSParserError {
     run(o) {
         const issues = [];
         if (o.getType() === "DDLS" && o instanceof objects_1.DataDefinition) {
-            const result = o.temporaryParse();
+            const hasError = o.hasParserError();
             const file = o.findSourceFile();
-            if (result === undefined && file) {
+            if (hasError === true && file) {
                 issues.push(issue_1.Issue.atRow(file, 1, "CDS Parser error", this.getMetadata().key));
             }
         }

package/package.json

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