@abaplint/core 2.113.97 → 2.113.99

package/build/abaplint.d.ts

@@ -7357,6 +7357,7 @@ export declare class VirtualPosition extends Position {
     readonly vcol: number;
     constructor(virtual: Position, row: number, col: number);
     equals(p: Position): boolean;
+    isAfter(p: Position | VirtualPosition): boolean;
 }
 
 export declare enum Visibility {

package/build/src/abap/2_statements/statements/export.js

@@ -7,7 +7,7 @@ const expressions_1 = require("../expressions");
 // todo, cloud, split?
 class Export {
     getMatcher() {
-        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
+        const from = (0, combi_1.seq)((0, combi_1.altPrio)("FROM", "="), expressions_1.Source);
         const client = (0, combi_1.seq)("CLIENT", expressions_1.Source);
         const id = (0, combi_1.seq)("ID", expressions_1.Source);
         const using = (0, combi_1.seq)("USING", expressions_1.Source);
@@ -19,7 +19,7 @@ class Export {
         const database = (0, combi_1.seq)("DATABASE", cluster, (0, combi_1.per)(from, client, id, using));
         const target = (0, combi_1.alt)(buffer, memory, database, table, shared);
         const left = (0, combi_1.alt)(expressions_1.FieldSub, expressions_1.FieldSymbol);
-        const source = (0, combi_1.alt)((0, combi_1.plus)((0, combi_1.altPrio)(expressions_1.ParameterS, (0, combi_1.seq)(left, from), left)), expressions_1.Dynamic, expressions_1.Constant);
+        const source = (0, combi_1.alt)((0, combi_1.plus)((0, combi_1.altPrio)((0, combi_1.seq)(left, from), left)), expressions_1.Dynamic, expressions_1.Constant);
         const compression = (0, combi_1.seq)("COMPRESSION", (0, combi_1.alt)("ON", "OFF"));
         const hint = (0, combi_1.seq)("CODE PAGE HINT", expressions_1.Source);
         return (0, combi_1.seq)("EXPORT", source, "TO", target, (0, combi_1.opt)(compression), (0, combi_1.opt)(hint));

package/build/src/abap/flow/selection_events.js

@@ -23,5 +23,6 @@ exports.DECLARATION_STUFF = [
     Statements.Parameter,
     Statements.SelectionScreen,
     Statements.ConstantBegin,
+    Statements.Define,
 ];
 //# sourceMappingURL=selection_events.js.map

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

@@ -7,7 +7,7 @@ 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.optPrio)((0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName))));
-        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, name);
+        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, _1.CDSAggregate, name);
         const operators = (0, combi_1.altPrio)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "<", ">", "LIKE", "NOT LIKE");
         const compare = (0, combi_1.seq)(operators, (0, combi_1.altPrio)(left, cds_integer_1.CDSInteger));
         const is = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));

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)(_1.CDSAggregate, _1.CDSString, _1.CDSArithmetics, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), _1.CDSPrefixedName, (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.CDSArithmetics, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSName, ": REDIRECTED TO", (0, combi_1.opt)((0, combi_1.alt)("PARENT", "COMPOSITION CHILD")), _1.CDSName), _1.CDSPrefixedName, _1.CDSInteger), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -34,6 +34,13 @@ class CDSFunction extends combi_1.Expression {
         const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const abap_user_timezone = (0, combi_1.seq)("ABAP_USER_TIMEZONE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const mod = (0, combi_1.seq)("MOD", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const replace = (0, combi_1.seq)("REPLACE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const lpad = (0, combi_1.seq)("LPAD", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const rpad = (0, combi_1.seq)("RPAD", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const instr = (0, combi_1.seq)("INSTR", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const length = (0, combi_1.seq)("LENGTH", "(", _1.CDSFunctionInput, ")");
+        const ltrim = (0, combi_1.seq)("LTRIM", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
+        const rtrim = (0, combi_1.seq)("RTRIM", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const left = (0, combi_1.seq)("LEFT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const right = (0, combi_1.seq)("RIGHT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const conversionInput = (0, combi_1.seq)(_1.CDSName, "=", ">", _1.CDSFunctionInput);
@@ -41,7 +48,7 @@ class CDSFunction extends combi_1.Expression {
         const unitConversion = (0, combi_1.seq)("UNIT_CONVERSION", "(", conversionInputs, ")");
         const currencyConversion = (0, combi_1.seq)("CURRENCY_CONVERSION", "(", conversionInputs, ")");
         const decimalShift = (0, combi_1.seq)("DECIMAL_SHIFT", "(", conversionInputs, ")");
-        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, 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, mod, left, right, unitConversion, currencyConversion, decimalShift);
+        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, 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, mod, left, right, lpad, rpad, instr, length, ltrim, rtrim, replace, unitConversion, currencyConversion, decimalShift);
     }
 }
 exports.CDSFunction = CDSFunction;

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSFunctionInput extends combi_1.Expression {
     getRunnable() {
         const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
-        const input = (0, combi_1.altPrio)(_1.CDSCast, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, (0, combi_1.regex)(/^\d+$/));
+        const input = (0, combi_1.altPrio)(_1.CDSCast, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
         return input;
     }
 }

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

@@ -4,7 +4,7 @@ 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+$/);
+        return (0, combi_1.seq)((0, combi_1.opt)("-"), (0, combi_1.regex)(/^\d+$/));
     }
 }
 exports.CDSInteger = CDSInteger;

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

@@ -6,7 +6,9 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_condition_1 = require("./cds_condition");
 class CDSJoin extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER")), "JOIN", _1.CDSSource, "ON", cds_condition_1.CDSCondition);
+        const cond = (0, combi_1.seq)(_1.CDSSource, "ON", cds_condition_1.CDSCondition);
+        const foo = (0, combi_1.altPrio)((0, combi_1.seq)("(", cond, ")"), cond);
+        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER")), "JOIN", foo);
     }
 }
 exports.CDSJoin = CDSJoin;

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.97";
+        return "2.113.99";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/cds_parser_error.js

@@ -37,7 +37,9 @@ class CDSParserError {
             const hasError = object.hasParserError();
             const file = object.findSourceFile();
             if (hasError === true && file) {
-                issues.push(issue_1.Issue.atRow(file, 1, "CDS Parser error", this.getMetadata().key, this.getConfig().severity));
+                const empty = file.getRaw().length === 0 ? ", empty file" : "";
+                const message = "CDS Parser error" + empty;
+                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.getConfig().severity));
             }
         }
         return issues;

