@abaplint/core 2.119.56 → 2.119.58

package/build/abaplint.d.ts

@@ -618,6 +618,9 @@ export declare class BuiltIn {
     static readonly filename = "_builtin.prog.abap";
     private static counter;
     private static readonly getCache;
+    private static typesCache;
+    private static extrasCacheKey;
+    private static extrasCache;
     static readonly methods: {
         [name: string]: IBuiltinMethod;
     };
@@ -1046,6 +1049,10 @@ declare class CDSString extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSTableField extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSType extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {
@@ -2771,6 +2778,7 @@ declare namespace ExpressionsCDS {
         CDSSelect,
         CDSSource,
         CDSString,
+        CDSTableField,
         CDSType_2 as CDSType,
         CDSWhere,
         CDSWithParameters

package/build/src/abap/2_statements/combi.js

@@ -53,6 +53,7 @@ exports.verNotLang = verNotLang;
 exports.failCombinator = failCombinator;
 exports.failStar = failStar;
 exports.stopBefore = stopBefore;
+exports.stopBefore1 = stopBefore1;
 const Tokens = __importStar(require("../1_lexer/tokens"));
 const nodes_1 = require("../nodes");
 const version_1 = require("../../version");
@@ -1033,4 +1034,27 @@ class StopBefore2 {
 function stopBefore(t1, t2) {
     return new StopBefore2(t1, t2);
 }
+class StopBefore1 {
+    constructor(words) { this.words = words.map(w => w.toUpperCase()); }
+    listKeywords() { return []; }
+    getUsing() { return []; }
+    run(r) {
+        var _a;
+        const result = [];
+        for (const input of r) {
+            const next = (_a = input.peek()) === null || _a === void 0 ? void 0 : _a.getUpperStr();
+            if (next !== undefined && this.words.includes(next)) {
+                continue;
+            }
+            result.push(input);
+        }
+        return result;
+    }
+    railroad() { return "Railroad.Terminal('stopBefore(" + this.words.join("|") + ")')"; }
+    toStr() { return "stopBefore(" + this.words.join(",") + ")"; }
+    first() { return [""]; }
+}
+function stopBefore1(...words) {
+    return new StopBefore1(words);
+}
 //# sourceMappingURL=combi.js.map

package/build/src/abap/2_statements/expressions/component_chain_simple.js

@@ -5,8 +5,8 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class ComponentChainSimple extends combi_1.Expression {
     getRunnable() {
-        const chain = (0, combi_1.seq)(_1.ComponentName, (0, combi_1.starPrio)((0, combi_1.seq)(_1.ArrowOrDash, _1.ComponentName)));
-        const ret = (0, combi_1.seq)(chain, (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength));
+        const chain = (0, combi_1.starPrio)((0, combi_1.altPrio)(_1.Dereference, (0, combi_1.seq)(_1.ArrowOrDash, _1.ComponentName)));
+        const ret = (0, combi_1.seq)(_1.ComponentName, chain, (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength));
         return ret;
     }
 }

package/build/src/abap/2_statements/expressions/parameter_list_s.js

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class ParameterListS extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.plus)(_1.ParameterS);
+        return (0, combi_1.plusPrio)(_1.ParameterS);
     }
 }
 exports.ParameterListS = ParameterListS;

package/build/src/abap/2_statements/expressions/type_table_key.js

@@ -9,10 +9,10 @@ class TypeTableKey extends combi_1.Expression {
         const uniqueness = (0, combi_1.alt)("NON-UNIQUE", "UNIQUE");
         const defaultKey = "DEFAULT KEY";
         const emptyKey = (0, combi_1.ver)(version_1.Release.v740sp02, "EMPTY KEY", { also: combi_1.AlsoIn.OpenABAP });
-        const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
+        const components = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.stopBefore1)("WITH", "INITIAL", "WITHOUT"), (0, combi_1.stopBefore)("READ", "-"), _1.FieldSub));
         const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
         const alias = (0, combi_1.seq)("ALIAS", _1.Field);
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, (0, combi_1.opt)(alias), "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.optPrio)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.altPrio)((0, combi_1.seq)(_1.Field, (0, combi_1.opt)(alias), "COMPONENTS", components), components))), (0, combi_1.optPrio)(further), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }

