@abaplint/core 2.93.87 → 2.93.89

package/build/abaplint.d.ts

@@ -671,6 +671,10 @@ declare class CDSGroupBy extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSInteger extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSJoin extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2096,6 +2100,7 @@ declare namespace ExpressionsCDS {
         CDSElement,
         CDSFunction,
         CDSGroupBy,
+        CDSInteger,
         CDSJoin,
         CDSName,
         CDSParametersSelect,

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

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSArithmetics = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("./cds_integer");
 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 val = (0, combi_1.alt)(cds_integer_1.CDSInteger, name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
         return (0, combi_1.seq)(val, operator, val);
     }

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

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSCondition = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("./cds_integer");
 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)("=", (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");
-        const isNotNull = (0, combi_1.seq)(name, "IS NOT NULL");
-        const condition = (0, combi_1.alt)(eq, isNull, isNotNull, isInitial, isNotInitial);
+        const left = (0, combi_1.alt)(name, _1.CDSFunction);
+        const compare = (0, combi_1.seq)(left, (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)(left, cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSString));
+        const is = (0, combi_1.seq)(left, "IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));
+        const condition = (0, combi_1.alt)(compare, is);
         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))));
     }

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)(cds_cast_1.CDSCast, _1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, (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, (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));
     }
 }
 exports.CDSElement = CDSElement;

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

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

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

@@ -35,6 +35,7 @@ __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_integer"), exports);
 __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
 __exportStar(require("./cds_parameters_select"), exports);

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.87",
+    "version": "2.93.89",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -51,7 +51,7 @@
         "@types/mocha": "^10.0.0",
         "@types/node": "^18.11.9",
         "chai": "^4.3.7",
-        "eslint": "^8.27.0",
+        "eslint": "^8.28.0",
         "mocha": "^10.1.0",
         "c8": "^7.12.0",
         "source-map-support": "^0.5.21",