@abaplint/core 2.83.3 → 2.83.7

package/build/src/abap/types/method_parameters.js

@@ -105,10 +105,13 @@ class MethodParameters {
             const nameToken = (_a = node.findFirstExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
             const ooName = nameToken === null || nameToken === void 0 ? void 0 : nameToken.getStr();
             const def = scope.findObjectDefinition(ooName);
+            const doVoid = def ? false : !scope.getDDIC().inErrorNamespace(ooName);
             if (def) {
                 scope.addReference(nameToken, def, _reference_1.ReferenceType.ObjectOrientedReference, filename);
             }
-            const doVoid = def ? false : !scope.getDDIC().inErrorNamespace(ooName);
+            else if (doVoid && ooName) {
+                scope.addReference(nameToken, undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: ooName.toUpperCase() });
+            }
             const eventName = (_b = node.findFirstExpression(Expressions.Field)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
             const event = new _object_oriented_1.ObjectOriented(scope).searchEvent(def, eventName);
             for (const p of handler.findAllExpressions(Expressions.MethodParamName)) {

package/build/src/cds/cds_lexer.js

@@ -50,11 +50,14 @@ class CDSLexer {
         let row = 1;
         let col = 1;
         let build = "";
-        const stream = new Stream(file.getRaw());
+        const stream = new Stream(file.getRaw().replace(/\r/g, "").replace(/\u00a0/g, " "));
+        let next = "";
         while (stream.length() > 0) {
-            const next = stream.takeNext();
+            const prev = next;
+            next = stream.takeNext();
             const nextNext = stream.peekNext();
             col++;
+            // string handling
             if (mode === Mode.String) {
                 build += next;
                 if (next === "'") {
@@ -63,6 +66,7 @@ class CDSLexer {
                 }
                 continue;
             }
+            // single line comment handling
             if (mode === Mode.SingleLineComment) {
                 if (next === "\n") {
                     mode = Mode.Default;
@@ -74,6 +78,18 @@ class CDSLexer {
                 build = result.add(build, row, col);
                 continue;
             }
+            // multi line comment handling
+            if (mode === Mode.MultiLineComment) {
+                if (prev === "*" && next === "/") {
+                    mode = Mode.Default;
+                }
+                continue;
+            }
+            else if (mode === Mode.Default && next === "/" && nextNext === "*") {
+                mode = Mode.MultiLineComment;
+                build = result.add(build, row, col);
+                continue;
+            }
             switch (next) {
                 case "'":
                     mode = Mode.String;
@@ -97,6 +113,10 @@ class CDSLexer {
                 case ")":
                 case "[":
                 case "]":
+                case "+":
+                case "-":
+                case "*":
+                case "/":
                     build = result.add(build, row, col);
                     result.add(next, row, col);
                     break;

package/build/src/cds/cds_parser.js

@@ -14,7 +14,10 @@ class CDSParser {
         }
         const tokens = cds_lexer_1.CDSLexer.run(file);
         // console.dir(tokens);
-        const res = combi_1.Combi.run(new Expressions.CDSDefineView(), tokens, version_1.defaultVersion);
+        let res = combi_1.Combi.run(new Expressions.CDSDefineView(), tokens, version_1.defaultVersion);
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineAbstract(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSAggregate = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSAggregate extends combi_1.Expression {
+    getRunnable() {
+        const value = (0, combi_1.alt)(_1.CDSName, _1.CDSCast, _1.CDSCase);
+        return (0, combi_1.seq)((0, combi_1.alt)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.opt)("DISTINCT"), value, ")");
+    }
+}
+exports.CDSAggregate = CDSAggregate;
+//# sourceMappingURL=cds_aggregate.js.map

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

@@ -3,13 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSAnnotation = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_annotation_array_1 = require("./cds_annotation_array");
 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)(/^\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)), "]");
-        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)));
+        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)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple)));
     }
 }
 exports.CDSAnnotation = CDSAnnotation;

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSAnnotationArray = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_annotation_simple_1 = require("./cds_annotation_simple");
+class CDSAnnotationArray extends combi_1.Expression {
+    getRunnable() {
+        const value = (0, combi_1.alt)(cds_annotation_simple_1.CDSAnnotationSimple, _1.CDSAnnotationObject, CDSAnnotationArray);
+        const valueList = (0, combi_1.seq)("[", value, (0, combi_1.star)((0, combi_1.seq)(",", value)), "]");
+        return valueList;
+    }
+}
+exports.CDSAnnotationArray = CDSAnnotationArray;
+//# sourceMappingURL=cds_annotation_array.js.map

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSAnnotationObject = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_annotation_simple_1 = require("./cds_annotation_simple");
+class CDSAnnotationObject extends combi_1.Expression {
+    getRunnable() {
+        const value = (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple);
+        const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
+        const valueNested = (0, combi_1.seq)("{", namedot, ":", value, (0, combi_1.star)((0, combi_1.seq)(",", namedot, ":", value)), "}");
+        return valueNested;
+    }
+}
+exports.CDSAnnotationObject = CDSAnnotationObject;
+//# sourceMappingURL=cds_annotation_object.js.map

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSAnnotationSimple = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSAnnotationSimple extends combi_1.Expression {
+    getRunnable() {
+        const value = (0, combi_1.alt)(_1.CDSString, "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_]+$/));
+        return value;
+    }
+}
+exports.CDSAnnotationSimple = CDSAnnotationSimple;
+//# sourceMappingURL=cds_annotation_simple.js.map

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSArithmetics = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSArithmetics extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        const val = (0, combi_1.alt)((0, combi_1.regex)(/\d+/), name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
+        const operator = (0, combi_1.alt)("+", "-", "*", "/");
+        return (0, combi_1.seq)(val, operator, val);
+    }
+}
+exports.CDSArithmetics = CDSArithmetics;
+//# sourceMappingURL=cds_arithmetics.js.map

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

