@abaplint/core 2.115.28 → 2.116.0

package/build/src/cds/cds_lexer.js

@@ -56,7 +56,7 @@ class CDSLexer {
         let row = 1;
         let col = 1;
         let build = "";
-        const stream = new Stream(file.getRaw().replace(/\r/g, "").replace(/\u00a0/g, " "));
+        const stream = new Stream(file.getRaw().replace(/\r/g, "").replace(/\u00a0/g, " ").replace(/\u000b/g, " "));
         let next = "";
         while (stream.length() > 0) {
             const prev = next;
@@ -67,7 +67,12 @@ class CDSLexer {
             if (mode === Mode.String) {
                 build += next;
                 if (next === "'" && nextNext === "'") {
-                    // escaped single quote, continue string
+                    // escaped single quote (doubled), continue string
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\\" && nextNext === "'") {
+                    // backslash-escaped single quote, continue string
                     build += stream.takeNext();
                     col++;
                 }
@@ -113,6 +118,8 @@ class CDSLexer {
             else if (mode === Mode.Default && next === "/" && nextNext === "*") {
                 mode = Mode.MultiLineComment;
                 build = result.add(build, row, col, mode);
+                stream.takeNext(); // consume the '*' so it doesn't become prev for '*/' detection
+                col++;
                 continue;
             }
             switch (next) {
@@ -140,6 +147,7 @@ class CDSLexer {
                 case ")":
                 case "[":
                 case "]":
+                case "!":
                 case "=":
                 case "<":
                 case ">":

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

@@ -5,8 +5,11 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSAggregate extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.alt)(name, "*", _1.CDSCast, _1.CDSCase, _1.CDSFunction);
+        // CDSPrefixedName handles dotted paths with path filters e.g. a._Assoc[filter].Field
+        // CDSArithmetics handles expressions like sum(A + B), max(A * 100)
+        // fieldAsType handles avg(field AS type) / sum(field AS type) — SAP inline type coercion
+        const fieldAsType = (0, combi_1.seq)(_1.CDSPrefixedName, "AS", _1.CDSType);
+        const value = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSCase, _1.CDSFunction, fieldAsType, _1.CDSPrefixedName, _1.CDSString, "*");
         return (0, combi_1.seq)((0, combi_1.altPrio)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.opt)("DISTINCT"), value, ")");
     }
 }

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

@@ -7,8 +7,8 @@ const cds_annotation_array_1 = require("./cds_annotation_array");
 class CDSAnnotation extends combi_1.Expression {
     getRunnable() {
         const nameWithSlash = (0, combi_1.seq)((0, combi_1.regex)(/^\w+$/), (0, combi_1.star)((0, combi_1.seq)("/", (0, combi_1.regex)(/^\w+$/))));
-        // Support both "@Name" (single token) and "@ Name" (two tokens with space)
-        const annotationStart = (0, combi_1.alt)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.seq)("@", (0, combi_1.regex)(/^\w+$/)));
+        // Support both "@Name" (single token), "@ Name" (two tokens), and "@< Name" (inline backward annotation)
+        const annotationStart = (0, combi_1.alt)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.seq)("@", (0, combi_1.regex)(/^\w+$/)), (0, combi_1.seq)("@", "<", (0, combi_1.regex)(/^\w+$/)));
         return (0, combi_1.seq)(annotationStart, (0, combi_1.star)((0, combi_1.seq)(".", nameWithSlash)), (0, combi_1.opt)((0, combi_1.seq)(":", (0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple))));
     }
 }

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

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSAnnotationSimple = void 0;
 const _1 = require(".");
+const cds_prefixed_name_1 = require("./cds_prefixed_name");
 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", "null", (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)("#", "(", _1.CDSString, ")"), (0, combi_1.seq)("#", "(", (0, combi_1.regex)(/^[\w_]+$/), ")"), (0, combi_1.regex)(/^#[\w_]+$/));
