@abaplint/transpiler 2.5.25 → 2.5.27

package/build/src/expressions/component_chain_simple.js

@@ -3,13 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentChainSimpleTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const traversal_1 = require("../traversal");
 class ComponentChainSimpleTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             const type = c.get();
             if (type instanceof core_1.Expressions.ComponentName) {
-                ret.append(c.getFirstToken().getStr().toLowerCase(), c, traversal);
+                let field = c.getFirstToken().getStr().toLowerCase();
+                const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
+                if (interfaceName && field.startsWith(interfaceName) === false) {
+                    field = interfaceName + "$" + field;
+                }
+                field = traversal_1.Traversal.escapeNamespace(field).replace("~", "$");
+                ret.append(field, c, traversal);
             }
             else if (type instanceof core_1.Expressions.ArrowOrDash) {
                 ret.append(".get().", c, traversal);

package/build/src/statements/method_implementation.js

@@ -42,10 +42,14 @@ class MethodImplementationTranspiler {
                 }
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
                 const type = identifier.getType();
-                const charOne = type instanceof abaplint.BasicTypes.CharacterType && type.getLength() === 1;
+                // todo, type X is also generic in method definitions, the real fix will be in abaplint
+                const charGeneric = type instanceof abaplint.BasicTypes.CharacterType
+                    && type.getLength() === 1
+                    && type.getDDICName() === undefined
+                    && type.getQualifiedName() === undefined;
                 if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
                     && type.isGeneric() === false
-                    && charOne === false) {
+                    && charGeneric === false) {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
                 }
                 else {

package/build/src/statements/read_table.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReadTableTranspiler = void 0;
 const abaplint = require("@abaplint/core");
-const traversal_1 = require("../traversal");
 const expressions_1 = require("../expressions");
 const unique_identifier_1 = require("../unique_identifier");
 const chunk_1 = require("../chunk");
@@ -55,19 +54,15 @@ class ReadTableTranspiler {
                 const left = compare.getChildren()[i * 3];
                 const source = compare.getChildren()[(i * 3) + 2];
                 const s = traversal.traverse(source).getCode();
-                let field = left.concatTokens().toLowerCase();
-                while (field.includes("->")) {
-                    field = field.replace("->", ".get().");
-                }
-                while (field.includes("-")) {
-                    field = field.replace("-", ".get().");
-                }
-                field = traversal_1.Traversal.escapeNamespace(field).replace("~", "$");
+                let field = "";
                 if (left.get() instanceof abaplint.Expressions.Dynamic
                     && left instanceof abaplint.Nodes.ExpressionNode) {
                     const concat = left.concatTokens().toLowerCase();
                     field = concat.substring(2, concat.length - 2);
                 }
+                else {
+                    field = traversal.traverse(left).getCode();
+                }
                 if (s.includes("await")) {
                     const id = unique_identifier_1.UniqueIdentifier.get();
                     prefix += "const " + id + " = " + s + ";\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.5.25",
+  "version": "2.5.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.95.35",
+    "@abaplint/core": "^2.95.36",
     "source-map": "^0.7.4"
   },
   "devDependencies": {