package/build/src/abap/2_statements/expressions/value_body.js

@@ -6,7 +6,7 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 class ValueBody extends combi_1.Expression {
     getRunnable() {
-        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(_1.ValueBase), (0, combi_1.star)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
+        const strucOrTab = (0, combi_1.seq)((0, combi_1.optPrio)(_1.Let), (0, combi_1.optPrio)(_1.ValueBase), (0, combi_1.starPrio)(_1.For), (0, combi_1.plusPrio)((0, combi_1.altPrio)(_1.FieldAssignment, _1.ValueBodyLine)));
         const tabdef = (0, combi_1.ver)(version_1.Release.v740sp08, (0, combi_1.altPrio)("OPTIONAL", (0, combi_1.seq)("DEFAULT", _1.Source)), { also: combi_1.AlsoIn.OpenABAP });
         return (0, combi_1.optPrio)((0, combi_1.altPrio)(strucOrTab, (0, combi_1.seq)(_1.Source, (0, combi_1.optPrio)(tabdef))));
     }

package/build/src/abap/5_syntax/_builtin.js

@@ -129,16 +129,20 @@ class BuiltIn {
         return def.predicate;
     }
     getTypes() {
-        const ret = this.buildSY();
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
+        // the identifiers are identical for every object, share them to reduce memory usage
+        if (BuiltIn.typesCache === undefined) {
+            const ret = this.buildSY();
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
+            }
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
+            }
+            BuiltIn.typesCache = ret;
         }
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
-        }
-        return ret;
+        return BuiltIn.typesCache;
     }
     get(extras) {
         const ret = [];
@@ -171,10 +175,17 @@ class BuiltIn {
             BuiltIn.getCache.push(this.buildConstant("space", new basic_1.CharacterType(1, { derivedFromConstant: true }), "' '"));
         }
         ret.push(...BuiltIn.getCache);
-        for (const e of extras) {
-            const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+        // the extras are identical for every object, share them to reduce memory usage
+        const key = extras.join("|");
+        if (key !== BuiltIn.extrasCacheKey) {
+            BuiltIn.extrasCacheKey = key;
+            BuiltIn.extrasCache = [];
+            for (const e of extras) {
+                const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
+                BuiltIn.extrasCache.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+            }
         }
+        ret.push(...BuiltIn.extrasCache);
         return ret;
     }
     /////////////////////////////
@@ -383,6 +394,9 @@ exports.BuiltIn = BuiltIn;
 BuiltIn.filename = "_builtin.prog.abap";
 BuiltIn.counter = 1;
 BuiltIn.getCache = [];
+BuiltIn.typesCache = undefined;
+BuiltIn.extrasCacheKey = undefined;
+BuiltIn.extrasCache = [];
 // todo: "pcre" vs "regex", only one of these parameters are allowed
 // todo: "pcre", only possible from 755
 BuiltIn.methods = {

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

@@ -56,6 +56,15 @@ class ComponentChain {
             if (i === 0 && child.concatTokens().toUpperCase() === "TABLE_LINE") {
                 continue;
             }
+            else if (child.get() instanceof Expressions.Dereference) {
+                if (!(context instanceof basic_1.DataReference)) {
+                    const message = "Not a data reference, cannot be dereferenced";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                context = context.getType();
+                continue;
+            }
             else if (child.get() instanceof Expressions.ArrowOrDash) {
                 const concat = child.concatTokens();
                 if (concat === "-") {

package/build/src/abap/nodes/_abstract_node.js

@@ -1,15 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractNode = void 0;
+// shared constant, so nodes without children don't waste memory on empty arrays
+const EMPTY = Object.freeze([]);
 class AbstractNode {
     constructor() {
-        this.children = [];
+        this.children = EMPTY;
     }
     addChild(n) {
+        if (this.children === EMPTY) {
+            this.children = [];
+        }
         this.children.push(n);
     }
     setChildren(children) {
-        this.children = children;
+        // copy, input arrays are built via push() and carry over-allocated backing stores
+        this.children = children.slice();
     }
     getChildren() {
         return this.children;

package/build/src/abap/nodes/statement_node.js

@@ -11,17 +11,13 @@ const string_template_middle_1 = require("../1_lexer/tokens/string_template_midd
 const string_template_end_1 = require("../1_lexer/tokens/string_template_end");
 const string_template_begin_1 = require("../1_lexer/tokens/string_template_begin");
 const string_template_1 = require("../1_lexer/tokens/string_template");
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementNode extends _abstract_node_1.AbstractNode {
     constructor(statement, colon, pragmas) {
         super();
         this.statement = statement;
         this.colon = colon;
-        if (pragmas) {
-            this.pragmas = pragmas;
-        }
-        else {
-            this.pragmas = [];
-        }
+        this.pragmas = pragmas !== null && pragmas !== void 0 ? pragmas : EMPTY_PRAGMAS;
     }
     get() {
         return this.statement;
@@ -36,7 +32,7 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         if (children.length === 0) {
             throw new Error("statement: zero children");
         }
-        this.children = children;
+        super.setChildren(children);
         return this;
     }
     getStart() {

package/build/src/abap/nodes/token_node.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenNode = void 0;
+const EMPTY_CHILDREN = Object.freeze([]);
 class TokenNode {
     constructor(token) {
         this.token = token;
@@ -12,7 +13,7 @@ class TokenNode {
         throw new Error("TokenNode, Method not implemented.");
     }
     getChildren() {
-        return [];
+        return EMPTY_CHILDREN;
     }
     concatTokens() {
         return this.token.getStr();

package/build/src/cds/cds_lexer.js

@@ -26,8 +26,9 @@ var Mode;
 (function (Mode) {
     Mode[Mode["Default"] = 0] = "Default";
     Mode[Mode["String"] = 1] = "String";
-    Mode[Mode["SingleLineComment"] = 2] = "SingleLineComment";
-    Mode[Mode["MultiLineComment"] = 3] = "MultiLineComment";
+    Mode[Mode["DoubleQuoteString"] = 2] = "DoubleQuoteString";
+    Mode[Mode["SingleLineComment"] = 3] = "SingleLineComment";
+    Mode[Mode["MultiLineComment"] = 4] = "MultiLineComment";
 })(Mode || (Mode = {}));
 class Result {
     constructor() {
@@ -87,6 +88,23 @@ class CDSLexer {
                 }
                 continue;
             }
+            // double-quote string handling
+            if (mode === Mode.DoubleQuoteString) {
+                build += next;
+                if (next === "\\" && nextNext === "\"") {
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\"" && nextNext === "\"") {
+                    build += stream.takeNext();
+                    col++;
+                }
+                else if (next === "\"") {
+                    build = result.add(build, row, col, mode);
+                    mode = Mode.Default;
+                }
+                continue;
+            }
             // single line comment handling
             if (mode === Mode.SingleLineComment) {
                 if (next === "\n") {
@@ -133,6 +151,11 @@ class CDSLexer {
                     mode = Mode.String;
                     build += next;
                     break;
+                case "\"":
+                    build = result.add(build, row, col, mode);
+                    mode = Mode.DoubleQuoteString;
+                    build += next;
+                    break;
                 case " ":
                 case "\t":
                     build = result.add(build, row, col, mode);

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

@@ -7,7 +7,9 @@ class CDSAs 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 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)));
+        const ident = (0, combi_1.regex)(/^\w+$/);
+        const namespacedAlias = (0, combi_1.seq)(ident, "/", ident, "/", ident);
+        return (0, combi_1.seq)("AS", (0, combi_1.altPrio)(namespacedAlias, _1.CDSName), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonType)));
     }
 }
 exports.CDSAs = CDSAs;

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

@@ -17,8 +17,9 @@ class CDSAssociation extends combi_1.Expression {
         // 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 parentForm = (0, combi_1.seq)("ASSOCIATION", "TO", "PARENT", _1.CDSRelation);
         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);
+        return (0, combi_1.altPrio)(ofTextForm, ofNumericForm, standardForm, parentForm);
     }
 }
 exports.CDSAssociation = CDSAssociation;

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

@@ -12,11 +12,9 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const directory = (0, combi_1.seq)("DIRECTORY", _1.CDSName, "FILTER", "BY", _1.CDSCondition);
         // DATE PERIOD: period from <field> to <field> [valid from :p to :p]
         const datePeriod = (0, combi_1.seq)("PERIOD", "FROM", _1.CDSName, "TO", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("VALID", "FROM", _1.CDSPrefixedName, "TO", _1.CDSPrefixedName)));
-        // DEPTH accepts an integer literal or a parameter reference (:param)
-        const depthValue = (0, combi_1.altPrio)(_1.CDSInteger, _1.CDSPrefixedName);
-        // LOAD mode: BULK, INCREMENTAL, or a parameter reference ($parameters.p_load)
+        const depthValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSInteger, _1.CDSPrefixedName);
         const loadMode = (0, combi_1.altPrio)("BULK", "INCREMENTAL", _1.CDSPrefixedName);
-        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)(datePeriod), (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)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
+        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)(datePeriod), (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)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
         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_table_entity.js

@@ -5,10 +5,10 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSDefineTableEntity extends combi_1.Expression {
     getRunnable() {
-        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
-        const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability, ";");
-        const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        const inlineBody = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
+        // Inline `{ ... }` body: one or more table-field entries. Each entry is
+        // wrapped in a CDSTableField node so downstream tooling can pair each
+        // field name with its own annotations.
+        const inlineBody = (0, combi_1.plus)(_1.CDSTableField);
         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)("}"));
         const selectBody = (0, combi_1.seq)("AS", "SELECT", "FROM", _1.CDSSource, (0, combi_1.star)(_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, _1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere));

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

@@ -10,8 +10,10 @@ 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), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.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)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), // post-select WITH HIERARCHY clause
-        (0, combi_1.opt)(";"));
+        const parenSelect = (0, combi_1.seq)("(", cds_select_1.CDSSelect, ")");
+        const unionBranch = (0, combi_1.altPrio)(parenSelect, cds_select_1.CDSSelect);
+        const topLevelSelect = (0, combi_1.altPrio)((0, combi_1.seq)(parenSelect, (0, combi_1.star)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch)))), cds_select_1.CDSSelect);
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.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", topLevelSelect, (0, combi_1.opt)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;

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