+        const value = (0, combi_1.alt)(_1.CDSString, "true", "false", "null", (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)("#", "(", _1.CDSString, ")"), 
+        // #(_Header.Field) — dotted path inside #(...)
+        (0, combi_1.seq)("#", "(", cds_prefixed_name_1.CDSPrefixedName, ")"), (0, combi_1.seq)("#", "(", (0, combi_1.regex)(/^[\w_]+$/), ")"), (0, combi_1.regex)(/^#[\w_]+$/));
         return value;
     }
 }

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

@@ -28,10 +28,11 @@ class CDSArithmetics extends combi_1.Expression {
         // Unary operator prefix, e.g. -field, +field
         const unary = (0, combi_1.altPrio)("-", "+");
         const unaryExpression = (0, combi_1.seq)(unary, val);
-        // An operand is either a parenthesized sub-expression (any depth) or a bare value.
+        // An operand is a paren, unary-prefixed value, or bare value.
+        // Including unaryExpression allows "A + + B" and "A + -B" patterns.
         // CDSArithParen = "(" altPrio(CDSArithmetics, CDSArithParen, val) ")" — separate singleton that
         // can recursively contain itself, enabling deeply nested parentheses without infinite recursion.
-        const operand = (0, combi_1.altPrio)(_1.CDSArithParen, val);
+        const operand = (0, combi_1.altPrio)(_1.CDSArithParen, unaryExpression, val);
         const operatorValue = (0, combi_1.seq)(operator, operand);
         // Main form: operand op operand op ... (leading term may itself be a paren)
         const withOperators = (0, combi_1.seq)(operand, (0, combi_1.plusPrio)(operatorValue));

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

@@ -5,7 +5,9 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSAs extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("AS", _1.CDSName);
+        // Greedy opt (not optPrio) — avoids exponential backtracking in CDSElement
+        const colonType = (0, combi_1.seq)(":", (0, combi_1.alt)(_1.CDSType, _1.CDSName, "LOCALIZED"));
+        return (0, combi_1.seq)("AS", _1.CDSName, (0, combi_1.opt)(colonType));
     }
 }
 exports.CDSAs = CDSAs;

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

@@ -6,7 +6,13 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_cardinality_1 = require("./cds_cardinality");
 class CDSAssociation extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("ASSOCIATION", (0, combi_1.opt)(cds_cardinality_1.CDSCardinality), "TO", (0, combi_1.opt)("PARENT"), _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));
+        // Text cardinality: "to exact one", "to one", "to many" — no brackets
+        const textCardinality = (0, combi_1.seq)((0, combi_1.opt)("EXACT"), (0, combi_1.altPrio)("ONE", "MANY"));
+        // "association of one to many Target as _Alias on condition" — OF + cardinality form
+        const ofForm = (0, combi_1.seq)("ASSOCIATION", "OF", cds_cardinality_1.CDSCardinality, "TO", _1.CDSRelation, "ON", _1.CDSCondition);
+        // "association [0..1] to Target as _Alias on condition" — standard form
+        const standardForm = (0, combi_1.seq)("ASSOCIATION", (0, combi_1.opt)(cds_cardinality_1.CDSCardinality), "TO", (0, combi_1.opt)((0, combi_1.altPrio)(textCardinality, "PARENT")), _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));
+        return (0, combi_1.altPrio)(ofForm, standardForm);
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -6,7 +6,7 @@ class CDSCardinality extends combi_1.Expression {
     getRunnable() {
         const numeric = (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 num = (0, combi_1.alt)("ONE", "MANY");
-        const text = (0, combi_1.seq)("OF", num, "TO", num);
+        const text = (0, combi_1.seq)(num, "TO", num);
         return (0, combi_1.alt)(numeric, text);
     }
 }

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

@@ -6,7 +6,12 @@ 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.CDSRelation);
+        const num = (0, combi_1.altPrio)("ONE", "MANY");
+        // Text cardinality after OF: "of exact one to many", "of one to many", or bare "of many" / "of one"
+        const textCardinality = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.opt)("EXACT"), num, "TO", num), (0, combi_1.seq)((0, combi_1.opt)("EXACT"), num));
+        // Only numeric cardinality [0..*] may appear before OF; text cardinality goes after OF.
+        const numericCardinality = (0, combi_1.seq)("[", (0, combi_1.altPrio)("0", "1", "*"), (0, combi_1.opt)((0, combi_1.seq)(".", ".", (0, combi_1.altPrio)("0", "1", "*"))), "]");
+        return (0, combi_1.seq)("COMPOSITION", (0, combi_1.opt)(numericCardinality), "OF", (0, combi_1.opt)((0, combi_1.altPrio)(cds_cardinality_1.CDSCardinality, textCardinality)), _1.CDSRelation);
     }
 }
 exports.CDSComposition = CDSComposition;

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_integer_1 = require("./cds_integer");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
-        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, _1.CDSAggregate, _1.CDSPrefixedName);
+        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSCast, _1.CDSFunction, _1.CDSAggregate, _1.CDSPrefixedName);
         const nonLikeOperators = (0, combi_1.altPrio)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "<", ">");
         const likeOperators = (0, combi_1.altPrio)("LIKE", "NOT LIKE");
         // Right side of comparison: simple values first, then parenthesized, then full arithmetic last.

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

@@ -10,7 +10,7 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const siblingsOrderField = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.opt)(sortDirection));
         const siblingsOrder = (0, combi_1.seq)("SIBLINGS", "ORDER", "BY", siblingsOrderField, (0, combi_1.star)((0, combi_1.seq)(",", siblingsOrderField)));
         const directory = (0, combi_1.seq)("DIRECTORY", _1.CDSName, "FILTER", "BY", _1.CDSCondition);
-        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", "ALLOWED")), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", "BREAKUP")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("FORCE", "NONE", "EMPTY"))));
+        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", _1.CDSInteger)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED"))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", "BREAKUP")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("FORCE", "NONE", "EMPTY", "OFF"))));
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
     }
 }

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

@@ -6,7 +6,7 @@ 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, (0, combi_1.opt)(_1.CDSProviderContract), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSAs), (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)(_1.CDSWhere), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;

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

@@ -7,7 +7,7 @@ const cds_name_1 = require("./cds_name");
 class CDSDefineTableFunction extends combi_1.Expression {
     getRunnable() {
         const methodName = (0, combi_1.seq)(cds_name_1.CDSName, "=", ">", cds_name_1.CDSName);
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineTableFunction = CDSDefineTableFunction;

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

@@ -10,7 +10,7 @@ const cds_with_parameters_1 = require("./cds_with_parameters");
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
         const columnAlias = (0, combi_1.seq)("(", cds_name_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", cds_name_1.CDSName)), ")");
-        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)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("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)(columnAlias), (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_function.js

@@ -12,6 +12,7 @@ class CDSFunction extends combi_1.Expression {
         const dats_add_months = (0, combi_1.seq)("DATS_ADD_MONTHS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const dats_days_between = (0, combi_1.seq)("DATS_DAYS_BETWEEN", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const dats_is_valid = (0, combi_1.seq)("DATS_IS_VALID", "(", _1.CDSFunctionInput, ")");
+        const tims_is_valid = (0, combi_1.seq)("TIMS_IS_VALID", "(", _1.CDSFunctionInput, ")");
         const substring = (0, combi_1.seq)("SUBSTRING", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const bintohex = (0, combi_1.seq)("BINTOHEX", "(", _1.CDSFunctionInput, ")");
         const hextobin = (0, combi_1.seq)("HEXTOBIN", "(", _1.CDSFunctionInput, ")");
@@ -29,6 +30,7 @@ class CDSFunction extends combi_1.Expression {
         const dats_tims_to_tstmp = (0, combi_1.seq)("DATS_TIMS_TO_TSTMP", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const tstmp_is_valid = (0, combi_1.seq)("TSTMP_IS_VALID", "(", _1.CDSFunctionInput, ")");
         const tstmp_current_utctimestamp = (0, combi_1.seq)("TSTMP_CURRENT_UTCTIMESTAMP", "(", ")");
+        const utcl_current = (0, combi_1.seq)("UTCL_CURRENT", "(", ")");
         const tstmp_seconds_between = (0, combi_1.seq)("TSTMP_SECONDS_BETWEEN", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const tstmp_add_seconds = (0, combi_1.seq)("TSTMP_ADD_SECONDS", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
@@ -44,12 +46,14 @@ class CDSFunction extends combi_1.Expression {
         const left = (0, combi_1.seq)("LEFT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const right = (0, combi_1.seq)("RIGHT", "(", _1.CDSFunctionInput, ",", _1.CDSFunctionInput, ")");
         const fltp_to_dec = (0, combi_1.seq)("FLTP_TO_DEC", "(", _1.CDSFunctionInput, "AS", _1.CDSType, ")");
+        const curr_to_decfloat_amount = (0, combi_1.seq)("CURR_TO_DECFLOAT_AMOUNT", "(", _1.CDSFunctionInput, ")");
         const conversionInput = (0, combi_1.seq)(_1.CDSName, "=", ">", _1.CDSFunctionInput);
         const conversionInputs = (0, combi_1.seq)(conversionInput, (0, combi_1.starPrio)((0, combi_1.seq)(",", conversionInput)));
         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, lpad, rpad, instr, length, ltrim, rtrim, replace, unitConversion, currencyConversion, decimalShift, fltp_to_dec);
+        const ratioOf = (0, combi_1.seq)("RATIO_OF", "(", 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, tims_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, utcl_current, 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, fltp_to_dec, ratioOf, curr_to_decfloat_amount);
     }
 }
 exports.CDSFunction = CDSFunction;

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_condition_1 = require("./cds_condition");
 class CDSJoin extends combi_1.Expression {
     getRunnable() {
-        const joinTypes = (0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER MANY TO EXACT ONE", "LEFT OUTER ONE TO EXACT ONE", "LEFT OUTER ONE TO MANY", "LEFT OUTER TO ONE", "LEFT OUTER TO MANY", "LEFT OUTER", "INNER ONE TO MANY", "INNER MANY TO ONE", "INNER ONE TO EXACT ONE", "INNER MANY TO EXACT ONE", "INNER", "CROSS", "RIGHT OUTER"));
+        const joinTypes = (0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER MANY TO EXACT ONE", "LEFT OUTER ONE TO EXACT ONE", "LEFT OUTER ONE TO MANY", "LEFT OUTER TO ONE", "LEFT OUTER TO MANY", "LEFT OUTER", "INNER ONE TO MANY", "INNER MANY TO ONE", "INNER ONE TO EXACT ONE", "INNER MANY TO EXACT ONE", "INNER TO MANY", "INNER TO ONE", "INNER TO EXACT ONE", "INNER", "CROSS", "RIGHT OUTER"));
         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);
         // Parenthesized join sub-expression: JOIN (src innerJOIN src ON cond) ON outerCond

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

@@ -9,7 +9,8 @@ class CDSSelect extends combi_1.Expression {
     getRunnable() {
         const fields = (0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement);
         const distinct = (0, combi_1.str)("DISTINCT");
-        const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSElement)));
+        // elem (,elem)* [,] — handles separator commas and optional trailing comma
+        const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
         return (0, combi_1.seq)("SELECT", (0, combi_1.optPrio)(distinct), (0, combi_1.opt)((0, combi_1.altPrio)("*", fields)), "FROM", _1.CDSSource, (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, cds_association_1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere), (0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.optPrio)(_1.CDSHaving), (0, combi_1.optPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), CDSSelect)));
     }

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

@@ -6,8 +6,9 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
         const singleSource = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
-        // FROM ( src [JOIN src ON cond]* ) — parenthesized join chain as primary source
-        const parenSource = (0, combi_1.seq)("(", singleSource, (0, combi_1.star)(_1.CDSJoin), ")");
+        // FROM ( src [JOIN src ON cond]* ) — parenthesized join chain, arbitrarily nested
+        // CDSSource is self-referential here to handle: (((T1 join T2) join T3) join T4)
+        const parenSource = (0, combi_1.seq)("(", (0, combi_1.altPrio)(CDSSource, singleSource), (0, combi_1.star)(_1.CDSJoin), ")");
         return (0, combi_1.altPrio)(parenSource, singleSource);
     }
 }

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

@@ -4,8 +4,9 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        // Allow any character except unescaped single quote; '' is an escaped single quote
-        const reg = (0, combi_1.regex)(/^'([^']|'')*'$/);
+        // Allow any character except unescaped single quote; '' or \' are escaped single quotes.
+        // Standalone backslashes (e.g. 'C:\\temp') are also valid as long as they don't form \'.
+        const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\(?!'))*'$/);
         // Typed literal: abap.char 'X' — previously lexed as abap . char'X' (single token)
         // now correctly lexed as three tokens: abap, ., char, 'value'
         const abap = (0, combi_1.seq)("abap", ".", (0, combi_1.regex)(/^char$/), reg);

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

@@ -5,7 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSWithParameters extends combi_1.Expression {
     getRunnable() {
-        const param = (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), _1.CDSName, ":", _1.CDSType);
+        const param = (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), _1.CDSName, ":", _1.CDSType, (0, combi_1.starPrio)(_1.CDSAnnotation));
         return (0, combi_1.seq)("WITH PARAMETERS", param, (0, combi_1.star)((0, combi_1.seq)(",", param)));
     }
 }

package/build/src/registry.js

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

package/build/src/rules/aff_and_xml.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AFFAndXML = exports.AFFAndXMLConf = void 0;
+const issue_1 = require("../issue");
+const _irule_1 = require("./_irule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+class AFFAndXMLConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.AFFAndXMLConf = AFFAndXMLConf;
+class AFFAndXML {
+    constructor() {
+        this.conf = new AFFAndXMLConf();
+    }
+    getMetadata() {
+        return {
+            key: "aff_and_xml",
+            title: "AFF and XML",
+            shortDescription: `Checks for objects that have both AFF (.json) and XML (.xml) files`,
+            extendedInformation: `If an object has both an ABAP file format JSON file and an XML file, the XML file should be removed`,
+            tags: [_irule_1.RuleTag.Syntax],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(_reg) {
+        return this;
+    }
+    run(obj) {
+        const files = obj.getFiles();
+        let hasJSON = false;
+        let hasXML = false;
+        const type = obj.getType().toLowerCase();
+        for (const file of files) {
+            const filename = file.getFilename().toLowerCase();
+            if (filename.endsWith("." + type + ".json")) {
+                hasJSON = true;
+            }
+            else if (filename.endsWith("." + type + ".xml")) {
+                hasXML = true;
+            }
+        }
+        if (hasJSON && hasXML) {
+            const xmlFile = obj.getXMLFile();
+            if (xmlFile) {
+                const message = "Object has both AFF JSON and XML files, remove the XML";
+                return [issue_1.Issue.atRow(xmlFile, 1, message, this.getMetadata().key, this.conf.severity)];
+            }
+        }
+        return [];
+    }
+}
+exports.AFFAndXML = AFFAndXML;
+//# sourceMappingURL=aff_and_xml.js.map

package/build/src/rules/definitions_top.js

@@ -30,11 +30,11 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             shortDescription: `Checks that definitions are placed at the beginning of METHODs, FORMs and FUNCTIONs.`,
             extendedInformation: `https://docs.abapopenchecks.org/checks/17/`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
-            badExample: `FROM foo.
+            badExample: `FORM foo.
   WRITE 'hello'.
   DATA int TYPE i.
 ENDFORM.`,
-            goodExample: `FROM foo.
+            goodExample: `FORM foo.
   DATA int TYPE i.
   WRITE 'hello'.
 ENDFORM.`,

package/build/src/rules/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./7bit_ascii"), exports);
 __exportStar(require("./abapdoc"), exports);
 __exportStar(require("./add_test_attributes"), exports);
+__exportStar(require("./aff_and_xml"), exports);
 __exportStar(require("./align_parameters"), exports);
 __exportStar(require("./align_pseudo_comments"), exports);
 __exportStar(require("./align_type_expressions"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.115.28",
+    "version": "2.116.0",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.57.6",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^24.11.0",
+        "@types/node": "^24.12.0",
         "chai": "^4.5.0",
         "eslint": "^9.39.2",
         "mocha": "^11.7.5",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.9",
+        "fast-xml-parser": "^5.4.2",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }