@abaplint/transpiler 2.10.71 → 2.10.73

package/build/src/expressions/field_chain.js

@@ -37,17 +37,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;

package/build/src/feature_flags.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FEATURE_FLAGS = void 0;
 exports.FEATURE_FLAGS = {
-    PRIVATE_ATTRIBUTES: false,
+    PRIVATE_ATTRIBUTES: true,
 };
 //# sourceMappingURL=feature_flags.js.map

package/build/src/traversal.js

@@ -413,6 +413,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;
@@ -422,18 +425,35 @@ 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 = "#";
             }
             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`;
         }
+        /*
+            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",
-  "version": "2.10.71",
+  "version": "2.10.73",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",