@@ -3,14 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSAssociation = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_cardinality_1 = require("./cds_cardinality");
 class CDSAssociation extends combi_1.Expression {
     getRunnable() {
-        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));
+        return (0, combi_1.seq)("ASSOCIATION", (0, combi_1.opt)(cds_cardinality_1.CDSCardinality), "TO", (0, combi_1.opt)("PARENT"), _1.CDSName, (0, combi_1.opt)(_1.CDSAs), "ON", _1.CDSCondition);
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSCardinality = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSCardinality extends combi_1.Expression {
+    getRunnable() {
+        const cardinality = (0, combi_1.seq)("[", (0, combi_1.alt)("0", "1"), (0, combi_1.opt)((0, combi_1.seq)(".", ".", (0, combi_1.alt)("0", "1", "*"))), "]");
+        return cardinality;
+    }
+}
+exports.CDSCardinality = CDSCardinality;
+//# sourceMappingURL=cds_cardinality.js.map

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSCase = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSCase extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        const value = (0, combi_1.alt)(name, _1.CDSString, _1.CDSFunction, CDSCase, _1.CDSCast, _1.CDSArithmetics);
+        const simple = (0, combi_1.seq)("CASE", name, (0, combi_1.plus)((0, combi_1.seq)("WHEN", value, "THEN", value)), "ELSE", value, "END");
+        const complex = (0, combi_1.seq)("CASE", (0, combi_1.plus)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value)), (0, combi_1.opt)((0, combi_1.seq)("ELSE", value)), "END");
+        return (0, combi_1.alt)(simple, complex);
+    }
+}
+exports.CDSCase = CDSCase;
+//# sourceMappingURL=cds_case.js.map

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

@@ -6,7 +6,7 @@ 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")), ")");
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
 exports.CDSCast = CDSCast;

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSComposition = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_cardinality_1 = require("./cds_cardinality");
+class CDSComposition extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("COMPOSITION", (0, combi_1.opt)(cds_cardinality_1.CDSCardinality), "OF", _1.CDSName, (0, combi_1.opt)(_1.CDSAs));
+    }
+}
+exports.CDSComposition = CDSComposition;
+//# sourceMappingURL=cds_composition.js.map

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSCondition = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSCondition extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", (0, combi_1.alt)(_1.CDSName, _1.CDSString))));
+        const eq = (0, combi_1.seq)(name, (0, combi_1.alt)("=", "<>", "<", ">", ">=", "<=", "LIKE"), (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString));
+        const isInitial = (0, combi_1.seq)(name, "IS INITIAL");
+        const isNotInitial = (0, combi_1.seq)(name, "IS NOT INITIAL");
+        const isNull = (0, combi_1.seq)(name, "IS NULL");
+        const isNotNull = (0, combi_1.seq)(name, "IS NOT NULL");
+        const condition = (0, combi_1.alt)(eq, isNull, isNotNull, isInitial, isNotInitial);
+        const paren = (0, combi_1.seq)("(", CDSCondition, ")");
+        return (0, combi_1.seq)((0, combi_1.alt)(condition, paren), (0, combi_1.star)((0, combi_1.seq)((0, combi_1.alt)("AND", "OR"), (0, combi_1.alt)(condition, paren))));
+    }
+}
+exports.CDSCondition = CDSCondition;
+//# sourceMappingURL=cds_condition.js.map

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSDefineAbstract = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_name_1 = require("./cds_name");
+class CDSDefineAbstract extends combi_1.Expression {
+    getRunnable() {
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("KEY"), cds_name_1.CDSName, ":", cds_name_1.CDSName, ";");
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE ABSTRACT ENTITY"), cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)(field), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineAbstract = CDSDefineAbstract;
+//# sourceMappingURL=cds_define_abstract.js.map

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

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSDefineView = void 0;
 const _1 = require(".");
+const __1 = require("../..");
 const combi_1 = require("../../abap/2_statements/combi");
 const cds_name_1 = require("./cds_name");
 const cds_select_1 = require("./cds_select");
+const cds_with_parameters_1 = require("./cds_with_parameters");
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE VIEW"), cds_name_1.CDSName, "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;

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.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));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.alt)((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)))), cds_cast_1.CDSCast, _1.CDSAggregate, _1.CDSString, _1.CDSFunction, (0, combi_1.regex)(/^\d+$/), _1.CDSArithmetics, _1.CDSCase), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -5,12 +5,29 @@ 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 qualified = (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))));
+        const input = (0, combi_1.alt)(qualified, (0, combi_1.regex)(/^\d+$/), _1.CDSCast, CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString);
         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 dats_add_days = (0, combi_1.seq)("DATS_ADD_DAYS", "(", input, ",", input, ",", input, ")");
