@abaplint/transpiler 2.13.75 → 2.13.77

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

@@ -3,7 +3,7 @@ import { Chunk } from "../chunk";
 import { Traversal } from "../traversal";
 import { IExpressionTranspiler } from "./_expression_transpiler";
 export declare class ComponentChainSimpleTranspiler implements IExpressionTranspiler {
-    private prefix;
+    private readonly prefix;
     constructor(prefix?: string);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/component_chain_simple.js

@@ -14,6 +14,7 @@ class ComponentChainSimpleTranspiler {
     transpile(node, traversal) {
         const offset = [];
         let ret = new chunk_1.Chunk();
+        let prefix = this.prefix;
         for (const c of node.getChildren()) {
             const type = c.get();
             if (type instanceof core_1.Expressions.ComponentName) {
@@ -23,11 +24,17 @@ class ComponentChainSimpleTranspiler {
                     field = interfaceName + "$" + field;
                 }
                 field = traversal_1.Traversal.escapeNamespace(field).replace("~", "$");
-                ret.append(this.prefix + field, c, traversal);
-                this.prefix = "";
+                if (traversal_1.Traversal.isBracketComponent(field)) {
+                    ret.append(prefix.replace(/\.$/, "") + `["${field}"]`, c, traversal);
+                }
+                else {
+                    ret.append(prefix + field, c, traversal);
+                }
+                prefix = "";
             }
             else if (type instanceof core_1.Expressions.ArrowOrDash) {
-                ret.append(".get().", c, traversal);
+                ret.append(".get()", c, traversal);
+                prefix = ".";
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.FieldOffset) {
                 offset.push("offset: " + new field_offset_1.FieldOffsetTranspiler().transpile(c, traversal).getCode());

package/build/src/expressions/field_chain.js

@@ -73,8 +73,10 @@ class FieldChainTranspiler {
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const interfaceName = traversal.isInterfaceAttribute(c.getFirstToken());
                 let name = c.getFirstToken().getStr().toLowerCase();
-                if (context instanceof abaplint.BasicTypes.ObjectReferenceType) {
-                    const cdef = traversal.findClassDefinition(context.getIdentifierName(), scope);
+                const attributeContext = context;
+                context = traversal.narrowContextAttribute(context, c.getFirstToken().getStr(), scope);
+                if (attributeContext instanceof abaplint.BasicTypes.ObjectReferenceType) {
+                    const cdef = traversal.findClassDefinition(attributeContext.getIdentifierName(), scope);
                     const tokenName = c.getFirstToken().getStr();
                     const attr = cdef?.getAttributes().findByName(tokenName);
                     // Do not mark constants as private JS fields. Constants are exposed on instances via constructor copying.
@@ -106,6 +108,7 @@ class FieldChainTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
                 const name = c.getFirstToken().getStr().toLowerCase();
+                context = traversal_1.Traversal.narrowContextComponent(context, c.getFirstToken().getStr());
                 if (traversal_1.Traversal.isBracketComponent(name)) {
                     ret.append(`["` + name + `"]`, c, traversal);
                 }
@@ -135,6 +138,9 @@ class FieldChainTranspiler {
             }
             else if (c instanceof core_1.Nodes.ExpressionNode
                 && c.get() instanceof core_1.Expressions.TableExpression) {
+                if (context instanceof abaplint.BasicTypes.TableType) {
+                    context = context.getRowType();
+                }
                 ret = new _1.TableExpressionTranspiler().transpile(c, traversal, ret);
             }
         }

package/build/src/expressions/target.js

@@ -55,6 +55,9 @@ class TargetTranspiler {
                 context = scope?.findVariable(c.getFirstToken().getStr())?.getType();
             }
             else if (c.get() instanceof core_1.Expressions.TableExpression && c instanceof core_1.Nodes.ExpressionNode) {
+                if (context instanceof abaplint.BasicTypes.TableType) {
+                    context = context.getRowType();
+                }
                 ret = new _1.TableExpressionTranspiler().transpile(c, traversal, ret);
             }
             else if (c.get() instanceof core_1.Expressions.InlineData && c instanceof core_1.Nodes.ExpressionNode) {
@@ -71,6 +74,7 @@ class TargetTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
                 const name = c.getFirstToken().getStr().toLowerCase();
+                context = traversal_1.Traversal.narrowContextComponent(context, c.getFirstToken().getStr());
                 if (traversal_1.Traversal.isBracketComponent(name)) {
                     ret.append(`["` + name + `"]`, c, traversal);
                 }
@@ -81,8 +85,10 @@ class TargetTranspiler {
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 let prefix = "";
                 let postfix = "";
-                if (context instanceof abaplint.BasicTypes.ObjectReferenceType) {
-                    const cdef = traversal.findClassDefinition(context.getIdentifierName(), scope);
+                const attributeContext = context;
+                context = traversal.narrowContextAttribute(context, c.getFirstToken().getStr(), scope);
+                if (attributeContext instanceof abaplint.BasicTypes.ObjectReferenceType) {
+                    const cdef = traversal.findClassDefinition(attributeContext.getIdentifierName(), scope);
                     const attr = cdef?.getAttributes().findByName(c.getFirstToken().getStr());
                     if (attr?.getVisibility() === abaplint.Visibility.Private) {
                         const id = scope?.getParent()?.getParent()?.getIdentifier();

package/build/src/statements/read_table.js

@@ -97,10 +97,11 @@ class ReadTableTranspiler {
                 const source = compare.getChildren()[(i * 3) + 2];
                 const s = traversal.traverse(source).getCode();
                 let field = "";
+                let key = left.concatTokens().toLowerCase();
                 if (left.get() instanceof abaplint.Expressions.Dynamic
                     && left instanceof abaplint.Nodes.ExpressionNode) {
-                    const concat = left.concatTokens().toLowerCase();
-                    field = "i." + concat.substring(2, concat.length - 2);
+                    key = key.substring(2, key.length - 2);
+                    field = "i." + key;
                 }
                 else if (left.get() instanceof abaplint.Expressions.ComponentChainSimple
                     && left instanceof abaplint.Nodes.ExpressionNode) {
@@ -117,12 +118,12 @@ class ReadTableTranspiler {
                     prefix += "const " + id + " = " + s + ";\n";
                     withKey.push("abap.compare.eq(" + field + ", " + id + ")");
                     withKeyValue.push(`{key: (i) => {return ${field}}, value: ${id}}`);
-                    withKeySimple.push(`"${field.replace("i.", "").replace(/\$/g, "/")}": ${id}`);
+                    withKeySimple.push(`${JSON.stringify(key)}: ${id}`);
                 }
                 else {
                     withKey.push("abap.compare.eq(" + field + ", " + s + ")");
                     withKeyValue.push(`{key: (i) => {return ${field}}, value: ${s}}`);
-                    withKeySimple.push(`"${field.replace("i.", "").replace(/\$/g, "/")}": ${s}`);
+                    withKeySimple.push(`${JSON.stringify(key)}: ${s}`);
                 }
             }
             extra.push("withKey: (i) => {return " + withKey.join(" && ") + ";}");

package/build/src/traversal.d.ts

@@ -71,6 +71,9 @@ export declare class Traversal {
     constructorPrototypePrefix(token: abaplint.Token, def: abaplint.Types.MethodDefinition | undefined, enclosingClass?: string): string | undefined;
     private isBuiltinVariable;
     isTypePool(token: abaplint.Token): string | undefined;
+    static narrowContextComponent(context: abaplint.AbstractType | undefined, name: string): abaplint.AbstractType | undefined;
+    narrowContextAttribute(context: abaplint.AbstractType | undefined, name: string, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
+    private static dereferenceContext;
     isInterfaceAttribute(token: abaplint.Token): string | undefined;
     findReadOrWriteReference(token: abaplint.Token): abaplint.Identifier | undefined;
     private findInferredTypeReference;

package/build/src/traversal.js

@@ -517,6 +517,45 @@ class Traversal {
         }
         return undefined;
     }
+    // narrows the current type context of a chain, ie. "ls_struct-comp" or "lt_tab[ 1 ]-comp"
+    static narrowContextComponent(context, name) {
+        const structure = Traversal.dereferenceContext(context);
+        if (structure instanceof abaplint.BasicTypes.StructureType) {
+            return structure.getComponentByName(name);
+        }
+        return undefined;
+    }
+    // narrows the current type context of a chain, ie. "lo_ref->attr"
+    narrowContextAttribute(context, name, scope) {
+        if (context instanceof abaplint.BasicTypes.ObjectReferenceType === false) {
+            return undefined;
+        }
+        let identifierName = context.getIdentifierName();
+        const visited = new Set();
+        while (identifierName !== undefined && visited.has(identifierName.toUpperCase()) === false) {
+            visited.add(identifierName.toUpperCase());
+            const def = this.findClassDefinition(identifierName, scope) || this.findInterfaceDefinition(identifierName, scope);
+            if (def === undefined) {
+                return undefined;
+            }
+            const type = def.getAttributes().findByName(name)?.getType();
+            if (type !== undefined) {
+                return type;
+            }
+            identifierName = def.getSuperClass();
+        }
+        return undefined;
+    }
+    static dereferenceContext(context) {
+        let ret = context;
+        if (ret instanceof abaplint.BasicTypes.TableType) {
+            ret = ret.getRowType();
+        }
+        if (ret instanceof abaplint.BasicTypes.DataReference) {
+            ret = ret.getType();
+        }
+        return ret;
+    }
     // returns the interface name if interfaced
     isInterfaceAttribute(token) {
         const ref = this.findReadOrWriteReference(token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.75",
+  "version": "2.13.77",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",