@abaplint/transpiler-cli 2.10.30 → 2.10.32

package/build/bundle.js

@@ -7858,7 +7858,7 @@ class StringTemplateFormatting extends combi_1.Expression {
         const alphaOptions = (0, combi_1.altPrio)("OUT", "RAW", "IN", _1.Source);
         const alignOptions = (0, combi_1.altPrio)("LEFT", "RIGHT", "CENTER", _1.Source, dynamic_1.Dynamic);
         const dateTimeOptions = (0, combi_1.altPrio)("RAW", "ISO", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
-        const timeStampOptions = (0, combi_1.altPrio)("SPACE", "ISO", "USER", "ENVIRONMENT", _1.Source);
+        const timeStampOptions = (0, combi_1.altPrio)("SPACE", "ISO", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const numberOptions = (0, combi_1.altPrio)("RAW", "USER", "ENVIRONMENT", _1.Source, dynamic_1.Dynamic);
         const signOptions = (0, combi_1.altPrio)("LEFT", "LEFTPLUS", "LEFTSPACE", "RIGHT", "RIGHTPLUS", "RIGHTSPACE", _1.Source);
         const caseOptions = (0, combi_1.altPrio)("RAW", "UPPER", "LOWER", _1.Source, dynamic_1.Dynamic);
@@ -38726,6 +38726,7 @@ class MethodDefinition extends _identifier_1.Identifier {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }
         super(found.getFirstToken(), input.filename);
+        this.className = input.scope.getName();
         this.redefinition = false;
         if (node.findDirectExpression(Expressions.Redefinition)) {
             this.redefinition = true;
@@ -38778,6 +38779,9 @@ class MethodDefinition extends _identifier_1.Identifier {
     getVisibility() {
         return this.visibility;
     }
+    getClassName() {
+        return this.className;
+    }
     isRedefinition() {
         return this.redefinition;
     }
@@ -52768,7 +52772,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.107";
+        return "2.113.108";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -78266,26 +78270,34 @@ class MethodCallTranspiler {
         }
         let name = nameToken.getStr().toLowerCase();
         if (traversal.isBuiltinMethod(nameToken)) {
-            name = "abap.builtin." + name + "(";
-        }
-        else {
-            name = name + "(";
+            name = "abap.builtin." + name;
         }
-        const m = traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken));
+        const scope = traversal.findCurrentScopeByToken(nameToken);
+        // it might be aliased?
+        const m = traversal.findMethodReference(nameToken, scope);
         if (m?.name && traversal.isBuiltinMethod(nameToken) === false) {
-            name = m.name.toLowerCase() + "(";
+            name = m.name.toLowerCase();
         }
+        name = traversal_1.Traversal.escapeNamespace(name.replace("~", "$"));
         if (feature_flags_1.FEATURE_FLAGS.private === true
             && m?.def.getVisibility() === core_1.Visibility.Private
-            && m?.def.isStatic() === false) {
-            name = "#" + name;
+            && m.def.isStatic() === false) {
+            const id = scope?.getParent()?.getParent()?.getIdentifier();
+            if (id?.stype === core_1.ScopeType.ClassImplementation
+                && m.def.getClassName().toUpperCase() === id.sname.toUpperCase()) {
+                name = "#" + name;
+            }
+            else {
+                name = `FRIENDS_ACCESS_INSTANCE["${name}"]`;
+            }
         }
+        name = name + "(";
         const step = node.findDirectExpression(core_1.Expressions.MethodCallParam);
         if (step === undefined) {
             throw new Error("MethodCallTranspiler, unexpected node");
         }
         const ret = new chunk_1.Chunk();
-        ret.append(traversal_1.Traversal.escapeNamespace(name.replace("~", "$")), nameToken, traversal);
+        ret.append(name, nameToken, traversal);
         ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(m?.def).transpile(step, traversal));
         ret.appendString(")");
         return ret;
@@ -78582,16 +78594,14 @@ class MethodSourceTranspiler {
             else if (child.get() instanceof core_1.Expressions.Dynamic) {
                 const second = child.getChildren()[1];
                 const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_METHOD'", child.getFirstToken(), true);
-                if (second.get() instanceof core_1.Expressions.FieldChain) {
+                if (second.get() instanceof core_1.Expressions.FieldChain && second instanceof core_1.Nodes.ExpressionNode) {
                     if (call.endsWith(".")) {
                         call = call.substring(0, call.length - 1);
                     }
                     if (call === "") {
                         call = "this";
                     }
-                    call += "[";
-                    call += traversal.traverse(second).getCode();
-                    call += ".get().toLowerCase().trimEnd()]";
+                    call = `abap.dynamicCallLookup(${call}, ${traversal.traverse(second).getCode()})`;
                 }
                 else if (second.get() instanceof core_1.Expressions.Constant) {
                     if (call === "") {

package/package.json

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