@abaplint/core 2.102.50 → 2.102.52

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

@@ -97,20 +97,23 @@ class Select {
                     if (isDynamic) {
                         throw new Error(`dynamic field list, inlining not possible`);
                     }
-                    if (isSimple.test(field.code) && dbSources.length === 1 && dbSources[0] !== undefined) {
-                        const dbType = dbSources[0].parseType(scope.getRegistry());
-                        let type = new basic_1.VoidType("SELECT_todo");
-                        if (dbType instanceof basic_1.StructureType) {
-                            type = dbType.getComponentByName(field.code);
-                            if (type === undefined) {
-                                throw new Error(`handleInto, internal error, should be checked earlier`);
+                    let type = new basic_1.VoidType("SELECT_todo");
+                    if (isSimple.test(field.code)) {
+                        for (const dbSource of dbSources) {
+                            if (dbSource === undefined) {
+                                continue;
+                            }
+                            const dbType = dbSource.parseType(scope.getRegistry());
+                            if (dbType instanceof basic_1.StructureType) {
+                                const found = dbType.getComponentByName(field.code);
+                                if (found) {
+                                    type = found;
+                                    break;
+                                }
                             }
                         }
-                        new inline_data_1.InlineData().runSyntax(inline, scope, filename, type);
-                    }
-                    else {
-                        new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("SELECT_todo"));
                     }
+                    new inline_data_1.InlineData().runSyntax(inline, scope, filename, type);
                 }
             }
         }

package/build/src/abap/types/message.js

@@ -19,7 +19,8 @@ class Message {
         return this.message;
     }
     getPlaceholderCount() {
-        return (this.getMessage().match(/&/g) || []).length;
+        const escaped = (this.getMessage().match(/&&/g) || []).length;
+        return (this.getMessage().match(/&/g) || []).length - escaped * 2;
     }
 }
 exports.Message = Message;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -2384,6 +2384,9 @@ ${indentation}    output = ${uniqueName}.\n`;
             else if (found.getType() instanceof basic_1.VoidType && found.getType().getQualifiedName() === undefined) {
                 continue;
             }
+            else if (found.getType() instanceof basic_1.StructureType && found.getType().getQualifiedName() === undefined) {
+                continue;
+            }
             let type = found.getType().getQualifiedName()
                 ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase()
                 : found.getType().toABAP();

package/build/src/rules/msag_consistency.js

@@ -6,6 +6,11 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const objects_1 = require("../objects");
 const position_1 = require("../position");
 class MSAGConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** paramters must be numbered */
+        this.numericParamters = true;
+    }
 }
 exports.MSAGConsistencyConf = MSAGConsistencyConf;
 class MSAGConsistency {
@@ -39,7 +44,7 @@ class MSAGConsistency {
         }
         const numbers = new Set();
         for (const message of obj.getMessages()) {
-            // todo, get the right positions in xml file
+            // todo, get the right positions in xml file, and report the issue there
             if (!message.getNumber().match(/\d\d\d/)) {
                 const text = this.getDescription("Message number must be 3 digits: message " + message.getNumber());
                 const position = new position_1.Position(1, 1);
@@ -62,6 +67,25 @@ class MSAGConsistency {
             else {
                 numbers.add(num);
             }
+            if (this.getConfig().numericParamters === true) {
+                const placeholderCount = message.getPlaceholderCount();
+                if (placeholderCount > 4) {
+                    const text = `More than 4 placeholders in mesasge ${message.getNumber()}`;
+                    const position = new position_1.Position(1, 1);
+                    const issue = issue_1.Issue.atPosition(obj.getFiles()[0], position, text, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+                for (let i = 1; i <= placeholderCount; i++) {
+                    const placeholder = "&" + i;
+                    if (message.getMessage().includes(placeholder) === false) {
+                        const text = `Expected placeholder ${placeholder} in message ${message.getNumber()}`;
+                        const position = new position_1.Position(1, 1);
+                        const issue = issue_1.Issue.atPosition(obj.getFiles()[0], position, text, this.getMetadata().key, this.conf.severity);
+                        issues.push(issue);
+                        break;
+                    }
+                }
+            }
         }
         return issues;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.50",
+    "version": "2.102.52",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,11 +50,11 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.37.1",
+        "@microsoft/api-extractor": "^7.38.0",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
-        "@types/node": "^20.7.1",
-        "chai": "^4.3.9",
+        "@types/node": "^20.8.0",
+        "chai": "^4.3.10",
         "eslint": "^8.50.0",
         "mocha": "^10.2.0",
         "c8": "^8.0.1",