@abaplint/transpiler 2.11.63 → 2.11.65

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

@@ -1,6 +1,6 @@
-import { Nodes } from "@abaplint/core";
+import { AbstractType, Nodes } from "@abaplint/core";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class FieldAssignmentTranspiler {
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, context?: AbstractType): Chunk;
 }

package/build/src/expressions/field_assignment.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldAssignmentTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const abaplint = require("@abaplint/core");
+const source_1 = require("./source");
 class FieldAssignmentTranspiler {
-    transpile(node, traversal) {
+    transpile(node, traversal, context) {
         const ret = new chunk_1.Chunk();
         const field = node.findDirectExpression(core_1.Expressions.FieldSub);
         if (field === undefined) {
@@ -14,7 +16,11 @@ class FieldAssignmentTranspiler {
         if (source === undefined) {
             throw new Error("FieldAssignmentTranspiler, Expected Source");
         }
-        ret.appendString(`.setField("${field.concatTokens().toLowerCase()}", ${traversal.traverse(source).getCode()})`);
+        if (context instanceof abaplint.BasicTypes.StructureType) {
+            context = context.getComponentByName(field.concatTokens());
+        }
+        const sourc = new source_1.SourceTranspiler().transpile(source, traversal, context).getCode();
+        ret.appendString(`.setField("${field.concatTokens().toLowerCase()}", ${sourc})`);
         return ret;
     }
 }

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

@@ -3,6 +3,7 @@ export * from "./attribute_chain";
 export * from "./attribute_name";
 export * from "./call_transformation_options";
 export * from "./call_transformation_parameters";
+export * from "./cast";
 export * from "./compare_operator";
 export * from "./compare";
 export * from "./component_chain_simple";
@@ -10,28 +11,26 @@ export * from "./component_chain";
 export * from "./component_compare";
 export * from "./component_cond_sub";
 export * from "./component_cond";
+export * from "./cond_body";
 export * from "./cond_sub";
 export * from "./cond";
 export * from "./constant";
-export * from "./cast";
 export * from "./database_table";
 export * from "./field_chain";
 export * from "./field_length";
 export * from "./field_offset";
 export * from "./field_symbol";
 export * from "./function_exporting";
-export * from "./table_expression";
 export * from "./function_parameters";
 export * from "./let";
 export * from "./message_number";
 export * from "./method_call_body";
 export * from "./method_call_chain";
-export * from "./cond_body";
 export * from "./method_call_param";
-export * from "./new_object";
 export * from "./method_call";
 export * from "./method_parameters";
 export * from "./method_source";
+export * from "./new_object";
 export * from "./parameter_list_s";
 export * from "./parameter_list_t";
 export * from "./parameter_name";
@@ -63,6 +62,8 @@ export * from "./sql_source";
 export * from "./sql_target";
 export * from "./string_template_source";
 export * from "./string_template";
+export * from "./switch_body";
+export * from "./table_expression";
 export * from "./target_field";
 export * from "./target";
 export * from "./type_name_or_infer";

package/build/src/expressions/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./attribute_chain"), exports);
 __exportStar(require("./attribute_name"), exports);
 __exportStar(require("./call_transformation_options"), exports);
 __exportStar(require("./call_transformation_parameters"), exports);
+__exportStar(require("./cast"), exports);
 __exportStar(require("./compare_operator"), exports);
 __exportStar(require("./compare"), exports);
 __exportStar(require("./component_chain_simple"), exports);
@@ -26,28 +27,26 @@ __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare"), exports);
 __exportStar(require("./component_cond_sub"), exports);
 __exportStar(require("./component_cond"), exports);
+__exportStar(require("./cond_body"), exports);
 __exportStar(require("./cond_sub"), exports);
 __exportStar(require("./cond"), exports);
 __exportStar(require("./constant"), exports);
-__exportStar(require("./cast"), exports);
 __exportStar(require("./database_table"), exports);
 __exportStar(require("./field_chain"), exports);
 __exportStar(require("./field_length"), exports);
 __exportStar(require("./field_offset"), exports);
 __exportStar(require("./field_symbol"), exports);
 __exportStar(require("./function_exporting"), exports);
-__exportStar(require("./table_expression"), exports);
 __exportStar(require("./function_parameters"), exports);
 __exportStar(require("./let"), exports);
 __exportStar(require("./message_number"), exports);
 __exportStar(require("./method_call_body"), exports);
 __exportStar(require("./method_call_chain"), exports);
-__exportStar(require("./cond_body"), exports);
 __exportStar(require("./method_call_param"), exports);
-__exportStar(require("./new_object"), exports);
 __exportStar(require("./method_call"), exports);
 __exportStar(require("./method_parameters"), exports);
 __exportStar(require("./method_source"), exports);
+__exportStar(require("./new_object"), exports);
 __exportStar(require("./parameter_list_s"), exports);
 __exportStar(require("./parameter_list_t"), exports);
 __exportStar(require("./parameter_name"), exports);
@@ -79,6 +78,8 @@ __exportStar(require("./sql_source"), exports);
 __exportStar(require("./sql_target"), exports);
 __exportStar(require("./string_template_source"), exports);
 __exportStar(require("./string_template"), exports);
+__exportStar(require("./switch_body"), exports);
+__exportStar(require("./table_expression"), exports);
 __exportStar(require("./target_field"), exports);
 __exportStar(require("./target"), exports);
 __exportStar(require("./type_name_or_infer"), exports);

package/build/src/expressions/source.js

@@ -96,6 +96,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.CondBody) {
                     continue;
                 }
+                else if (c.get() instanceof core_1.Expressions.SwitchBody) {
+                    continue;
+                }
                 else {
                     ret.appendString("SourceUnknown$" + c.get().constructor.name);
                 }
@@ -151,6 +154,17 @@ class SourceTranspiler {
                 }
                 ret.appendChunk(new _1.CondBodyTranspiler().transpile(typ, condBody, traversal));
             }
+            else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "SWITCH") {
+                const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+                if (typ === undefined) {
+                    throw new Error("TypeNameOrInfer not found in SwitchBody");
+                }
+                const switchBody = node.findDirectExpression(core_1.Expressions.SwitchBody);
+                if (switchBody === undefined) {
+                    throw new Error("SwitchBody not found");
+                }
+                ret.appendChunk(new _1.SwitchBodyTranspiler().transpile(typ, switchBody, traversal));
+            }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "REF") {
                 const infer = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
                 if (infer?.concatTokens() !== "#") {

package/build/src/expressions/string_template_source.js

@@ -12,7 +12,7 @@ class StringTemplateSourceTranspiler {
         let post = ")";
         const formatting = node.findDirectExpression(core_1.Expressions.StringTemplateFormatting);
         if (formatting) {
-            const options = this.build(formatting, traversal, context);
+            const options = this.build(formatting, traversal, context, node);
             if (options) {
                 post = "," + options + ")";
             }
@@ -24,7 +24,7 @@ class StringTemplateSourceTranspiler {
         ret += pre + new _1.SourceTranspiler().transpile(c, traversal).getCode() + post;
         return new chunk_1.Chunk(ret);
     }
-    build(node, traversal, context) {
+    build(node, traversal, context, _top) {
         let option = "";
         let count = 0;
         for (const c of node.getChildren()) {
@@ -45,10 +45,9 @@ class StringTemplateSourceTranspiler {
             }
         }
         if (option.startsWith(`"alpha":"in"`)) {
-            if (context === undefined) {
-                throw new Error("ALPHA = IN, context undefined");
+            if (context !== undefined) {
+                option += `, "alphaInContext": ` + transpile_types_1.TranspileTypes.toType(context);
             }
-            option += `, "alphaInContext": ` + transpile_types_1.TranspileTypes.toType(context);
         }
         if (option !== "") {
             return "{" + option + "}";

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

@@ -0,0 +1,6 @@
+import { Nodes } from "@abaplint/core";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class SwitchBodyTranspiler {
+    transpile(typ: Nodes.ExpressionNode, body: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/switch_body.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchBodyTranspiler = void 0;
+const core_1 = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const type_name_or_infer_1 = require("./type_name_or_infer");
+const transpile_types_1 = require("../transpile_types");
+const source_1 = require("./source");
+class SwitchBodyTranspiler {
+    transpile(typ, body, traversal) {
+        if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
+            throw new Error("SwitchBodyTranspiler, Expected TypeNameOrInfer");
+        }
+        else if (body.findDirectExpression(core_1.Expressions.Let)) {
+            throw new Error("SwitchBodyTranspiler, Let not supported, todo");
+        }
+        const source = traversal.traverse(body.findDirectExpression(core_1.Expressions.Source));
+        const whenThenOr = [];
+        const elseExpression = body.findExpressionAfterToken("ELSE");
+        {
+            let currentWhenThen = { whenOr: [], then: undefined };
+            let mode = "";
+            for (const c of body.getChildren()) {
+                if (c instanceof core_1.Nodes.TokenNode) {
+                    if (c.concatTokens() === "WHEN") {
+                        if (currentWhenThen.whenOr.length > 0) {
+                            whenThenOr.push(currentWhenThen);
+                        }
+                        currentWhenThen = { whenOr: [], then: undefined };
+                        mode = "WHEN";
+                    }
+                    else if (c.concatTokens() === "THEN") {
+                        mode = "THEN";
+                    }
+                }
+                else if (mode === "WHEN" && c instanceof core_1.Nodes.ExpressionNode) {
+                    currentWhenThen.whenOr.push(c);
+                }
+                else if (mode === "THEN" && c instanceof core_1.Nodes.ExpressionNode) {
+                    currentWhenThen.then = c;
+                }
+            }
+            if (currentWhenThen.whenOr.length > 0) {
+                whenThenOr.push(currentWhenThen);
+            }
+        }
+        const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typ, traversal);
+        const target = transpile_types_1.TranspileTypes.toType(type);
+        const ret = new chunk_1.Chunk();
+        ret.appendString("(" + target + ".set(");
+        ret.appendString("await (async () => {\n");
+        for (const wto of whenThenOr) {
+            let thenValue = "";
+            if (wto.then?.get() instanceof core_1.Expressions.Source) {
+                thenValue = new source_1.SourceTranspiler().transpile(wto.then, traversal).getCode();
+            }
+            else {
+                throw new Error("SwitchBodyTranspiler, Expected Source1, todo, " + wto.then?.get().constructor.name);
+            }
+            // todo, async await?
+            for (const thenOr of wto.whenOr) {
+                let condition = "";
+                if (thenOr.get() instanceof core_1.Expressions.Source) {
+                    condition = new source_1.SourceTranspiler().transpile(thenOr, traversal).getCode();
+                }
+                else {
+                    throw new Error("SwitchBodyTranspiler, Expected Source2, todo, " + thenOr.get().constructor.name);
+                }
+                ret.appendString(`if (abap.compare.eq(${source.getCode()}, ${condition})) { return ${thenValue}; }\n`);
+            }
+        }
+        if (elseExpression) {
+            if (!(elseExpression.get() instanceof core_1.Expressions.Source)) {
+                throw new Error("SwitchBodyTranspiler, Expected Source3, todo, " + elseExpression.get().constructor.name);
+            }
+            const value = new source_1.SourceTranspiler().transpile(elseExpression, traversal).getCode();
+            ret.appendString(`return ${value};\n`);
+        }
+        else {
+            ret.appendString(`return ${target};\n`);
+        }
+        ret.appendString("})()))");
+        return ret;
+    }
+}
+exports.SwitchBodyTranspiler = SwitchBodyTranspiler;
+//# sourceMappingURL=switch_body.js.map

package/build/src/expressions/value_body.js

@@ -26,7 +26,7 @@ class ValueBodyTranspiler {
         const hasLines = body.findDirectExpression(core_1.Expressions.ValueBodyLine) !== undefined;
         for (const child of body.getChildren()) {
             if (child.get() instanceof core_1.Expressions.FieldAssignment && child instanceof core_1.Nodes.ExpressionNode) {
-                const transpiled = new field_assignment_1.FieldAssignmentTranspiler().transpile(child, traversal).getCode();
+                const transpiled = new field_assignment_1.FieldAssignmentTranspiler().transpile(child, traversal, context).getCode();
                 if (hasLines === false) {
                     ret.appendString(transpiled);
                 }

package/build/src/statements/move.js

@@ -15,7 +15,8 @@ class MoveTranspiler {
         if (targetExpressions.length === 1
             && sourceExpression?.getChildren().length === 1
             && sourceExpression.findDirectExpression(abaplint.Expressions.StringTemplate)
-            && sourceExpression.concatTokens().toUpperCase().endsWith(" ALPHA = IN }|")) {
+            && sourceExpression.concatTokens().toUpperCase().endsWith(" ALPHA = IN }|")
+            && sourceExpression.concatTokens().toUpperCase().startsWith("|{")) {
             const target = targets[0].getCode();
             const tSource = traversal.traverse(sourceExpression.findFirstExpression(abaplint.Expressions.StringTemplateSource)?.findDirectExpression(abaplint.Expressions.Source));
             ret.appendString(target + `.set(abap.alphaIn(${tSource.getCode()}, ${target}, ${target}));`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.63",
+  "version": "2.11.65",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.189",
+    "@abaplint/core": "^2.113.192",
     "source-map": "^0.7.6"
   },
   "devDependencies": {