@abaplint/transpiler 2.10.31 → 2.10.33

package/build/src/expressions/method_call.js

@@ -14,26 +14,34 @@ class MethodCallTranspiler {
         }
         let name = nameToken.getStr().toLowerCase();
         if (traversal.isBuiltinMethod(nameToken)) {
-            name = "abap.builtin." + name + "(";
+            name = "abap.builtin." + name;
         }
-        else {
-            name = 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;

package/build/src/unit_test.js

@@ -224,16 +224,20 @@ async function run() {
                     ret += `  meth.skip();\n`;
                     continue;
                 }
+                const callSpecial = (name) => {
+                    let ret = "";
+                    ret += `        if (test.${name}) await test.${name}();\n`;
+                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.${name}) await test.FRIENDS_ACCESS_INSTANCE.${name}();\n`;
+                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}) await test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}();\n`;
+                    return ret;
+                };
                 ret += `      {\n        const test = await (new ${lc}()).constructor_();\n`;
-                // todo, some refactoring here,
-                ret += `        if (test.setup) await test.setup();\n`;
-                ret += `        if (test.FRIENDS_ACCESS_INSTANCE.setup) await test.FRIENDS_ACCESS_INSTANCE.setup();\n`;
-                ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.setup) await test.FRIENDS_ACCESS_INSTANCE.SUPER.setup();\n`;
+                ret += callSpecial("setup");
                 ret += `        console.log("${st.obj.getName()}: running ${lc}->${m}");\n`;
                 ret += `        meth = locl.addMethod("${m}");\n`;
                 ret += `        await test.FRIENDS_ACCESS_INSTANCE.${m}();\n`;
                 ret += `        meth.pass();\n`;
-                ret += `        if (test.teardown) await test.teardown();\n`;
+                ret += callSpecial("teardown");
                 ret += `      }\n`;
             }
             ret += `      if (${lc}.class_teardown) await ${lc}.class_teardown();\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.31",
+  "version": "2.10.33",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.107",
+    "@abaplint/core": "^2.113.108",
     "source-map": "^0.7.4"
   },
   "devDependencies": {