@abaplint/transpiler-cli 2.13.39 → 2.13.41

package/build/bundle.js

@@ -327,31 +327,34 @@ async function writeObjects(outputFiles, config, outputFolder, files) {
     const writeSourceMaps = config.write_source_map || false;
     const filesToWrite = [];
     for (const output of outputFiles) {
+        const type = output.object.type.toUpperCase();
         let contents = output.chunk.getCode();
+        // PROG output gets a runtime bootstrap line prepended, which shifts every
+        // generated line down by one - the source map must account for this offset
+        let generatedLineOffset = 0;
+        if (type === "PROG") {
+            // hmm, will this work for INCLUDEs ?
+            contents = `if (!globalThis.abap) await import("./_init.mjs");\n` + contents;
+            generatedLineOffset = 1;
+        }
         if (writeSourceMaps === true
-            && output.object.type.toUpperCase() === "PROG"
-            && output.object.type.toUpperCase() === "FUGR"
-            && output.object.type.toUpperCase() === "CLAS") {
+            && (type === "PROG" || type === "FUGR" || type === "CLAS")) {
             const name = output.filename + ".map";
             // SourceMappingUrl needs to be percent-encoded, ref https://github.com/microsoft/TypeScript/issues/40951
             contents = contents + `\n//# sourceMappingURL=` + name.replace(/#/g, "%23");
-            let map = output.chunk.getMap(output.filename);
-            for (const f of files) { // hack the paths to the original files
+            // map the bare abap filename each mapping carries to its path on disk;
+            // source map "sources" are URLs, so always forward slashes, also on Windows
+            const sourcePaths = {};
+            for (const f of files) {
                 if (f.relative === undefined) {
                     continue;
                 }
-                if (map.includes(`"${f.filename}"`)) {
-                    let withPath = `"${f.relative}${path.sep}${f.filename}"`;
-                    withPath = withPath.replace(/\\/g, "\\\\");
-                    map = map.replace(`"${f.filename}"`, withPath);
-                }
+                const rel = f.relative.split(path.sep).join("/");
+                sourcePaths[f.filename] = rel === "" ? f.filename : `${rel}/${f.filename}`;
             }
+            const map = output.chunk.getMap(output.filename, { generatedLineOffset, sourcePaths });
             filesToWrite.push({ path: outputFolder + path.sep + name, contents: map });
         }
-        if (output.object.type.toUpperCase() === "PROG") {
-            // hmm, will this work for INCLUDEs ?
-            contents = `if (!globalThis.abap) await import("./_init.mjs");\n` + contents;
-        }
         filesToWrite.push({ path: outputFolder + path.sep + output.filename, contents });
     }
     await file_operations_1.FileOperations.writeFiles(filesToWrite);
@@ -26425,7 +26428,7 @@ class CurrentScope {
         return this.reg.getConfig().getLanguageVersion();
     }
     getOpenABAP() {
-        return this.reg.getConfig().getOpenABAP();
+        return this.reg.getConfig().isOpenABAP();
     }
     getRegistry() {
         return this.reg;
@@ -27999,7 +28002,8 @@ class TypeUtils {
             console.dir(target);
             console.dir(calculated);
         */
-        if (calculated && source instanceof basic_1.StringType && target instanceof basic_1.XStringType) {
+        if (calculated && source instanceof basic_1.StringType
+            && (target instanceof basic_1.XStringType || target instanceof basic_1.XSequenceType)) {
             return false;
         }
         if (calculated) {
@@ -28020,7 +28024,7 @@ class TypeUtils {
             }
             else if (target instanceof basic_1.XStringType) {
                 if (((_c = source.getAbstractTypeData()) === null || _c === void 0 ? void 0 : _c.derivedFromConstant) === true) {
-                    return true;
+                    return (node === null || node === void 0 ? void 0 : node.concatTokens()) !== "''";
                 }
                 return false;
             }
@@ -29428,6 +29432,75 @@ exports.BasicTypes = BasicTypes;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/_check_offset_length.js"
+/*!*************************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/_check_offset_length.js ***!
+  \*************************************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.checkOffsetLength = checkOffsetLength;
+const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js"));
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const _builtin_1 = __webpack_require__(/*! ../_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
+// Offsets or lengths cannot be specified for STRING or XSTRING fields
+// passed as a method parameter source. Returns true if an issue was reported.
+function checkOffsetLength(source, sourceType, method, input) {
+    const chain = source.findDirectExpression(Expressions.FieldChain);
+    const isCalculated = source.findDirectExpression(Expressions.Source) !== undefined;
+    const hasOffsetOrLength = chain !== undefined
+        && isCalculated === false
+        && (chain.findDirectExpression(Expressions.FieldOffset) !== undefined
+            || chain.findDirectExpression(Expressions.FieldLength) !== undefined);
+    if (hasOffsetOrLength
+        && !(method instanceof _builtin_1.BuiltInMethod)
+        && (sourceType instanceof basic_1.StringType || sourceType instanceof basic_1.XStringType)) {
+        const message = `Offsets or lengths cannot be specified for fields of type "STRING" or "XSTRING" in the current statement`;
+        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, source.getFirstToken(), message));
+        return true;
+    }
+    return false;
+}
+//# sourceMappingURL=_check_offset_length.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_chain.js"
 /*!********************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_chain.js ***!
@@ -32572,6 +32645,7 @@ const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/c
 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 constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/constant.js");
+const _check_offset_length_1 = __webpack_require__(/*! ./_check_offset_length */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/_check_offset_length.js");
 class MethodCallParam {
     static runSyntax(node, input, method) {
         if (!(node.get() instanceof Expressions.MethodCallParam)) {
@@ -32632,6 +32706,9 @@ class MethodCallParam {
             let sourceType = undefined;
             if (child.get() instanceof Expressions.Source) {
                 sourceType = source_1.Source.runSyntax(child, input, targetType);
+                if ((0, _check_offset_length_1.checkOffsetLength)(child, sourceType, method, input)) {
+                    return;
+                }
             }
             else if (child.get() instanceof Expressions.ConstantString) {
                 sourceType = constant_1.Constant.runSyntax(child);
@@ -32712,6 +32789,7 @@ const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expr
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
+const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
 class MethodDefReturning {
     static runSyntax(node, input, meta) {
@@ -32724,8 +32802,11 @@ class MethodDefReturning {
             throw new assert_error_1.AssertError("method_parameter.ts, unexpected structure");
         }
         let found = new basic_types_1.BasicTypes(input).parseType(type);
-        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true) {
-            found = new basic_1.UnknownType("RETURNING parameter must be fully specified");
+        const message = "RETURNING parameter must be fully specified";
+        const typeText = type.concatTokens().toUpperCase();
+        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true || typeText === "TYPE X" || typeText === "TYPE C") {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, type.getFirstToken(), message));
+            found = new basic_1.UnknownType(message);
         }
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, found, meta);
@@ -32884,6 +32965,7 @@ const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modu
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
 const field_chain_1 = __webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/field_chain.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const _check_offset_length_1 = __webpack_require__(/*! ./_check_offset_length */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/_check_offset_length.js");
 class MethodParameters {
     constructor() {
         this.requiredParameters = undefined;
@@ -33054,7 +33136,6 @@ class MethodParameters {
         }
     }
     parameterListS(node, input, method) {
-        var _a;
         if (node === undefined) {
             return [];
         }
@@ -33062,14 +33143,21 @@ class MethodParameters {
             throw new assert_error_1.AssertError("parameterListS, unexpected node");
         }
         const ret = [];
+        const supplied = new Set();
         for (const c of node.getChildren()) {
             if (!(c.get() instanceof Expressions.ParameterS) || !(c instanceof nodes_1.ExpressionNode)) {
                 throw new assert_error_1.AssertError("parameterListS, unexpected node, child");
             }
-            const name = (_a = c.findDirectExpression(Expressions.ParameterName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase();
-            if (name === undefined) {
+            const nameNode = c.findDirectExpression(Expressions.ParameterName);
+            const name = nameNode === null || nameNode === void 0 ? void 0 : nameNode.getFirstToken().getStr().toUpperCase();
+            if (name === undefined || nameNode === undefined) {
                 throw new assert_error_1.AssertError("parameterListS, no name determined");
             }
+            if (supplied.has(name)) {
+                const message = `Method parameter "${name}" is supplied more than once`;
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameNode.getFirstToken(), message));
+            }
+            supplied.add(name);
             const source = c.findDirectExpression(Expressions.Source);
             if (source === undefined) {
                 throw new assert_error_1.AssertError("parameterListS, no source found");
@@ -33087,6 +33175,7 @@ class MethodParameters {
                 targetType = method;
             }
             let sourceType = source_1.Source.runSyntax(source, input, targetType);
+            (0, _check_offset_length_1.checkOffsetLength)(source, sourceType, method, input);
             if (sourceType === undefined) {
                 if (method instanceof basic_1.VoidType) {
                     sourceType = method;
@@ -33102,7 +33191,6 @@ class MethodParameters {
         return ret;
     }
     parameterListT(node, input) {
-        var _a;
         if (node === undefined) {
             return [];
         }
@@ -33110,14 +33198,21 @@ class MethodParameters {
             throw new assert_error_1.AssertError("parameterListT, unexpected node");
         }
         const ret = [];
+        const supplied = new Set();
         for (const c of node.getChildren()) {
             if (!(c.get() instanceof Expressions.ParameterT) || !(c instanceof nodes_1.ExpressionNode)) {
                 throw new assert_error_1.AssertError("parameterListT, unexpected node, child");
             }
-            const name = (_a = c.findDirectExpression(Expressions.ParameterName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase();
-            if (name === undefined) {
+            const nameNode = c.findDirectExpression(Expressions.ParameterName);
+            const name = nameNode === null || nameNode === void 0 ? void 0 : nameNode.getFirstToken().getStr().toUpperCase();
+            if (name === undefined || nameNode === undefined) {
                 throw new assert_error_1.AssertError("parameterListT, no name determined");
             }
+            if (supplied.has(name)) {
+                const message = `Method parameter "${name}" is supplied more than once`;
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameNode.getFirstToken(), message));
+            }
+            supplied.add(name);
             const target = c.findDirectExpression(Expressions.Target);
             if (target === undefined) {
                 throw new assert_error_1.AssertError("parameterListT, no target found");
@@ -34388,6 +34483,7 @@ class Source {
                         else {
                             this.addIfInferred(node, input, foundType);
                         }
+                        this.traverseRemainingChildren(children, input);
                         return foundType ? foundType : bodyType;
                     }
                 case "SWITCH":
@@ -37458,8 +37554,10 @@ const inline_data_1 = __webpack_require__(/*! ../expressions/inline_data */ "./n
 const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 class CallTransformation {
     runSyntax(node, input) {
+        const resultParameters = node.findExpressionAfterToken("RESULT");
+        const resultSources = new Set((resultParameters === null || resultParameters === void 0 ? void 0 : resultParameters.findAllExpressions(Expressions.SimpleSource3)) || []);
         for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
-            source_1.Source.runSyntax(s, input);
+            source_1.Source.runSyntax(s, input, undefined, resultSources.has(s));
         }
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(d, input);
@@ -37646,6 +37744,7 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.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 Catch {
     runSyntax(node, input) {
         var _a, _b;
@@ -37696,7 +37795,22 @@ class Catch {
             }
         }
         else if (target) {
-            target_1.Target.runSyntax(target, input);
+            const targetType = target_1.Target.runSyntax(target, input);
+            if (targetType instanceof basic_1.ObjectReferenceType) {
+                for (const c of node.findDirectExpressions(Expressions.ClassName)) {
+                    const token = c.getFirstToken();
+                    const className = token.getStr().toUpperCase();
+                    const found = input.scope.existsObject(className);
+                    if (found === null || found === void 0 ? void 0 : found.id) {
+                        const catchType = new basic_1.ObjectReferenceType(found.id);
+                        if (new _type_utils_1.TypeUtils(input.scope).isAssignableStrict(catchType, targetType) === false) {
+                            const message = "CATCH target not compatible with " + className;
+                            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, token, message));
+                            return;
+                        }
+                    }
+                }
+            }
         }
     }
 }
@@ -38417,6 +38531,11 @@ class Concatenate {
     runSyntax(node, input) {
         const byteMode = node.findDirectTokenByText("BYTE") !== undefined;
         const linesMode = node.findDirectTokenByText("LINES") !== undefined;
+        if (node.findFirstExpression(Expressions.TableExpression) !== undefined) {
+            const message = "CONCATENATE with table expression not possible";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return;
+        }
         const target = node.findFirstExpression(Expressions.Target);
         const inline = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData);
         if (inline) {
@@ -54015,7 +54134,7 @@ class CDSDefineAbstract extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", _1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "ABSTRACT", "ENTITY", cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.alt)(field, compsiOrAssoci)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), "ABSTRACT", "ENTITY", cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.alt)(field, compsiOrAssoci)), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineAbstract = CDSDefineAbstract;
@@ -54041,7 +54160,7 @@ class CDSDefineCustom extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)(cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE"), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineCustom = CDSDefineCustom;
@@ -54071,7 +54190,7 @@ class CDSDefineExternalEntity extends combi_1.Expression {
         const body = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
         const externalEntity = (0, combi_1.seq)((0, combi_1.opt)("WRITABLE"), "EXTERNAL", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName), (0, combi_1.opt)(_1.CDSWithParameters));
         const staticEntity = (0, combi_1.seq)("STATIC", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName));
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.alt)(externalEntity, staticEntity), (0, combi_1.str)("{"), body, (0, combi_1.str)("}"), (0, combi_1.opt)((0, combi_1.seq)("WITH", "FEDERATED", "DATA", (0, combi_1.optPrio)((0, combi_1.alt)((0, combi_1.seq)("PROVIDED", "AT", "RUNTIME"), (0, combi_1.seq)("PROVIDED", "BY", _1.CDSName))))), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.alt)(externalEntity, staticEntity), (0, combi_1.str)("{"), body, (0, combi_1.str)("}"), (0, combi_1.opt)((0, combi_1.seq)("WITH", "FEDERATED", "DATA", (0, combi_1.optPrio)((0, combi_1.alt)((0, combi_1.seq)("PROVIDED", "AT", "RUNTIME"), (0, combi_1.seq)("PROVIDED", "BY", _1.CDSName))))), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineExternalEntity = CDSDefineExternalEntity;
@@ -54103,7 +54222,7 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const depthValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSInteger, _1.CDSPrefixedName);
         const loadMode = (0, combi_1.altPrio)("BULK", "INCREMENTAL", _1.CDSPrefixedName);
         const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)(datePeriod), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineHierarchy = CDSDefineHierarchy;
@@ -54128,7 +54247,7 @@ class CDSDefineProjection extends combi_1.Expression {
     getRunnable() {
         // redefine association _Assoc redirected to [composition child | parent] Entity
         const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSName, "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, redefineAssoc)), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, redefineAssoc)), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;
@@ -54157,7 +54276,7 @@ class CDSDefineTableEntity extends combi_1.Expression {
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
         const selectBody = (0, combi_1.seq)("AS", "SELECT", "FROM", _1.CDSSource, (0, combi_1.star)(_1.CDSJoin), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSComposition, _1.CDSAssociation)), (0, combi_1.opt)(elements), (0, combi_1.optPrio)(_1.CDSWhere));
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), "TABLE", "ENTITY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.str)("{"), inlineBody, (0, combi_1.str)("}")), selectBody), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), "TABLE", "ENTITY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.str)("{"), inlineBody, (0, combi_1.str)("}")), selectBody), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineTableEntity = CDSDefineTableEntity;
@@ -55099,7 +55218,7 @@ class Config {
         }
         return (0, version_1.versionToABAPRelease)(v);
     }
-    getOpenABAP() {
+    isOpenABAP() {
         return this.getRelease() === version_1.Release["open-abap"];
     }
     getVersion() {
@@ -69246,7 +69365,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.64";
+        return "2.120.2";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -73949,6 +74068,270 @@ exports.ClassicExceptionsOverlap = ClassicExceptionsOverlap;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/clear_exporting_parameters.js"
+/*!***********************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/clear_exporting_parameters.js ***!
+  \***********************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ClearExportingParameters = exports.ClearExportingParametersConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const syntax_1 = __webpack_require__(/*! ../abap/5_syntax/syntax */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/syntax.js");
+const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
+const _scope_type_1 = __webpack_require__(/*! ../abap/5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
+const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const _reference_1 = __webpack_require__(/*! ../abap/5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const Expressions = __importStar(__webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js"));
+class ClearExportingParametersConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Skip specific parameter names, case insensitive
+         * @uniqueItems true
+         */
+        this.skipNames = [];
+    }
+}
+exports.ClearExportingParametersConf = ClearExportingParametersConf;
+class ClearExportingParameters {
+    constructor() {
+        this.conf = new ClearExportingParametersConf();
+    }
+    getMetadata() {
+        return {
+            key: "clear_exporting_parameters",
+            title: "Clear EXPORTING parameters",
+            shortDescription: `Checks that EXPORTING parameters passed by reference are cleared or assigned before they are read`,
+            extendedInformation: `An EXPORTING parameter passed by reference behaves like a CHANGING parameter: it is not
+initialized when the method is called, so it can still contain a value supplied by the caller. Clear or overwrite it
+before reading it, so a leftover value is not accidentally used.
+
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#clear-or-overwrite-exporting-reference-parameters
+
+https://help.sap.com/doc/abapdocu_latest_index_htm/latest/en-US/abenref_transf_output_param_guidl.htm
+
+Note: EXPORTING parameters passed by VALUE are always initialized and are therefore not reported.
+Reading and writing the parameter in the same statement (e.g. "ev_result = ev_result + 1") is reported,
+as the source is evaluated before the parameter is assigned.
+Objects containing parser or syntax errors are not reported.
+
+Only class and interface method implementations are checked, function module parameters are currently not supported.`,
+            tags: [_irule_1.RuleTag.Styleguide],
+            badExample: `CLASS lcl DEFINITION.
+  PUBLIC SECTION.
+    METHODS foo EXPORTING ev_result TYPE i.
+ENDCLASS.
+CLASS lcl IMPLEMENTATION.
+  METHOD foo.
+    ev_result = ev_result + 1.
+  ENDMETHOD.
+ENDCLASS.`,
+            goodExample: `CLASS lcl DEFINITION.
+  PUBLIC SECTION.
+    METHODS foo EXPORTING ev_result TYPE i.
+ENDCLASS.
+CLASS lcl IMPLEMENTATION.
+  METHOD foo.
+    CLEAR ev_result.
+    ev_result = ev_result + 1.
+  ENDMETHOD.
+ENDCLASS.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+        if (this.conf.skipNames === undefined) {
+            this.conf.skipNames = [];
+        }
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        if (!(obj instanceof _abap_object_1.ABAPObject) || obj instanceof objects_1.Interface) {
+            return [];
+        }
+        for (const file of obj.getABAPFiles()) {
+            for (const statement of file.getStatements()) {
+                if (statement.get() instanceof _statement_1.Unknown) {
+                    return []; // contains parser errors
+                }
+            }
+        }
+        const syntax = new syntax_1.SyntaxLogic(this.reg, obj).run();
+        if (syntax.issues.length > 0) {
+            return []; // contains syntax errors
+        }
+        const issues = [];
+        this.traverse(syntax.spaghetti.getTop(), obj, issues);
+        return issues;
+    }
+    traverse(node, obj, issues) {
+        if (node.getIdentifier().stype === _scope_type_1.ScopeType.Method) {
+            this.checkMethod(node, obj, issues);
+        }
+        for (const child of node.getChildren()) {
+            this.traverse(child, obj, issues);
+        }
+    }
+    checkMethod(node, obj, issues) {
+        const parameters = this.findExportingByReference(node, obj);
+        if (parameters.length === 0) {
+            return;
+        }
+        const references = this.collectReferences(node);
+        for (const parameter of parameters) {
+            const issue = this.checkParameter(parameter, references, obj);
+            if (issue !== undefined) {
+                issues.push(issue);
+            }
+        }
+    }
+    findExportingByReference(node, obj) {
+        var _a;
+        const ret = [];
+        const vars = node.getData().vars;
+        for (const name in vars) {
+            const parameter = vars[name];
+            const meta = parameter.getMeta();
+            if (meta.includes("exporting" /* IdentifierMeta.MethodExporting */) === false
+                || meta.includes("pass_by_value" /* IdentifierMeta.PassByValue */) === true) {
+                continue;
+            }
+            else if ((_a = this.conf.skipNames) === null || _a === void 0 ? void 0 : _a.some(s => s.toUpperCase() === name.toUpperCase())) {
+                continue;
+            }
+            const type = parameter.getType();
+            if (type instanceof basic_1.VoidType || type instanceof basic_1.UnknownType) {
+                continue; // e.g. RAP magic parameters, or unresolved types
+            }
+            else if (this.isPassByValue(parameter, obj) === true) {
+                continue; // VALUE(..) parameters are always initialized
+            }
+            ret.push(parameter);
+        }
+        return ret;
+    }
+    isPassByValue(parameter, obj) {
+        var _a;
+        // the PassByValue meta is not set for EXPORTING parameters, so determine it from the definition
+        const file = obj.getABAPFileByName(parameter.getFilename());
+        if (file === undefined) {
+            return false;
+        }
+        const statement = edit_helper_1.EditHelper.findStatement(parameter.getToken(), file);
+        if (statement === undefined) {
+            return false;
+        }
+        for (const param of statement.findAllExpressions(Expressions.MethodParam)) {
+            const nameToken = (_a = param.findFirstExpression(Expressions.MethodParamName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            if (nameToken !== undefined && nameToken.getStart().equals(parameter.getStart())) {
+                return param.getFirstToken().getStr().toUpperCase() === "VALUE";
+            }
+        }
+        return false;
+    }
+    collectReferences(node) {
+        // methods do not nest, so all descendant scopes (FOR, LET, ...) belong to this method
+        const ret = [...node.getData().references];
+        for (const child of node.getChildren()) {
+            ret.push(...this.collectReferences(child));
+        }
+        return ret;
+    }
+    checkParameter(parameter, references, obj) {
+        let firstRead = undefined;
+        let earliestWrite = undefined;
+        for (const reference of references) {
+            if (reference.resolved === undefined || parameter.equals(reference.resolved) === false) {
+                continue;
+            }
+            const pos = reference.position.getStart();
+            if (reference.referenceType === _reference_1.ReferenceType.DataReadReference) {
+                if (firstRead === undefined || pos.isBefore(firstRead.position.getStart())) {
+                    firstRead = reference;
+                }
+            }
+            else if (reference.referenceType === _reference_1.ReferenceType.DataWriteReference) {
+                if (earliestWrite === undefined || pos.isBefore(earliestWrite.position.getStart())) {
+                    earliestWrite = reference;
+                }
+            }
+        }
+        if (firstRead === undefined) {
+            return undefined; // never read, no hazard
+        }
+        // the parameter is safe only if it is written in a statement strictly before the first read
+        const readStatement = this.statementStart(firstRead, obj);
+        const writeStatement = earliestWrite === undefined ? undefined : this.statementStart(earliestWrite, obj);
+        if (writeStatement !== undefined && readStatement !== undefined && writeStatement.isBefore(readStatement)) {
+            return undefined;
+        }
+        const message = `EXPORTING parameter "${parameter.getName().toLowerCase()}" read before it is cleared or assigned`;
+        return issue_1.Issue.atIdentifier(firstRead.position, message, this.getMetadata().key, this.conf.severity);
+    }
+    statementStart(reference, obj) {
+        const file = obj.getABAPFileByName(reference.position.getFilename());
+        for (const statement of (file === null || file === void 0 ? void 0 : file.getStatements()) || []) {
+            const pos = reference.position.getStart();
+            const start = statement.getStart();
+            const end = statement.getEnd();
+            if (pos.equals(start) || (pos.isAfter(start) && pos.isBefore(end))) {
+                return start;
+            }
+        }
+        return undefined;
+    }
+}
+exports.ClearExportingParameters = ClearExportingParameters;
+//# sourceMappingURL=clear_exporting_parameters.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/cloud_types.js"
 /*!********************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/cloud_types.js ***!
@@ -75864,7 +76247,7 @@ Make sure to test the downported code, it might not always be completely correct
     initialize(reg) {
         this.lowReg = reg;
         const config = this.lowReg.getConfig();
-        if (config.getRelease() === version_1.Release.v702 || config.getOpenABAP()) {
+        if (config.getRelease() === version_1.Release.v702 || config.isOpenABAP()) {
             this.initHighReg();
         }
         return this;
@@ -75897,7 +76280,7 @@ Make sure to test the downported code, it might not always be completely correct
         const ret = [];
         this.counter = 1;
         const config = this.lowReg.getConfig();
-        if (config.getRelease() !== version_1.Release.v702 && !config.getOpenABAP()) {
+        if (config.getRelease() !== version_1.Release.v702 && !config.isOpenABAP()) {
             return ret;
         }
         else if (!(lowObj instanceof _abap_object_1.ABAPObject)) {
@@ -75991,6 +76374,18 @@ Make sure to test the downported code, it might not always be completely correct
                     }
                 }
             }
+            // INTO after WHERE parses as a valid SELECT in the low version, but is only allowed in
+            // strict SQL syntax, so move it also when the statement is no longer Unknown
+            if (ret.length === 0) {
+                for (let i = 0; i < lowStatements.length; i++) {
+                    const low = lowStatements[i];
+                    const high = highStatements[i];
+                    const issue = this.downportSQLMoveInto(low, high, lowFile, highSyntax);
+                    if (issue) {
+                        ret.push(issue);
+                    }
+                }
+            }
         }
         return ret;
     }
@@ -76234,10 +76629,14 @@ Make sure to test the downported code, it might not always be completely correct
         return undefined;
     }
     //////////////////////////////////////////
-    /** move INTO from after WHERE to after FROM */
+    /** move INTO from after WHERE to after FROM,
+     * note that INTO after WHERE is only valid in strict SQL syntax, so it must be moved when
+     * downporting; this can happen both while the statement is still Unknown(from the main loop)
+     * and after the @ and FIELDS have been removed, leaving a SELECT that parses in the low version */
     downportSQLMoveInto(low, high, lowFile, _highSyntax) {
         var _a;
-        if (!(low.get() instanceof _statement_1.Unknown)) {
+        if (!(high.get() instanceof Statements.Select)
+            && !(high.get() instanceof Statements.SelectLoop)) {
             return undefined;
         }
         // note: SQLCond is also used in JOIN(FROM) conditions
@@ -76245,6 +76644,7 @@ Make sure to test the downported code, it might not always be completely correct
         if (where === undefined) {
             return undefined;
         }
+        // the FIELDS list sits between FROM and WHERE, wait for it to be removed first
         if (high.findFirstExpression(Expressions.SQLFields) !== undefined) {
             return undefined;
         }
@@ -76752,7 +77152,7 @@ ${indentation}`);
     outlineCatchSimple(node, lowFile) {
         // outlines "CATCH cx_bcs INTO DATA(lx_bcs_excep).", note that this does not need to look at types
         var _a, _b;
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         if (!(node.get() instanceof Statements.Catch)) {
@@ -76801,7 +77201,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         if (!(node.get() instanceof Statements.Move)) {
             return undefined;
         }
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         const target = node.findFirstExpression(Expressions.Target);
@@ -76857,7 +77257,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
     }
     partiallyImplemented(node, lowFile) {
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         if (node.get() instanceof Statements.InterfaceDef) {
@@ -77533,7 +77933,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         if (!(node.get() instanceof Statements.Loop)) {
             return undefined;
         }
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         const source = (_a = node.findDirectExpression(Expressions.LoopSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.SimpleSource2);
@@ -78209,7 +78609,7 @@ ${indentation}    output = ${uniqueName}.\n`;
     outlineData(node, lowFile, highSyntax) {
         // hmm, no guard here, as DATA(SDF) is valid in 702
         var _a, _b;
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         for (const i of node.findAllExpressionsRecursive(Expressions.InlineData)) {
@@ -78428,7 +78828,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         return false;
     }
     replaceXsdBool(node, lowFile, highSyntax) {
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
@@ -78557,7 +78957,7 @@ ${indentation}    output = ${uniqueName}.\n`;
     }
     replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
-        if (this.lowReg.getConfig().getOpenABAP()) {
+        if (this.lowReg.getConfig().isOpenABAP()) {
             return undefined;
         }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
@@ -82731,6 +83131,7 @@ __exportStar(__webpack_require__(/*! ./check_subrc */ "./node_modules/@abaplint/
 __exportStar(__webpack_require__(/*! ./check_syntax */ "./node_modules/@abaplint/core/build/src/rules/check_syntax.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_text_elements */ "./node_modules/@abaplint/core/build/src/rules/check_text_elements.js"), exports);
 __exportStar(__webpack_require__(/*! ./check_transformation_exists */ "./node_modules/@abaplint/core/build/src/rules/check_transformation_exists.js"), exports);
+__exportStar(__webpack_require__(/*! ./clear_exporting_parameters */ "./node_modules/@abaplint/core/build/src/rules/clear_exporting_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./class_attribute_names */ "./node_modules/@abaplint/core/build/src/rules/class_attribute_names.js"), exports);
 __exportStar(__webpack_require__(/*! ./classic_exceptions_overlap */ "./node_modules/@abaplint/core/build/src/rules/classic_exceptions_overlap.js"), exports);
 __exportStar(__webpack_require__(/*! ./cloud_types */ "./node_modules/@abaplint/core/build/src/rules/cloud_types.js"), exports);
@@ -82836,6 +83237,7 @@ __exportStar(__webpack_require__(/*! ./preferred_compare_operator */ "./node_mod
 __exportStar(__webpack_require__(/*! ./prefix_is_current_class */ "./node_modules/@abaplint/core/build/src/rules/prefix_is_current_class.js"), exports);
 __exportStar(__webpack_require__(/*! ./reduce_procedural_code */ "./node_modules/@abaplint/core/build/src/rules/reduce_procedural_code.js"), exports);
 __exportStar(__webpack_require__(/*! ./reduce_string_templates */ "./node_modules/@abaplint/core/build/src/rules/reduce_string_templates.js"), exports);
+__exportStar(__webpack_require__(/*! ./redundant_conversion */ "./node_modules/@abaplint/core/build/src/rules/redundant_conversion.js"), exports);
 __exportStar(__webpack_require__(/*! ./release_idoc */ "./node_modules/@abaplint/core/build/src/rules/release_idoc.js"), exports);
 __exportStar(__webpack_require__(/*! ./remove_descriptions */ "./node_modules/@abaplint/core/build/src/rules/remove_descriptions.js"), exports);
 __exportStar(__webpack_require__(/*! ./rfc_error_handling */ "./node_modules/@abaplint/core/build/src/rules/rfc_error_handling.js"), exports);
@@ -83041,7 +83443,7 @@ class InlineDataOldVersions extends _abap_rule_1.ABAPRule {
     runParsed(file) {
         const issues = [];
         if ((0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp02)
-            || this.reg.getConfig().getOpenABAP()
+            || this.reg.getConfig().isOpenABAP()
             || this.reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud) {
             return [];
         }
@@ -87163,7 +87565,7 @@ Not considered optional branches:
         const release = this.reg.getConfig().getRelease();
         if (release === version_1.Release.v700
             || release === version_1.Release.v702
-            || this.reg.getConfig().getOpenABAP()) {
+            || this.reg.getConfig().isOpenABAP()) {
             return [];
         }
         const struc = file.getStructure();
@@ -91314,6 +91716,269 @@ exports.ReduceStringTemplates = ReduceStringTemplates;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/redundant_conversion.js"
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/redundant_conversion.js ***!
+  \*****************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RedundantConversion = exports.RedundantConversionConf = void 0;
+const Expressions = __importStar(__webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js"));
+const Statements = __importStar(__webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js"));
+const _reference_1 = __webpack_require__(/*! ../abap/5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const constant_1 = __webpack_require__(/*! ../abap/5_syntax/expressions/constant */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/constant.js");
+const syntax_1 = __webpack_require__(/*! ../abap/5_syntax/syntax */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/syntax.js");
+const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../abap/types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
+class RedundantConversionConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.RedundantConversionConf = RedundantConversionConf;
+class RedundantConversion {
+    constructor() {
+        this.conf = new RedundantConversionConf();
+    }
+    getMetadata() {
+        return {
+            key: "redundant_conversion",
+            title: "Redundant Conversion",
+            shortDescription: `Find redundant CONV expressions`,
+            extendedInformation: `Reports CONV expressions whose operand already has the conversion's target type.`,
+            tags: [_irule_1.RuleTag.Quickfix],
+            badExample: `DATA text TYPE string.
+text = CONV string( text ).`,
+            goodExample: `DATA text TYPE string.
+text = text.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        var _a, _b;
+        if (!(0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp02)
+            && !this.reg.getConfig().isOpenABAP()) {
+            return [];
+        }
+        if (!(obj instanceof _abap_object_1.ABAPObject)) {
+            return [];
+        }
+        const syntax = new syntax_1.SyntaxLogic(this.reg, obj).run();
+        if (syntax.issues.length > 0) {
+            return [];
+        }
+        const issues = [];
+        for (const file of obj.getABAPFiles()) {
+            const structure = file.getStructure();
+            if (structure === undefined) {
+                continue;
+            }
+            for (const source of structure.findAllExpressions(Expressions.Source)) {
+                if (source.getFirstToken().getStr().toUpperCase() !== "CONV") {
+                    continue;
+                }
+                const typeExpression = source.findDirectExpression(Expressions.TypeNameOrInfer);
+                const bodySource = (_a = source.findDirectExpression(Expressions.ConvBody)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
+                if (typeExpression === undefined
+                    || bodySource === undefined) {
+                    continue;
+                }
+                const scope = syntax.spaghetti.lookupPosition(source.getFirstToken().getStart(), file.getFilename());
+                if (scope === undefined) {
+                    continue;
+                }
+                const target = (_b = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.InferredType
+                    && reference.position.getStart().equals(typeExpression.getFirstToken().getStart()))) === null || _b === void 0 ? void 0 : _b.resolved;
+                const operandType = this.sourceType(bodySource, scope);
+                if (!(target instanceof _typed_identifier_1.TypedIdentifier)) {
+                    continue;
+                }
+                const operandHasSameType = operandType !== undefined && this.sameType(target.getType(), operandType);
+                const arithmeticHasSameContext = this.arithmeticUsesSameTargetType(source, bodySource, file, scope, target.getType());
+                if (operandHasSameType === false && arithmeticHasSameContext === false) {
+                    continue;
+                }
+                const closingParen = source.getDirectTokens().find(token => token.getStr() === ")" && token.getStart().isAfter(bodySource.getLastToken().getStart()));
+                if (closingParen === undefined) {
+                    continue;
+                }
+                const preserveParentheses = bodySource.findDirectExpression(Expressions.ArithOperator) !== undefined
+                    || bodySource.findDirectTokenByText("&&") !== undefined;
+                // Apply the later edit first so the original positions remain valid when
+                // both parts of the CONV wrapper are changed on the same line.
+                const fix = edit_helper_1.EditHelper.merge(edit_helper_1.EditHelper.replaceRange(file, bodySource.getLastToken().getEnd(), closingParen.getEnd(), preserveParentheses ? ")" : ""), edit_helper_1.EditHelper.replaceRange(file, source.getFirstToken().getStart(), bodySource.getFirstToken().getStart(), preserveParentheses ? "(" : ""));
+                issues.push(issue_1.Issue.atRange(file, source.getFirstToken().getStart(), closingParen.getEnd(), "Redundant CONV expression", this.getMetadata().key, this.conf.severity, fix));
+            }
+        }
+        return issues;
+    }
+    arithmeticUsesSameTargetType(conversion, bodySource, file, scope, conversionType) {
+        var _a, _b;
+        if (bodySource.findDirectExpression(Expressions.ArithOperator) === undefined) {
+            return false;
+        }
+        const statement = file.getStatements().find(candidate => candidate.includesToken(conversion.getFirstToken()));
+        if (!((statement === null || statement === void 0 ? void 0 : statement.get()) instanceof Statements.Move)) {
+            return false;
+        }
+        const targetToken = (_a = statement.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (targetToken === undefined) {
+            return false;
+        }
+        const assignmentTarget = (_b = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.DataWriteReference
+            && reference.position.getStart().equals(targetToken.getStart()))) === null || _b === void 0 ? void 0 : _b.resolved;
+        return assignmentTarget instanceof _typed_identifier_1.TypedIdentifier
+            && this.sameType(conversionType, assignmentTarget.getType());
+    }
+    sourceType(source, scope) {
+        let context;
+        for (const child of source.getChildren()) {
+            if (!(child instanceof nodes_1.ExpressionNode)) {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.FieldChain) {
+                context = this.fieldChainType(child, scope);
+                if (context === undefined) {
+                    return undefined;
+                }
+            }
+            else if (child.get() instanceof Expressions.Constant) {
+                context = this.infer(context, constant_1.Constant.runSyntax(child));
+            }
+            else if (child.get() instanceof Expressions.Source) {
+                context = this.infer(context, this.sourceType(child, scope));
+            }
+            else if (child.get() instanceof Expressions.ArithOperator) {
+                if (child.concatTokens() === "**") {
+                    context = new basic_1.FloatType();
+                }
+            }
+            else {
+                return undefined;
+            }
+        }
+        if (source.findDirectTokenByText("&&")) {
+            return basic_1.StringType.get();
+        }
+        return context;
+    }
+    fieldChainType(fieldChain, scope) {
+        var _a;
+        const operand = (_a = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.DataReadReference
+            && reference.position.getStart().equals(fieldChain.getFirstToken().getStart()))) === null || _a === void 0 ? void 0 : _a.resolved;
+        if (!(operand instanceof _typed_identifier_1.TypedIdentifier)) {
+            return undefined;
+        }
+        let type = operand.getType();
+        for (const child of fieldChain.getChildren()) {
+            if (!(child instanceof nodes_1.ExpressionNode)
+                || child.get() instanceof Expressions.SourceField) {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.ComponentName) {
+                if (type instanceof basic_1.TableType) {
+                    type = type.getRowType();
+                }
+                if (!(type instanceof basic_1.StructureType)) {
+                    return undefined;
+                }
+                type = type.getComponentByName(child.concatTokens());
+            }
+            else {
+                // Offsets, table expressions, attributes, and dereferences need more
+                // context than the initial data reference provides.
+                return undefined;
+            }
+        }
+        return type;
+    }
+    infer(context, found) {
+        if (context instanceof basic_1.FloatType && found instanceof basic_1.IntegerType) {
+            return context;
+        }
+        else if (context instanceof basic_1.IntegerType && found instanceof basic_1.HexType) {
+            return context;
+        }
+        else if ((context instanceof basic_1.IntegerType || context instanceof basic_1.FloatType) && (found === null || found === void 0 ? void 0 : found.isGeneric())) {
+            return context;
+        }
+        return found;
+    }
+    sameType(first, second) {
+        var _a, _b;
+        if (first instanceof basic_1.UnknownType
+            || second instanceof basic_1.UnknownType
+            || first instanceof basic_1.VoidType
+            || second instanceof basic_1.VoidType
+            || first.isGeneric()
+            || second.isGeneric()) {
+            return false;
+        }
+        if (first.constructor !== second.constructor) {
+            return false;
+        }
+        if (first instanceof basic_1.StructureType || first instanceof basic_1.TableType) {
+            const firstName = (_a = first.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+            const secondName = (_b = second.getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+            return firstName !== undefined && firstName === secondName;
+        }
+        return first.toABAP() === second.toABAP();
+    }
+}
+exports.RedundantConversion = RedundantConversion;
+//# sourceMappingURL=redundant_conversion.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/release_idoc.js"
 /*!*********************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/release_idoc.js ***!
@@ -93266,7 +93931,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
         }
         if (!(0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp02)
             && this.reg.getConfig().getLanguageVersion() !== version_1.LanguageVersion.Cloud
-            && !this.reg.getConfig().getOpenABAP()) {
+            && !this.reg.getConfig().isOpenABAP()) {
             return [];
         }
         for (const s of file.getStatements()) {
@@ -97304,7 +97969,7 @@ ENDIF.`,
         }
         const release = this.reg.getConfig().getRelease();
         const langVers = this.reg.getConfig().getLanguageVersion();
-        if (this.reg.getConfig().getOpenABAP()) {
+        if (this.reg.getConfig().isOpenABAP()) {
             return [];
         }
         else if (!(0, version_1.releaseAtLeast)(release, version_1.Release.v740sp02) && langVers !== version_1.LanguageVersion.Cloud) {
@@ -99367,9 +100032,14 @@ abaplint:
 // Keeps track of source maps as generated code is added
 class Chunk {
     raw;
+    // tracked incrementally so appends never re-scan the whole buffer
+    lineCount;
+    lastLineLength;
     mappings = [];
     constructor(str) {
         this.raw = "";
+        this.lineCount = 1;
+        this.lastLineLength = 0;
         this.mappings = [];
         if (str) {
             this.appendString(str);
@@ -99388,63 +100058,85 @@ class Chunk {
         if (append.getCode() === "") {
             return this;
         }
-        const lines = this.raw.split("\n");
-        const lineCount = lines.length;
-        const lastLine = lines[lines.length - 1];
         for (const m of append.mappings) {
-            // original stays the same, but adjust the generated positions
-            const add = m;
-            if (add.generated.line === 1 && this.raw.endsWith("\n") === false) {
-                add.generated.column += lastLine.length;
-            }
-            else {
-                add.generated.line += lineCount - 1;
+            // deep copy so the appended chunk's mappings are never mutated,
+            // otherwise appending the same chunk twice double-shifts its positions
+            const add = {
+                source: m.source,
+                name: m.name,
+                generated: { line: m.generated.line, column: m.generated.column },
+                original: { line: m.original.line, column: m.original.column },
+            };
+            // original stays the same, but adjust the generated positions:
+            // the appended content begins at the end of the current buffer, so its
+            // first line continues the current last line, and every line moves down
+            if (add.generated.line === 1) {
+                add.generated.column += this.lastLineLength;
             }
+            add.generated.line += this.lineCount - 1;
             this.mappings.push(add);
         }
-        this.raw += append.getCode();
-        return this;
+        return this.appendString(append.getCode());
+    }
+    originalPosition(pos) {
+        if (pos instanceof abaplint.Position || pos instanceof abaplint.Token) {
+            return { line: pos.getRow(), column: pos.getCol() - 1 };
+        }
+        else {
+            return { line: pos.getFirstToken().getRow(), column: pos.getFirstToken().getCol() - 1 };
+        }
     }
     append(input, pos, traversal) {
         if (input === "") {
             return this;
         }
         if (pos && input !== "\n") {
-            const lines = this.raw.split("\n");
-            const lastLine = lines[lines.length - 1];
-            let originalLine = 0;
-            let originalColumn = 0;
-            if (pos instanceof abaplint.Position || pos instanceof abaplint.Token) {
-                originalLine = pos.getRow();
-                originalColumn = pos.getCol() - 1;
-            }
-            else {
-                originalLine = pos.getFirstToken().getRow();
-                originalColumn = pos.getFirstToken().getCol() - 1;
-            }
             this.mappings.push({
                 source: traversal.getFilename(),
                 generated: {
-                    line: lines.length,
-                    column: lastLine.length,
-                },
-                original: {
-                    line: originalLine,
-                    column: originalColumn,
+                    line: this.lineCount,
+                    column: this.lastLineLength,
                 },
+                original: this.originalPosition(pos),
             });
         }
-        this.raw += input;
+        return this.appendString(input);
+    }
+    /**
+     * Baseline fallback so statements whose transpiler emitted no mappings still
+     * resolve to their ABAP source. Adds a single mapping from the start of this
+     * chunk (generated line 1, column 0) to `pos`. No-op if the chunk is empty or
+     * already carries mappings, so it never overrides finer-grained mappings.
+     */
+    ensureStartMapping(pos, traversal) {
+        if (this.raw === "" || this.mappings.length > 0) {
+            return this;
+        }
+        this.mappings.push({
+            source: traversal.getFilename(),
+            generated: { line: 1, column: 0 },
+            original: this.originalPosition(pos),
+        });
         return this;
     }
     appendString(input) {
         this.raw += input;
+        const lastNewline = input.lastIndexOf("\n");
+        if (lastNewline < 0) {
+            this.lastLineLength += input.length;
+        }
+        else {
+            this.lineCount += input.split("\n").length - 1;
+            this.lastLineLength = input.length - lastNewline - 1;
+        }
         return this;
     }
     stripLastNewline() {
         // note: this will not change the source map
         if (this.raw.endsWith("\n")) {
             this.raw = this.raw.substring(0, this.raw.length - 1);
+            this.lineCount--;
+            this.lastLineLength = this.raw.length - this.raw.lastIndexOf("\n") - 1;
         }
     }
     getCode() {
@@ -99464,16 +100156,18 @@ class Chunk {
             if (l.startsWith("}")) {
                 i = i - 1;
             }
-            if (i > 0) {
-                output.push(" ".repeat(i * 2) + l);
+            // clamp so unbalanced braces never produce a negative indent/shift
+            const indent = i > 0 ? i * 2 : 0;
+            if (indent > 0) {
+                output.push(" ".repeat(indent) + l);
             }
             else {
                 output.push(l);
             }
-            // fix maps
+            // fix maps: shift columns by the indentation actually applied to this line
             for (const m of this.mappings) {
                 if (m.generated.line === line) {
-                    m.generated.column += i * 2;
+                    m.generated.column += indent;
                 }
             }
             if (l.endsWith(" {")) {
@@ -99482,11 +100176,28 @@ class Chunk {
             line++;
         }
         this.raw = output.join("\n");
+        // line structure is unchanged, but the last line may have been indented
+        this.lastLineLength = output[output.length - 1].length;
         return this;
     }
-    getMap(generatedFilename) {
+    /**
+     * @param generatedFilename name written to the "file" field of the map
+     * @param options.generatedLineOffset number of lines prepended to the generated
+     *   output after this chunk was built (e.g. a runtime import line); every mapping
+     *   is shifted down by this amount so the map stays aligned with the file on disk
+     * @param options.sourcePaths maps a mapping "source" (the bare abap filename) to
+     *   the path that should appear in the map, avoiding fragile post-hoc string edits
+     */
+    getMap(generatedFilename, options) {
+        const offset = options?.generatedLineOffset ?? 0;
+        const sourcePaths = options?.sourcePaths ?? {};
         const sourceMapGenerator = new sourceMap.SourceMapGenerator();
-        this.mappings.forEach(m => sourceMapGenerator.addMapping(m));
+        this.mappings.forEach(m => sourceMapGenerator.addMapping({
+            source: sourcePaths[m.source] ?? m.source,
+            name: m.name,
+            original: m.original,
+            generated: { line: m.generated.line + offset, column: m.generated.column },
+        }));
         const json = sourceMapGenerator.toJSON();
         json.file = generatedFilename;
         json.sourceRoot = "";
@@ -102988,6 +103699,7 @@ exports.ReceiveParametersTranspiler = ReceiveParametersTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ReduceBodyTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
 const target_1 = __webpack_require__(/*! ./target */ "./node_modules/@abaplint/transpiler/build/src/expressions/target.js");
@@ -103007,10 +103719,14 @@ class ReduceBodyTranspiler {
         else if (forExpressions.length > 1) {
             throw new Error("ReduceBodyTranspiler, multiple FOR not supported, " + body.concatTokens());
         }
-        else if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "GROUPS"].some(token => forExpressions[0].findDirectTokenByText(token))) {
+        const loopExpression = forExpression.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
+        if (loopExpression === undefined) {
+            // index based FOR, eg. "FOR i = 1 WHILE i <= 5"
+            return this.transpileIndex(body, forExpression, traversal);
+        }
+        else if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "GROUPS"].some(token => forExpression.findDirectTokenByText(token))) {
             throw new Error("ValueBody FOR todo, " + body.concatTokens());
         }
-        const loopExpression = forExpression.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
         const loopSource = traversal.traverse(loopExpression?.findDirectExpression(core_1.Expressions.Source)).getCode();
         const loopVariable = traversal.traverse(loopExpression?.findDirectExpression(core_1.Expressions.TargetField)
             || loopExpression?.findDirectExpression(core_1.Expressions.TargetFieldSymbol)).getCode();
@@ -103028,6 +103744,75 @@ class ReduceBodyTranspiler {
         const returnId = UniqueIdentifier.get();
         ret.appendString(`const ${returnId} = ${target};\n`);
         */
+        const returnField = this.declareInit(body, traversal, ret);
+        ret.appendString(`for await (const ${loopVariable} of abap.statements.loop(${loopSource}${loopWhere})) {\n`);
+        ret.appendString(this.transpileNext(body, traversal));
+        ret.appendString(`}\n`);
+        ret.appendString(`return ${returnField};\n`);
+        ret.appendString("})())");
+        return ret;
+    }
+    transpileIndex(body, forExpression, traversal) {
+        if (["FROM", "TO", "GROUPS"].some(token => forExpression.findDirectTokenByText(token))) {
+            throw new Error("ValueBody FOR todo, " + body.concatTokens());
+        }
+        const counter = forExpression.findDirectExpression(core_1.Expressions.InlineFieldDefinition);
+        if (counter === undefined) {
+            throw new Error("ValueBody FOR todo, " + body.concatTokens());
+        }
+        const cond = forExpression.findDirectExpression(core_1.Expressions.Cond);
+        if (cond === undefined) {
+            throw new Error("ValueBody FOR missing condition, " + body.concatTokens());
+        }
+        const hasUntil = forExpression.findDirectTokenByText("UNTIL") !== undefined;
+        const hasWhile = forExpression.findDirectTokenByText("WHILE") !== undefined;
+        if ((hasUntil ? 1 : 0) + (hasWhile ? 1 : 0) !== 1) {
+            throw new Error("ValueBody FOR todo, condition, " + body.concatTokens());
+        }
+        const fieldName = counter.findDirectExpression(core_1.Expressions.Field)?.concatTokens().toLowerCase();
+        if (fieldName === undefined) {
+            throw new Error("ValueBody FOR todo, inline field, " + body.concatTokens());
+        }
+        const scope = traversal.findCurrentScopeByToken(counter.getFirstToken());
+        const variable = scope?.findVariable(fieldName);
+        if (variable === undefined) {
+            throw new Error("ValueBody FOR todo, variable, " + body.concatTokens());
+        }
+        const counterName = traversal_1.Traversal.prefixVariable(fieldName);
+        const startSource = counter.findDirectExpression(core_1.Expressions.Source);
+        if (startSource === undefined) {
+            throw new Error("ValueBody FOR missing initial value, " + body.concatTokens());
+        }
+        const start = traversal.traverse(startSource).getCode();
+        const thenExpr = forExpression.findExpressionAfterToken("THEN");
+        let incrementExpression = "";
+        if (thenExpr && thenExpr instanceof core_1.Nodes.ExpressionNode) {
+            incrementExpression = traversal.traverse(thenExpr).getCode();
+        }
+        else {
+            incrementExpression = `abap.operators.add(${counterName}, new abap.types.Integer().set(1))`;
+        }
+        const condCode = traversal.traverse(cond).getCode();
+        const ret = new chunk_1.Chunk();
+        ret.appendString("(await (async () => {\n");
+        const returnField = this.declareInit(body, traversal, ret);
+        ret.appendString(transpile_types_1.TranspileTypes.declare(variable) + `\n`);
+        ret.appendString(`${counterName}.set(${start});\n`);
+        ret.appendString(`while (true) {\n`);
+        if (hasWhile) {
+            ret.appendString(`if (!(${condCode})) {\nbreak;\n}\n`);
+        }
+        ret.appendString(this.transpileNext(body, traversal));
+        ret.appendString(`${counterName}.set(${incrementExpression});\n`);
+        if (hasUntil) {
+            ret.appendString(`if (${condCode}) {\nbreak;\n}\n`);
+        }
+        ret.appendString(`}\n`);
+        ret.appendString(`return ${returnField};\n`);
+        ret.appendString("})())");
+        return ret;
+    }
+    declareInit(body, traversal, ret) {
         let returnField = "";
         for (const init of body.findDirectExpressions(core_1.Expressions.InlineFieldDefinition)) {
             const fieldName = init.findDirectExpression(core_1.Expressions.Field).concatTokens().toLowerCase();
@@ -103039,18 +103824,18 @@ class ReduceBodyTranspiler {
             }
             ret.appendString(transpile_types_1.TranspileTypes.declare(variable) + `\n`);
         }
-        ret.appendString(`for await (const ${loopVariable} of abap.statements.loop(${loopSource}${loopWhere})) {\n`);
+        return returnField;
+    }
+    transpileNext(body, traversal) {
+        let ret = "";
         for (const nextChild of body.findDirectExpression(core_1.Expressions.ReduceNext)?.getChildren() || []) {
             if (nextChild.get() instanceof core_1.Expressions.SimpleTarget && nextChild instanceof core_1.Nodes.ExpressionNode) {
-                ret.appendString(new target_1.TargetTranspiler().transpile(nextChild, traversal).getCode() + ".set(");
+                ret += new target_1.TargetTranspiler().transpile(nextChild, traversal).getCode() + ".set(";
             }
             else if (nextChild.get() instanceof core_1.Expressions.Source && nextChild instanceof core_1.Nodes.ExpressionNode) {
-                ret.appendString(traversal.traverse(nextChild).getCode() + ");\n");
+                ret += traversal.traverse(nextChild).getCode() + ");\n";
             }
         }
-        ret.appendString(`}\n`);
-        ret.appendString(`return ${returnField};\n`);
-        ret.appendString("})())");
         return ret;
     }
 }
@@ -104874,6 +105659,9 @@ class SwitchBodyTranspiler {
                     else if (c.concatTokens() === "THEN") {
                         mode = "THEN";
                     }
+                    else if (c.concatTokens() === "ELSE") {
+                        mode = "";
+                    }
                 }
                 else if (mode === "WHEN" && c instanceof core_1.Nodes.ExpressionNode) {
                     currentWhenThen.whenOr.push(c);
@@ -105270,6 +106058,7 @@ class ValueBodyTranspiler {
         }
         let post = "";
         let extraFields = "";
+        let baseCode = undefined;
         const hasLines = body.findDirectExpression(core_1.Expressions.ValueBodyLine) !== undefined;
         const children = body.getChildren();
         for (let i = 0; i < children.length; i++) {
@@ -105285,7 +106074,8 @@ class ValueBodyTranspiler {
             }
             else if (child.get() instanceof core_1.Expressions.ValueBase && child instanceof core_1.Nodes.ExpressionNode) {
                 const source = traversal.traverse(child.findDirectExpression(core_1.Expressions.Source));
-                ret = new chunk_1.Chunk().appendString(source.getCode() + ".clone()");
+                baseCode = source.getCode() + ".clone()";
+                ret = new chunk_1.Chunk().appendString(baseCode);
             }
             else if (child.get() instanceof core_1.Expressions.ValueBodyLine && child instanceof core_1.Nodes.ExpressionNode) {
                 if (!(context instanceof core_1.BasicTypes.TableType)) {
@@ -105312,7 +106102,7 @@ class ValueBodyTranspiler {
                     }
                 }
                 i = idx - 1;
-                const result = this.buildForChain(forNodes, typ, traversal, body);
+                const result = this.buildForChain(forNodes, typ, traversal, body, baseCode);
                 ret = result.chunk;
                 post = result.post;
             }
@@ -105323,6 +106113,8 @@ class ValueBodyTranspiler {
                 const pre = `(await (async () => { try { return `;
                 ret = new chunk_1.Chunk().appendString(pre + ret.getCode());
                 post += `; } catch (error) { if (abap.isLineNotFound(error)) { return ${deflt}; } throw error; } })())`;
+                // the default value Source is part of this DEFAULT handling, stop processing further children
+                break;
             }
             else if (child instanceof core_1.Nodes.TokenNode && child.getFirstToken().getStr().toUpperCase() === "OPTIONAL") {
                 // note: this is last in the body, so its okay to prepend and postpend
@@ -105336,8 +106128,8 @@ class ValueBodyTranspiler {
         }
         return ret.appendString(post);
     }
-    buildForChain(forNodes, typ, traversal, body) {
-        const val = new type_name_or_infer_1.TypeNameOrInfer().transpile(typ, traversal).getCode();
+    buildForChain(forNodes, typ, traversal, body, baseCode) {
+        const val = baseCode ?? new type_name_or_infer_1.TypeNameOrInfer().transpile(typ, traversal).getCode();
         const chunk = new chunk_1.Chunk();
         const preLoopDecls = [];
         const descriptors = [];
@@ -105953,8 +106745,11 @@ class HandleFUGR {
             const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, this.options).traverse(rearranged);
             chunk.appendChunk(contents);
             chunk.stripLastNewline();
-            chunk.runIndentationLogic(this.options?.ignoreSourceMap);
         }
+        // indentation must run once over the accumulated chunk: running it per
+        // appended file re-indents the earlier files, drifting the brace counter
+        // and shifting their mapping columns multiple times
+        chunk.runIndentationLogic(this.options?.ignoreSourceMap);
         chunk.appendString("\n}");
         const output = {
             object: {
@@ -108585,17 +109380,14 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class ClearTranspiler {
     transpile(node, traversal) {
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
+        // Reference implementation for the source-map convention:
+        // - keep the target's own expression-level mappings by appending its Chunk
+        //   (do NOT flatten with target.getCode(), that discards the mappings)
+        // - map the trailing generated syntax to the statement's last token, not
+        //   getEnd() which points one column past the statement
         const ret = new chunk_1.Chunk();
-        /*
         ret.appendChunk(target);
-        ret.append(".clear();", node.getLastToken().getEnd(), traversal);
-        */
-        ret.append(target.getCode() + ".clear();", node.getLastToken().getEnd(), traversal);
-        //    ret.append(target.getCode() + ".clear();", node, traversal);
-        /*
-            ret.append(target.getCode(), node.getFirstToken().getStart(), traversal);
-            ret.append(".clear();", node.getLastToken().getEnd(), traversal);
-            */
+        ret.append(".clear();", node.getLastToken(), traversal);
         return ret;
     }
 }
@@ -108905,6 +109697,9 @@ class ConcatenateTranspiler {
         if (concat.includes(" RESPECTING BLANKS")) {
             extra += ", respectingBlanks: true";
         }
+        if (concat.includes(" IN BYTE MODE")) {
+            extra += ", byteMode: true";
+        }
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
         return new chunk_1.Chunk()
             .append("abap.statements.concatenate({source: [", node, traversal)
@@ -112000,8 +112795,11 @@ class LoopTranspiler {
         const source = traversal.traverse(loopSource).getCode();
         this.unique = unique_identifier_1.UniqueIdentifier.get();
         let target = "";
+        // the abap expression the target-assignment line should map back to
+        let targetNode = undefined;
         const into = this.determineInto(node);
         if (into && this.skipInto !== true) {
+            targetNode = into;
             const concat = node.concatTokens().toUpperCase();
             const t = traversal.traverse(into).getCode();
             const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
@@ -112021,6 +112819,7 @@ class LoopTranspiler {
         else if (this.skipInto !== true) {
             const assigning = node.findFirstExpression(abaplint.Expressions.FSTarget)?.findFirstExpression(abaplint.Expressions.FieldSymbol);
             if (assigning) {
+                targetNode = assigning;
                 target = traversal.traverse(assigning).getCode() + ".assign(" + this.unique + ");";
             }
         }
@@ -112101,7 +112900,15 @@ class LoopTranspiler {
         if (extra.length > 0) {
             concat = ",{" + extra.join(",") + "}";
         }
-        return new chunk_1.Chunk(`for await (const ${this.unique} of abap.statements.loop(${source}${concat})) {\n${target}`);
+        // map the loop head to the statement start and the target-assignment line
+        // (foo.set(unique)) back to the INTO/ASSIGNING target expression
+        const ret = new chunk_1.Chunk();
+        ret.append(`for await (const ${this.unique} of abap.statements.loop(${source}${concat})) {`, node, traversal);
+        ret.appendString("\n");
+        if (target !== "") {
+            ret.append(target, targetNode ?? node, traversal);
+        }
+        return ret;
     }
 }
 exports.LoopTranspiler = LoopTranspiler;
@@ -114106,7 +114913,6 @@ exports.ReturnTranspiler = void 0;
 const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
 const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
-const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class ReturnTranspiler {
     transpile(node, traversal) {
         const source = node.findDirectExpression(abaplint.Expressions.Source);
@@ -114120,8 +114926,9 @@ class ReturnTranspiler {
             }
         }
         let pre = "";
-        if (traversal.isInsideDoOrWhile(node)) {
-            pre = `abap.builtin.sy.get().index.set(${unique_identifier_1.UniqueIdentifier.getIndexBackup1()});\n`;
+        const syIndexBackup = traversal.findCurrentDoOrWhileIndexBackup(node);
+        if (syIndexBackup !== undefined) {
+            pre = `abap.builtin.sy.get().index.set(${syIndexBackup});\n`;
         }
         if (scope?.getIdentifier().stype === abaplint.ScopeType.Method
             && scope?.getIdentifier().sname.toLowerCase() === "constructor") {
@@ -116936,9 +117743,11 @@ class ConstantsTranspiler {
         if (name === undefined) {
             throw "ConstantsTranspilerName";
         }
-        let ret = new statements_1.DataTranspiler().transpile(begin, traversal).getCode() + "\n";
-        ret += ConstantsTranspiler.handleValues(name, node, traversal);
-        return new chunk_1.Chunk(ret);
+        const ret = new chunk_1.Chunk();
+        ret.appendChunk(new statements_1.DataTranspiler().transpile(begin, traversal).ensureStartMapping(begin, traversal));
+        ret.appendString("\n");
+        ret.appendString(ConstantsTranspiler.handleValues(name, node, traversal));
+        return ret;
     }
     static handleValues(prefix, node, traversal) {
         let ret = "";
@@ -117014,7 +117823,7 @@ class DataTranspiler {
             return new chunk_1.Chunk("");
         }
         const topName = begin.findDirectExpression(abaplint.Expressions.DefinitionName)?.concatTokens().toLowerCase();
-        const chunk = new statements_1.DataTranspiler().transpile(begin, traversal);
+        const chunk = new statements_1.DataTranspiler().transpile(begin, traversal).ensureStartMapping(begin, traversal);
         for (const d of node.findDirectStatements(abaplint.Statements.Data)) {
             const subName = d.findFirstExpression(abaplint.Expressions.DefinitionName)?.concatTokens().toLowerCase();
             if (subName && topName) {
@@ -117105,7 +117914,8 @@ class DoTranspiler {
         const syIndexBackup = unique_identifier_1.UniqueIdentifier.getIndexBackup();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Do) {
-                ret.appendChunk(new statements_1.DoTranspiler(syIndexBackup).transpile(c, traversal));
+                traversal.registerDoOrWhileIndexBackup(c, syIndexBackup);
+                ret.appendChunk(new statements_1.DoTranspiler(syIndexBackup).transpile(c, traversal).ensureStartMapping(c, traversal));
                 ret.appendString("\n");
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndDo) {
@@ -117242,7 +118052,7 @@ const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 class FunctionModuleTranspiler {
     transpile(node, traversal) {
-        let r = "";
+        const chunk = new chunk_1.Chunk();
         let name = "";
         for (const c of node.getChildren()) {
             if (c.get() instanceof abaplint.Statements.FunctionModule && c instanceof abaplint.Nodes.StatementNode) {
@@ -117250,19 +118060,19 @@ class FunctionModuleTranspiler {
                 if (name === undefined) {
                     name = "FunctionModuleTranspilerNameNotFound";
                 }
-                r += `async function ${traversal_1.Traversal.escapeNamespace(name)}(INPUT) {\n`;
-                r += this.findSignature(traversal, name, c);
+                chunk.append(`async function ${traversal_1.Traversal.escapeNamespace(name)}(INPUT) {\n`, c, traversal);
+                chunk.appendString(this.findSignature(traversal, name, c));
             }
             else if (c.get() instanceof abaplint.Statements.EndFunction) {
-                r += "}\n";
-                r += `abap.FunctionModules['${name.toUpperCase()}'] = ${traversal_1.Traversal.escapeNamespace(name)};\n`;
+                chunk.append("}\n", c, traversal);
+                chunk.appendString(`abap.FunctionModules['${name.toUpperCase()}'] = ${traversal_1.Traversal.escapeNamespace(name)};\n`);
             }
             else {
-                r += traversal.traverse(c).getCode();
+                chunk.appendChunk(traversal.traverse(c));
             }
         }
         unique_identifier_1.UniqueIdentifier.resetIndexBackup();
-        return new chunk_1.Chunk(r);
+        return chunk;
     }
     //////////////////////
     findSignature(traversal, name, node) {
@@ -117591,6 +118401,7 @@ class LoopTranspiler {
                     ret.appendString(`let ${tabix} = undefined;\n`);
                 }
                 const loop = new statements_1.LoopTranspiler();
+                // LoopStatementTranspiler maps its own head, so no ensureStartMapping needed here
                 ret.appendChunk(loop.transpile(c, traversal));
                 ret.appendString("\n");
                 if (hasAt === true) {
@@ -117781,7 +118592,8 @@ class SelectTranspiler {
         const targetName = unique_identifier_1.UniqueIdentifier.get();
         const loopName = unique_identifier_1.UniqueIdentifier.get();
         ret.appendString(`let ${targetName} = new abap.types.Table(abap.DDIC["${from}"].type());\n`);
-        ret.appendChunk(new select_1.SelectTranspiler().transpile(selectStatement, traversal, targetName));
+        const selectHead = new select_1.SelectTranspiler().transpile(selectStatement, traversal, targetName);
+        ret.appendChunk(selectHead.ensureStartMapping(selectStatement, traversal));
         // todo: optimize, it should do real streaming?
         const packageSize = selectStatement.findFirstExpression(abaplint.Expressions.SQLPackageSize)
             ?.findFirstExpression(abaplint.Expressions.SQLSource);
@@ -118105,7 +118917,8 @@ class WhileTranspiler {
         const syIndexBackup = unique_identifier_1.UniqueIdentifier.getIndexBackup();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.While) {
-                ret.appendChunk(new statements_1.WhileTranspiler(syIndexBackup).transpile(c, traversal));
+                traversal.registerDoOrWhileIndexBackup(c, syIndexBackup);
+                ret.appendChunk(new statements_1.WhileTranspiler(syIndexBackup).transpile(c, traversal).ensureStartMapping(c, traversal));
                 ret.appendString("\n");
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndWhile) {
@@ -118445,6 +119258,7 @@ class Traversal {
     file;
     obj;
     sqlInferredType;
+    doOrWhileIndexBackups = new Map();
     reg;
     options;
     constructor(spaghetti, file, obj, reg, options) {
@@ -119177,12 +119991,18 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return stack.length > 0;
     }
     isInsideDoOrWhile(node) {
+        return this.findCurrentDoOrWhileIndexBackup(node) !== undefined;
+    }
+    registerDoOrWhileIndexBackup(node, name) {
+        this.doOrWhileIndexBackups.set(node, name);
+    }
+    findCurrentDoOrWhileIndexBackup(node) {
         const stack = [];
         for (const statement of this.getFile().getStatements()) {
             const get = statement.get();
             if (get instanceof abaplint.Statements.While
                 || get instanceof abaplint.Statements.Do) {
-                stack.push(statement);
+                stack.push(this.doOrWhileIndexBackups.get(statement));
             }
             else if (get instanceof abaplint.Statements.EndWhile
                 || get instanceof abaplint.Statements.EndDo) {
@@ -119192,7 +120012,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
                 break;
             }
         }
-        return stack.length > 0;
+        return stack[stack.length - 1];
     }
     registerClassOrInterface(def) {
         if (def === undefined) {
@@ -119305,6 +120125,8 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         if (list[search]) {
             const transpiler = new list[search]();
             const chunk = transpiler.transpile(node, this);
+            // baseline: statements that emitted no mappings still resolve to their source
+            chunk.ensureStartMapping(node, this);
             chunk.appendString("\n");
             return chunk;
         }