@abaplint/core 2.115.25 → 2.115.27

package/build/abaplint.d.ts

@@ -824,10 +824,43 @@ declare class CDSAnnotationSimple extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+/**
+ * Arithmetic expression: one or more values joined by +, -, *, /.
+ *
+ * Parenthesized sub-expressions of any nesting depth are handled via the
+ * separate CDSArithParen singleton (which wraps back to CDSArithmetics).
+ * The mutual reference between two distinct singletons enables true n-level
+ * nesting with no fixed limit and no infinite recursion.
+ *
+ * Grammar (simplified):
+ *   CDSArithmetics  →  operand (op operand)+          -- with-operator form
+ *                    | unary val                       -- unary form
+ *                    | unary val (op operand)+         -- unary + continuation
+ *                    | unary CDSArithParen             -- unary applied to paren, e.g. -(field)
+ *                    | unary CDSArithParen (op op)+    -- unary paren + continuation
+ *   operand         →  CDSArithParen | val
+ *   CDSArithParen   →  "(" CDSArithmetics ")" | "(" CDSArithParen ")" | "(" val ")"
+ */
 declare class CDSArithmetics extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+/**
+ * Parenthesized arithmetic sub-expression.
+ *
+ * Matches either:
+ *   "(" CDSArithmetics ")"  — parenthesized expression with operators, e.g. (A + B), (A - B * C)
+ *   "(" CDSArithParen ")"   — nested grouping parens, e.g. ((A + B)), (((A + B)))
+ *   "(" val ")"             — parenthesized single value used for grouping, e.g. (field), (func(...))
+ *
+ * Mutual recursion with CDSArithmetics enables n-level deep nesting with no fixed limit:
+ *   CDSArithmetics  →  operand (op operand)+
+ *   CDSArithParen   →  "(" CDSArithmetics ")" | "(" CDSArithParen ")" | "(" val ")"
+ */
+declare class CDSArithParen extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSAs extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -864,6 +897,10 @@ declare class CDSDefineCustom extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSDefineHierarchy extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSDefineProjection extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2555,6 +2592,7 @@ declare namespace ExpressionsCDS {
         CDSAnnotationObject,
         CDSAnnotationSimple,
         CDSAnnotation,
+        CDSArithParen,
         CDSArithmetics,
         CDSAs,
         CDSAssociation,
@@ -2565,6 +2603,7 @@ declare namespace ExpressionsCDS {
         CDSCondition,
         CDSDefineAbstract,
         CDSDefineCustom,
+        CDSDefineHierarchy,
         CDSDefineProjection,
         CDSDefineTableFunction,
         CDSDefineView,

package/build/src/abap/5_syntax/expressions/select.js

@@ -245,7 +245,7 @@ class Select {
         }
     }
     static buildStructureType(fields, dbSources, scope) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         if (fields.length === 1 && dbSources.length === 1) {
             const dbType = (_a = dbSources[0]) === null || _a === void 0 ? void 0 : _a.parseType(scope.getRegistry());
             if (dbType === undefined) {
@@ -286,8 +286,36 @@ class Select {
                 }
             }
         }
+        else if (dbSources.length === 1) {
+            const dbType = (_d = dbSources[0]) === null || _d === void 0 ? void 0 : _d.parseType(scope.getRegistry());
+            if (dbType === undefined) {
+                const name = ((_e = dbSources[0]) === null || _e === void 0 ? void 0 : _e.getName()) || "buildStructureTypeError";
+                if (scope.getRegistry().inErrorNamespace(name) === true) {
+                    return new basic_1.UnknownType("Select, " + name + " not found");
+                }
+                else {
+                    return basic_1.VoidType.get((_f = dbSources[0]) === null || _f === void 0 ? void 0 : _f.getName());
+                }
+            }
+            if (!(dbType instanceof basic_1.StructureType)) {
+                return basic_1.VoidType.get("SELECT_todo14");
+            }
+            const allFieldsSimple = fields.every(f => isSimple.test(f.code));
+            if (allFieldsSimple === true) {
+                const components = [];
+                for (const field of fields) {
+                    const type = dbType.getComponentByName(field.code);
+                    if (type === undefined) {
+                        return basic_1.VoidType.get("SELECT_todo9");
+                    }
+                    components.push({ name: field.as || field.code, type });
+                }
+                return new basic_1.StructureType(components);
+            }
+            return basic_1.VoidType.get("SELECT_todo12");
+        }
         else {
-            return basic_1.VoidType.get("SELECT_todo9");
+            return basic_1.VoidType.get("SELECT_todo13");
         }
     }
     static buildTableType(fields, dbSources, scope) {

package/build/src/cds/cds_lexer.js

@@ -117,10 +117,12 @@ class CDSLexer {
             }
             switch (next) {
                 case "'":
+                    build = result.add(build, row, col, mode);
                     mode = Mode.String;
                     build += next;
                     break;
                 case " ":
+                case "\t":
                     build = result.add(build, row, col, mode);
                     break;
                 case "\n":
@@ -148,6 +150,11 @@ class CDSLexer {
                     build = result.add(build, row, col, mode);
                     result.add(next, row, col, mode);
                     break;
+                case "@":
+                    // @ starts a new annotation; flush current token and start building with @
+                    build = result.add(build, row, col, mode);
+                    build = "@";
+                    break;
                 default:
                     build += next;
                     break;

package/build/src/cds/cds_parser.js

@@ -34,6 +34,9 @@ class CDSParser {
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSExtendView(), tokens, version_1.defaultVersion);
         }
+        if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
+            res = combi_1.Combi.run(new Expressions.CDSDefineHierarchy(), tokens, version_1.defaultVersion);
+        }
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }

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

