@abaplint/transpiler 2.6.41 → 2.6.43

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

@@ -7,5 +7,5 @@ export declare class ConstantTranspiler implements IExpressionTranspiler {
     constructor(addGet?: boolean);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
     private character;
-    escape(str: string): string;
+    static escape(str: string): string;
 }

package/build/src/expressions/constant.js

@@ -28,14 +28,14 @@ class ConstantTranspiler {
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
             else if (res.startsWith("`") && this.addGet === false) {
-                const code = "new abap.types.String().set(" + this.escape(res) + ")";
+                const code = "new abap.types.String().set(" + ConstantTranspiler.escape(res) + ")";
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
             else {
                 if (res.startsWith("'")) {
                     res = "'" + res.substring(1, res.length - 1).trimEnd() + "'";
                 }
-                const code = this.escape(res);
+                const code = ConstantTranspiler.escape(res);
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
         }
@@ -56,7 +56,7 @@ class ConstantTranspiler {
                     chunk.append(code, node, traversal);
                 }
                 else if (res.startsWith("`") && this.addGet === false) {
-                    const code = "new abap.types.String().set(" + this.escape(res) + ")";
+                    const code = "new abap.types.String().set(" + ConstantTranspiler.escape(res) + ")";
                     chunk.append(code, node, traversal);
                 }
             }
@@ -72,10 +72,10 @@ class ConstantTranspiler {
             // note: Characters cannot have length = zero, 1 is minimum
             length = 1;
         }
-        const code = "new abap.types.Character(" + length + ").set(" + this.escape(res) + ")";
+        const code = "new abap.types.Character(" + length + ").set(" + ConstantTranspiler.escape(res) + ")";
         return code;
     }
-    escape(str) {
+    static escape(str) {
         str = str.replace(/\\/g, "\\\\");
         if (str.startsWith("'")) {
             const reg = new RegExp(/(.+)''(.+)/g);

package/build/src/statements/data.js

@@ -21,7 +21,13 @@ class DataTranspiler {
         if (found === undefined) {
             throw new Error("DataTranspiler, var not found, \"" + token.getStr() + "\"");
         }
-        const value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        let value = "";
+        if (found.getValue() !== undefined && node.concatTokens().includes(" & ")) {
+            value = "\n" + traversal.setValues(found, found.getName());
+        }
+        else {
+            value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        }
         const ret = new chunk_1.Chunk()
             .appendString("let ")
             .append(found.getName().toLowerCase(), token, traversal)
@@ -39,7 +45,7 @@ class DataTranspiler {
                 int = val.findFirstExpression(abaplint.Expressions.ConstantString);
             }
             if (int) {
-                const escaped = new constant_1.ConstantTranspiler().escape(int.concatTokens());
+                const escaped = constant_1.ConstantTranspiler.escape(int.concatTokens());
                 value = "\n" + name + ".set(" + escaped + ");";
             }
             else if (val.getChildren()[1].get() instanceof abaplint.Expressions.SimpleFieldChain) {

package/build/src/structures/interface.js

@@ -64,7 +64,7 @@ class InterfaceTranspiler {
             const valExpression = constantStatement === null || constantStatement === void 0 ? void 0 : constantStatement.findFirstExpression(abaplint.Expressions.Value);
             if ((valExpression === null || valExpression === void 0 ? void 0 : valExpression.getChildren()[1].get()) instanceof abaplint.Expressions.SimpleFieldChain) {
                 const s = new expressions_1.FieldChainTranspiler().transpile(valExpression.getChildren()[1], traversal, false).getCode();
-                const e = new expressions_1.ConstantTranspiler().escape(s);
+                const e = expressions_1.ConstantTranspiler.escape(s);
                 ret += name + ".set(" + e + ");\n";
                 continue;
             }

package/build/src/traversal.js

@@ -501,21 +501,23 @@ class Traversal {
     static setValues(identifier, name) {
         const val = identifier.getValue();
         let ret = "";
-        if (typeof val === "string") {
-            const e = new expressions_1.ConstantTranspiler().escape(val);
-            ret += name + ".set(" + e + ");\n";
-        }
-        else if (typeof val === "object") {
-            const a = val;
-            for (const v of Object.keys(val)) {
-                let s = a[v];
-                if (s === undefined) {
-                    continue;
+        const handle = (val, name) => {
+            if (typeof val === "string") {
+                const e = expressions_1.ConstantTranspiler.escape(val);
+                ret += name + ".set(" + e + ");\n";
+            }
+            else if (typeof val === "object") {
+                const a = val;
+                for (const v of Object.keys(val)) {
+                    const s = a[v];
+                    if (s === undefined) {
+                        continue;
+                    }
+                    handle(s, name + ".get()." + v);
                 }
-                s = new expressions_1.ConstantTranspiler().escape(s);
-                ret += name + ".get()." + v + ".set(" + s + ");\n";
             }
-        }
+        };
+        handle(val, name);
         return ret;
     }
     buildInternalName(name, def) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.41",
+  "version": "2.6.43",
   "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.99.4",
+    "@abaplint/core": "^2.99.7",
     "source-map": "^0.7.4"
   },
   "devDependencies": {