@abaplint/transpiler-cli 2.10.70 → 2.10.72

package/build/bundle.js

@@ -78790,17 +78790,23 @@ class FieldChainTranspiler {
                 }
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
-                let pprefix = "";
+                const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
+                let name = c.getFirstToken().getStr().toLowerCase();
                 if (context instanceof abaplint.BasicTypes.ObjectReferenceType) {
                     const cdef = traversal.findClassDefinition(context.getIdentifierName(), scope);
                     const attr = cdef?.getAttributes().findByName(c.getFirstToken().getStr());
                     if (feature_flags_1.FEATURE_FLAGS.PRIVATE_ATTRIBUTES === true
                         && attr?.getVisibility() === abaplint.Visibility.Private) {
-                        pprefix = "#";
+                        const id = scope?.getParent()?.getParent()?.getIdentifier();
+                        if (id?.stype === abaplint.ScopeType.ClassImplementation
+                            && cdef?.getName().toUpperCase() === id.sname.toUpperCase()) {
+                            name = "#" + name;
+                        }
+                        else {
+                            name = `FRIENDS_ACCESS_INSTANCE["${name}"]`;
+                        }
                     }
                 }
-                const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
-                let name = pprefix + c.getFirstToken().getStr().toLowerCase();
                 if (prefix && interfaceName && name.startsWith(interfaceName) === false && interfaceNameAdded === false) {
                     name = traversal_1.Traversal.escapeNamespace(name).replace("~", "$");
                     name = traversal_1.Traversal.escapeNamespace(interfaceName) + "$" + name;
@@ -89768,6 +89774,9 @@ class Traversal {
                 const name = "this." + escaped;
                 ret += name + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
                 ret += this.setValues(a, name);
+                if (escaped?.startsWith("#")) {
+                    ret += `this.FRIENDS_ACCESS_INSTANCE["${escaped.replace("#", "")}"] = ${name};\n`;
+                }
             }
         }
         return ret;
@@ -89777,18 +89786,37 @@ class Traversal {
         if (hasSuperClass === true) {
             ret += `"SUPER": sup.FRIENDS_ACCESS_INSTANCE,\n`;
         }
-        for (const a of def.getMethodDefinitions()?.getAll() || []) {
-            const name = a.getName().toLowerCase();
-            if (name === "constructor" || a.isStatic() === true) {
+        for (const method of def.getMethodDefinitions()?.getAll() || []) {
+            const name = method.getName().toLowerCase();
+            if (name === "constructor" || method.isStatic() === true) {
                 continue;
             }
             let privateHash = "";
-            if (a.getVisibility() === abaplint.Visibility.Private) {
+            if (method.getVisibility() === abaplint.Visibility.Private) {
                 privateHash = "#";
             }
+            else {
+                continue;
+            }
             const methodName = privateHash + Traversal.escapeNamespace(name.replace("~", "$"));
             ret += `"${name.replace("~", "$")}": this.${methodName}.bind(this),\n`;
         }
+        /*
+            for (const attribute of def.getAttributes()?.getAll() || []) {
+              if (attribute.getMeta().includes(abaplint.IdentifierMeta.Static) === true) {
+                // hmm, is this correct?
+                continue;
+              }
+              let privateHash = "";
+              if (attribute.getVisibility() === abaplint.Visibility.Private) {
+                privateHash = "#";
+              } else {
+                continue;
+              }
+              const attributeName = privateHash + Traversal.escapeNamespace(attribute.getName().toLowerCase());
+              ret += `"${attribute.getName().toLowerCase()}": this.${attributeName},\n`;
+            }
+              */
         ret += "};\n";
         return ret;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.70",
+  "version": "2.10.72",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -28,7 +28,7 @@
   "license": "MIT",
   "devDependencies": {
     "@abaplint/core": "^2.113.149",
-    "@abaplint/transpiler": "^2.10.70",
+    "@abaplint/transpiler": "^2.10.72",
     "@types/glob": "^8.1.0",
     "@types/node": "^22.16.5",
     "@types/progress": "^2.0.7",