@abaplint/transpiler-cli 2.13.63 → 2.13.65

package/build/bundle.js

@@ -402,7 +402,12 @@ function loadPlugin() {
 }
 async function build(config, files) {
     const libFiles = await loadLib(config);
-    const t = new Transpiler.Transpiler(config.options, loadPlugin());
+    const options = { ...config.options };
+    if (config.write_source_map !== true) {
+        // Do not pay to allocate and copy mappings that the CLI will not write.
+        options.ignoreSourceMap = true;
+    }
+    const t = new Transpiler.Transpiler(options, loadPlugin());
     const reg = new abaplint.Registry();
     for (const f of files) {
         reg.addFile(new abaplint.MemoryFile(f.filename, f.contents));
@@ -410,7 +415,6 @@ async function build(config, files) {
     for (const l of libFiles) {
         reg.addDependency(new abaplint.MemoryFile(l.filename, l.contents));
     }
-    reg.parse();
     const output = await t.run(reg, new Progress());
     return output;
 }
@@ -9439,21 +9443,21 @@ class SQLFunction extends combi_1.Expression {
         const fn = (name, params, v) => {
             const nameReg = (0, combi_1.regex)(new RegExp("^" + name + "$", "i"));
             if (params === 0) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else if (params === VARIADIC) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else {
                 const extra = [];
                 for (let i = 1; i < params; i++) {
                     extra.push(commaParam);
                 }
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
         };
         const castInput = (0, combi_1.altPrio)(sql_case_1.SQLCase, sql_function_input_1.SQLFunctionInput);
-        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         const hostParen = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW));
         const hostVar = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(simple_source3_1.SimpleSource3, hostParen));
         const abapOnly = (0, combi_1.altPrio)(constant_1.Constant, hostVar);
@@ -9463,7 +9467,7 @@ class SQLFunction extends combi_1.Expression {
             const kvs = params.map(p => (0, combi_1.seq)((0, combi_1.regex)(new RegExp("^" + p.name + "$", "i")), "=", valueFor(p)));
             const anyKv = kvs.length === 1 ? kvs[0] : (0, combi_1.altPrio)(kvs[0], kvs[1], ...kvs.slice(2));
             const body = (0, combi_1.optPrio)((0, combi_1.seq)(anyKv, (0, combi_1.starPrio)((0, combi_1.seq)(",", anyKv))));
-            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)));
+            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         };
         return (0, combi_1.altPrio)(cast, sql_replace_regexpr_1.SQLReplaceRegexpr, sql_occurrences_regexpr_1.SQLOccurrencesRegexpr, sql_substring_regexpr_1.SQLSubstringRegexpr, sql_locate_regexpr_1.SQLLocateRegexpr, ...exports.sqlFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlNamedFunctionDefs.map(([name, v, params]) => namedFn(name, v, params)), ...exports.sqlSpatialFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlSpatialAggregateDefs.map(([name, params, v]) => fn(name, params, v)));
     }
