@abaplint/transpiler-cli 2.7.101 → 2.7.102

package/build/bundle.js

@@ -521,6 +521,11 @@ class Lexer {
                 this.add();
                 this.m = this.ModeNormal;
             }
+            else if (this.m === this.ModeTemplate
+                && ahead === "}"
+                && current !== "\\") {
+                this.add();
+            }
             else if (this.m === this.ModeStr
                 && current === "'"
                 && buf.length > 1
@@ -6570,7 +6575,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class SQLFields extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("FIELDS", _1.SQLFieldList);
+        return (0, combi_1.seq)("FIELDS", (0, combi_1.opt)("DISTINCT"), _1.SQLFieldList);
     }
 }
 exports.SQLFields = SQLFields;
@@ -15547,9 +15552,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TruncateDataset = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class TruncateDataset {
     getMatcher() {
-        return (0, combi_1.seq)("TRUNCATE DATASET", expressions_1.Source, "AT CURRENT POSITION");
+        return (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("TRUNCATE DATASET", expressions_1.Source, "AT CURRENT POSITION"));
     }
 }
 exports.TruncateDataset = TruncateDataset;
@@ -20922,6 +20928,7 @@ class TypeUtils {
         else if (source instanceof basic_1.XStringType) {
             if (target instanceof basic_1.CLikeType
                 || target instanceof basic_1.IntegerType
+                || target instanceof basic_1.StringType
                 || target instanceof basic_1.ObjectReferenceType
                 || target instanceof basic_1.HexType) {
                 return false;
@@ -22898,20 +22905,30 @@ const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "
 const source_field_1 = __webpack_require__(/*! ./source_field */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source_field.js");
 class FieldChain {
     runSyntax(node, scope, filename, refType) {
-        const concat = node.concatTokens();
-        if (concat.includes("-")) {
-            // workaround for names with dashes
-            const found = scope.findVariable(concat);
-            if (found) {
-                if (refType) {
-                    scope.addReference(node.getFirstToken(), found, refType, filename);
+        var _a, _b, _c, _d, _e;
+        const children = node.getChildren().slice();
+        let contextName = children[0].concatTokens();
+        let context = undefined;
+        try {
+            context = this.findTop(children.shift(), scope, filename, refType);
+        }
+        catch (error) {
+            const concat = node.concatTokens();
+            if (concat.includes("-") && ((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SourceField) {
+                // workaround for names with dashes, eg. "sy-repid"
+                const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
+                const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+                const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                if (found) {
+                    if (refType) {
+                        scope.addReference(node.getFirstToken(), found, refType, filename);
+                    }
+                    // this is not completely correct, but will work, dashes in names is a mess anyhow
+                    return found.getType();
                 }
-                return found.getType();
             }
+            throw error;
         }
-        const children = node.getChildren().slice();
-        let contextName = children[0].concatTokens();
-        let context = this.findTop(children.shift(), scope, filename, refType);
         while (children.length > 0) {
             contextName += children[0].concatTokens();
             const current = children.shift();
@@ -22959,7 +22976,30 @@ class FieldChain {
                 if (context instanceof basic_1.TableType && context.isWithHeader()) {
                     context = context.getRowType();
                 }
-                context = new component_name_1.ComponentName().runSyntax(context, current);
+                try {
+                    context = new component_name_1.ComponentName().runSyntax(context, current);
+                }
+                catch (error) {
+                    const concat = node.concatTokens();
+                    if (concat.includes("-")) {
+                        // workaround for names with dashes, eg. "sy-repid"
+                        const offset = ((_d = node.findDirectExpression(Expressions.FieldOffset)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
+                        const length = ((_e = node.findDirectExpression(Expressions.FieldLength)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "";
+                        const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                        if (found) {
+                            if (refType) {
+                                scope.addReference(node.getFirstToken(), found, refType, filename);
+                            }
+                            context = found.getType();
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
+                    else {
+                        throw error;
+                    }
+                }
             }
             else if (current instanceof nodes_1.ExpressionNode
                 && current.get() instanceof Expressions.TableExpression) {
@@ -23688,6 +23728,7 @@ class MethodCallChain {
         if (first.get() instanceof Expressions.MethodCall) {
             children.unshift(first);
         }
+        let previous = "";
         while (children.length > 0) {
             const current = children.shift();
             if (current === undefined) {
@@ -23708,6 +23749,9 @@ class MethodCallChain {
                     }
                 }
                 else {
+                    if (previous === "=>" && (method === null || method === void 0 ? void 0 : method.isStatic()) === false) {
+                        throw new Error("Method \"" + methodName + "\" not static");
+                    }
                     const extra = {
                         ooName: foundDef === null || foundDef === void 0 ? void 0 : foundDef.getName(),
                         ooType: foundDef instanceof class_definition_1.ClassDefinition ? "CLAS" : "INTF"
@@ -23745,6 +23789,7 @@ class MethodCallChain {
             else if (current instanceof nodes_1.ExpressionNode && current.get() instanceof Expressions.AttributeName) {
                 context = new attribute_name_1.AttributeName().runSyntax(context, current, scope, filename);
             }
+            previous = current.concatTokens();
         }
         return context;
     }
@@ -24728,20 +24773,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);
                 }
             }
         }
@@ -25402,7 +25450,8 @@ class StringTemplate {
             if (type === undefined) {
                 throw new Error("No target type determined");
             }
-            else if (typeUtils.isCharLike(type) === false && typeUtils.isHexLike(type) === false) {
+            else if ((typeUtils.isCharLike(type) === false && typeUtils.isHexLike(type) === false)
+                || type instanceof basic_1.StructureType) {
                 throw new Error("Not character like, " + type.constructor.name);
             }
             const format = templateSource.findDirectExpression(Expressions.StringTemplateFormatting);
@@ -26449,9 +26498,10 @@ const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_module
 const fstarget_1 = __webpack_require__(/*! ../expressions/fstarget */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/fstarget.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class Assign {
     runSyntax(node, scope, filename) {
-        var _a, _b;
+        var _a;
         const assignSource = node.findDirectExpression(Expressions.AssignSource);
         const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressions(Expressions.Source)) || [];
         const theSource = sources[sources.length - 1];
@@ -26470,10 +26520,18 @@ class Assign {
         else {
             sourceType = new source_1.Source().runSyntax(theSource, scope, filename);
         }
-        if (sourceType === undefined || ((_a = node.findDirectExpression(Expressions.AssignSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Dynamic))) {
+        if ((assignSource === null || assignSource === void 0 ? void 0 : assignSource.getChildren().length) === 5
+            && ((_a = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens()) === "COMPONENT") {
+            const componentSource = sources[sources.length - 2];
+            const componentType = new source_1.Source().runSyntax(componentSource, scope, filename);
+            if (new _type_utils_1.TypeUtils(scope).isAssignable(componentType, new basic_1.CharacterType(30)) === false) {
+                throw new Error("component name must be charlike");
+            }
+        }
+        if (sourceType === undefined || (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpression(Expressions.Dynamic))) {
             sourceType = new basic_1.AnyType();
         }
-        for (const d of ((_b = node.findDirectExpression(Expressions.AssignSource)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(Expressions.Dynamic)) || []) {
+        for (const d of (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findAllExpressions(Expressions.Dynamic)) || []) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }
         const target = node.findDirectExpression(Expressions.FSTarget);
@@ -35994,7 +36052,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;
@@ -48199,7 +48258,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.51";
+        return "2.102.56";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -60960,6 +61019,11 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
 class MSAGConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** paramters must be numbered */
+        this.numericParamters = true;
+    }
 }
 exports.MSAGConsistencyConf = MSAGConsistencyConf;
 class MSAGConsistency {
@@ -60993,7 +61057,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);
@@ -61016,6 +61080,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;
     }
@@ -67578,6 +67661,7 @@ class UnreachableCode extends _abap_rule_1.ABAPRule {
             || s instanceof Statements.EndMethod
             || s instanceof Statements.EndModule
             || s instanceof Statements.EndForm
+            || s instanceof Statements.EndTestSeam
             || s instanceof Statements.EndAt
             || s instanceof Statements.EndSelect
             || s instanceof Statements.AtSelectionScreen
@@ -83484,7 +83568,7 @@ Builder.prototype.j2x = function(jObj, level) {
   let attrStr = '';
   let val = '';
   for (let key in jObj) {
-    if(!jObj.hasOwnProperty(key)) continue;
+    if(!Object.prototype.hasOwnProperty.call(jObj, key)) continue;
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node only if it is not an attribute
       if (this.isAttribute(key)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.101",
+  "version": "2.7.102",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.7.101",
+    "@abaplint/transpiler": "^2.7.102",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.7.1",
-    "@abaplint/core": "^2.102.51",
+    "@types/node": "^20.8.2",
+    "@abaplint/core": "^2.102.56",
     "progress": "^2.0.3",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",