@@ -10,9 +10,13 @@ class CDSElement extends combi_1.Expression {
         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.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
         const extensionWildcard = (0, combi_1.seq)("$extension", ".", "*");
-        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName);
+        const excludingNames = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSName)));
+        const excluding = (0, combi_1.seq)("EXCLUDING", "{", excludingNames, "}");
+        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName, (0, combi_1.optPrio)(excluding), (0, combi_1.optPrio)("SIGNATURE ONLY"));
         const typedVirtual = (0, combi_1.seq)("VIRTUAL", _1.CDSName, ":", _1.CDSType);
-        const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _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);
+        const pathSegment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.CDSParametersSelect, _1.CDSParameters)));
+        const funcWithPath = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.plusPrio)(pathSegment));
+        const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, funcWithPath, _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);
         const elementBody = (0, combi_1.altPrio)(typedVirtual, (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));
     }

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

@@ -8,7 +8,9 @@ class CDSExtendView extends combi_1.Expression {
         const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
         const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
         const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.seq)("[", _1.CDSCondition, "]")), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
-        const extendView = (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")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), valueNested, (0, combi_1.opt)(";"));
+        const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
+        const elementNested = (0, combi_1.seq)("{", (0, combi_1.altPrio)("*", elementList), "}");
+        const extendView = (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")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.altPrio)(elementNested, valueNested), (0, combi_1.opt)(";"));
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, ";");
         const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
         const entityBody = (0, combi_1.seq)("{", (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp)), "}");

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

