@abaplint/transpiler 2.1.75 → 2.1.77

package/build/src/expressions/method_call.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodCallTranspiler = void 0;
 const core_1 = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const method_call_param_1 = require("./method_call_param");
 const chunk_1 = require("../chunk");
 class MethodCallTranspiler {
@@ -27,7 +28,7 @@ class MethodCallTranspiler {
             throw new Error("MethodCallTranspiler, unexpected node");
         }
         const ret = new chunk_1.Chunk();
-        ret.append(name.replace("~", "$"), nameToken, traversal);
+        ret.append(traversal_1.Traversal.escapeClassName(name.replace("~", "$")), nameToken, traversal);
         ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(m === null || m === void 0 ? void 0 : m.def).transpile(step, traversal));
         ret.appendString(")");
         return ret;

package/build/src/expressions/method_call_chain.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodCallChainTranspiler = void 0;
 const core_1 = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
 class MethodCallChainTranspiler {
     transpile(node, traversal) {
@@ -29,7 +30,7 @@ class MethodCallChainTranspiler {
                 ret = new chunk_1.Chunk().append(traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken()), c, traversal);
             }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.MethodName) {
-                const name = c.getFirstToken().getStr().toLowerCase().replace("~", "$");
+                const name = traversal_1.Traversal.escapeClassName(c.getFirstToken().getStr().toLowerCase().replace("~", "$"));
                 ret.append(name, c, traversal);
             }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr() === "->") {

package/build/src/expressions/method_source.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodSourceTranspiler = void 0;
 /* eslint-disable max-len */
 const core_1 = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
 const _1 = require(".");
 class MethodSourceTranspiler {
@@ -64,7 +65,7 @@ class MethodSourceTranspiler {
                 if (i === 0) {
                     this.prepend += "this.";
                 }
-                const methodName = child.concatTokens().toLowerCase().replace("~", "$");
+                const methodName = traversal_1.Traversal.escapeClassName(child.concatTokens().toLowerCase().replace("~", "$"));
                 call += methodName;
             }
             else if (child.concatTokens() === "=>") {

package/build/src/statements/method_implementation.js

@@ -90,11 +90,11 @@ class MethodImplementationTranspiler {
         if (method && method.isStatic()) {
             // in ABAP static methods can be called with instance arrows, "->"
             const className = (_b = (_a = scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().sname) === null || _b === void 0 ? void 0 : _b.toLowerCase();
-            staticMethod = "async " + methodName + "(" + unique + ") {\n" +
-                "return " + traversal_1.Traversal.escapeClassName(className) + "." + methodName + "(" + unique + ");\n" +
+            staticMethod = "async " + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ") {\n" +
+                "return " + traversal_1.Traversal.escapeClassName(className) + "." + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ");\n" +
                 "}\n" + "static ";
         }
-        const str = staticMethod + "async " + methodName + "(" + unique + ") {" + after;
+        const str = staticMethod + "async " + traversal_1.Traversal.escapeClassName(methodName) + "(" + unique + ") {" + after;
         return new chunk_1.Chunk().append(str, node, traversal);
     }
     findMethod(name, cdef, traversal) {

package/build/src/statements/move.js

@@ -7,21 +7,26 @@ class MoveTranspiler {
     transpile(node, traversal) {
         var _a;
         const source = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Source));
-        const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target));
+        const targets = [];
+        for (const t of node.findDirectExpressions(abaplint.Expressions.Target)) {
+            targets.push(traversal.traverse(t));
+        }
         const ret = new chunk_1.Chunk();
         const second = (_a = node.getChildren()[1]) === null || _a === void 0 ? void 0 : _a.concatTokens();
         if (second === "?=") {
             ret.appendString("await abap.statements.cast(")
-                .appendChunk(target)
+                .appendChunk(targets[0])
                 .appendString(", ")
                 .appendChunk(source)
                 .append(");", node.getLastToken(), traversal);
         }
         else {
-            ret.appendChunk(target)
-                .appendString(".set(")
-                .appendChunk(source)
-                .append(");", node.getLastToken(), traversal);
+            for (const target of targets) {
+                ret.appendChunk(target)
+                    .appendString(".set(")
+                    .appendChunk(source)
+                    .append(");", node.getLastToken(), traversal);
+            }
         }
         return ret;
     }

package/build/src/traversal.js

@@ -140,7 +140,7 @@ class Traversal {
             return name;
         }
         else if (this.isClassAttribute(t)) {
-            name = "this." + name;
+            name = "this." + Traversal.escapeClassName(name);
         }
         else if (this.isBuiltinVariable(t)) {
             name = "abap.builtin." + name;
@@ -306,7 +306,7 @@ class Traversal {
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
-            const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
+            const n = Traversal.escapeClassName(name.toLowerCase()) + "$" + a.getName().toLowerCase();
             ret += "this." + n + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
         }
         for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {

package/build/src/validation.js

@@ -38,7 +38,7 @@ exports.config = {
         "ambiguous_statement": true,
         "implement_methods": true,
         "begin_end_names": true,
-        "no_chained_assignment": true,
+        //    "no_chained_assignment": true,
         "check_syntax": true,
         "form_no_dash": true,
         "omit_preceding_zeros": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.1.75",
+  "version": "2.1.77",
   "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.93.28",
+    "@abaplint/core": "^2.93.29",
     "source-map": "^0.7.4"
   },
   "devDependencies": {