+        const dats_add_months = (0, combi_1.seq)("DATS_ADD_MONTHS", "(", input, ",", input, ",", input, ")");
+        const dats_days_between = (0, combi_1.seq)("DATS_DAYS_BETWEEN", "(", input, ",", input, ")");
+        const dats_is_valid = (0, combi_1.seq)("DATS_IS_VALID", "(", input, ")");
         const substring = (0, combi_1.seq)("SUBSTRING", "(", input, ",", input, ",", input, ")");
-        return (0, combi_1.alt)(substring, coalesce, concat, concat_with_space);
+        const bintohex = (0, combi_1.seq)("BINTOHEX", "(", input, ")");
+        const hextobin = (0, combi_1.seq)("HEXTOBIN", "(", input, ")");
+        const tstmp_to_dats = (0, combi_1.seq)("TSTMP_TO_DATS", "(", input, ",", input, ",", input, ",", input, ")");
+        const tstmp_to_tims = (0, combi_1.seq)("TSTMP_TO_TIMS", "(", input, ",", input, ",", input, ",", input, ")");
+        const tstmp_to_dst = (0, combi_1.seq)("TSTMP_TO_DST", "(", input, ",", input, ",", input, ",", input, ")");
+        const dats_tims_to_tstmp = (0, combi_1.seq)("DATS_TIMS_TO_TSTMP", "(", input, ",", input, ",", input, ",", input, ",", input, ")");
+        const tstmp_is_valid = (0, combi_1.seq)("TSTMP_IS_VALID", "(", input, ")");
+        const tstmp_current_utctimestamp = (0, combi_1.seq)("TSTMP_CURRENT_UTCTIMESTAMP", "(", ")");
+        const tstmp_seconds_between = (0, combi_1.seq)("TSTMP_SECONDS_BETWEEN", "(", input, ",", input, ",", input, ")");
+        const tstmp_add_seconds = (0, combi_1.seq)("TSTMP_ADD_SECONDS", "(", input, ",", input, ",", input, ")");
+        const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", input, ",", input, ")");
+        const abap_user_timezone = (0, combi_1.seq)("ABAP_USER_TIMEZONE", "(", input, ",", input, ",", input, ")");
+        return (0, combi_1.alt)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, concat_with_space, dats_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp);
     }
 }
 exports.CDSFunction = CDSFunction;

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

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

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSJoin = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_condition_1 = require("./cds_condition");
 class CDSJoin extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, ".", _1.CDSName);
-        return (0, combi_1.seq)("INNER JOIN", _1.CDSSource, "ON", name, "=", name);
+        return (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("INNER", "LEFT OUTER", "LEFT OUTER TO ONE")), "JOIN", _1.CDSSource, "ON", cds_condition_1.CDSCondition);
     }
 }
 exports.CDSJoin = CDSJoin;

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

@@ -4,7 +4,7 @@ exports.CDSName = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\$?[\w_]+$/);
+        return (0, combi_1.seq)((0, combi_1.opt)(":"), (0, combi_1.regex)(/^\$?#?[\w_]+$/));
     }
 }
 exports.CDSName = CDSName;

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSParameters = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSParameters extends combi_1.Expression {
+    getRunnable() {
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        const value = (0, combi_1.alt)(name, _1.CDSString);
+        return (0, combi_1.seq)("[", (0, combi_1.regex)(/\d+/), ":", name, "=", value, (0, combi_1.star)((0, combi_1.seq)("AND", name, "=", value)), "]");
+    }
+}
+exports.CDSParameters = CDSParameters;
+//# sourceMappingURL=cds_parameters.js.map

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.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));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)("DISTINCT"), "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.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.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSString = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSString extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^'[\w: -_]*'$/);
+    }
+}
+exports.CDSString = CDSString;
+//# sourceMappingURL=cds_string.js.map

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

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

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

