@abaplint/transpiler 2.0.26 → 2.0.27

package/build/src/expressions/source.js

@@ -12,7 +12,10 @@ class SourceTranspiler {
     transpile(node, traversal) {
         let ret = new chunk_1.Chunk();
         const post = new chunk_1.Chunk();
-        for (const c of node.getChildren()) {
+        const children = node.getChildren();
+        for (let i = 0; i < children.length; i++) {
+            const c = children[i];
+            const last = i === children.length - 1;
             if (c instanceof core_1.Nodes.ExpressionNode) {
                 if (c.get() instanceof core_1.Expressions.FieldChain) {
                     ret.appendChunk(new _1.FieldChainTranspiler(this.addGet).transpile(c, traversal));
@@ -35,14 +38,12 @@ class SourceTranspiler {
                 }
                 else if (c.get() instanceof core_1.Expressions.MethodCallChain) {
                     ret.appendChunk(traversal.traverse(c));
-                    if (this.addGet) {
-                        const code = ret.getCode();
-                        if (code.includes("await")) {
-                            ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get()");
-                        }
-                        else {
-                            ret.append(".get()", c, traversal);
-                        }
+                    const code = ret.getCode();
+                    if (code.includes("await")) {
+                        ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(")");
+                    }
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
                     }
                 }
                 else if (c.get() instanceof core_1.Expressions.Source) {
@@ -57,6 +58,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.ComponentChain) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get().");
                     ret.appendChunk(new _1.ComponentChainTranspiler().transpile(c, traversal));
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
+                    }
                 }
                 else if (c.get() instanceof core_1.Expressions.Dereference) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").getPointer()");
@@ -82,6 +86,7 @@ class SourceTranspiler {
             }
         }
         ret.appendChunk(post);
+        //    console.dir(ret.getCode());
         return ret;
     }
 }

package/build/src/statements/end_method.js

@@ -15,7 +15,7 @@ class EndMethodTranspiler {
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 returning += "return " + n.toLowerCase() + ";\n";
             }
         }

package/build/src/statements/method_implementation.js

@@ -31,14 +31,14 @@ class MethodImplementationTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             const varName = n.toLowerCase();
-            if (identifier.getMeta().includes("importing" /* MethodImporting */)
-                || identifier.getMeta().includes("changing" /* MethodChanging */)
-                || identifier.getMeta().includes("exporting" /* MethodExporting */)) {
+            if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
+                || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)
+                || identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
                 if (unique === "") {
                     unique = "INPUT";
                 }
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
-                if (identifier.getMeta().includes("importing" /* MethodImporting */) && identifier.getType().isGeneric() === false) {
+                if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */) && identifier.getType().isGeneric() === false) {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
                 }
                 else {
@@ -71,7 +71,7 @@ class MethodImplementationTranspiler {
                     after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + " = " + val + ";}\n";
                 }
             }
-            else if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            else if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
             }
         }

package/build/src/statements/return.js

@@ -9,7 +9,7 @@ class ReturnTranspiler {
         const vars = scope === null || scope === void 0 ? void 0 : scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 extra = " " + n.toLowerCase();
             }
         }

package/build/src/structures/interface.js

@@ -36,8 +36,8 @@ class InterfaceTranspiler {
         let ret = "\n";
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("static" /* Static */) === false
-                || identifier.getMeta().includes("read_only" /* ReadOnly */) === false) {
+            if (identifier.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === false
+                || identifier.getMeta().includes("read_only" /* abaplint.IdentifierMeta.ReadOnly */) === false) {
                 continue;
             }
             const interfaceName = node.getFirstToken().getStr().toLowerCase();

package/build/src/traversal.js

@@ -154,7 +154,7 @@ class Traversal {
         const found = scope.findScopeForVariable(name);
         const id = scope.findVariable(name);
         if (found && id
-            && id.getMeta().includes("static" /* Static */)
+            && id.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */)
             && found.stype === abaplint.ScopeType.ClassImplementation) {
             //      console.dir(found.sname);
             return found.sname.toLowerCase();
@@ -261,7 +261,7 @@ class Traversal {
         ret += "this.me = new abap.types.ABAPObject();\n";
         ret += "this.me.set(this);\n";
         for (const a of def.getAttributes().getAll()) {
-            if (a.getMeta().includes("static" /* Static */) === true) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const name = a.getName().toLowerCase();
@@ -305,7 +305,7 @@ class Traversal {
         let ret = "";
         const intf = this.findInterfaceDefinition(name, scope);
         for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
-            if (a.getMeta().includes("static" /* Static */) === true) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const n = name.toLowerCase() + "$" + a.getName().toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "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.90.6",
+    "@abaplint/core": "^2.90.9",
     "source-map": "^0.7.3"
   },
   "devDependencies": {
@@ -37,6 +37,6 @@
     "chai": "^4.3.6",
     "mocha": "^10.0.0",
     "source-map-support": "^0.5.21",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.2"
   }
 }