@abaplint/core 2.115.28 → 2.116.1

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,17 @@ 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 === "\\") {
+                    // escaped backslash (e.g. '\\' in ltrim/rtrim calls), consume both chars
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\\" && nextNext === "'") {
+                    // backslash-escaped single quote, continue string
                     build += stream.takeNext();
                     col++;
                 }
@@ -113,6 +123,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 +152,7 @@ class CDSLexer {
                 case ")":
                 case "[":
                 case "]":
+                case "!":
                 case "=":
                 case "<":
                 case ">":

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

@@ -5,9 +5,12 @@ 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);
-        return (0, combi_1.seq)((0, combi_1.altPrio)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.opt)("DISTINCT"), value, ")");
+        // 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.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")), value, ")");
     }
 }
 exports.CDSAggregate = CDSAggregate;

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

@@ -7,9 +7,9 @@ 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+$/)));
-        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))));
+        // 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.optPrio)((0, combi_1.seq)(":", (0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple))));
     }
 }
 exports.CDSAnnotation = CDSAnnotation;

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

@@ -7,7 +7,7 @@ const cds_annotation_simple_1 = require("./cds_annotation_simple");
 class CDSAnnotationArray extends combi_1.Expression {
     getRunnable() {
         const value = (0, combi_1.alt)(cds_annotation_simple_1.CDSAnnotationSimple, _1.CDSAnnotationObject, CDSAnnotationArray);
-        const valueList = (0, combi_1.seq)("[", value, (0, combi_1.starPrio)((0, combi_1.seq)(",", value)), "]");
+        const valueList = (0, combi_1.seq)("[", value, (0, combi_1.star)((0, combi_1.seq)(",", value)), "]");
         return valueList;
     }
 }

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

@@ -8,7 +8,7 @@ class CDSAnnotationObject extends combi_1.Expression {
     getRunnable() {
         const value = (0, combi_1.seq)(":", (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple));
         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, (0, combi_1.opt)(value), (0, combi_1.star)((0, combi_1.seq)(",", namedot, (0, combi_1.opt)(value))), "}");
+        const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.optPrio)(value), (0, combi_1.star)((0, combi_1.seq)(",", namedot, (0, combi_1.optPrio)(value))), "}");
         return valueNested;
     }
 }

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

@@ -2,10 +2,15 @@
 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 ident = (0, combi_1.regex)(/^[\w_]+$/);
+        // #(expr) where expr can be: identifier, dotted path, string, or concatenation with +
+        const hashArg = (0, combi_1.altPrio)(_1.CDSString, cds_prefixed_name_1.CDSPrefixedName, ident);
+        const hashExpr = (0, combi_1.seq)(hashArg, (0, combi_1.starPrio)((0, combi_1.seq)("+", hashArg)));
+        const value = (0, combi_1.altPrio)(_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.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)("#", "(", hashExpr, ")"), (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);
+        const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
+        const colonType = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
+        return (0, combi_1.seq)("AS", _1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonType)));
     }
 }
 exports.CDSAs = CDSAs;

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

@@ -6,7 +6,19 @@ 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"));
+        // Numeric cardinality: any non-negative integer or * (e.g. [0..1], [1..2], [0..*])
+        const cardNum = (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), "*");
+        const numericCardinality = (0, combi_1.seq)("[", cardNum, (0, combi_1.optPrio)((0, combi_1.seq)(".", ".", cardNum)), "]");
+        // Text-based OF form: "association of one to many Target on ..." — text cardinality includes "TO"
+        const ofTextSide = (0, combi_1.altPrio)((0, combi_1.seq)("EXACT", "ONE"), "ONE", "MANY");
+        const ofTextForm = (0, combi_1.seq)("ASSOCIATION", "OF", ofTextSide, "TO", ofTextSide, _1.CDSRelation, "ON", _1.CDSCondition);
+        // Numeric OF form: "association of [0..1] to Target on ..."
+        const ofNumericForm = (0, combi_1.seq)("ASSOCIATION", "OF", numericCardinality, "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.optPrio)(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)(ofTextForm, ofNumericForm, standardForm);
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -4,10 +4,12 @@ exports.CDSCardinality = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 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);
-        return (0, combi_1.alt)(numeric, text);
+        // Numeric cardinality: any non-negative integer or * (e.g. [0..1], [1..2], [0..*])
+        const num = (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), "*");
+        const numeric = (0, combi_1.seq)("[", num, (0, combi_1.optPrio)((0, combi_1.seq)(".", ".", num)), "]");
+        const textNum = (0, combi_1.altPrio)("ONE", "MANY");
+        const text = (0, combi_1.seq)(textNum, "TO", textNum);
+        return (0, combi_1.altPrio)(numeric, text);
     }
 }
 exports.CDSCardinality = CDSCardinality;

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