@@ -5,10 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSWhere extends combi_1.Expression {
     getRunnable() {
-        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)));
+        return (0, combi_1.seq)("WHERE", _1.CDSCondition);
     }
 }
 exports.CDSWhere = CDSWhere;

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSWithParameters = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSWithParameters extends combi_1.Expression {
+    getRunnable() {
+        const param = (0, combi_1.seq)(_1.CDSName, ":", _1.CDSType);
+        return (0, combi_1.seq)("wITH PARAMETERS", param, (0, combi_1.star)((0, combi_1.seq)(",", param)));
+    }
+}
+exports.CDSWithParameters = CDSWithParameters;
+//# sourceMappingURL=cds_with_parameters.js.map

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

@@ -10,16 +10,32 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./cds_aggregate"), exports);
+__exportStar(require("./cds_aggregate"), exports);
+__exportStar(require("./cds_annotation_array"), exports);
+__exportStar(require("./cds_annotation_object"), exports);
+__exportStar(require("./cds_annotation_simple"), exports);
 __exportStar(require("./cds_annotation"), exports);
+__exportStar(require("./cds_arithmetics"), exports);
 __exportStar(require("./cds_as"), exports);
 __exportStar(require("./cds_association"), exports);
+__exportStar(require("./cds_cardinality"), exports);
+__exportStar(require("./cds_case"), exports);
 __exportStar(require("./cds_cast"), exports);
+__exportStar(require("./cds_composition"), exports);
+__exportStar(require("./cds_condition"), exports);
+__exportStar(require("./cds_define_abstract"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_function"), exports);
+__exportStar(require("./cds_group_by"), exports);
 __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
+__exportStar(require("./cds_parameters"), exports);
 __exportStar(require("./cds_select"), exports);
 __exportStar(require("./cds_source"), exports);
+__exportStar(require("./cds_string"), exports);
+__exportStar(require("./cds_type"), exports);
 __exportStar(require("./cds_where"), exports);
+__exportStar(require("./cds_with_parameters"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/ddl/ddl_lexer.js

@@ -6,7 +6,7 @@ const position_1 = require("../position");
 class DDLLexer {
     static run(file) {
         const step1 = [];
-        const lines = file.getRaw().replace(/\c/g, "").split("\n");
+        const lines = file.getRaw().replace(/\r/g, "").split("\n");
         for (const l of lines) {
             if (l.startsWith("@")) {
                 continue; // skip annotations for now

package/build/src/objects/data_definition.js

@@ -66,6 +66,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         if (this.isDirty() === false) {
             return { updated: false, runtime: 0 };
         }
+        const start = Date.now();
         this.sqlViewName = undefined;
         const match = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw().match(/@AbapCatalog\.sqlViewName: '(\w+)'/);
         if (match) {
@@ -79,8 +80,9 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         else {
             this.parserError = true;
         }
+        const end = Date.now();
         this.dirty = false;
-        return { updated: true, runtime: 0 };
+        return { updated: true, runtime: end - start };
     }
     findFieldNames(tree) {
         var _a;
@@ -88,7 +90,8 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         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);
+                const list = e.findDirectExpressions(expressions_1.CDSName);
+                found = list[list.length - 1];
             }
             if (found === undefined) {
                 continue;

package/build/src/registry.js

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

package/build/src/rules/7bit_ascii.js

@@ -17,7 +17,9 @@ class SevenBitAscii {
             key: "7bit_ascii",
             title: "Check for 7bit ascii",
             shortDescription: `Only allow characters from the 7bit ASCII set.`,
-            extendedInformation: `https://docs.abapopenchecks.org/checks/05/`,
+            extendedInformation: `https://docs.abapopenchecks.org/checks/05/
+
+Checkes files with extension ".abap" and ".asddls"`,
             tags: [_irule_1.RuleTag.SingleFile],
         };
     }
@@ -33,7 +35,8 @@ class SevenBitAscii {
     run(obj) {
         const output = [];
         for (const file of obj.getFiles()) {
-            if (file.getFilename().endsWith(".abap")) {
+            const filename = file.getFilename();
+            if (filename.endsWith(".abap") || filename.endsWith(".asddls")) {
                 const rows = file.getRawRows();
                 for (let i = 0; i < rows.length; i++) {
                     const found = /[\u007f-\uffff]/.exec(rows[i]);

package/package.json

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