@abaplint/transpiler-cli 2.5.25 → 2.5.27

package/build/bundle.js

@@ -21633,29 +21633,81 @@ exports.Compare = Compare;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentChain = void 0;
+const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const void_type_1 = __webpack_require__(/*! ../../types/basic/void_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/void_type.js");
 const structure_type_1 = __webpack_require__(/*! ../../types/basic/structure_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/structure_type.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const types_1 = __webpack_require__(/*! ../../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
+const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 class ComponentChain {
-    runSyntax(context, node) {
-        if (context instanceof void_type_1.VoidType) {
-            return context;
-        }
-        const name = node.getFirstToken().getStr();
-        if (!(context instanceof structure_type_1.StructureType)) {
-            if (name.toUpperCase() === "TABLE_LINE") {
+    runSyntax(context, node, scope, filename) {
+        const children = node.getChildren();
+        for (let i = 0; i < children.length; i++) {
+            if (context instanceof void_type_1.VoidType || context instanceof basic_1.UnknownType) {
                 return context;
             }
-            throw new Error("ComponentChain, not a structure");
-        }
-        if (name.toUpperCase() === "TABLE_LINE") {
-            return context;
-        }
-        const ret = context.getComponentByName(name);
-        if (ret === undefined) {
-            throw new Error("Component \"" + name + "\" not found in structure");
+            const child = children[i];
+            if (i === 0 && child.concatTokens().toUpperCase() === "TABLE_LINE") {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.ArrowOrDash) {
+                const concat = child.concatTokens();
+                if (concat === "-") {
+                    if (!(context instanceof structure_type_1.StructureType)) {
+                        throw new Error("ComponentChain, not a structure");
+                    }
+                }
+                else if (concat === "=>") {
+                    if (!(context instanceof basic_1.ObjectReferenceType)) {
+                        throw new Error("ComponentChain, not a reference");
+                    }
+                }
+                else if (concat === "->") {
+                    if (!(context instanceof basic_1.ObjectReferenceType) && !(context instanceof basic_1.DataReference)) {
+                        throw new Error("ComponentChain, not a reference");
+                    }
+                }
+            }
+            else if (child.get() instanceof Expressions.ComponentName) {
+                const name = child.concatTokens();
+                if (context instanceof basic_1.DataReference) {
+                    context = context.getType();
+                    if (name === "*") {
+                        continue;
+                    }
+                }
+                if (context instanceof structure_type_1.StructureType) {
+                    context = context.getComponentByName(name);
+                    if (context === undefined) {
+                        throw new Error("Component \"" + name + "\" not found in structure");
+                    }
+                }
+                else if (context instanceof basic_1.ObjectReferenceType) {
+                    const id = context.getIdentifier();
+                    if (id instanceof types_1.InterfaceDefinition || id instanceof types_1.ClassDefinition) {
+                        const found = id.getAttributes().findByName(name);
+                        context = found === null || found === void 0 ? void 0 : found.getType();
+                        if (context === undefined) {
+                            throw new Error("Attribute \"" + name + "\" not found");
+                        }
+                        else {
+                            const extra = {
+                                ooName: id.getName(),
+                                ooType: id instanceof types_1.ClassDefinition ? "CLAS" : "INTF"
+                            };
+                            scope.addReference(child.getFirstToken(), found, _reference_1.ReferenceType.DataWriteReference, filename, extra);
+                        }
+                    }
+                    else {
+                        throw new Error("ComponentChain, unexpected type2");
+                    }
+                }
+                else {
+                    throw new Error("ComponentChain, not a structure");
+                }
+            }
         }
-        // todo, add more here
-        return ret;
+        return context;
     }
 }
 exports.ComponentChain = ComponentChain;
@@ -21729,7 +21781,7 @@ class ComponentCompareSimple {
         for (const c of node.getChildren()) {
             if (c instanceof nodes_1.ExpressionNode) {
                 if (c.get() instanceof Expressions.ComponentChainSimple) {
-                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c);
+                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c, scope, filename);
                 }
                 else if (c.get() instanceof Expressions.Dynamic) {
                     targetType = undefined;
@@ -24163,7 +24215,7 @@ class Source {
                 //        console.dir("dash");
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.ComponentChain) {
-                context = new component_chain_1.ComponentChain().runSyntax(context, first);
+                context = new component_chain_1.ComponentChain().runSyntax(context, first, scope, filename);
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.AttributeChain) {
                 context = new attribute_chain_1.AttributeChain().runSyntax(context, first, scope, filename, _reference_1.ReferenceType.DataReadReference);
@@ -46157,7 +46209,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.35";
+        return "2.95.36";
     }
     getDDICReferences() {
         return this.references;
@@ -67409,13 +67461,20 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentChainSimpleTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 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);
@@ -73538,10 +73597,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 {
@@ -74093,7 +74156,6 @@ exports.ReadReportTranspiler = ReadReportTranspiler;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ReadTableTranspiler = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
-const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@abaplint/transpiler/build/src/traversal.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
@@ -74146,19 +74208,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-cli",
-  "version": "2.5.25",
+  "version": "2.5.27",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.25",
+    "@abaplint/transpiler": "^2.5.27",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.35",
+    "@abaplint/core": "^2.95.36",
     "progress": "^2.0.3",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.0.1",