@abaplint/transpiler 2.10.65 → 2.10.67

package/build/src/feature_flags.d.ts

@@ -1 +1,3 @@
-export declare const FEATURE_FLAGS: {};
+export declare const FEATURE_FLAGS: {
+    PRIVATE_ATTRIBUTES: boolean;
+};

package/build/src/feature_flags.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FEATURE_FLAGS = void 0;
-exports.FEATURE_FLAGS = {};
+exports.FEATURE_FLAGS = {
+    PRIVATE_ATTRIBUTES: true,
+};
 //# sourceMappingURL=feature_flags.js.map

package/build/src/structures/class_implementation.d.ts

@@ -8,6 +8,7 @@ export declare class ClassImplementationTranspiler implements IStructureTranspil
     /** Finds static attributes + constants including those from interfaces (from superclass is ingored) */
     private findStaticAttributes;
     private buildTypes;
+    private buildPrivate;
     /** this builds the part after the class, containing the static variables/constants */
     private buildStatic;
     private buildConstructor;

package/build/src/structures/class_implementation.js

@@ -5,6 +5,7 @@ const abaplint = require("@abaplint/core");
 const traversal_1 = require("../traversal");
 const transpile_types_1 = require("../transpile_types");
 const chunk_1 = require("../chunk");
+const feature_flags_1 = require("../feature_flags");
 class ClassImplementationTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
@@ -73,6 +74,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) {
@@ -144,8 +161,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;

package/build/src/traversal.d.ts

@@ -22,6 +22,7 @@ export declare class Traversal {
     private fuctionGroupWorkaround;
     getInterfaceDefinition(token: abaplint.Token): abaplint.IInterfaceDefinition | undefined;
     getClassDefinition(token: abaplint.Token): abaplint.IClassDefinition | undefined;
+    private isPrivateAttribute;
     private isClassAttribute;
     prefixAndName(t: abaplint.Token, filename?: string): string;
     private isStaticClassAttribute;

package/build/src/traversal.js

@@ -9,6 +9,7 @@ const transpile_types_1 = require("./transpile_types");
 const chunk_1 = require("./chunk");
 const expressions_1 = require("./expressions");
 const keywords_1 = require("./keywords");
+const feature_flags_1 = require("./feature_flags");
 class Traversal {
     constructor(spaghetti, file, obj, reg, options) {
         this.scopeCache = undefined;
@@ -124,6 +125,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) {
@@ -165,7 +182,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("%", "$");
@@ -380,14 +401,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",
-  "version": "2.10.65",
+  "version": "2.10.67",
   "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.148",
+    "@abaplint/core": "^2.113.149",
     "source-map": "^0.7.4"
   },
   "devDependencies": {