@abaplint/core 2.113.33 → 2.113.35

package/build/abaplint.d.ts

@@ -5108,6 +5108,7 @@ declare type ParsedDataDefinition = {
     fields: {
         key: boolean;
         name: string;
+        prefix: string;
         annotations: string[];
     }[];
     sources: {

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const tokens_1 = require("../../1_lexer/tokens");
 class DefinitionName extends combi_1.Expression {
     getRunnable() {
-        const r = (0, combi_1.regex)(/^((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%]+)$/);
+        const r = (0, combi_1.regex)(/^&|&?((\w*\/\w+\/)|(\w*\/\w+\/)?[\w\*$%]+)$/);
         return (0, combi_1.seq)(r, (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)(r))), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.DashW)));
     }
 }

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

@@ -17,7 +17,7 @@ class SQLCompare extends combi_1.Expression {
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)));
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)));
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

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

@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLHaving = void 0;
 const combi_1 = require("../combi");
 const dynamic_1 = require("./dynamic");
+const sql_aggregation_1 = require("./sql_aggregation");
+const sql_compare_operator_1 = require("./sql_compare_operator");
+const sql_source_1 = require("./sql_source");
 class SQLHaving extends combi_1.Expression {
     getRunnable() {
-        const having = (0, combi_1.seq)("HAVING", dynamic_1.Dynamic);
+        const cond = (0, combi_1.seq)(sql_aggregation_1.SQLAggregation, sql_compare_operator_1.SQLCompareOperator, sql_source_1.SQLSource);
+        const having = (0, combi_1.seq)("HAVING", (0, combi_1.altPrio)(dynamic_1.Dynamic, cond));
         return having;
     }
 }

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

@@ -15,7 +15,8 @@ class CallFunction {
         const separate = (0, combi_1.str)("AS SEPARATE UNIT");
         const keeping = (0, combi_1.str)("KEEPING LOGICAL UNIT OF WORK");
         const options = (0, combi_1.per)(starting, update, background, expressions_1.Destination, calling, performing, separate, keeping);
-        const dynamic = (0, combi_1.seq)("PARAMETER-TABLE", expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)("EXCEPTION-TABLE", expressions_1.Source)));
+        const ex = (0, combi_1.seq)("EXCEPTION-TABLE", expressions_1.Source);
+        const dynamic = (0, combi_1.alt)((0, combi_1.seq)("PARAMETER-TABLE", expressions_1.Source, (0, combi_1.opt)(ex)), ex);
         const call = (0, combi_1.seq)("CALL", (0, combi_1.altPrio)("FUNCTION", (0, combi_1.verNot)(version_1.Version.Cloud, "CUSTOMER-FUNCTION")), expressions_1.FunctionName, (0, combi_1.opt)(options), (0, combi_1.alt)(expressions_1.FunctionParameters, dynamic));
         return call;
     }

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

@@ -18,10 +18,12 @@ class NewPage {
         const keep = (0, combi_1.seq)("KEEP IN SPOOL", expressions_1.Source);
         const layout = (0, combi_1.seq)("LAYOUT", expressions_1.Source);
         const listAuth = (0, combi_1.seq)("LIST AUTHORITY", expressions_1.Source);
+        const department = (0, combi_1.seq)("DEPARTMENT", expressions_1.Source);
+        const receiver = (0, combi_1.seq)("RECEIVER", expressions_1.Source);
         const dataset = (0, combi_1.seq)("LIST DATASET", expressions_1.Source);
         const name = (0, combi_1.seq)("LIST NAME", expressions_1.Source);
         const newList = (0, combi_1.seq)("NEW LIST IDENTIFICATION", expressions_1.Source);
-        const ret = (0, combi_1.seq)("NEW-PAGE", (0, combi_1.opt)((0, combi_1.per)(print, (0, combi_1.alt)("NO-TITLE", "WITH-TITLE"), (0, combi_1.alt)("NO-HEADING", "WITH-HEADING"), "NO DIALOG", parameters, listAuth, immediately, dataset, coverPage, newList, keep, name, layout, destination, coverText, archive, "NEW-SECTION", lineCount, line)));
+        const ret = (0, combi_1.seq)("NEW-PAGE", (0, combi_1.opt)((0, combi_1.per)(print, (0, combi_1.alt)("NO-TITLE", "WITH-TITLE"), (0, combi_1.alt)("NO-HEADING", "WITH-HEADING"), "NO DIALOG", parameters, listAuth, immediately, dataset, coverPage, newList, keep, department, name, layout, destination, receiver, coverText, archive, "NEW-SECTION", lineCount, line)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

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

@@ -10,7 +10,7 @@ class ScrollList {
         const line = (0, combi_1.seq)("LINE", expressions_1.Source);
         const column = (0, combi_1.seq)("TO COLUMN", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", (0, combi_1.alt)("FIRST PAGE", "LAST PAGE", (0, combi_1.seq)("PAGE", expressions_1.Source)));
-        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), column, line));
+        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.alt)("LEFT", "RIGHT"), column, line));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

package/build/src/cds/cds_determine_types.js

@@ -2,20 +2,71 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSDetermineTypes = void 0;
 const basic_1 = require("../abap/types/basic");
+const ddic_1 = require("../ddic");
 class CDSDetermineTypes {
-    parseType(_reg, parsedData) {
+    parseType(reg, parsedData) {
+        const ddic = new ddic_1.DDIC(reg);
         if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields.length) === 0) {
             return new basic_1.VoidType("DDLS:todo");
         }
         else {
             const components = [];
             for (const f of (parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields) || []) {
-                components.push({
-                    name: f.name,
-                    type: new basic_1.VoidType("DDLS:fieldname"),
-                });
+                if (f.prefix !== "") {
+                    const source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === f.prefix.toUpperCase(); });
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType("CDS parser error, unknown source"),
+                        });
+                        continue;
+                    }
+                    const lookup = ddic.lookupTableOrView(source.name);
+                    if (lookup.type) {
+                        if (lookup.type instanceof basic_1.StructureType) {
+                            const type = lookup.type.getComponentByName(f.name);
+                            if (type) {
+                                components.push({
+                                    name: f.name,
+                                    type: type,
+                                });
+                            }
+                            else {
+                                components.push({
+                                    name: f.name,
+                                    type: new basic_1.UnknownType(f.name + " not found in " + source.name + ", CDSDetermineTypes"),
+                                });
+                            }
+                        }
+                        else {
+                            // its void or unknown
+                            components.push({
+                                name: f.name,
+                                type: lookup.type,
+                            });
+                        }
+                    }
+                    else if (reg.inErrorNamespace(source.name)) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType(source.name + " not found, CDSDetermineTypes"),
+                        });
+                    }
+                    else {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType(source.name),
+                        });
+                    }
+                }
+                else {
+                    components.push({
+                        name: f.name,
+                        type: new basic_1.VoidType("DDLS:fieldname"),
+                    });
+                }
             }
-            return new basic_1.StructureType(components);
+            return new basic_1.StructureType(components, parsedData.definitionName, parsedData.definitionName, parsedData.description);
         }
     }
 }

package/build/src/objects/data_definition.js

@@ -126,6 +126,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             expr = tree.findFirstExpression(expressions_1.CDSDefineProjection);
         }
         for (const e of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressions(expressions_1.CDSElement)) || []) {
+            let prefix = "";
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
                 const list = e.findAllExpressions(expressions_1.CDSName);
@@ -134,6 +135,9 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
                 }
                 else {
                     found = list[list.length - 1];
+                    if (list.length > 1) {
+                        prefix = list[0].concatTokens();
+                    }
                 }
             }
             if (found === undefined) {
@@ -150,6 +154,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             this.parsedData.fields.push({
                 name: name,
                 annotations: annotations,
+                prefix: prefix,
                 key: e.findDirectTokenByText("KEY") !== undefined,
             });
         }

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.33",
+    "version": "2.113.35",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,10 +53,10 @@
         "@microsoft/api-extractor": "^7.47.11",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.9",
-        "@types/node": "^22.8.1",
+        "@types/node": "^22.8.7",
         "chai": "^4.5.0",
-        "eslint": "^9.13.0",
-        "mocha": "^10.7.3",
+        "eslint": "^9.14.0",
+        "mocha": "^10.8.2",
         "c8": "^10.1.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^2.3.0",