@abaplint/transpiler 2.13.74 → 2.13.76

package/build/src/expressions/component_chain.js

@@ -9,7 +9,8 @@ class ComponentChainTranspiler {
         const ret = new chunk_1.Chunk();
         for (const n of node.getChildren()) {
             if (n.get() instanceof core_1.Expressions.ComponentName) {
-                ret.append(n.concatTokens().toLowerCase(), n, traversal);
+                const name = n.concatTokens().toLowerCase();
+                ret.append(traversal_1.Traversal.isBracketComponent(name) ? `["${name}"]` : name, n, traversal);
             }
             else if (n.concatTokens() === "-") {
                 ret.append(".get().", n, traversal);

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

@@ -106,7 +106,7 @@ class FieldChainTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
                 const name = c.getFirstToken().getStr().toLowerCase();
-                if (name.match(/^\d/) || name.includes("/")) {
+                if (traversal_1.Traversal.isBracketComponent(name)) {
                     ret.append(`["` + name + `"]`, c, traversal);
                 }
                 else {

package/build/src/expressions/target.js

@@ -71,7 +71,7 @@ class TargetTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.ComponentName) {
                 const name = c.getFirstToken().getStr().toLowerCase();
-                if (name.match(/^\d/) || name.includes("/")) {
+                if (traversal_1.Traversal.isBracketComponent(name)) {
                     ret.append(`["` + name + `"]`, c, traversal);
                 }
                 else {

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

@@ -19,6 +19,7 @@ export declare class Traversal {
     /** the self reference "me", it is a FieldChain in eg. MethodCallChain and a SourceField in eg. MethodSource */
     static isMe(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.TokenNode | abaplint.Nodes.StructureNode): boolean;
     static prefixVariable(name: string | undefined): string;
+    static isBracketComponent(name: string): boolean;
     getCurrentObject(): abaplint.ABAPObject;
     traverse(node: abaplint.INode | undefined): Chunk;
     getFilename(): string;

package/build/src/traversal.js

@@ -111,6 +111,9 @@ class Traversal {
         }
         return name + "";
     }
+    static isBracketComponent(name) {
+        return name.match(/^\d/) !== null || name.includes("/") || name.startsWith("%");
+    }
     getCurrentObject() {
         return this.obj;
     }

package/package.json

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