@@ -5,9 +5,13 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSCase extends combi_1.Expression {
     getRunnable() {
-        // CDSArithmetics first: handles cast()*n, sum()*n, field+n, etc. before standalone alternatives
-        const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, _1.CDSArithmetics, _1.CDSCast, _1.CDSAggregate, _1.CDSArithParen, _1.CDSFunction, _1.CDSInteger, _1.CDSPrefixedName);
-        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSFunction, _1.CDSPrefixedName), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)));
+        // caseParen: explicit "( case ... end )" alternative placed BEFORE CDSArithmetics.
+        // This avoids CDSArithmetics trying ( case ... end ) as an operand (partial match + fail),
+        // which causes 2^N backtracking for N levels of nested parenthesized CASE expressions.
+        // CDSArithmetics is still tried after for arithmetic like (-1)*Amount or (2*A)-B.
+        const caseParen = (0, combi_1.seq)("(", CDSCase, ")");
+        const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, caseParen, _1.CDSArithmetics, _1.CDSCast, _1.CDSAggregate, _1.CDSArithParen, _1.CDSFunction, _1.CDSInteger, _1.CDSPrefixedName);
+        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSFunction, _1.CDSPrefixedName), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)));
         const complex = (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value));
         return (0, combi_1.seq)("CASE", (0, combi_1.altPrio)(complex, simple), (0, combi_1.optPrio)((0, combi_1.seq)("ELSE", value)), "END");
     }

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

@@ -6,7 +6,13 @@ 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));
+        // Numeric cardinality [n..m] before OF: any non-negative integer or *
+        const cardNum = (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), "*");
+        const numericCardinality = (0, combi_1.seq)("[", cardNum, (0, combi_1.optPrio)((0, combi_1.seq)(".", ".", cardNum)), "]");
+        return (0, combi_1.seq)("COMPOSITION", (0, combi_1.optPrio)(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,20 +6,22 @@ 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);
+        // CDSArithmetics before CDSCast/CDSFunction so cast(A)-cast(B) is handled as arithmetic, not two separate casts
+        // CDSCase allows nested case expressions on either side of a comparison
+        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSArithmetics, _1.CDSCast, _1.CDSFunction, _1.CDSAggregate, _1.CDSCase, _1.CDSArithParen, _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.
         // CDSArithmetics is last to avoid triggering CDSPrefixedName→CDSCondition→CDSArithmetics cycle.
         const right = (0, combi_1.altPrio)(_1.CDSArithParen, left, cds_integer_1.CDSInteger, _1.CDSArithmetics);
         // ESCAPE is only valid with LIKE/NOT LIKE, not with other comparison operators.
-        const compare = (0, combi_1.altPrio)((0, combi_1.seq)(likeOperators, right, (0, combi_1.opt)((0, combi_1.seq)("ESCAPE", _1.CDSString))), (0, combi_1.seq)(nonLikeOperators, right));
+        const compare = (0, combi_1.altPrio)((0, combi_1.seq)(likeOperators, right, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.CDSString))), (0, combi_1.seq)(nonLikeOperators, right));
         const is = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));
-        const between = (0, combi_1.seq)("BETWEEN", left, "AND", left);
+        const between = (0, combi_1.seq)((0, combi_1.altPrio)("NOT BETWEEN", "BETWEEN"), left, "AND", left);
         const condition = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), left, (0, combi_1.altPrio)(compare, is, between));
         const paren = (0, combi_1.seq)("(", CDSCondition, ")");
         const notParen = (0, combi_1.seq)("NOT", paren);
