@abaplint/transpiler-cli 2.12.24 → 2.12.25

package/build/bundle.js

@@ -22209,8 +22209,25 @@ class Procedural {
         }
         return undefined;
     }
+    findFunctionGroupScope(fg) {
+        var _a, _b, _c;
+        for (const module of fg.getModules()) {
+            if (module.isGlobalParameters() === false) {
+                continue;
+            }
+            // console.dir(fg.getSequencedFiles());
+            const fmFile = fg.getSequencedFiles().find((f) => { return f.getFilename().endsWith(".fugr." + module.getName().toLowerCase().replace(/\//g, "#") + ".abap"); });
+            if (fmFile === undefined) {
+                continue;
+            }
+            const nameToken = (_c = (_b = (_a = fmFile.getStructure()) === null || _a === void 0 ? void 0 : _a.findFirstStatement(Statements.FunctionModule)) === null || _b === void 0 ? void 0 : _b.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.getFirstToken();
+            if (nameToken === undefined) {
+                continue;
+            }
+            this.addFunctionScope(module, nameToken, fmFile.getFilename(), true);
+        }
+    }
     findFunctionScope(obj, node, filename) {
-        var _a, _b, _c, _d, _e;
         if (!(obj instanceof objects_1.FunctionGroup)) {
             throw new Error("findFunctionScope, expected function group input");
         }
@@ -22221,6 +22238,13 @@ class Procedural {
         if (definition === undefined) {
             throw new Error("Function module definition \"" + name + "\" not found");
         }
+        if (definition.isGlobalParameters() === true) {
+            return; // already added at global level
+        }
+        this.addFunctionScope(definition, nameToken, filename);
+    }
+    addFunctionScope(definition, nameToken, filename, ignoreIfAlreadyExists = false) {
+        var _a, _b, _c, _d, _e;
         const ddic = new ddic_1.DDIC(this.reg);
         const allNames = new Set();
         for (const param of definition.getParameters()) {
@@ -22306,7 +22330,15 @@ class Procedural {
             }
             else {
                 const type = new _typed_identifier_1.TypedIdentifier(nameToken, filename, found);
-                this.scope.addNamedIdentifier(param.name, type);
+                if (ignoreIfAlreadyExists === true) {
+                    const exists = this.scope.findVariable(param.name);
+                    if (exists === undefined) {
+                        this.scope.addNamedIdentifier(param.name, type);
+                    }
+                }
+                else {
+                    this.scope.addNamedIdentifier(param.name, type);
+                }
                 allNames.add(param.name.toUpperCase());
             }
         }
@@ -22630,6 +22662,22 @@ class TypeUtils {
         // todo
         return true;
     }
+    isCompareable(source1, source2, node1, node2) {
+        /*
+        console.dir(source1);
+        console.dir(source2);
+        */
+        if (source1 === undefined || source2 === undefined) {
+            return true;
+        }
+        if (source1 instanceof basic_1.HexType && this.isCalculated(node1) && source2 instanceof basic_1.IntegerType) {
+            return false;
+        }
+        if (source2 instanceof basic_1.HexType && this.isCalculated(node2) && source1 instanceof basic_1.IntegerType) {
+            return false;
+        }
+        return true;
+    }
     structureContainsString(structure) {
         for (const c of structure.getComponents()) {
             if (c.type instanceof basic_1.StringType) {
@@ -22659,6 +22707,13 @@ class TypeUtils {
             || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
         return calculated;
     }
+    isAssignableNew(source, target, node) {
+        const calculated = (node === null || node === void 0 ? void 0 : node.findFirstExpression(Expressions.ArithOperator)) !== undefined;
+        if (calculated && source instanceof basic_1.HexType && target instanceof basic_1.IntegerType) {
+            return false;
+        }
+        return this.isAssignable(source, target);
+    }
     isAssignableStrict(source, target, node) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const calculated = node ? this.isCalculated(node) : false;
@@ -24258,10 +24313,14 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const method_call_chain_1 = __webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_call_chain.js");
 const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source_field_symbol.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class Compare {
     static runSyntax(node, input) {
-        for (const t of node.findDirectExpressions(Expressions.Source)) {
-            source_1.Source.runSyntax(t, input);
+        const sourceTypes = [];
+        const sources = node.findDirectExpressions(Expressions.Source);
+        for (const t of sources) {
+            sourceTypes.push(source_1.Source.runSyntax(t, input));
         }
         for (const t of node.findDirectExpressions(Expressions.SourceFieldSymbolChain)) {
             source_field_symbol_1.SourceFieldSymbol.runSyntax(t, input);
@@ -24269,6 +24328,12 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             method_call_chain_1.MethodCallChain.runSyntax(t, input);
         }
+        if (node.findDirectExpression(Expressions.CompareOperator)
+            && new _type_utils_1.TypeUtils(input.scope).isCompareable(sourceTypes[0], sourceTypes[1], sources[0], sources[1]) === false
+            && sourceTypes.length === 2) {
+            const message = "Incompatible types for comparison";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+        }
     }
 }
 exports.Compare = Compare;
@@ -28051,53 +28116,84 @@ exports.SQLSource = SQLSource;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.StringTemplate = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const Tokens = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class StringTemplate {
     static runSyntax(node, input) {
         const typeUtils = new _type_utils_1.TypeUtils(input.scope);
         const ret = basic_1.StringType.get();
-        for (const templateSource of node.findAllExpressions(Expressions.StringTemplateSource)) {
-            const s = templateSource.findDirectExpression(Expressions.Source);
-            const type = source_1.Source.runSyntax(s, input, ret);
-            if (type === undefined) {
-                const message = "No target type determined";
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
-            }
-            else if ((typeUtils.isCharLike(type) === false
-                && typeUtils.isHexLike(type) === false
-                && !(type instanceof basic_1.UTCLongType))
-                || type instanceof basic_1.StructureType) {
-                const message = "String template, not character like, " + type.constructor.name;
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+        for (const child of node.getChildren()) {
+            if (child instanceof nodes_1.ExpressionNode && child.get() instanceof Expressions.StringTemplateSource) {
+                const s = child.findDirectExpression(Expressions.Source);
+                const type = source_1.Source.runSyntax(s, input, ret);
+                if (type === undefined) {
+                    const message = "No target type determined";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                else if ((typeUtils.isCharLike(type) === false
+                    && typeUtils.isHexLike(type) === false
+                    && !(type instanceof basic_1.UTCLongType))
+                    || type instanceof basic_1.StructureType) {
+                    const message = "String template, not character like, " + type.constructor.name;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                const format = child.findDirectExpression(Expressions.StringTemplateFormatting);
+                const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();
+                for (const formatSource of (format === null || format === void 0 ? void 0 : format.findAllExpressions(Expressions.Source)) || []) {
+                    source_1.Source.runSyntax(formatSource, input);
+                }
+                if (format
+                    && (formatConcat === null || formatConcat === void 0 ? void 0 : formatConcat.includes("ALPHA = "))
+                    && !(type instanceof basic_1.UnknownType)
+                    && !(type instanceof basic_1.VoidType)
+                    && !(type instanceof basic_1.StringType)
+                    && !(type instanceof basic_1.CLikeType)
+                    && !(type instanceof basic_1.CharacterType)
+                    && !(type instanceof basic_1.NumericGenericType)
+                    && !(type instanceof basic_1.NumericType)
+                    && !(type instanceof basic_1.AnyType)) {
+                    const message = `Cannot apply ALPHA to this type (${type.constructor.name})`;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, format.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
             }
-            const format = templateSource.findDirectExpression(Expressions.StringTemplateFormatting);
-            const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();
-            for (const formatSource of (format === null || format === void 0 ? void 0 : format.findAllExpressions(Expressions.Source)) || []) {
-                source_1.Source.runSyntax(formatSource, input);
-            }
-            if (format
-                && (formatConcat === null || formatConcat === void 0 ? void 0 : formatConcat.includes("ALPHA = "))
-                && !(type instanceof basic_1.UnknownType)
-                && !(type instanceof basic_1.VoidType)
-                && !(type instanceof basic_1.StringType)
-                && !(type instanceof basic_1.CLikeType)
-                && !(type instanceof basic_1.CharacterType)
-                && !(type instanceof basic_1.NumericGenericType)
-                && !(type instanceof basic_1.NumericType)
-                && !(type instanceof basic_1.AnyType)) {
-                const message = `Cannot apply ALPHA to this type (${type.constructor.name})`;
-                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, format.getFirstToken(), message));
-                return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+            else if (child instanceof nodes_1.TokenNode) {
+                const token = child.get();
+                if (token instanceof Tokens.StringTemplate
+                    || token instanceof Tokens.StringTemplateBegin
+                    || token instanceof Tokens.StringTemplateMiddle
+                    || token instanceof Tokens.StringTemplateEnd) {
+                    const issue = this.validateEscapeSequences(token.getStr(), input, child);
+                    if (issue) {
+                        input.issues.push(issue);
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
+                }
             }
         }
         return ret;
     }
+    static validateEscapeSequences(str, input, node) {
+        // Valid escape sequences in ABAP string templates: \|, \{, \}, \\, \n, \r, \t
+        const validEscapes = new Set(["\\|", "\\{", "\\}", "\\\\", "\\n", "\\r", "\\t"]);
+        for (let i = 0; i < str.length; i++) {
+            if (str[i] === "\\") {
+                const escape = str.substring(i, i + 2);
+                if (!validEscapes.has(escape)) {
+                    return (0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), `Invalid escape sequence "${escape}" in string template`);
+                }
+                i++; // skip the next character as it's part of the escape sequence
+            }
+        }
+        return undefined;
+    }
 }
 exports.StringTemplate = StringTemplate;
 //# sourceMappingURL=string_template.js.map
@@ -32475,7 +32571,7 @@ class Move {
                 return;
             }
         }
-        else if (new _type_utils_1.TypeUtils(input.scope).isAssignable(sourceType, targetType) === false) {
+        else if (new _type_utils_1.TypeUtils(input.scope).isAssignableNew(sourceType, targetType, source) === false) {
             const message = "Incompatible types";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
@@ -35435,6 +35531,9 @@ class SyntaxLogic {
                     stype = _scope_type_1.ScopeType.FunctionGroup;
                 }
                 this.scope.push(stype, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
+                if (this.object instanceof objects_1.FunctionGroup) {
+                    this.helpers.proc.findFunctionGroupScope(this.object);
+                }
             }
         }
         else if (this.object instanceof objects_1.TypePool) {
@@ -39131,6 +39230,9 @@ class FunctionModuleDefinition {
     getName() {
         return this.name;
     }
+    isGlobalParameters() {
+        return this.globalParameters;
+    }
     ///////////////
     parse(data) {
         if (data.FUNCNAME === undefined) {
@@ -39139,6 +39241,7 @@ class FunctionModuleDefinition {
         this.name = data.FUNCNAME;
         this.description = data.SHORT_TEXT;
         this.parameters = [];
+        this.globalParameters = data.GLOBAL_FLAG === "X";
         this.moduleType = FunctionModuleType.regular;
         if (data.REMOTE_CALL === "R") {
             this.moduleType = FunctionModuleType.remote;
@@ -54236,7 +54339,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.14";
+        return "2.115.16";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -63290,6 +63393,68 @@ exports.Exporting = Exporting;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/fm_global_parameters_obsolete.js"
+/*!**************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/fm_global_parameters_obsolete.js ***!
+  \**************************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FMGlobalParametersObsolete = exports.FMGlobalParametersObsoleteConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const Objects = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
+class FMGlobalParametersObsoleteConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.FMGlobalParametersObsoleteConf = FMGlobalParametersObsoleteConf;
+class FMGlobalParametersObsolete {
+    constructor() {
+        this.conf = new FMGlobalParametersObsoleteConf();
+    }
+    getMetadata() {
+        return {
+            key: "fm_global_parameters_obsolete",
+            title: "FM Global Parameters Obsolete",
+            shortDescription: `Check for function modules with global parameteers`,
+            extendedInformation: `https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abenglobal_parameters_obsolete.htm`,
+            tags: [],
+        };
+    }
+    initialize(_reg) {
+        return this;
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    run(obj) {
+        if (!(obj instanceof Objects.FunctionGroup)) {
+            return [];
+        }
+        const issues = [];
+        for (const module of obj.getModules()) {
+            if (module.isGlobalParameters() === true) {
+                const file = obj.getMainABAPFile();
+                if (file === undefined) {
+                    continue;
+                }
+                const message = `Function Module "${module.getName()}" uses obsolete global parameters`;
+                issues.push(issue_1.Issue.atPosition(file, new position_1.Position(1, 1), message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+}
+exports.FMGlobalParametersObsolete = FMGlobalParametersObsolete;
+//# sourceMappingURL=fm_global_parameters_obsolete.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/forbidden_identifier.js"
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/forbidden_identifier.js ***!
@@ -65660,6 +65825,7 @@ __exportStar(__webpack_require__(/*! ./empty_structure */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./exit_or_check */ "./node_modules/@abaplint/core/build/src/rules/exit_or_check.js"), exports);
 __exportStar(__webpack_require__(/*! ./expand_macros */ "./node_modules/@abaplint/core/build/src/rules/expand_macros.js"), exports);
 __exportStar(__webpack_require__(/*! ./exporting */ "./node_modules/@abaplint/core/build/src/rules/exporting.js"), exports);
+__exportStar(__webpack_require__(/*! ./fm_global_parameters_obsolete */ "./node_modules/@abaplint/core/build/src/rules/fm_global_parameters_obsolete.js"), exports);
 __exportStar(__webpack_require__(/*! ./forbidden_identifier */ "./node_modules/@abaplint/core/build/src/rules/forbidden_identifier.js"), exports);
 __exportStar(__webpack_require__(/*! ./forbidden_pseudo_and_pragma */ "./node_modules/@abaplint/core/build/src/rules/forbidden_pseudo_and_pragma.js"), exports);
 __exportStar(__webpack_require__(/*! ./forbidden_void_type */ "./node_modules/@abaplint/core/build/src/rules/forbidden_void_type.js"), exports);
@@ -65673,6 +65839,7 @@ __exportStar(__webpack_require__(/*! ./identical_conditions */ "./node_modules/@
 __exportStar(__webpack_require__(/*! ./identical_contents */ "./node_modules/@abaplint/core/build/src/rules/identical_contents.js"), exports);
 __exportStar(__webpack_require__(/*! ./identical_descriptions */ "./node_modules/@abaplint/core/build/src/rules/identical_descriptions.js"), exports);
 __exportStar(__webpack_require__(/*! ./identical_form_names */ "./node_modules/@abaplint/core/build/src/rules/identical_form_names.js"), exports);
+__exportStar(__webpack_require__(/*! ./identical_move */ "./node_modules/@abaplint/core/build/src/rules/identical_move.js"), exports);
 __exportStar(__webpack_require__(/*! ./if_in_if */ "./node_modules/@abaplint/core/build/src/rules/if_in_if.js"), exports);
 __exportStar(__webpack_require__(/*! ./implement_methods */ "./node_modules/@abaplint/core/build/src/rules/implement_methods.js"), exports);
 __exportStar(__webpack_require__(/*! ./implicit_start_of_selection */ "./node_modules/@abaplint/core/build/src/rules/implicit_start_of_selection.js"), exports);
@@ -65684,7 +65851,6 @@ __exportStar(__webpack_require__(/*! ./intf_referencing_clas */ "./node_modules/
 __exportStar(__webpack_require__(/*! ./invalid_table_index */ "./node_modules/@abaplint/core/build/src/rules/invalid_table_index.js"), exports);
 __exportStar(__webpack_require__(/*! ./keep_single_parameter_on_one_line */ "./node_modules/@abaplint/core/build/src/rules/keep_single_parameter_on_one_line.js"), exports);
 __exportStar(__webpack_require__(/*! ./keyword_case */ "./node_modules/@abaplint/core/build/src/rules/keyword_case.js"), exports);
-__exportStar(__webpack_require__(/*! ./identical_move */ "./node_modules/@abaplint/core/build/src/rules/identical_move.js"), exports);
 __exportStar(__webpack_require__(/*! ./line_break_multiple_parameters */ "./node_modules/@abaplint/core/build/src/rules/line_break_multiple_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./line_break_style */ "./node_modules/@abaplint/core/build/src/rules/line_break_style.js"), exports);
 __exportStar(__webpack_require__(/*! ./line_length */ "./node_modules/@abaplint/core/build/src/rules/line_length.js"), exports);
@@ -80075,7 +80241,10 @@ class ConstantTranspiler {
         this.addGet = addGet;
     }
     handleInteger(int, traversal) {
-        const concat = int.concatTokens().trim();
+        let concat = int.concatTokens().trim().replace(/^0+/, "");
+        if (concat === "") {
+            concat = "0";
+        }
         const parsed = Number.parseInt(concat, 10);
         let code = "";
         if (concat.length > 18) {
@@ -93029,7 +93198,13 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases() || []) {
-            ret += "this." + a.getName().toLowerCase() + " = this." + Traversal.escapeNamespace(a.getComponent().replace("~", "$").toLowerCase()) + ";\n";
+            const thisName = `this.${a.getName().toLowerCase()}`;
+            const aliasName = "this." + Traversal.escapeNamespace(a.getComponent().replace("~", "$").toLowerCase());
+            ret += `if (${thisName} === undefined)\n`;
+            ret += thisName + " = " + aliasName + ";\n";
+            // or the method(if its a method) might be implemented as its aliased name
+            ret += `else if (${aliasName} === undefined)\n`;
+            ret += aliasName + " = " + thisName + ";\n";
         }
         // constants can be accessed both statically and via reference
         for (const c of def.getAttributes()?.getConstants() || []) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.12.24",
+  "version": "2.12.25",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,10 +27,10 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.115.14",
-    "@abaplint/transpiler": "^2.12.24",
+    "@abaplint/core": "^2.115.16",
+    "@abaplint/transpiler": "^2.12.25",
     "@types/glob": "^8.1.0",
-    "@types/node": "^24.10.7",
+    "@types/node": "^24.10.8",
     "@types/progress": "^2.0.7",
     "glob": "=7.2.0",
     "progress": "^2.0.3",