@abaplint/transpiler 2.6.27 → 2.6.29

package/build/src/statements/assign.js

@@ -75,7 +75,8 @@ class AssignTranspiler {
                 }
             }
             else if ((first === null || first === void 0 ? void 0 : first.get()) instanceof abaplint.Expressions.Source && first instanceof abaplint.Nodes.ExpressionNode) {
-                const name = first.concatTokens().toLowerCase();
+                //        const name = first.concatTokens().toLowerCase();
+                const name = new expressions_1.SourceTranspiler().transpile(first, traversal).getCode();
                 options.push(`dynamicSource: (() => {
           try { return ${name}; } catch {}
           try { return this.${name}; } catch {}

package/build/src/statements/method_implementation.js

@@ -25,7 +25,7 @@ class MethodImplementationTranspiler {
         if (methodName.toUpperCase() === "CONSTRUCTOR" && classDef) {
             // note that all ABAP identifiers are lower cased, sometimes the kernel does magic, so it needs to know the method input name
             unique = "INPUT";
-            after = traversal.buildConstructorContents(scope.getParent(), classDef);
+            //      after = traversal.buildConstructorContents(scope.getParent(), classDef);
             methodName = "constructor_";
         }
         const methodDef = this.findMethodParameters(scope);

package/build/src/structures/class_implementation.js

@@ -10,10 +10,13 @@ class ClassImplementationTranspiler {
         const ret = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             ret.appendChunk(traversal.traverse(c));
+            if (c.get() instanceof abaplint.Statements.ClassImplementation) {
+                ret.appendString(this.buildConstructor(node.getFirstStatement(), traversal));
+            }
             if (c instanceof abaplint.Nodes.StatementNode
                 && c.get() instanceof abaplint.Statements.ClassImplementation
                 && this.hasConstructor(node) === false) {
-                ret.appendString(this.buildConstructor(c, traversal));
+                ret.appendString("async constructor_(INPUT) {\nif (super.constructor_) { await super.constructor_(INPUT); }\nreturn this;\n}\n");
             }
         }
         ret.appendString(this.buildStatic(node.findFirstExpression(abaplint.Expressions.ClassName), traversal));
@@ -127,6 +130,9 @@ class ClassImplementationTranspiler {
     }
     buildConstructor(node, traversal) {
         var _a;
+        if (node === undefined) {
+            throw new Error("buildConstructor node undefined");
+        }
         const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
         const token = (_a = node.findFirstExpression(abaplint.Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
         if (token === undefined) {
@@ -140,7 +146,8 @@ class ClassImplementationTranspiler {
         if (ret === "") {
             return ret;
         }
-        return "async constructor_(INPUT) {\n" + ret + "return this;\n}\n";
+        // note: for CALL TRANSFORMATION, its nice that the values are initialized by the JS constructor,
+        return "constructor() {\n" + ret + "}\n";
     }
 }
 exports.ClassImplementationTranspiler = ClassImplementationTranspiler;

package/build/src/traversal.js

@@ -319,10 +319,15 @@ class Traversal {
     buildConstructorContents(scope, def) {
         var _a, _b, _c;
         let ret = "";
-        if (def.getSuperClass() !== undefined
-            && def.getMethodDefinitions().getByName("CONSTRUCTOR") === undefined) {
-            ret += `await super.constructor_(INPUT);\n`;
+        if (def.getSuperClass() !== undefined || def.getName().toUpperCase() === "CX_ROOT") {
+            ret += "super();\n";
         }
+        /*
+            if (def.getSuperClass() !== undefined
+                && def.getMethodDefinitions().getByName("CONSTRUCTOR") === undefined) {
+              ret += `await super.constructor_(INPUT);\n`;
+            }
+        */
         const cName = Traversal.escapeNamespace(def.getName().toLowerCase());
         ret += "this.me = new abap.types.ABAPObject();\n";
         ret += "this.me.set(this);\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.27",
+  "version": "2.6.29",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",