-        return (0, combi_1.seq)((0, combi_1.altPrio)(condition, notParen, paren), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.altPrio)("AND", "OR"), (0, combi_1.altPrio)(condition, notParen, paren))));
+        return (0, combi_1.seq)((0, combi_1.altPrio)(condition, notParen, paren), (0, combi_1.star)((0, combi_1.seq)((0, combi_1.altPrio)("AND", "OR"), (0, combi_1.altPrio)(condition, notParen, paren))));
     }
 }
 exports.CDSCondition = CDSCondition;

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.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", _1.CDSType, ";");
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", _1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "ABSTRACT", "ENTITY", cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.alt)(field, compsiOrAssoci)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }

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

@@ -7,7 +7,7 @@ const cds_name_1 = require("./cds_name");
 const cds_type_1 = require("./cds_type");
 class CDSDefineCustom extends combi_1.Expression {
     getRunnable() {
-        const field = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
+        const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)(cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }

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

@@ -5,12 +5,12 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSDefineHierarchy extends combi_1.Expression {
     getRunnable() {
-        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("KEY"), _1.CDSPrefixedName, (0, combi_1.opt)(_1.CDSAs));
+        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), _1.CDSPrefixedName, (0, combi_1.optPrio)(_1.CDSAs));
         const sortDirection = (0, combi_1.altPrio)("ASCENDING", "DESCENDING");
-        const siblingsOrderField = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.opt)(sortDirection));
+        const siblingsOrderField = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(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_element.js

@@ -8,10 +8,16 @@ const cds_cast_1 = require("./cds_cast");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
         const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
-        const colonThing = (0, combi_1.seq)(":", (0, combi_1.alt)(_1.CDSName, _1.CDSType, "LOCALIZED"));
+        const colonThing = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
         // $extension.* — extension field wildcard
         const extensionWildcard = (0, combi_1.seq)("$extension", ".", "*");
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.opt)((0, combi_1.altPrio)("KEY", "VIRTUAL")), (0, combi_1.altPrio)(extensionWildcard, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger), (0, combi_1.optPrio)(cds_as_1.CDSAs));
+        const body = (0, combi_1.altPrio)(extensionWildcard, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
+        // KEY/VIRTUAL keyword handling via altPrio:
+        // - Try keyword form first: if keyword consumed but body fails (e.g. "virtual.Field"),
+        //   altPrio backtracks to plain body (which handles "virtual" as a datasource alias prefix).
+        // - This gives exactly 1 state in all cases (no exponential blowup from opt()).
+        const elementBody = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.altPrio)("KEY", "VIRTUAL"), body), body);
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_name_1 = require("./cds_name");
 class CDSExtendView extends combi_1.Expression {
     getRunnable() {
-        const namedot = (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", cds_name_1.CDSName)), (0, combi_1.opt)(_1.CDSAs));
+        const namedot = (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", cds_name_1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
         const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), cds_name_1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(cds_name_1.CDSName), valueNested, (0, combi_1.opt)(";"));
     }

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,25 @@ 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, ")");
+        const replaceRegexpr = (0, combi_1.seq)("REPLACE_REGEXPR", "(", conversionInputs, ")");
+        const matchesRegexpr = (0, combi_1.seq)("MATCHES_REGEXPR", "(", conversionInputs, ")");
+        const occurrencesRegexpr = (0, combi_1.seq)("OCCURRENCES_REGEXPR", "(", conversionInputs, ")");
+        const substrRegexpr = (0, combi_1.seq)("SUBSTR_REGEXPR", "(", conversionInputs, ")");
+        const locateRegexpr = (0, combi_1.seq)("LOCATE_REGEXPR", "(", conversionInputs, ")");
+        // Generic fallback: user-defined/extension functions like GET_NUMERIC_VALUE(arg).
+        // Use a regex that excludes CDS keywords that would otherwise be matched by CDSName.
+        // Must contain at least one underscore to distinguish from keywords (e.g. GET_NUMERIC_VALUE).
+        const extFuncName = (0, combi_1.regex)(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)+$/i);
+        const genericArgs = (0, combi_1.seq)(_1.CDSFunctionInput, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSFunctionInput)));
+        const genericFunc = (0, combi_1.seq)(extFuncName, "(", genericArgs, ")");
+        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, replaceRegexpr, matchesRegexpr, occurrencesRegexpr, substrRegexpr, locateRegexpr, curr_to_decfloat_amount, genericFunc);
     }
 }
 exports.CDSFunction = CDSFunction;

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

@@ -7,7 +7,11 @@ class CDSInteger extends combi_1.Expression {
         const digits = (0, combi_1.regex)(/^\d+$/);
         // Decimal numbers like 100.00 are lexed as 3 tokens: "100" "." "00"
         const decimal = (0, combi_1.seq)(digits, ".", digits);
-        return (0, combi_1.seq)((0, combi_1.opt)("-"), (0, combi_1.altPrio)(decimal, digits));
+        // Scientific notation like 0.0000000000000000E+00 is lexed as:
+        // "0" "." "0000000000000000E" "+" "00"  (mantissa ends with E, sign, exponent)
+        const mantissa = (0, combi_1.regex)(/^\d+E$/i);
+        const sciNotation = (0, combi_1.seq)(digits, ".", mantissa, (0, combi_1.altPrio)("+", "-"), digits);
+        return (0, combi_1.seq)((0, combi_1.opt)("-"), (0, combi_1.altPrio)(sciNotation, decimal, digits));
     }
 }
 exports.CDSInteger = CDSInteger;

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

@@ -6,13 +6,22 @@ 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 cardSide = (0, combi_1.altPrio)("EXACT ONE", "ONE", "MANY");
+        // LEFT OUTER [card TO card] — structured to cover all combinations
+        const leftOuterCard = (0, combi_1.seq)("LEFT OUTER", cardSide, "TO", cardSide);
+        const leftOuterToCard = (0, combi_1.seq)("LEFT OUTER TO", (0, combi_1.altPrio)("EXACT ONE", "ONE", "MANY"));
+        // INNER [card TO card]
+        const innerCard = (0, combi_1.seq)("INNER", cardSide, "TO", cardSide);
+        const innerToCard = (0, combi_1.seq)("INNER TO", (0, combi_1.altPrio)("EXACT ONE", "ONE", "MANY"));
+        const joinTypes = (0, combi_1.optPrio)((0, combi_1.altPrio)(leftOuterCard, leftOuterToCard, "LEFT OUTER", innerCard, innerToCard, "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
         const innerJoin = (0, combi_1.seq)(joinTypes, "JOIN", (0, combi_1.altPrio)((0, combi_1.seq)("(", cond, ")"), cond));
         const parenJoinChain = (0, combi_1.seq)("(", _1.CDSSource, (0, combi_1.star)(innerJoin), ")", "ON", cds_condition_1.CDSCondition);
-        return (0, combi_1.seq)(joinTypes, "JOIN", (0, combi_1.altPrio)(parenJoinChain, foo, _1.CDSSource));
+        // Inline nested join: JOIN src [JOIN src ON cond]* ON outerCond
+        const inlineChain = (0, combi_1.seq)(_1.CDSSource, (0, combi_1.star)((0, combi_1.seq)(joinTypes, "JOIN", _1.CDSSource, "ON", cds_condition_1.CDSCondition)), "ON", cds_condition_1.CDSCondition);
+        return (0, combi_1.seq)(joinTypes, "JOIN", (0, combi_1.altPrio)(parenJoinChain, inlineChain, foo, _1.CDSSource));
     }
 }
 exports.CDSJoin = CDSJoin;

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