@@ -5,7 +5,7 @@ const _1 = require(".");
 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", (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (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, ")"), (0, combi_1.seq)("#", "(", (0, combi_1.regex)(/^[\w_]+$/), ")"), (0, combi_1.regex)(/^#[\w_]+$/));
         return value;
     }
 }

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSArithParen = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("./cds_integer");
+/**
+ * Parenthesized arithmetic sub-expression.
+ *
+ * Matches either:
+ *   "(" CDSArithmetics ")"  — parenthesized expression with operators, e.g. (A + B), (A - B * C)
+ *   "(" CDSArithParen ")"   — nested grouping parens, e.g. ((A + B)), (((A + B)))
+ *   "(" val ")"             — parenthesized single value used for grouping, e.g. (field), (func(...))
+ *
+ * Mutual recursion with CDSArithmetics enables n-level deep nesting with no fixed limit:
+ *   CDSArithmetics  →  operand (op operand)+
+ *   CDSArithParen   →  "(" CDSArithmetics ")" | "(" CDSArithParen ")" | "(" val ")"
+ */
+class CDSArithParen extends combi_1.Expression {
+    getRunnable() {
+        const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, _1.CDSAggregate, _1.CDSPrefixedName);
+        return (0, combi_1.seq)("(", (0, combi_1.altPrio)(_1.CDSArithmetics, CDSArithParen, val), ")");
+    }
+}
+exports.CDSArithParen = CDSArithParen;
+//# sourceMappingURL=cds_arith_paren.js.map

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

@@ -4,19 +4,50 @@ exports.CDSArithmetics = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 const cds_integer_1 = require("./cds_integer");
+/**
+ * Arithmetic expression: one or more values joined by +, -, *, /.
+ *
+ * Parenthesized sub-expressions of any nesting depth are handled via the
+ * separate CDSArithParen singleton (which wraps back to CDSArithmetics).
+ * The mutual reference between two distinct singletons enables true n-level
+ * nesting with no fixed limit and no infinite recursion.
+ *
+ * Grammar (simplified):
+ *   CDSArithmetics  →  operand (op operand)+          -- with-operator form
+ *                    | unary val                       -- unary form
+ *                    | unary val (op operand)+         -- unary + continuation
+ *                    | unary CDSArithParen             -- unary applied to paren, e.g. -(field)
+ *                    | unary CDSArithParen (op op)+    -- unary paren + continuation
+ *   operand         →  CDSArithParen | val
+ *   CDSArithParen   →  "(" CDSArithmetics ")" | "(" CDSArithParen ")" | "(" val ")"
+ */
 class CDSArithmetics extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, _1.CDSAggregate, name);
+        const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, _1.CDSAggregate, _1.CDSPrefixedName);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
-        // Support unary operators (e.g., "- field" in CASE expressions)
+        // Unary operator prefix, e.g. -field, +field
         const unary = (0, combi_1.altPrio)("-", "+");
         const unaryExpression = (0, combi_1.seq)(unary, val);
