@abaplint/transpiler 2.6.26 → 2.6.28

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/transpile_types.js

@@ -17,15 +17,14 @@ class TranspileTypes {
         return pre + t.getName().toLowerCase() + " = " + code + ";\n";
     }
     toType(type) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let resolved = "";
         let extra = "";
         if (type instanceof abaplint.BasicTypes.ObjectReferenceType
             || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
             resolved = "ABAPObject";
-            if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_a = type.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) + "\"}";
-            }
+            extra = "{qualifiedName: " + JSON.stringify((_a = type.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) +
+                ", RTTIName: " + JSON.stringify((_b = type.getRTTIName()) === null || _b === void 0 ? void 0 : _b.toUpperCase()) + "}";
         }
         else if (type instanceof abaplint.BasicTypes.TableType) {
             resolved = "Table";
@@ -39,31 +38,31 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.IntegerType) {
             resolved = "Integer";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_b = type.getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_c = type.getQualifiedName()) === null || _c === void 0 ? void 0 : _c.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.StringType) {
             resolved = "String";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_c = type.getQualifiedName()) === null || _c === void 0 ? void 0 : _c.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_d = type.getQualifiedName()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.UTCLongType) {
             resolved = "UTCLong";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_d = type.getQualifiedName()) === null || _d === void 0 ? void 0 : _d.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_e = type.getQualifiedName()) === null || _e === void 0 ? void 0 : _e.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DateType) {
             resolved = "Date";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_e = type.getQualifiedName()) === null || _e === void 0 ? void 0 : _e.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_f = type.getQualifiedName()) === null || _f === void 0 ? void 0 : _f.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.TimeType) {
             resolved = "Time";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_f = type.getQualifiedName()) === null || _f === void 0 ? void 0 : _f.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_g = type.getQualifiedName()) === null || _g === void 0 ? void 0 : _g.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DataReference) {
@@ -134,7 +133,7 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.XStringType) {
             resolved = "XString";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_g = type.getQualifiedName()) === null || _g === void 0 ? void 0 : _g.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_h = type.getQualifiedName()) === null || _h === void 0 ? void 0 : _h.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.XSequenceType) {
@@ -150,13 +149,13 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.FloatType) {
             resolved = "Float";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_h = type.getQualifiedName()) === null || _h === void 0 ? void 0 : _h.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_j = type.getQualifiedName()) === null || _j === void 0 ? void 0 : _j.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.FloatingPointType) {
             resolved = "Float";
             if (type.getQualifiedName() !== undefined) {
-                extra = "{qualifiedName: \"" + ((_j = type.getQualifiedName()) === null || _j === void 0 ? void 0 : _j.toUpperCase()) + "\"}";
+                extra = "{qualifiedName: \"" + ((_k = type.getQualifiedName()) === null || _k === void 0 ? void 0 : _k.toUpperCase()) + "\"}";
             }
         }
         else if (type instanceof abaplint.BasicTypes.DecFloat34Type) {

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";
@@ -479,14 +484,8 @@ class Traversal {
         if (def === undefined) {
             return "";
         }
-        const name = def.getName();
-        if (def.isGlobal() === false) {
-            const prefix = this.buildPrefix();
-            return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
-        }
-        else {
-            return `abap.Classes['${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
-        }
+        const name = this.buildInternalName(def.getName(), def);
+        return `abap.Classes['${name}'] = ${Traversal.escapeNamespace(def.getName().toLowerCase())};`;
     }
     setValues(identifier, name) {
         return Traversal.setValues(identifier, name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.26",
+  "version": "2.6.28",
   "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.97.15",
+    "@abaplint/core": "^2.97.16",
     "source-map": "^0.7.4"
   },
   "devDependencies": {