package/build/src/virtual_position.js

@@ -16,6 +16,26 @@ class VirtualPosition extends position_1.Position {
         const casted = p;
         return super.equals(this) && this.vrow === casted.vrow && this.vcol === casted.vcol;
     }
+    isAfter(p) {
+        if (p instanceof VirtualPosition) {
+            if (this.getRow() > p.getRow()) {
+                return true;
+            }
+            if (this.getRow() === p.getRow() && this.getCol() > p.getCol()) {
+                return true;
+            }
+            if (this.getRow() === p.getRow() && this.getCol() === p.getCol() && this.vrow > p.vrow) {
+                return true;
+            }
+            if (this.getRow() === p.getRow() && this.getCol() === p.getCol() && this.vrow === p.vrow && this.vcol > p.vcol) {
+                return true;
+            }
+            return false;
+        }
+        else {
+            return super.isAfter(p);
+        }
+    }
 }
 exports.VirtualPosition = VirtualPosition;
 //# sourceMappingURL=virtual_position.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.97",
+    "version": "2.113.99",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,9 +53,9 @@
         "@microsoft/api-extractor": "^7.49.1",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^22.10.7",
+        "@types/node": "^22.10.10",
         "chai": "^4.5.0",
-        "eslint": "^9.18.0",
+        "eslint": "^9.19.0",
         "mocha": "^11.1.0",
         "c8": "^10.1.3",
         "source-map-support": "^0.5.21",