-        const operatorValue = (0, combi_1.seq)(operator, val);
-        const paren = (0, combi_1.seq)("(", val, (0, combi_1.plusPrio)(operatorValue), ")");
-        const noParen = (0, combi_1.seq)(val, (0, combi_1.plusPrio)(operatorValue));
-        // todo: this is pretty bad, it needs a rewrite
-        return (0, combi_1.altPrio)(unaryExpression, (0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), noParen);
+        // An operand is either a parenthesized sub-expression (any depth) or a bare value.
+        // 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 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));
+        // Unary followed by optional continuation operators: -1 * field, -field + 1
+        const unaryWithOps = (0, combi_1.seq)(unaryExpression, (0, combi_1.plusPrio)(operatorValue));
+        // Top-level parenthesized expression as a standalone field value: (A + B) * C
+        const parenExpr = (0, combi_1.altPrio)(withOperators, unaryExpression);
+        const paren = (0, combi_1.seq)("(", parenExpr, ")");
+        // Unary applied to a parenthesized group, e.g. -(TaxAmount)
+        const unaryParen = (0, combi_1.seq)(unary, _1.CDSArithParen);
+        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), // (expr) op ...
+        (0, combi_1.seq)(unaryParen, (0, combi_1.starPrio)(operatorValue)), // -(paren) op ...
+        unaryWithOps, // -val op ...
+        unaryExpression, // -val
+        unaryParen, // -(paren)
+        withOperators);
     }
 }
 exports.CDSArithmetics = CDSArithmetics;

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

@@ -6,7 +6,7 @@ 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);
+        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)));
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -5,11 +5,10 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSCase extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, _1.CDSFunction, name);
-        const thenValue = (0, combi_1.altPrio)((0, combi_1.seq)("(", value, ")"), value);
-        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSFunction, name), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", thenValue)));
-        const complex = (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", thenValue));
+        // 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)));
+        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_cast.js

@@ -5,8 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSCast extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const first = (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSCase, _1.CDSAggregate, _1.CDSArithmetics, CDSCast, _1.CDSString, _1.CDSInteger, name);
+        // CDSArithmetics before CDSFunction/CDSAggregate: handles function()*n, cast()*n, sum()*n patterns
+        const first = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSFunction, _1.CDSArithParen, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSPrefixedName, _1.CDSInteger);
         return (0, combi_1.seq)("CAST", "(", first, "AS", _1.CDSType, (0, combi_1.optPrio)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }

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

@@ -6,15 +6,17 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_integer_1 = require("./cds_integer");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName))));
-        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, _1.CDSAggregate, name);
+        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, _1.CDSAggregate, _1.CDSPrefixedName);
         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));
+        // Right side of comparison: arithmetic expressions, parenthesized sub-expressions, or simple values
+        const right = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, left, cds_integer_1.CDSInteger);
+        const compare = (0, combi_1.seq)(operators, 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 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, ")");
-        return (0, combi_1.seq)((0, combi_1.altPrio)(condition, paren), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.altPrio)("AND", "OR"), (0, combi_1.altPrio)(condition, paren))));
+        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))));
     }
 }
 exports.CDSCondition = CDSCondition;

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

@@ -7,7 +7,8 @@ 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, ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE ABSTRACT ENTITY"), cds_name_1.CDSName, (0, combi_1.str)("{"), (0, combi_1.plus)(field), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        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)(";"));
     }
 }
 exports.CDSDefineAbstract = CDSDefineAbstract;

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSDefineHierarchy = void 0;
+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 sortDirection = (0, combi_1.altPrio)("ASCENDING", "DESCENDING");
+        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"))));
+        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)(";"));
+    }
+}
+exports.CDSDefineHierarchy = CDSDefineHierarchy;
+//# sourceMappingURL=cds_define_hierarchy.js.map

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

@@ -9,7 +9,8 @@ const cds_select_1 = require("./cds_select");
 const cds_with_parameters_1 = require("./cds_with_parameters");
 class CDSDefineView 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")), cds_name_1.CDSName, (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
+        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)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;

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

@@ -9,7 +9,9 @@ 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"));
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.altPrio)("KEY", "VIRTUAL")), (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.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));
+        // $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));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -43,12 +43,13 @@ class CDSFunction extends combi_1.Expression {
         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 fltp_to_dec = (0, combi_1.seq)("FLTP_TO_DEC", "(", _1.CDSFunctionInput, "AS", _1.CDSType, ")");
         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);
+        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);
     }
 }
 exports.CDSFunction = CDSFunction;

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

@@ -5,8 +5,7 @@ const _1 = require(".");
 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.CDSArithmetics, _1.CDSAggregate, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
+        const input = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, _1.CDSPrefixedName, _1.CDSInteger);
         return input;
     }
 }

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

@@ -5,8 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSGroupBy extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
-        return (0, combi_1.seq)("GROUP BY", name, (0, combi_1.star)((0, combi_1.seq)(",", name)));
+        return (0, combi_1.seq)("GROUP BY", _1.CDSPrefixedName, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSPrefixedName)));
     }
 }
 exports.CDSGroupBy = CDSGroupBy;

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

@@ -4,7 +4,10 @@ exports.CDSInteger = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSInteger extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.opt)("-"), (0, combi_1.regex)(/^\d+$/));
+        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));
     }
 }
 exports.CDSInteger = CDSInteger;

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

@@ -6,9 +6,13 @@ 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 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", "CROSS", "RIGHT OUTER")), "JOIN", (0, combi_1.altPrio)(foo, _1.CDSSource));
+        // 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));
     }
 }
 exports.CDSJoin = CDSJoin;

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSParametersSelect extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.alt)(name, _1.CDSString);
+        const value = (0, combi_1.alt)(_1.CDSInteger, name, _1.CDSString);
         const nameValue = (0, combi_1.seq)(name, ":", value);
         return (0, combi_1.seq)("(", nameValue, (0, combi_1.star)((0, combi_1.seq)(",", nameValue)), ")");
     }

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

@@ -5,9 +5,27 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_name_1 = require("./cds_name");
 const cds_parameters_1 = require("./cds_parameters");
 const cds_parameters_select_1 = require("./cds_parameters_select");
+const cds_condition_1 = require("./cds_condition");
+const cds_integer_1 = require("./cds_integer");
+const cds_string_1 = require("./cds_string");
 class CDSPrefixedName extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.opt)((0, combi_1.alt)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.star)((0, combi_1.seq)(".", cds_name_1.CDSName, (0, combi_1.opt)(cds_parameters_1.CDSParameters))));
+        // Path filter variants:
+        //   [inner], [left outer], [cross]              — join-type redirect
+        //   [1:left outer], [1:inner]                   — cardinality + join-type
+        //   [1: condition]                              — cardinality + filter condition
+        //   [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, "]"));
+        // 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.star)(segment));
     }
 }
 exports.CDSPrefixedName = CDSPrefixedName;

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

@@ -5,7 +5,10 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
+        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), ")");
+        return (0, combi_1.altPrio)(parenSource, singleSource);
     }
 }
 exports.CDSSource = CDSSource;

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

@@ -4,10 +4,12 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        const abap = (0, combi_1.seq)("abap", ".", (0, combi_1.regex)(/^char'\w'$/));
-        // https://stackoverflow.com/a/57754227
-        const reg = (0, combi_1.regex)(/^'([A-Za-zÀ-ž\u0370-\u03FF\u0400-\u04FF:\| -_]|'')*'$/);
-        return (0, combi_1.altPrio)(reg, abap);
+        // 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);
+        return (0, combi_1.altPrio)(abap, reg);
     }
 }
 exports.CDSString = CDSString;

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

@@ -20,6 +20,7 @@ __exportStar(require("./cds_annotation_array"), exports);
 __exportStar(require("./cds_annotation_object"), exports);
 __exportStar(require("./cds_annotation_simple"), exports);
 __exportStar(require("./cds_annotation"), exports);
+__exportStar(require("./cds_arith_paren"), exports);
 __exportStar(require("./cds_arithmetics"), exports);
 __exportStar(require("./cds_as"), exports);
 __exportStar(require("./cds_association"), exports);
@@ -30,6 +31,7 @@ __exportStar(require("./cds_composition"), exports);
 __exportStar(require("./cds_condition"), exports);
 __exportStar(require("./cds_define_abstract"), exports);
 __exportStar(require("./cds_define_custom"), exports);
+__exportStar(require("./cds_define_hierarchy"), exports);
 __exportStar(require("./cds_define_projection"), exports);
 __exportStar(require("./cds_define_table_function"), exports);
 __exportStar(require("./cds_define_view"), exports);

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.115.25",
+    "version": "2.115.27",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.56.3",
+        "@microsoft/api-extractor": "^7.57.5",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
         "@types/node": "^24.10.13",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.3.5",
+        "fast-xml-parser": "^5.3.9",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }