@abaplint/core 2.120.41 → 2.120.43

package/build/abaplint.d.ts

@@ -5628,9 +5628,11 @@ declare type ParsedDataDefinition = {
     sqlViewName: string | undefined;
     definitionName: string | undefined;
     description: string | undefined;
+    /** name is the name of the element, nameInSource the name in the prefixed source, if aliased via "as" */
     fields: {
         key: boolean;
         name: string;
+        nameInSource?: string;
         prefix: string;
         annotations: string[];
     }[];

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

@@ -347,21 +347,21 @@ class SQLFunction extends combi_1.Expression {
         const fn = (name, params, v) => {
             const nameReg = (0, combi_1.regex)(new RegExp("^" + name + "$", "i"));
             if (params === 0) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else if (params === VARIADIC) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else {
                 const extra = [];
                 for (let i = 1; i < params; i++) {
                     extra.push(commaParam);
                 }
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
         };
         const castInput = (0, combi_1.altPrio)(sql_case_1.SQLCase, sql_function_input_1.SQLFunctionInput);
-        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         const hostParen = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW));
         const hostVar = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(simple_source3_1.SimpleSource3, hostParen));
         const abapOnly = (0, combi_1.altPrio)(constant_1.Constant, hostVar);
@@ -371,7 +371,7 @@ class SQLFunction extends combi_1.Expression {
             const kvs = params.map(p => (0, combi_1.seq)((0, combi_1.regex)(new RegExp("^" + p.name + "$", "i")), "=", valueFor(p)));
             const anyKv = kvs.length === 1 ? kvs[0] : (0, combi_1.altPrio)(kvs[0], kvs[1], ...kvs.slice(2));
             const body = (0, combi_1.optPrio)((0, combi_1.seq)(anyKv, (0, combi_1.starPrio)((0, combi_1.seq)(",", anyKv))));
-            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)));
+            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         };
         return (0, combi_1.altPrio)(cast, sql_replace_regexpr_1.SQLReplaceRegexpr, sql_occurrences_regexpr_1.SQLOccurrencesRegexpr, sql_substring_regexpr_1.SQLSubstringRegexpr, sql_locate_regexpr_1.SQLLocateRegexpr, ...exports.sqlFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlNamedFunctionDefs.map(([name, v, params]) => namedFn(name, v, params)), ...exports.sqlSpatialFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlSpatialAggregateDefs.map(([name, params, v]) => fn(name, params, v)));
     }

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

@@ -13,7 +13,7 @@ class Write {
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
         const options = (0, combi_1.per)(mask, to, (0, combi_1.seq)("EXPONENT", expressions_1.Source), "NO-GROUPING", "NO-ZERO", "CENTERED", (0, combi_1.seq)("INPUT", (0, combi_1.opt)(onOff)), "NO-GAP", "LEFT-JUSTIFIED", as, (0, combi_1.seq)("FRAMES", onOff), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(onOff)), "RIGHT-JUSTIFIED", (0, combi_1.seq)("TIME ZONE", expressions_1.Source), (0, combi_1.seq)("UNDER", expressions_1.Source), (0, combi_1.seq)("STYLE", expressions_1.Source), (0, combi_1.seq)("ROUND", expressions_1.Source), (0, combi_1.seq)("QUICKINFO", expressions_1.Source), "ENVIRONMENT TIME FORMAT", dateFormat, (0, combi_1.seq)("UNIT", expressions_1.Source), (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff)), (0, combi_1.seq)("INDEX", expressions_1.Source), (0, combi_1.seq)("DECIMALS", expressions_1.Source), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(onOff)), expressions_1.Color, (0, combi_1.seq)("CURRENCY", expressions_1.Source), "RESET", "NO-SIGN");
         // Need to refactor all this sometime,
-        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)((0, combi_1.seq)("AT /", (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)("NO-GAP")), (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
+        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)((0, combi_1.seq)("AT /", (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(options)), (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
         return (0, combi_1.verNotLang)(version_1.LanguageVersion.Cloud, ret);
     }
 }

package/build/src/cds/cds_determine_types.js

@@ -5,6 +5,7 @@ const basic_1 = require("../abap/types/basic");
 const ddic_1 = require("../ddic");
 class CDSDetermineTypes {
     parseType(reg, parsedData, ddlsName) {
+        var _a;
         const ddic = new ddic_1.DDIC(reg);
         if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields.length) === 0) {
             return basic_1.VoidType.get("DDLS:todo");
@@ -41,10 +42,11 @@ class CDSDetermineTypes {
                         });
                         continue;
                     }
+                    const nameInSource = (_a = f.nameInSource) !== null && _a !== void 0 ? _a : f.name;
                     const lookup = ddic.lookupTableOrView(source.name);
                     if (lookup.type) {
                         if (lookup.type instanceof basic_1.StructureType) {
-                            const type = lookup.type.getComponentByName(f.name);
+                            const type = lookup.type.getComponentByName(nameInSource);
                             if (type) {
                                 components.push({
                                     name: f.name,
@@ -54,7 +56,7 @@ class CDSDetermineTypes {
                             else {
                                 components.push({
                                     name: f.name,
-                                    type: new basic_1.UnknownType(f.name + " not found in " + source.name + ", CDSDetermineTypes"),
+                                    type: new basic_1.UnknownType(nameInSource + " not found in " + source.name + ", CDSDetermineTypes"),
                                 });
                             }
                         }

package/build/src/objects/data_definition.js

@@ -138,19 +138,18 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         }
         for (const e of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressions(expressions_1.CDSElement)) || []) {
             let prefix = "";
+            let nameInSource = undefined;
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
-            if (found === undefined) {
-                const list = (_b = e.findDirectExpression(expressions_1.CDSPrefixedName)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(expressions_1.CDSName);
-                if (list) {
-                    if (e.concatTokens().toUpperCase().includes(" REDIRECTED TO ")) {
-                        found = list[0];
-                    }
-                    else {
-                        found = list[list.length - 1];
-                        if (list.length > 1) {
-                            prefix = list[0].concatTokens();
-                        }
-                    }
+            const list = (_b = e.findDirectExpression(expressions_1.CDSPrefixedName)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(expressions_1.CDSName);
+            if (list !== undefined) {
+                const redirected = list.length > 1 && e.concatTokens().toUpperCase().includes(" REDIRECTED TO ");
+                if (list.length > 1 && redirected === false) {
+                    // "prefix.field" is looked up as "field" in "prefix", also when aliased via "as"
+                    prefix = list[0].concatTokens();
+                    nameInSource = list[list.length - 1].concatTokens();
+                }
+                if (found === undefined) {
+                    found = redirected === true ? list[0] : list[list.length - 1];
                 }
             }
             if (found === undefined) {
@@ -172,6 +171,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             }
             this.parsedData.fields.push({
                 name: name,
+                nameInSource: nameInSource,
                 annotations: annotations,
                 prefix: prefix,
                 key: e.findDirectTokenByText("KEY") !== undefined,

package/build/src/registry.js

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

package/build/src/rules/xml_consistency.js

@@ -46,6 +46,8 @@ class XMLConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
         super(...arguments);
         /** Problem severity for text and translation length checks */
         this.textAndTranslationLengthSeverity = severity_1.Severity.Error;
+        /** Problem severity for data element(DTEL) field checks */
+        this.dataElementSeverity = severity_1.Severity.Error;
     }
 }
 exports.XMLConsistencyConf = XMLConsistencyConf;
@@ -254,7 +256,7 @@ class XMLConsistency {
     }
     checkRequiredField(file, fieldName, value) {
         if (value === undefined || value === "") {
-            return issue_1.Issue.atRow(file, 1, `Missing required field ${fieldName} in DD04V`, this.getMetadata().key, this.conf.severity);
+            return issue_1.Issue.atRow(file, 1, `Missing required field ${fieldName} in DD04V`, this.getMetadata().key, this.conf.dataElementSeverity);
         }
         return undefined;
     }

package/package.json

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