@abaplint/transpiler 2.11.38 → 2.11.40

package/build/src/expressions/field_chain.js

@@ -43,9 +43,14 @@ class FieldChainTranspiler {
                 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());
+                    const tokenName = c.getFirstToken().getStr();
+                    const attr = cdef?.getAttributes().findByName(tokenName);
+                    // Do not mark constants as private JS fields. Constants are exposed on instances via constructor copying.
+                    const constants = cdef?.getAttributes().getConstants() || [];
+                    const isConstant = constants.some(cons => cons.getName().toUpperCase() === tokenName.toUpperCase());
                     if (feature_flags_1.FEATURE_FLAGS.PRIVATE_ATTRIBUTES === true
-                        && attr?.getVisibility() === abaplint.Visibility.Private) {
+                        && attr?.getVisibility() === abaplint.Visibility.Private
+                        && isConstant === false) {
                         const id = scope?.getParent()?.getParent()?.getIdentifier();
                         if (id?.stype === abaplint.ScopeType.ClassImplementation
                             && cdef?.getName().toUpperCase() === id.sname.toUpperCase()) {

package/build/src/expressions/value_body.js

@@ -6,6 +6,8 @@ const chunk_1 = require("../chunk");
 const type_name_or_infer_1 = require("./type_name_or_infer");
 const value_body_line_1 = require("./value_body_line");
 const field_assignment_1 = require("./field_assignment");
+const statements_1 = require("../statements");
+const source_field_symbol_1 = require("./source_field_symbol");
 class ValueBodyTranspiler {
     transpile(typ, body, traversal) {
         if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
@@ -13,8 +15,9 @@ class ValueBodyTranspiler {
         }
         let ret = new chunk_1.Chunk().appendString(new type_name_or_infer_1.TypeNameOrInfer().transpile(typ, traversal).getCode());
         const context = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
-        const hasLines = body.findDirectExpression(core_1.Expressions.ValueBodyLine) !== undefined;
+        let post = "";
         let extraFields = "";
+        const hasLines = body.findDirectExpression(core_1.Expressions.ValueBodyLine) !== undefined;
         for (const child of body.getChildren()) {
             if (child.get() instanceof core_1.Expressions.FieldAssignment && child instanceof core_1.Nodes.ExpressionNode) {
                 const transpiled = new field_assignment_1.FieldAssignmentTranspiler().transpile(child, traversal).getCode();
@@ -40,11 +43,47 @@ class ValueBodyTranspiler {
                 const source = traversal.traverse(child);
                 ret.appendString(".set(" + source.getCode() + ".clone())");
             }
+            else if (child.get() instanceof core_1.Expressions.For && child instanceof core_1.Nodes.ExpressionNode) {
+                if (child.getChildren().length !== 2) {
+                    throw new Error("ValueBody FOR todo, num");
+                }
+                const loop = child.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
+                if (loop === undefined) {
+                    throw new Error("ValueBody FOR todo");
+                }
+                else if (loop.getChildren().length !== 3) {
+                    throw new Error("ValueBody FOR todo, num loop");
+                }
+                let targetDeclare = "";
+                let targetAction = "";
+                const fs = loop.findDirectExpression(core_1.Expressions.TargetFieldSymbol);
+                if (fs) {
+                    targetDeclare = new statements_1.FieldSymbolTranspiler().transpile(fs, traversal).getCode();
+                    const targetName = new source_field_symbol_1.SourceFieldSymbolTranspiler().transpile(fs, traversal).getCode();
+                    targetAction = `${targetName}.assign(unique1);`;
+                }
+                else {
+                    const field = traversal.traverse(loop.findDirectExpression(core_1.Expressions.TargetField));
+                    if (field === undefined) {
+                        throw new Error("ValueBody FOR empty field todo");
+                    }
+                    targetAction = `const ${field.getCode()} = unique1.clone();`;
+                }
+                const source = traversal.traverse(loop.findDirectExpression(core_1.Expressions.Source)).getCode();
+                const val = new type_name_or_infer_1.TypeNameOrInfer().transpile(typ, traversal).getCode();
+                ret = new chunk_1.Chunk().appendString(`await (async () => {
+${targetDeclare}
+const VAL = ${val};
+for await (const unique1 of abap.statements.loop(${source})) {
+  ${targetAction}
+  VAL`);
+                post = ";\n}\nreturn VAL;\n})()";
+            }
             else {
                 throw new Error("ValueBodyTranspiler, unknown " + child.get().constructor.name + " \"" + child.concatTokens()) + "\"";
             }
         }
-        return ret;
+        return ret.appendString(post);
     }
 }
 exports.ValueBodyTranspiler = ValueBodyTranspiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.38",
+  "version": "2.11.40",
   "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.180",
+    "@abaplint/core": "^2.113.181",
     "source-map": "^0.7.6"
   },
   "devDependencies": {