@abaplint/transpiler 2.10.31 → 2.10.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,26 +14,34 @@ class MethodCallTranspiler {
14
14
  }
15
15
  let name = nameToken.getStr().toLowerCase();
16
16
  if (traversal.isBuiltinMethod(nameToken)) {
17
- name = "abap.builtin." + name + "(";
17
+ name = "abap.builtin." + name;
18
18
  }
19
- else {
20
- name = name + "(";
21
- }
22
- const m = traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken));
19
+ const scope = traversal.findCurrentScopeByToken(nameToken);
20
+ // it might be aliased?
21
+ const m = traversal.findMethodReference(nameToken, scope);
23
22
  if (m?.name && traversal.isBuiltinMethod(nameToken) === false) {
24
- name = m.name.toLowerCase() + "(";
23
+ name = m.name.toLowerCase();
25
24
  }
25
+ name = traversal_1.Traversal.escapeNamespace(name.replace("~", "$"));
26
26
  if (feature_flags_1.FEATURE_FLAGS.private === true
27
27
  && m?.def.getVisibility() === core_1.Visibility.Private
28
- && m?.def.isStatic() === false) {
29
- name = "#" + name;
28
+ && m.def.isStatic() === false) {
29
+ const id = scope?.getParent()?.getParent()?.getIdentifier();
30
+ if (id?.stype === core_1.ScopeType.ClassImplementation
31
+ && m.def.getClassName().toUpperCase() === id.sname.toUpperCase()) {
32
+ name = "#" + name;
33
+ }
34
+ else {
35
+ name = `FRIENDS_ACCESS_INSTANCE["${name}"]`;
36
+ }
30
37
  }
38
+ name = name + "(";
31
39
  const step = node.findDirectExpression(core_1.Expressions.MethodCallParam);
32
40
  if (step === undefined) {
33
41
  throw new Error("MethodCallTranspiler, unexpected node");
34
42
  }
35
43
  const ret = new chunk_1.Chunk();
36
- ret.append(traversal_1.Traversal.escapeNamespace(name.replace("~", "$")), nameToken, traversal);
44
+ ret.append(name, nameToken, traversal);
37
45
  ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(m?.def).transpile(step, traversal));
38
46
  ret.appendString(")");
39
47
  return ret;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abaplint/transpiler",
3
- "version": "2.10.31",
3
+ "version": "2.10.32",
4
4
  "description": "Transpiler",
5
5
  "main": "build/src/index.js",
6
6
  "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
29
29
  "author": "abaplint",
30
30
  "license": "MIT",
31
31
  "dependencies": {
32
- "@abaplint/core": "^2.113.107",
32
+ "@abaplint/core": "^2.113.108",
33
33
  "source-map": "^0.7.4"
34
34
  },
35
35
  "devDependencies": {