@@ -17,15 +17,26 @@ class CDSPrefixedName extends combi_1.Expression {
         //   [condition]                                 — filter condition only
         const joinType = (0, combi_1.altPrio)("LEFT OUTER", "INNER", "CROSS");
         const joinRedirect = (0, combi_1.seq)("[", joinType, "]");
-        const cardinalityJoin = (0, combi_1.seq)("[", cds_integer_1.CDSInteger, ":", joinType, "]");
-        // [1: left outer where (condition)] — cardinality + join-type + WHERE filter
-        const cardinalityJoinWhere = (0, combi_1.seq)("[", cds_integer_1.CDSInteger, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, cardinalityJoin, joinRedirect, (0, combi_1.seq)("[", cds_integer_1.CDSInteger, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
+        // Cardinality spec: integer or * (e.g. [*:inner], [1:inner])
+        const cardSpec = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
+        const cardinalityJoin = (0, combi_1.seq)("[", cardSpec, ":", joinType, "]");
+        // [1: left outer where condition] — cardinality + join-type + WHERE filter
+        const cardinalityJoinWhere = (0, combi_1.seq)("[", cardSpec, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
+        // [left outer where condition] — join-type + WHERE filter (no cardinality prefix)
+        const joinWhere = (0, combi_1.seq)("[", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
+        // Text cardinality forms: [to one: cond], [to many: cond]
+        const textCard = (0, combi_1.altPrio)("TO ONE", "TO MANY");
+        const textCardFilter = (0, combi_1.seq)("[", textCard, ":", cds_condition_1.CDSCondition, "]");
+        // Numeric range cardinality: [0..1: cond], [1..1: cond], [0..*: cond], [n..m: cond]
+        const cardNum = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
+        const rangeCard = (0, combi_1.seq)(cds_integer_1.CDSInteger, ".", ".", cardNum);
+        const rangeCardFilter = (0, combi_1.seq)("[", rangeCard, ":", cds_condition_1.CDSCondition, "]");
+        const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, joinWhere, cardinalityJoin, joinRedirect, textCardFilter, rangeCardFilter, (0, combi_1.seq)("[", cardSpec, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
         // Each dotted segment may have its own path filter: A[cond].B[cond].C
         // The final segment may also be a string literal: #enum.'value'
         // A segment may have a parameterized call: _Assoc( P_Key : value ) or _Assoc[filter]
-        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName), (0, combi_1.opt)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.opt)(pathFilter));
-        return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)((0, combi_1.altPrio)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.opt)(pathFilter), (0, combi_1.starPrio)(segment));
+        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
+        return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.optPrio)(pathFilter), (0, combi_1.star)(segment));
     }
 }
 exports.CDSPrefixedName = CDSPrefixedName;

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

@@ -9,9 +9,10 @@ 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)));
+        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.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.optPrio)("ALL"), CDSSelect), (0, combi_1.seq)("EXCEPT", CDSSelect), (0, combi_1.seq)("INTERSECT", CDSSelect))));
     }
 }
 exports.CDSSelect = CDSSelect;

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

@@ -5,9 +5,12 @@ const _1 = require(".");
 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), ")");
+        // Static where filter in FROM: SomeTable [Field = 'Value']
+        const staticFilter = (0, combi_1.seq)("[", _1.CDSCondition, "]");
+        const singleSource = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
+        // 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,11 +4,16 @@ 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)(/^'([^']|'')*'$/);
-        // 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);
+        // Allow any character except unescaped single quote; escape sequences:
+        //   ''  — escaped single quote (doubling)
+        //   \'  — escaped single quote (backslash form)
+        //   \\  — escaped backslash (e.g. '\\' in ltrim/rtrim calls)
+        //   \x  — other backslash sequences not followed by '
+        const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'$/);
+        // Typed literal: abap.int4'1', abap.char'X', abap.numc(3)'123', etc.
+        // Lexed as tokens: abap, ., typename, 'value'
+        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|sstring|char|numc|dats|tims|fltp|decfloat\d+|dec|string|raw|xstring|clnt|lang|unit|cuky|curr|quan|d|t|p|n|c|x|f)$/i);
+        const abap = (0, combi_1.seq)("abap", ".", abapTypeName, (0, combi_1.optPrio)((0, combi_1.seq)("(", (0, combi_1.regex)(/^\d+$/), ")")), reg);
         return (0, combi_1.altPrio)(abap, reg);
     }
 }

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSType extends combi_1.Expression {
     getRunnable() {
         const decimals = (0, combi_1.seq)(",", (0, combi_1.regex)(/\d+/));
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), (0, combi_1.opt)(decimals), ")")));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.optPrio)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), (0, combi_1.optPrio)(decimals), ")")));
     }
 }
 exports.CDSType = CDSType;

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.star)(_1.CDSAnnotation), _1.CDSName, ":", _1.CDSType, (0, combi_1.star)(_1.CDSAnnotation));
         return (0, combi_1.seq)("WITH PARAMETERS", param, (0, combi_1.star)((0, combi_1.seq)(",", param)));
     }
 }