@@ -7,7 +7,9 @@ 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)(_1.CDSInteger, name, _1.CDSString);
-        const nameValue = (0, combi_1.seq)(name, ":", value);
+        const colonPair = (0, combi_1.seq)(name, ":", value, (0, combi_1.optPrio)("DEFAULT"));
+        const arrowPair = (0, combi_1.seq)(name, "=", ">", value);
+        const nameValue = (0, combi_1.altPrio)(colonPair, arrowPair);
         return (0, combi_1.seq)("(", nameValue, (0, combi_1.star)((0, combi_1.seq)(",", nameValue)), ")");
     }
 }

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

@@ -16,13 +16,13 @@ class CDSPrefixedName extends combi_1.Expression {
         const cardinalityJoin = (0, combi_1.seq)("[", cardSpec, ":", joinType, "]");
         const cardinalityJoinWhere = (0, combi_1.seq)("[", cardSpec, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
         const joinWhere = (0, combi_1.seq)("[", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        const textCard = (0, combi_1.altPrio)("TO EXACT ONE", "TO ONE", "TO MANY");
+        const textCard = (0, combi_1.altPrio)("MANY TO EXACT ONE", "MANY TO ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY");
         const textCardFilter = (0, combi_1.seq)("[", textCard, (0, combi_1.optPrio)((0, combi_1.seq)(":", (0, combi_1.altPrio)((0, combi_1.seq)(joinType, "WHERE", cds_condition_1.CDSCondition), joinType, cds_condition_1.CDSCondition))), "]");
         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, "]"));
-        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));
+        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));
     }
 }

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSRelation extends combi_1.Expression {
     getRunnable() {
         const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSRelation = CDSRelation;

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

@@ -11,11 +11,12 @@ class CDSSelect extends combi_1.Expression {
         const distinct = (0, combi_1.str)("DISTINCT");
         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)("}"));
-        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", _1.CDSPrefixedName);
-        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")");
+        const aspectValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSPrefixedName);
+        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", aspectValue);
+        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")", (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
         const parenSelect = (0, combi_1.seq)("(", CDSSelect, ")");
         const unionBranch = (0, combi_1.altPrio)(parenSelect, 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.optPrio)(bindAspect), (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"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch))));
+        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.starPrio)(bindAspect), (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"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch))));
     }
 }
 exports.CDSSelect = CDSSelect;

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

