@abaplint/core 2.91.34 → 2.91.37

package/build/abaplint.d.ts

@@ -615,6 +615,10 @@ declare class CDSDefineAbstract extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSDefineProjection extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSDefineView extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2014,6 +2018,7 @@ declare namespace ExpressionsCDS {
         CDSComposition,
         CDSCondition,
         CDSDefineAbstract,
+        CDSDefineProjection,
         CDSDefineView,
         CDSElement,
         CDSFunction,

package/build/src/cds/cds_lexer.js

@@ -80,6 +80,11 @@ class CDSLexer {
                 build = result.add(build, row, col);
                 continue;
             }
+            else if (mode === Mode.Default && next === "-" && nextNext === "-") {
+                mode = Mode.SingleLineComment;
+                build = result.add(build, row, col);
+                continue;
+            }
             // multi line comment handling
             if (mode === Mode.MultiLineComment) {
                 if (next === "\n") {
@@ -118,6 +123,9 @@ class CDSLexer {
                 case ")":
                 case "[":
                 case "]":
+                case "=":
+                case "<":
+                case ">":
                 case "+":
                 case "-":
                 case "*":

package/build/src/cds/cds_parser.js

@@ -18,6 +18,9 @@ class CDSParser {
         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)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineProjection(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }

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

@@ -5,7 +5,8 @@ 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);
+        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.CDSCast, _1.CDSCase);
         return (0, combi_1.seq)((0, combi_1.alt)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.opt)("DISTINCT"), value, ")");
     }
 }

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

@@ -7,7 +7,7 @@ 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 simple = (0, combi_1.seq)("CASE", (0, combi_1.alt)(name, _1.CDSFunction), (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);
     }

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

@@ -6,7 +6,7 @@ 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", "NOT LIKE"), (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString));
+        const eq = (0, combi_1.seq)(name, (0, combi_1.alt)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), "<", ">", (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "LIKE", "NOT 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");

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

@@ -6,7 +6,7 @@ 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, ";");
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", _1.CDSType, ";");
         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)(";"));
     }
 }

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSDefineProjection = void 0;
+const _1 = require(".");
+const __1 = require("../..");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSDefineProjection extends combi_1.Expression {
+    getRunnable() {
+        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")), _1.CDSName, "PROVIDER CONTRACT", _1.CDSName, "AS PROJECTION ON", _1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+    }
+}
+exports.CDSDefineProjection = CDSDefineProjection;
+//# sourceMappingURL=cds_define_projection.js.map

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

@@ -29,6 +29,7 @@ __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_projection"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_function"), exports);

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.34",
+    "version": "2.91.37",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.29.3",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.9",
+        "@types/node": "^18.7.11",
         "chai": "^4.3.6",
         "eslint": "^8.22.0",
         "mocha": "^10.0.0",