package/build/src/objects/data_definition.js

@@ -173,15 +173,22 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         }
     }
     findSourcesAndRelations(tree) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         for (const e of tree.findAllExpressions(expressions_1.CDSSource)) {
             const name = ((_a = e.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase().replace(/ /g, "")) || "ERROR";
             const as = (_c = (_b = e.findDirectExpression(expressions_1.CDSAs)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(expressions_1.CDSName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
             this.parsedData.sources.push({ name, as });
         }
         for (const e of tree.findAllExpressions(expressions_1.CDSRelation)) {
-            const name = e.getFirstToken().getStr();
-            const as = (_e = (_d = e.findDirectExpression(expressions_1.CDSAs)) === null || _d === void 0 ? void 0 : _d.findDirectExpression(expressions_1.CDSName)) === null || _e === void 0 ? void 0 : _e.getFirstToken().getStr();
+            // For namespace-prefixed names like /PF1/C_VH_TRANSTYPE, getFirstToken() only yields "/".
+            // Collect all tokens NOT part of the CDSAs child to reconstruct the full name.
+            const asNode = e.findDirectExpression(expressions_1.CDSAs);
+            const asTokenSet = new Set(asNode ? asNode.getTokens().map(t => `${t.getStart().getRow()}:${t.getStart().getCol()}`) : []);
+            const name = e.getTokens()
+                .filter(t => !asTokenSet.has(`${t.getStart().getRow()}:${t.getStart().getCol()}`))
+                .map(t => t.getStr())
+                .join("") || "ERROR";
+            const as = (_d = asNode === null || asNode === void 0 ? void 0 : asNode.findDirectExpression(expressions_1.CDSName)) === null || _d === void 0 ? void 0 : _d.getFirstToken().getStr();
             this.parsedData.relations.push({ name, as });
         }
         for (const e of tree.findAllExpressions(expressions_1.CDSAssociation)) {
@@ -189,10 +196,18 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             if (j === undefined) {
                 continue;
             }
-            const name = j.getFirstToken().getStr();
-            const as = (_g = (_f = j.findDirectExpression(expressions_1.CDSAs)) === null || _f === void 0 ? void 0 : _f.findDirectExpression(expressions_1.CDSName)) === null || _g === void 0 ? void 0 : _g.getFirstToken().getStr();
+            // CDSRelation: seq(opt(/NS/), entityName, opt(CDSAs))
+            // For namespace-prefixed names like /PF1/C_VH_TRANSTYPE, getFirstToken() only yields "/"
+            // Collect all tokens that are NOT part of the CDSAs child to reconstruct the full name
+            const asNode = j.findDirectExpression(expressions_1.CDSAs);
+            const asTokenSet = new Set(asNode ? asNode.getTokens().map(t => `${t.getStart().getRow()}:${t.getStart().getCol()}`) : []);
+            const name = j.getTokens()
+                .filter(t => !asTokenSet.has(`${t.getStart().getRow()}:${t.getStart().getCol()}`))
+                .map(t => t.getStr())
+                .join("") || "ERROR";
+            const as = (_e = asNode === null || asNode === void 0 ? void 0 : asNode.findDirectExpression(expressions_1.CDSName)) === null || _e === void 0 ? void 0 : _e.getFirstToken().getStr();
             this.parsedData.associations.push({
-                name: name || "ERROR",
+                name: name,
                 as: as,
             });
         }

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.1";
     }
     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/fm_global_parameters_obsolete.js

@@ -16,7 +16,7 @@ class FMGlobalParametersObsolete {
         return {
             key: "fm_global_parameters_obsolete",
             title: "FM Global Parameters Obsolete",
-            shortDescription: `Check for function modules with global parameteers`,
+            shortDescription: `Check for function modules with global parameters`,
             extendedInformation: `https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abenglobal_parameters_obsolete.htm`,
             tags: [],
         };

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.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,20 +50,20 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.57.6",
+        "@microsoft/api-extractor": "^7.57.7",
         "@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",
         "c8": "^11.0.0",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "=2.4.0",
+        "ts-json-schema-generator": "^2.9.0",
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.9",
+        "fast-xml-parser": "^5.5.3",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }