@abaplint/transpiler 2.5.12 → 2.5.14

package/build/src/expressions/field_chain.d.ts

@@ -6,5 +6,5 @@ export declare class FieldChainTranspiler implements IExpressionTranspiler {
     private readonly addGet;
     private addGetOffset;
     constructor(addGet?: boolean);
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal, prefix?: boolean, filename?: string): Chunk;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, prefix?: boolean, filename?: string, wrongScope?: boolean): Chunk;
 }

package/build/src/expressions/field_chain.js

@@ -10,7 +10,7 @@ class FieldChainTranspiler {
     constructor(addGet = false) {
         this.addGet = addGet;
     }
-    transpile(node, traversal, prefix = true, filename) {
+    transpile(node, traversal, prefix = true, filename, wrongScope = false) {
         const ret = new chunk_1.Chunk();
         const extra = [];
         for (const c of node.getChildren()) {
@@ -25,6 +25,9 @@ class FieldChainTranspiler {
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ClassName) {
                 const name = traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken());
                 ret.append(name + ".", c, traversal);
+                if (wrongScope === true && traversal.reg.getObject("INTF", c.getFirstToken().getStr())) {
+                    ret.append(traversal_1.Traversal.escapeNamespace(c.getFirstToken().getStr().toLocaleLowerCase()) + "$", c, traversal);
+                }
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());

package/build/src/statements/method_implementation.js

@@ -102,7 +102,7 @@ class MethodImplementationTranspiler {
                         }
                         else {
                             // note: this can be difficult, the "def" might be from an interface, ie. a different scope than the method
-                            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename()).getCode();
+                            val = new expressions_1.FieldChainTranspiler().transpile(parameterDefault, traversal, true, methodDef === null || methodDef === void 0 ? void 0 : methodDef.getFilename(), true).getCode();
                             if (val.startsWith(parameterDefault.getFirstToken().getStr().toLowerCase()) === true) {
                                 val = "this." + val;
                             }

package/build/src/traversal.js

@@ -506,14 +506,14 @@ class Traversal {
     traverseStructure(node) {
         const list = StructureTranspilers;
         const ret = new chunk_1.Chunk();
+        const search = node.get().constructor.name + "Transpiler";
+        if (list[search]) {
+            const transpiler = new list[search]();
+            ret.appendChunk(transpiler.transpile(node, this));
+            return ret;
+        }
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StructureNode) {
-                const search = c.get().constructor.name + "Transpiler";
-                if (list[search]) {
-                    const transpiler = new list[search]();
-                    ret.appendChunk(transpiler.transpile(c, this));
-                    continue;
-                }
                 ret.appendChunk(this.traverseStructure(c));
             }
             else if (c instanceof abaplint.Nodes.StatementNode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.5.12",
+  "version": "2.5.14",
   "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.95.28",
+    "@abaplint/core": "^2.95.29",
     "source-map": "^0.7.4"
   },
   "devDependencies": {