@@ -6,10 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
         const staticFilter = (0, combi_1.seq)("[", _1.CDSCondition, "]");
-        // Dotted path: T._Assoc — association path as FROM source
-        const dottedName = (0, combi_1.seq)(_1.CDSName, ".", _1.CDSName);
-        const namedSource = (0, combi_1.altPrio)(dottedName, _1.CDSName);
-        const singleSource = (0, combi_1.seq)(namedSource, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
+        const singleSource = (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(staticFilter), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
         const funcSingleSource = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
         const parenSource = (0, combi_1.seq)("(", (0, combi_1.altPrio)(CDSSource, singleSource), (0, combi_1.star)(_1.CDSJoin), ")");
         return (0, combi_1.altPrio)(parenSource, funcSingleSource, singleSource);

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

@@ -4,8 +4,8 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'$/);
-        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|d|t|p|n|c|x|f)$/i);
+        const reg = (0, combi_1.regex)(/^(?:'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'|"(?:[^"\\]|""|\\"|\\\\|\\(?!"))*")$/);
+        const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|sstr|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|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_table_field.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSTableField = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+// A single field or association/composition inside a `define table entity { ... }`
+// inline body. Wraps annotations + name + type together so tooling can iterate
+// per-field with associated field-level annotations (matches the CDSElement
+// shape used for select-list elements).
+class CDSTableField extends combi_1.Expression {
+    getRunnable() {
+        const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
+        const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability);
+        const assocOrComp = (0, combi_1.seq)(_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, assocOrComp), ";");
+    }
+}
+exports.CDSTableField = CDSTableField;
+//# sourceMappingURL=cds_table_field.js.map

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

@@ -54,6 +54,7 @@ __exportStar(require("./cds_relation"), exports);
 __exportStar(require("./cds_select"), exports);
 __exportStar(require("./cds_source"), exports);
 __exportStar(require("./cds_string"), exports);
+__exportStar(require("./cds_table_field"), exports);
 __exportStar(require("./cds_type"), exports);
 __exportStar(require("./cds_where"), exports);
 __exportStar(require("./cds_with_parameters"), exports);

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.56";
+        return "2.119.58";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.56",
+    "version": "2.119.58",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",