@abaplint/transpiler 2.1.62 → 2.1.64

package/build/src/statements/call.js

@@ -7,10 +7,6 @@ const expressions_1 = require("../expressions");
 class CallTranspiler {
     transpile(node, traversal) {
         var _a, _b, _c, _d;
-        if (node.concatTokens().toLowerCase().includes("super->constructor")) {
-            // todo, https://github.com/abaplint/transpiler/issues/133
-            return new chunk_1.Chunk("");
-        }
         const chain = node.findDirectExpression(abaplint.Expressions.MethodCallChain);
         if (chain) {
             let pre = "";
@@ -49,9 +45,15 @@ if (e.classic) {
 }
 }`;
             }
+            const chainChunk = traversal.traverse(chain);
+            let chainCode = chainChunk.getCode();
+            if (chainCode.startsWith("await super.constructor(")) {
+                // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
+                chainCode = chainCode.replace("await super.constructor(", "await super.constructor_(");
+            }
             return new chunk_1.Chunk()
                 .appendString(pre)
-                .appendChunk(traversal.traverse(chain))
+                .appendString(chainCode)
                 .append(post, node.getLastToken(), traversal);
         }
         const methodSource = node.findDirectExpression(abaplint.Expressions.MethodSource);
@@ -69,8 +71,12 @@ if (e.classic) {
                 pre = target.getCode() + ".set(";
                 post = ")";
             }
-            const ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal);
-            return new chunk_1.Chunk().appendChunk(ms).appendString("(" + body + ")" + post + ";");
+            let ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal).getCode();
+            if (ms === "await super.get().constructor") {
+                // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
+                ms = "await super.constructor_";
+            }
+            return new chunk_1.Chunk().appendString(ms).appendString("(" + body + ")" + post + ";");
         }
         throw new Error("CallTranspiler, todo");
     }

package/build/src/statements/create_object.js

@@ -49,6 +49,9 @@ class CreateObjectTranspiler {
             throw new Error("CreateObjectTranspiler, unable to lookup position");
         }
         const target = node.findDirectExpression(abaplint.Expressions.Target);
+        if (target === undefined) {
+            throw new Error(`CreateObjectTranspiler, target not found`);
+        }
         const type = traversal.determineType(node, scope);
         if (type === undefined) {
             throw new Error(`CreateObjectTranspiler, target variable "${target === null || target === void 0 ? void 0 : target.concatTokens()}" not found in scope`);

package/build/src/traversal.js

@@ -251,16 +251,9 @@ class Traversal {
         return undefined;
     }
     buildConstructorContents(scope, def) {
-        /*
-        const vars = scope?.getData().vars;
-        if (vars === undefined || Object.keys(vars).length === 0) {
-          return "";
-        }
-        */
         let ret = "";
-        if (def.getSuperClass() !== undefined) {
-            // todo, more here, there might be parameters to pass
-            // for now just pass the same input
+        if (def.getSuperClass() !== undefined
+            && def.getMethodDefinitions().getByName("CONSTRUCTOR") === undefined) {
             ret += `await super.constructor_(INPUT);\n`;
         }
         ret += "this.me = new abap.types.ABAPObject();\n";
@@ -322,7 +315,7 @@ class Traversal {
         return ret;
     }
     determineType(node, scope) {
-        var _a;
+        var _a, _b, _c;
         if (scope === undefined) {
             return undefined;
         }
@@ -339,6 +332,21 @@ class Traversal {
                 && context instanceof abaplint.BasicTypes.StructureType) {
                 context = context.getComponentByName(c.getFirstToken().getStr());
             }
+            else if (c.get() instanceof abaplint.Expressions.AttributeName
+                && context instanceof abaplint.BasicTypes.ObjectReferenceType) {
+                const id = context.getIdentifier();
+                if (id instanceof abaplint.Types.ClassDefinition || id instanceof abaplint.Types.InterfaceDefinition) {
+                    const concat = c.concatTokens();
+                    if (concat.includes("~")) {
+                        const [iname, aname] = concat.split("~");
+                        const intf = scope.findInterfaceDefinition(iname);
+                        context = (_b = intf === null || intf === void 0 ? void 0 : intf.getAttributes().findByName(aname)) === null || _b === void 0 ? void 0 : _b.getType();
+                    }
+                    else {
+                        context = (_c = id.getAttributes().findByName(concat)) === null || _c === void 0 ? void 0 : _c.getType();
+                    }
+                }
+            }
         }
         return context;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.1.62",
+  "version": "2.1.64",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.93.12",
+    "@abaplint/core": "^2.93.15",
     "source-map": "^0.7.4"
   },
   "devDependencies": {