@abaplint/core 2.83.3 → 2.83.4

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_annotation.js

@@ -6,9 +6,10 @@ 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)(/^\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, "}");
+        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_]+$/));
+        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)), "}");
+        const valueList = (0, combi_1.seq)("[", (0, combi_1.alt)(value, valueNested), (0, combi_1.star)((0, combi_1.seq)(",", (0, combi_1.alt)(value, valueNested))), "]");
         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)));
     }
 }

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

@@ -5,10 +5,10 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 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 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", "*"))), "]");
         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 cond = (0, combi_1.seq)(name, "=", (0, combi_1.alt)(name, _1.CDSString));
         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));
     }

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.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_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)((0, combi_1.seq)(".", _1.CDSName))), cds_cast_1.CDSCast), (0, combi_1.optPrio)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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_where.js

@@ -5,9 +5,8 @@ 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));
+        const condition = (0, combi_1.seq)(field, "=", (0, combi_1.alt)(_1.CDSString, field));
         return (0, combi_1.seq)("WHERE", condition, (0, combi_1.star)((0, combi_1.seq)("AND", condition)));
     }
 }

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

@@ -15,6 +15,7 @@ __exportStar(require("./cds_as"), exports);
 __exportStar(require("./cds_association"), exports);
 __exportStar(require("./cds_cast"), exports);
 __exportStar(require("./cds_define_view"), exports);
+__exportStar(require("./cds_define_abstract"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_join"), exports);
@@ -22,4 +23,5 @@ __exportStar(require("./cds_name"), exports);
 __exportStar(require("./cds_select"), exports);
 __exportStar(require("./cds_source"), exports);
 __exportStar(require("./cds_where"), exports);
+__exportStar(require("./cds_string"), exports);
 //# sourceMappingURL=index.js.map

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.4";
     }
     getDDICReferences() {
         return this.references;

package/package.json

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