@abaplint/transpiler-cli 2.10.66 → 2.10.69

package/build/bundle.js

@@ -80732,13 +80732,17 @@ exports.StringTemplateSourceTranspiler = StringTemplateSourceTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TargetTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const feature_flags_1 = __webpack_require__(/*! ../feature_flags */ "./node_modules/@abaplint/transpiler/build/src/feature_flags.js");
 class TargetTranspiler {
     transpile(node, traversal) {
         const offset = [];
         let ret = new chunk_1.Chunk();
+        let context = undefined;
+        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
         const children = node.getChildren();
         for (let i = 0; i < children.length; i++) {
             const c = children[i];
@@ -80746,6 +80750,7 @@ class TargetTranspiler {
             if (c.get() instanceof core_1.Expressions.TargetField) {
                 const prefix = traversal.prefixAndName(c.getFirstToken()).replace("~", "$");
                 ret.append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(prefix)), c, traversal);
+                context = scope?.findVariable(c.getFirstToken().getStr())?.getType();
             }
             else if (c.get() instanceof core_1.Expressions.ClassName) {
                 const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
@@ -80761,8 +80766,17 @@ class TargetTranspiler {
                 }
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
+                let prefix = "";
+                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) {
+                        prefix = "#";
+                    }
+                }
                 const intf = traversal_1.Traversal.escapeNamespace(traversal.isInterfaceAttribute(c.getFirstToken()));
-                let name = traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
+                let name = prefix + traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
                 if (intf && name.startsWith(intf) === false) {
                     name = intf + "$" + name;
                 }
@@ -80811,6 +80825,23 @@ exports.TargetTranspiler = TargetTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/feature_flags.js":
+/*!**********************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/feature_flags.js ***!
+  \**********************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FEATURE_FLAGS = void 0;
+exports.FEATURE_FLAGS = {
+    PRIVATE_ATTRIBUTES: true,
+};
+//# sourceMappingURL=feature_flags.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_abap.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/handlers/handle_abap.js ***!
@@ -88168,6 +88199,7 @@ const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abap
 const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const feature_flags_1 = __webpack_require__(/*! ../feature_flags */ "./node_modules/@abaplint/transpiler/build/src/feature_flags.js");
 class ClassImplementationTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
@@ -88236,6 +88268,22 @@ class ClassImplementationTranspiler {
         }
         return ret;
     }
+    buildPrivate(node, traversal) {
+        if (node === undefined || feature_flags_1.FEATURE_FLAGS.PRIVATE_ATTRIBUTES === false) {
+            return "";
+        }
+        const cdef = traversal.getClassDefinition(node.getFirstToken());
+        if (cdef === undefined) {
+            return "ERROR_CDEF_NOT_FOUND";
+        }
+        let ret = "";
+        for (const attr of cdef.getAttributes().getAll()) {
+            if (attr.getVisibility() === abaplint.Visibility.Private) {
+                ret += "#" + traversal_1.Traversal.escapeNamespace(attr.getName().toLowerCase()) + ";\n";
+            }
+        }
+        return ret;
+    }
     /** this builds the part after the class, containing the static variables/constants */
     buildStatic(node, traversal) {
         if (node === undefined) {
@@ -88307,8 +88355,9 @@ class ClassImplementationTranspiler {
         if (ret === "") {
             return ret;
         }
+        const privates = this.buildPrivate(node.findFirstExpression(abaplint.Expressions.ClassName), traversal);
         // note: for CALL TRANSFORMATION, its nice that the values are initialized by the JS constructor,
-        return "constructor() {\n" + ret + "}\n";
+        return privates + "constructor() {\n" + ret + "}\n";
     }
 }
 exports.ClassImplementationTranspiler = ClassImplementationTranspiler;
@@ -89301,6 +89350,7 @@ const transpile_types_1 = __webpack_require__(/*! ./transpile_types */ "./node_m
 const chunk_1 = __webpack_require__(/*! ./chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const expressions_1 = __webpack_require__(/*! ./expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const keywords_1 = __webpack_require__(/*! ./keywords */ "./node_modules/@abaplint/transpiler/build/src/keywords.js");
+const feature_flags_1 = __webpack_require__(/*! ./feature_flags */ "./node_modules/@abaplint/transpiler/build/src/feature_flags.js");
 class Traversal {
     constructor(spaghetti, file, obj, reg, options) {
         this.scopeCache = undefined;
@@ -89416,6 +89466,22 @@ class Traversal {
         }
         return undefined;
     }
+    isPrivateAttribute(token) {
+        const scope = this.findCurrentScopeByToken(token);
+        if (scope === undefined) {
+            throw new Error("isPrivateAttribute, unable to lookup position");
+        }
+        const name = token.getStr();
+        if (name.toLowerCase() === "me") {
+            return false;
+        }
+        const found = scope.findVariable(name);
+        if (found instanceof abaplint.Types.ClassAttribute
+            && found.getVisibility() === abaplint.Visibility.Private) {
+            return true;
+        }
+        return false;
+    }
     isClassAttribute(token) {
         const scope = this.findCurrentScopeByToken(token);
         if (scope === undefined) {
@@ -89457,7 +89523,11 @@ class Traversal {
             return name;
         }
         else if (this.isClassAttribute(t)) {
-            name = "this." + Traversal.escapeNamespace(name);
+            let escaped = Traversal.escapeNamespace(name);
+            if (feature_flags_1.FEATURE_FLAGS.PRIVATE_ATTRIBUTES === true && this.isPrivateAttribute(t)) {
+                escaped = "#" + escaped;
+            }
+            name = "this." + escaped;
         }
         else if (this.isBuiltinVariable(t)) {
             name = "abap.builtin." + name.toLowerCase().replace("%", "$");
@@ -89672,14 +89742,19 @@ class Traversal {
     buildThisAttributes(def, cName) {
         let ret = "";
         for (const a of def.getAttributes()?.getAll() || []) {
-            const escaped = Traversal.escapeNamespace(a.getName().toLowerCase());
+            let escaped = Traversal.escapeNamespace(a.getName().toLowerCase());
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 ret += "this." + escaped + " = " + cName + "." + escaped + ";\n";
-                continue;
             }
-            const name = "this." + escaped;
-            ret += name + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
-            ret += this.setValues(a, name);
+            else {
+                if (feature_flags_1.FEATURE_FLAGS.PRIVATE_ATTRIBUTES === true
+                    && a.getVisibility() === abaplint.Visibility.Private) {
+                    escaped = "#" + escaped;
+                }
+                const name = "this." + escaped;
+                ret += name + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
+                ret += this.setValues(a, name);
+            }
         }
         return ret;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.66",
+  "version": "2.10.69",
   "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.66",
+    "@abaplint/transpiler": "^2.10.69",
     "@types/glob": "^8.1.0",
     "@types/node": "^22.16.5",
     "@types/progress": "^2.0.7",