@@ -11249,6 +11253,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TypeParam = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const _derived_types_1 = __webpack_require__(/*! ./_derived_types */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/_derived_types.js");
 class TypeParam extends combi_1.Expression {
     getRunnable() {
         const table = (0, combi_1.seq)((0, combi_1.altPrio)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY"), "TABLE");
@@ -11256,7 +11262,10 @@ class TypeParam extends combi_1.Expression {
         const typeLine = "LINE OF";
         const ret = (0, combi_1.seq)((0, combi_1.alt)(foo, typeLine), _1.TypeNameOrInfer, (0, combi_1.opt)(_1.Default));
         const like = (0, combi_1.seq)("LIKE", (0, combi_1.opt)("LINE OF"), _1.FieldChain, (0, combi_1.optPrio)(_1.Default));
-        return (0, combi_1.alt)((0, combi_1.seq)("TYPE", (0, combi_1.alt)(table, ret)), like);
+        const entity = (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation);
+        const rapTable = (0, combi_1.ver)(version_1.Release.v770, (0, combi_1.seq)("TYPE", "TABLE FOR", (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION IMPORT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("READ LINK", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v787, (0, combi_1.seq)("EVENT", entity), { also: combi_1.AlsoIn.OpenABAP })), (0, combi_1.optPrio)("VALUE IS INITIAL")), { also: combi_1.AlsoIn.OpenABAP });
+        // Method parameters also allow the RAP table and response type forms.
+        return (0, combi_1.altPrio)(rapTable, _1.TypeStructure, (0, combi_1.seq)("TYPE", (0, combi_1.alt)(table, ret)), like);
     }
 }
 exports.TypeParam = TypeParam;
@@ -26522,6 +26531,21 @@ class CurrentScope {
         }
         this.current.getData().forms.push(...f);
     }
+    /** The FORM definitions are built up front, at that point the program level types are not known.
+     * When the FORM statement is traversed it is replaced with one resolved in the scope of the FORM */
+    updateFormDefinition(f) {
+        let search = this.current;
+        while (search !== undefined) {
+            const forms = search.getData().forms;
+            for (let i = 0; i < forms.length; i++) {
+                if (forms[i].equals(f)) {
+                    forms[i] = f;
+                    return;
+                }
+            }
+            search = search.getParent();
+        }
+    }
     addInterfaceDefinition(i) {
         if (this.current === undefined) {
             return;
@@ -27468,6 +27492,7 @@ class Procedural {
                 scope: _current_scope_1.CurrentScope.buildDefault(this.reg, obj),
                 filename: file.getFilename(),
                 issues: [],
+                deferred: [],
             };
             for (const found of structure.findAllStructures(Structures.Form)) {
                 this.scope.addFormDefinitions([new types_1.FormDefinition(found, input)]);
@@ -36913,6 +36938,7 @@ class FindGlobalDefinitions {
             filename: file.getFilename(),
             scope: _current_scope_1.CurrentScope.buildDefault(this.reg, obj),
             issues: [],
+            deferred: [],
         };
         if (obj instanceof interface_1.Interface) {
             const found = struc.findFirstStructure(Structures.Interface);
@@ -41141,6 +41167,9 @@ class Form {
         }
         input.scope.push(_scope_type_1.ScopeType.Form, name, node.getFirstToken().getStart(), input.filename);
         const form = new form_definition_1.FormDefinition(node, input);
+        // the definitions are built up front, before the program level types are known, replace it
+        // with this one, which is resolved in the scope of the FORM
+        input.scope.updateFormDefinition(form);
         input.scope.addList(form.getUsingParameters());
         input.scope.addList(form.getChangingParameters());
         input.scope.addList(form.getTablesParameters());
@@ -44175,12 +44204,19 @@ class Perform {
         input.scope.addReference(expr.getFirstToken(), found, _reference_1.ReferenceType.FormReference, input.filename);
         ////////////////////////////
         // check parameters match
-        // USING and CHANGING are interchangeable, the actual parameters form a single positional list
-        if (this.checkParameters(node, tables, found.getTablesParameters(), "TABLES", input) === false) {
-            return;
-        }
-        const formal = found.getUsingParameters().concat(found.getChangingParameters());
-        this.checkParameters(node, using.concat(changing), formal, "USING/CHANGING", input);
+        // deferred, the FORM might be defined after the PERFORM, its parameters are only typed
+        // once the FORM statement itself has been traversed
+        input.deferred.push(() => {
+            var _a;
+            // look up again, the definition is replaced when the FORM statement is traversed
+            const def = (_a = input.scope.findFormDefinition(name)) !== null && _a !== void 0 ? _a : found;
+            if (this.checkParameters(node, tables, def.getTablesParameters(), "TABLES", input) === false) {
+                return;
+            }
+            // USING and CHANGING are interchangeable, the actual parameters form a single positional list
+            const formal = def.getUsingParameters().concat(def.getChangingParameters());
+            this.checkParameters(node, using.concat(changing), formal, "USING/CHANGING", input);
+        });
     }
     // returns false if an issue was reported
     checkParameters(node, actual, formal, kind, input) {
@@ -45576,22 +45612,8 @@ class SelectOption {
             return;
         }
         const nameChain = node.findFirstExpression(Expressions.FieldChain);
-        let found = new basic_types_1.BasicTypes(input).resolveLikeName(nameChain);
+        const found = new basic_types_1.BasicTypes(input).resolveLikeName(nameChain);
         if (found) {
-            if (found instanceof basic_1.StructureType) {
-                let length = 0;
-                for (const c of found.getComponents()) {
-                    if (c.type instanceof basic_1.CharacterType) {
-                        length += c.type.getLength();
-                    }
-                }
-                if (length === 0) {
-                    found = basic_1.VoidType.get("Selectoption, fallback");
-                }
-                else {
-                    found = new basic_1.CharacterType(length);
-                }
-            }
             const stru = new basic_1.StructureType([
                 { name: "SIGN", type: new basic_1.CharacterType(1) },
                 { name: "OPTION", type: new basic_1.CharacterType(2) },
@@ -48845,6 +48867,7 @@ class SyntaxLogic {
     constructor(reg, object) {
         this.reg = reg;
         this.issues = [];
+        this.deferred = [];
         this.object = object;
     }
     run() {
@@ -48858,6 +48881,7 @@ class SyntaxLogic {
             proc: new _procedural_1.Procedural(this.reg, this.scope),
         };
         this.issues = [];
+        this.deferred = [];
         this.reg.getDDICReferences().clear(this.object);
         this.reg.getMSAGReferences().clear(this.object);
         if (this.object instanceof objects_1.Program && this.object.isInclude()) {
@@ -48865,6 +48889,11 @@ class SyntaxLogic {
             return { issues: [], spaghetti: this.scope.pop(new position_1.Position(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)) };
         }
         this.traverseObject();
+        // the FORM definitions are now all traversed, ie. their parameters are typed
+        for (const d of this.deferred) {
+            d();
+        }
+        this.deferred = [];
         for (;;) {
             const spaghetti = this.scope.pop(new position_1.Position(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)); // pop built-in scopes
             if (spaghetti.getTop().getIdentifier().stype === _scope_type_1.ScopeType.BuiltIn) {
@@ -48964,6 +48993,7 @@ class SyntaxLogic {
             scope: this.scope,
             filename,
             issues: this.issues,
+            deferred: this.deferred,
         };
         if (stru instanceof Structures.ClassDefinition) {
             new class_definition_1.ClassDefinition(node, input);
@@ -49015,6 +49045,7 @@ class SyntaxLogic {
             scope: this.scope,
             filename,
             issues: this.issues,
+            deferred: this.deferred,
         };
         // todo, refactor
         if (s instanceof Statements.Type) {
@@ -70595,7 +70626,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.37";
+        return "2.120.42";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -73286,7 +73317,7 @@ const KNOWN_CURR_DATA_ELEMENTS = ["BWERT", "DZWERT"];
 const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION"];
 const MAX_LABEL_LENGTH = 40;
 // Annotations which are not supported in CDS view entities
-const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure"];
+const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure", "Semantics.currencyCode"];
 class CDSCheckSyntax {
     constructor() {
         this.conf = new CDSCheckSyntaxConf();
@@ -73330,6 +73361,7 @@ Missing objects are only reported when their names match the configured errorNam
         this.checkFieldAnnotations(tree, ddic, issues, file);
         this.checkLabels(tree, issues, file);
         this.checkViewEntityAnnotations(tree, issues, file);
+        this.checkSearchable(tree, issues, file);
         this.checkReservedNames(tree, issues, file);
         this.checkFields(tree, sources, object, issues, file);
         return issues;
@@ -73551,6 +73583,29 @@ Missing objects are only reported when their names match the configured errorNam
             }
         }
     }
+    checkSearchable(tree, issues, file) {
+        let searchable;
+        for (const annotation of tree.findAllExpressionsRecursive(expressions_1.CDSAnnotation)) {
+            const normalized = annotation.concatTokens().replace(/\s/g, "").toUpperCase().replace(/^@</, "@");
+            if (this.hasSearchAnnotation(normalized, "defaultSearchElement")) {
+                return;
+            }
+            else if (searchable === undefined && this.hasSearchAnnotation(normalized, "searchable")) {
+                searchable = annotation;
+            }
+        }
+        if (searchable !== undefined) {
+            const message = "@Search.defaultSearchElement: true required on at least one element " +
+                "when @Search.searchable: true";
+            issues.push(issue_1.Issue.atToken(file, searchable.getFirstToken(), message, this.getMetadata().key, this.conf.severity));
+        }
+    }
+    hasSearchAnnotation(normalized, name) {
+        if (normalized.startsWith("@SEARCH") === false) {
+            return false;
+        }
+        return new RegExp("[.{,]" + name.toUpperCase() + ":TRUE").test(normalized);
+    }
     checkReservedNames(tree, issues, file) {
         var _a, _b;
         for (const element of tree.findAllExpressionsRecursive(expressions_1.CDSElement)) {
@@ -74242,6 +74297,7 @@ https://help.sap.com/doc/abapdocu_latest_index_htm/latest/en-US/abenchained_stat
                     || statement instanceof Statements.Ranges
                     || statement instanceof Statements.TypePools
                     || statement instanceof Statements.FieldSymbol
+                    || statement instanceof Statements.Nodes
                     || statement instanceof Statements.Data
                     || statement instanceof Statements.DataBegin
                     || statement instanceof Statements.DataEnd)) {
@@ -101138,6 +101194,7 @@ exports.DECLARATION_STUFF = exports.SELECTION_EVENTS = void 0;
 const Statements = __importStar(__webpack_require__(/*! ./abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js"));
 exports.SELECTION_EVENTS = [
     Statements.StartOfSelection,
+    Statements.Get,
     Statements.AtSelectionScreen,
     Statements.AtLineSelection,
     Statements.AtPF,
@@ -102234,7 +102291,7 @@ class Chunk {
         if (input === "") {
             return this;
         }
-        if (pos && input !== "\n") {
+        if (pos && input !== "\n" && traversal.isSourceMapEnabled?.() !== false) {
             this.mappings.push({
                 source: traversal.getFilename(),
                 generated: {
@@ -102253,7 +102310,7 @@ class Chunk {
      * already carries mappings, so it never overrides finer-grained mappings.
      */
     ensureStartMapping(pos, traversal) {
-        if (this.raw === "" || this.mappings.length > 0) {
+        if (this.raw === "" || this.mappings.length > 0 || traversal.isSourceMapEnabled?.() === false) {
             return this;
         }
         this.mappings.push({
@@ -102296,29 +102353,32 @@ class Chunk {
         if (ignoreSourceMap === true) {
             this.mappings = [];
         }
+        const indentationByLine = this.mappings.length > 0 ? [] : undefined;
         for (const l of this.raw.split("\n")) {
             if (l.startsWith("}")) {
                 i = i - 1;
             }
             // clamp so unbalanced braces never produce a negative indent/shift
             const indent = i > 0 ? i * 2 : 0;
+            if (indentationByLine !== undefined) {
+                indentationByLine[line] = indent;
+            }
             if (indent > 0) {
                 output.push(" ".repeat(indent) + l);
             }
             else {
                 output.push(l);
             }
-            // 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 += indent;
-                }
-            }
             if (l.endsWith(" {")) {
                 i = i + 1;
             }
             line++;
         }
+        // Shift every mapping once. The previous line-major implementation
+        // inspected every mapping for every generated line (O(lines * mappings)).
+        for (const m of this.mappings) {
+            m.generated.column += indentationByLine?.[m.generated.line] || 0;
+        }
         this.raw = output.join("\n");
         // line structure is unchanged, but the last line may have been indented
         this.lastLineLength = output[output.length - 1].length;
@@ -102445,39 +102505,49 @@ class DatabaseSetup {
         // note: avoid hitting maximum statement size by splitting into multiple statements
         const insert = [];
         const populateTables = new populate_tables_1.PopulateTables(this.reg);
+        const add = (statement) => {
+            if (statement.length > 0) {
+                insert.push(statement);
+            }
+        };
+        const addAll = (statements) => {
+            for (const statement of statements) {
+                add(statement);
+            }
+        };
         // INSERT data
         for (const obj of this.reg.getObjects()) {
             if (options?.populateTables?.tadir !== false) {
-                insert.push(populateTables.insertTADIR(obj));
+                add(populateTables.insertTADIR(obj));
             }
             if (obj instanceof abaplint.Objects.MessageClass) {
-                insert.push(...populateTables.insertT100(obj));
+                addAll(populateTables.insertT100(obj));
             }
             else if (options?.populateTables?.wwwparams !== false
                 && obj instanceof abaplint.Objects.WebMIME) {
-                insert.push(...populateTables.insertWWWPARAMS(obj));
+                addAll(populateTables.insertWWWPARAMS(obj));
             }
             else if (obj instanceof abaplint.Objects.Class
                 || obj instanceof abaplint.Objects.Interface
                 || obj instanceof abaplint.Objects.Program) {
                 if (options?.populateTables?.reposrc !== false) {
-                    insert.push(populateTables.insertREPOSRC(obj));
+                    add(populateTables.insertREPOSRC(obj));
                 }
                 if ((obj instanceof abaplint.Objects.Class || obj instanceof abaplint.Objects.Interface)
                     && options?.populateTables?.seosubco !== false) {
-                    insert.push(...populateTables.insertSEOSUBCO(obj));
+                    addAll(populateTables.insertSEOSUBCO(obj));
                 }
                 if ((obj instanceof abaplint.Objects.Class || obj instanceof abaplint.Objects.Interface)
                     && options?.populateTables?.seosubcodf !== false) {
-                    insert.push(...populateTables.insertSEOSUBCODF(obj));
+                    addAll(populateTables.insertSEOSUBCODF(obj));
                 }
                 if ((obj instanceof abaplint.Objects.Class || obj instanceof abaplint.Objects.Interface)
                     && options?.populateTables?.seosubcotx !== false) {
-                    insert.push(...populateTables.insertSEOSUBCOTX(obj));
+                    addAll(populateTables.insertSEOSUBCOTX(obj));
                 }
             }
         }
-        insert.push(populateTables.insertT000());
+        add(populateTables.insertT000());
         return insert;
     }
 }
@@ -109790,11 +109860,13 @@ class Transpiler {
     // workaround for web/webpack
     async runRaw(files) {
         const memory = files.map(f => new abaplint.MemoryFile(f.filename, f.contents));
-        const reg = new abaplint.Registry().addFiles(memory).parse();
-        return new Transpiler().run(reg);
+        const reg = new abaplint.Registry().addFiles(memory);
+        return this.run(reg);
     }
     async run(reg, progress) {
-        reg.parse();
+        // Validation installs the transpiler configuration and findIssues() parses
+        // dirty registries. Parsing before that would be wasted because setConfig()
+        // marks every registry object dirty again.
         this.validate(reg);
         const dbSetup = new db_1.DatabaseSetup(reg).run(this.options);
         this.plugin?.amendDatabaseSetup?.(dbSetup, reg, this.options || {});
@@ -110880,7 +110952,14 @@ class AssignTranspiler {
         }
         else {
             let dynamicName = "";
-            for (const c of assignSource?.getChildren() || []) {
+            const first = assignSource?.getFirstChild();
+            // dynamicSource below already contains the first source expression.
+            // Keep only the dynamic suffix in dynamicName, otherwise structure
+            // components in that expression are resolved a second time at runtime.
+            const dynamicNameChildren = first?.get() instanceof abaplint.Expressions.Source
+                ? assignSource?.getChildren().slice(1)
+                : assignSource?.getChildren();
+            for (const c of dynamicNameChildren || []) {
                 if (c instanceof abaplint.Nodes.ExpressionNode
                     && c.get() instanceof abaplint.Expressions.Dynamic
                     && c.findFirstExpression(abaplint.Expressions.ConstantString)) {
@@ -110901,7 +110980,10 @@ class AssignTranspiler {
                     continue;
                 }
                 else if (c.concatTokens() === "=>" || c.concatTokens() === "->") {
-                    dynamicName += " + '" + c.concatTokens() + "'";
+                    if (dynamicName !== "") {
+                        dynamicName += " + ";
+                    }
+                    dynamicName += "'" + c.concatTokens() + "'";
                 }
                 else {
                     if (dynamicName !== "") {
@@ -110912,7 +110994,6 @@ class AssignTranspiler {
             }
             options.push(`dynamicName: ` + dynamicName);
             // dynamicSource is the first part of the dynamic part
-            const first = assignSource?.getFirstChild();
             if (first?.get() instanceof abaplint.Expressions.Dynamic && first instanceof abaplint.Nodes.ExpressionNode) {
                 const firstFirst = first.getChildren()[1];
                 if (firstFirst?.get() instanceof abaplint.Expressions.Constant) {
@@ -110996,6 +111077,27 @@ exports.AtLineSelectionTranspiler = AtLineSelectionTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/at_pf.js"
+/*!*************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/at_pf.js ***!
+  \*************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AtPFTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class AtPFTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("AT PFnn, not supported, transpiler");`);
+    }
+}
+exports.AtPFTranspiler = AtPFTranspiler;
+//# sourceMappingURL=at_pf.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js"
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js ***!
@@ -111017,6 +111119,27 @@ exports.AtSelectionScreenTranspiler = AtSelectionScreenTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/at_user_command.js"
+/*!***********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/at_user_command.js ***!
+  \***********************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AtUserCommandTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class AtUserCommandTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("AT USER-COMMAND, not supported, transpiler");`);
+    }
+}
+exports.AtUserCommandTranspiler = AtUserCommandTranspiler;
+//# sourceMappingURL=at_user_command.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js"
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js ***!
@@ -111487,6 +111610,27 @@ exports.CallScreenTranspiler = CallScreenTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/call_selection_screen.js"
+/*!*****************************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/call_selection_screen.js ***!
+  \*****************************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CallSelectionScreenTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class CallSelectionScreenTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("CALL SELECTION-SCREEN, not supported, transpiler");`);
+    }
+}
+exports.CallSelectionScreenTranspiler = CallSelectionScreenTranspiler;
+//# sourceMappingURL=call_selection_screen.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/call_transaction.js"
 /*!************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/call_transaction.js ***!
@@ -114699,6 +114843,27 @@ exports.GetTimeTranspiler = GetTimeTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/hide.js"
+/*!************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/hide.js ***!
+  \************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.HideTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class HideTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("HIDE, not supported, transpiler");`);
+    }
+}
+exports.HideTranspiler = HideTranspiler;
+//# sourceMappingURL=hide.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/if.js"
 /*!**********************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/if.js ***!
@@ -114883,14 +115048,17 @@ __exportStar(__webpack_require__(/*! ./add */ "./node_modules/@abaplint/transpil
 __exportStar(__webpack_require__(/*! ./append */ "./node_modules/@abaplint/transpiler/build/src/statements/append.js"), exports);
 __exportStar(__webpack_require__(/*! ./assert */ "./node_modules/@abaplint/transpiler/build/src/statements/assert.js"), exports);
 __exportStar(__webpack_require__(/*! ./assign */ "./node_modules/@abaplint/transpiler/build/src/statements/assign.js"), exports);
+__exportStar(__webpack_require__(/*! ./at_pf */ "./node_modules/@abaplint/transpiler/build/src/statements/at_pf.js"), exports);
 __exportStar(__webpack_require__(/*! ./at_selection_screen */ "./node_modules/@abaplint/transpiler/build/src/statements/at_selection_screen.js"), exports);
 __exportStar(__webpack_require__(/*! ./at */ "./node_modules/@abaplint/transpiler/build/src/statements/at.js"), exports);
+__exportStar(__webpack_require__(/*! ./at_user_command */ "./node_modules/@abaplint/transpiler/build/src/statements/at_user_command.js"), exports);
 __exportStar(__webpack_require__(/*! ./authority_check */ "./node_modules/@abaplint/transpiler/build/src/statements/authority_check.js"), exports);
 __exportStar(__webpack_require__(/*! ./break_id */ "./node_modules/@abaplint/transpiler/build/src/statements/break_id.js"), exports);
 __exportStar(__webpack_require__(/*! ./break */ "./node_modules/@abaplint/transpiler/build/src/statements/break.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_function */ "./node_modules/@abaplint/transpiler/build/src/statements/call_function.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_kernel */ "./node_modules/@abaplint/transpiler/build/src/statements/call_kernel.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_screen */ "./node_modules/@abaplint/transpiler/build/src/statements/call_screen.js"), exports);
+__exportStar(__webpack_require__(/*! ./call_selection_screen */ "./node_modules/@abaplint/transpiler/build/src/statements/call_selection_screen.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_transaction */ "./node_modules/@abaplint/transpiler/build/src/statements/call_transaction.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_transformation */ "./node_modules/@abaplint/transpiler/build/src/statements/call_transformation.js"), exports);
 __exportStar(__webpack_require__(/*! ./call */ "./node_modules/@abaplint/transpiler/build/src/statements/call.js"), exports);
@@ -114958,6 +115126,7 @@ __exportStar(__webpack_require__(/*! ./get_parameter */ "./node_modules/@abaplin
 __exportStar(__webpack_require__(/*! ./get_reference */ "./node_modules/@abaplint/transpiler/build/src/statements/get_reference.js"), exports);
 __exportStar(__webpack_require__(/*! ./get_run_time */ "./node_modules/@abaplint/transpiler/build/src/statements/get_run_time.js"), exports);
 __exportStar(__webpack_require__(/*! ./get_time */ "./node_modules/@abaplint/transpiler/build/src/statements/get_time.js"), exports);
+__exportStar(__webpack_require__(/*! ./hide */ "./node_modules/@abaplint/transpiler/build/src/statements/hide.js"), exports);
 __exportStar(__webpack_require__(/*! ./if */ "./node_modules/@abaplint/transpiler/build/src/statements/if.js"), exports);
 __exportStar(__webpack_require__(/*! ./import */ "./node_modules/@abaplint/transpiler/build/src/statements/import.js"), exports);
 __exportStar(__webpack_require__(/*! ./include */ "./node_modules/@abaplint/transpiler/build/src/statements/include.js"), exports);
@@ -114979,6 +115148,7 @@ __exportStar(__webpack_require__(/*! ./modify_internal */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./modify_screen */ "./node_modules/@abaplint/transpiler/build/src/statements/modify_screen.js"), exports);
 __exportStar(__webpack_require__(/*! ./move_corresponding */ "./node_modules/@abaplint/transpiler/build/src/statements/move_corresponding.js"), exports);
 __exportStar(__webpack_require__(/*! ./move */ "./node_modules/@abaplint/transpiler/build/src/statements/move.js"), exports);
+__exportStar(__webpack_require__(/*! ./new_page */ "./node_modules/@abaplint/transpiler/build/src/statements/new_page.js"), exports);
 __exportStar(__webpack_require__(/*! ./open_cursor */ "./node_modules/@abaplint/transpiler/build/src/statements/open_cursor.js"), exports);
 __exportStar(__webpack_require__(/*! ./open_dataset */ "./node_modules/@abaplint/transpiler/build/src/statements/open_dataset.js"), exports);
 __exportStar(__webpack_require__(/*! ./overlay */ "./node_modules/@abaplint/transpiler/build/src/statements/overlay.js"), exports);
@@ -116393,6 +116563,27 @@ exports.MoveCorrespondingTranspiler = MoveCorrespondingTranspiler;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/statements/new_page.js"
+/*!****************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/statements/new_page.js ***!
+  \****************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.NewPageTranspiler = void 0;
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+class NewPageTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("NEW-PAGE, not supported, transpiler");`);
+    }
+}
+exports.NewPageTranspiler = NewPageTranspiler;
+//# sourceMappingURL=new_page.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/statements/open_cursor.js"
 /*!*******************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/statements/open_cursor.js ***!
@@ -122034,6 +122225,8 @@ class Traversal {
     obj;
     sqlInferredType;
     doOrWhileIndexBackups = new Map();
+    statementsInsideLoop = new WeakSet();
+    enclosingDoOrWhile = new WeakMap();
     reg;
     options;
     constructor(spaghetti, file, obj, reg, options) {
@@ -122042,6 +122235,43 @@ class Traversal {
         this.obj = obj;
         this.reg = reg;
         this.options = options;
+        this.buildStatementContext();
+    }
+    /** Build file-level control-flow context once instead of rescanning all
+     * preceding statements for every DATA, CHECK, EXIT, and RETURN. */
+    buildStatementContext() {
+        const loopStack = [];
+        const doOrWhileStack = [];
+        for (const statement of this.file.getStatements()) {
+            const get = statement.get();
+            if (get instanceof abaplint.Statements.Loop
+                || get instanceof abaplint.Statements.While
+                || get instanceof abaplint.Statements.SelectLoop
+                || get instanceof abaplint.Statements.Do) {
+                loopStack.push(statement);
+            }
+            else if (get instanceof abaplint.Statements.EndLoop
+                || get instanceof abaplint.Statements.EndWhile
+                || get instanceof abaplint.Statements.EndSelect
+                || get instanceof abaplint.Statements.EndDo) {
+                loopStack.pop();
+            }
+            if (loopStack.length > 0) {
+                this.statementsInsideLoop.add(statement);
+            }
+            if (get instanceof abaplint.Statements.While
+                || get instanceof abaplint.Statements.Do) {
+                doOrWhileStack.push(statement);
+            }
+            else if (get instanceof abaplint.Statements.EndWhile
+                || get instanceof abaplint.Statements.EndDo) {
+                doOrWhileStack.pop();
+            }
+            const enclosing = doOrWhileStack[doOrWhileStack.length - 1];
+            if (enclosing !== undefined) {
+                this.enclosingDoOrWhile.set(statement, enclosing);
+            }
+        }
     }
     static escapeNamespace(name) {
         return name?.replace(/\//g, "$");
@@ -122088,6 +122318,9 @@ class Traversal {
     getSpaghetti() {
         return this.spaghetti;
     }
+    isSourceMapEnabled() {
+        return this.options?.ignoreSourceMap !== true;
+    }
     /** finds a statement in the _current_ file given a position */
     findStatementInFile(pos) {
         for (const s of this.file.getStatements()) {
@@ -122550,9 +122783,16 @@ class Traversal {
         return ret;
     }
     buildFriendsAccess(def, hasSuperClass) {
-        let ret = "this.FRIENDS_ACCESS_INSTANCE = {\n";
+        let ret = "";
         if (hasSuperClass === true) {
-            ret += `"SUPER": sup.FRIENDS_ACCESS_INSTANCE,\n`;
+            // A subclass instance can be held through a superclass reference. In
+            // that case friend access must still find private members declared by
+            // the superclass.
+            ret += "this.FRIENDS_ACCESS_INSTANCE = Object.create(sup.FRIENDS_ACCESS_INSTANCE || null);\n";
+            ret += `this.FRIENDS_ACCESS_INSTANCE["SUPER"] = sup.FRIENDS_ACCESS_INSTANCE;\n`;
+        }
+        else {
+            ret += "this.FRIENDS_ACCESS_INSTANCE = {\n";
         }
         for (const method of def.getMethodDefinitions()?.getAll() || []) {
             const name = method.getName().toLowerCase();
@@ -122565,9 +122805,16 @@ class Traversal {
             }
             const methodName = privateHash + Traversal.escapeNamespace(name.replace("~", "$"));
             // NOTE: currently all are needed in the unit test setup
-            ret += `"${name.replace("~", "$")}": this.${methodName}.bind(this),\n`;
+            if (hasSuperClass === true) {
+                ret += `this.FRIENDS_ACCESS_INSTANCE["${name.replace("~", "$")}"] = this.${methodName}.bind(this);\n`;
+            }
+            else {
+                ret += `"${name.replace("~", "$")}": this.${methodName}.bind(this),\n`;
+            }
+        }
+        if (hasSuperClass === false) {
+            ret += "};\n";
         }
-        ret += "};\n";
         return ret;
     }
     buildConstructorContents(scope, def) {
@@ -122806,26 +123053,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return context;
     }
     isInsideLoop(node) {
-        const stack = [];
-        for (const statement of this.getFile().getStatements()) {
-            const get = statement.get();
-            if (get instanceof abaplint.Statements.Loop
-                || get instanceof abaplint.Statements.While
-                || get instanceof abaplint.Statements.SelectLoop
-                || get instanceof abaplint.Statements.Do) {
-                stack.push(statement);
-            }
-            else if (get instanceof abaplint.Statements.EndLoop
-                || get instanceof abaplint.Statements.EndWhile
-                || get instanceof abaplint.Statements.EndSelect
-                || get instanceof abaplint.Statements.EndDo) {
-                stack.pop();
-            }
-            if (statement === node) {
-                break;
-            }
-        }
-        return stack.length > 0;
+        return this.statementsInsideLoop.has(node);
     }
     isInsideDoOrWhile(node) {
         return this.findCurrentDoOrWhileIndexBackup(node) !== undefined;
@@ -122834,22 +123062,8 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         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(this.doOrWhileIndexBackups.get(statement));
-            }
-            else if (get instanceof abaplint.Statements.EndWhile
-                || get instanceof abaplint.Statements.EndDo) {
-                stack.pop();
-            }
-            if (statement === node) {
-                break;
-            }
-        }
-        return stack[stack.length - 1];
+        const enclosing = this.enclosingDoOrWhile.get(node);
+        return enclosing === undefined ? undefined : this.doOrWhileIndexBackups.get(enclosing);
     }
     registerClassOrInterface(def) {
         if (def === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.13.63",
+  "version": "2.13.65",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.120.37",
-    "@abaplint/transpiler": "^2.13.63",
+    "@abaplint/core": "^2.120.42",
+    "@abaplint/transpiler": "^2.13.65",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.13.3",
     "@types/progress": "^2.0.7",