@abaplint/transpiler-cli 2.6.42 → 2.6.43

package/build/bundle.js

@@ -21625,7 +21625,23 @@ class BasicTypes {
         }
         const constant = val.findFirstExpression(Expressions.Constant);
         if (constant) {
-            return constant.concatTokens();
+            const conc = val.findFirstExpression(Expressions.ConcatenatedConstant);
+            if (conc) {
+                const first = conc.getFirstToken().getStr().substring(0, 1);
+                let result = "";
+                for (const token of conc.getAllTokens()) {
+                    if (token.getStr() === "&") {
+                        continue;
+                    }
+                    else {
+                        result += token.getStr().substring(1, token.getStr().length - 1);
+                    }
+                }
+                return first + result + first;
+            }
+            else {
+                return constant.concatTokens();
+            }
         }
         const chain = val.findFirstExpression(Expressions.SimpleFieldChain);
         if (chain) {
@@ -46629,7 +46645,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.99.6";
+        return "2.99.7";
     }
     getDDICReferences() {
         return this.references;
@@ -63954,7 +63970,7 @@ https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abenopensql_strict_mo
 Also see separate rule sql_escape_host_variables
 
 Activates from v750 and up`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix],
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Quickfix],
         };
     }
     getConfig() {
@@ -68700,14 +68716,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);
             }
         }
@@ -68728,7 +68744,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);
                 }
             }
@@ -68744,10 +68760,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);
@@ -72900,7 +72916,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)
@@ -72918,7 +72940,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) {
@@ -77560,7 +77582,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;
             }
@@ -78593,7 +78615,7 @@ class Traversal {
         let ret = "";
         const handle = (val, name) => {
             if (typeof val === "string") {
-                const e = new expressions_1.ConstantTranspiler().escape(val);
+                const e = expressions_1.ConstantTranspiler.escape(val);
                 ret += name + ".set(" + e + ");\n";
             }
             else if (typeof val === "object") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.6.42",
+  "version": "2.6.43",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,15 +25,15 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.42",
+    "@abaplint/transpiler": "^2.6.43",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.0.0",
-    "@abaplint/core": "^2.99.6",
+    "@types/node": "^20.1.0",
+    "@abaplint/core": "^2.99.7",
     "progress": "^2.0.3",
     "webpack": "^5.82.0",
-    "webpack-cli": "^5.0.2",
+    "webpack-cli": "^5.1.0",
     "typescript": "^5.0.4"
   }
 }