@abaplint/transpiler-cli 2.11.63 → 2.11.65

package/build/bundle.js

@@ -6813,7 +6813,7 @@ class Source extends combi_1.Expression {
         const old = (0, combi_1.seq)((0, combi_1.optPrio)(prefix), (0, combi_1.altPrio)(_1.Constant, _1.StringTemplate, text_element_1.TextElement, bool, method, (0, combi_1.seq)(_1.FieldChain, deref), paren), (0, combi_1.optPrio)(after));
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
-        const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const reff = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("REF", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, (0, combi_1.optPrio)("OPTIONAL"), rparen), version_1.Version.OpenABAP);
@@ -53851,7 +53851,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.191";
+        return "2.113.192";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -79368,8 +79368,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FieldAssignmentTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js");
 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) {
@@ -79379,7 +79381,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;
     }
 }
@@ -79728,6 +79734,7 @@ __exportStar(__webpack_require__(/*! ./attribute_chain */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./attribute_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/attribute_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_transformation_options */ "./node_modules/@abaplint/transpiler/build/src/expressions/call_transformation_options.js"), exports);
 __exportStar(__webpack_require__(/*! ./call_transformation_parameters */ "./node_modules/@abaplint/transpiler/build/src/expressions/call_transformation_parameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./cast */ "./node_modules/@abaplint/transpiler/build/src/expressions/cast.js"), exports);
 __exportStar(__webpack_require__(/*! ./compare_operator */ "./node_modules/@abaplint/transpiler/build/src/expressions/compare_operator.js"), exports);
 __exportStar(__webpack_require__(/*! ./compare */ "./node_modules/@abaplint/transpiler/build/src/expressions/compare.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_chain_simple */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_chain_simple.js"), exports);
@@ -79735,28 +79742,26 @@ __exportStar(__webpack_require__(/*! ./component_chain */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./component_compare */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_compare.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_cond_sub */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_cond_sub.js"), exports);
 __exportStar(__webpack_require__(/*! ./component_cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/component_cond.js"), exports);
+__exportStar(__webpack_require__(/*! ./cond_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./cond_sub */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_sub.js"), exports);
 __exportStar(__webpack_require__(/*! ./cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond.js"), exports);
 __exportStar(__webpack_require__(/*! ./constant */ "./node_modules/@abaplint/transpiler/build/src/expressions/constant.js"), exports);
-__exportStar(__webpack_require__(/*! ./cast */ "./node_modules/@abaplint/transpiler/build/src/expressions/cast.js"), exports);
 __exportStar(__webpack_require__(/*! ./database_table */ "./node_modules/@abaplint/transpiler/build/src/expressions/database_table.js"), exports);
 __exportStar(__webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./field_length */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_length.js"), exports);
 __exportStar(__webpack_require__(/*! ./field_offset */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_offset.js"), exports);
 __exportStar(__webpack_require__(/*! ./field_symbol */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_symbol.js"), exports);
 __exportStar(__webpack_require__(/*! ./function_exporting */ "./node_modules/@abaplint/transpiler/build/src/expressions/function_exporting.js"), exports);
-__exportStar(__webpack_require__(/*! ./table_expression */ "./node_modules/@abaplint/transpiler/build/src/expressions/table_expression.js"), exports);
 __exportStar(__webpack_require__(/*! ./function_parameters */ "./node_modules/@abaplint/transpiler/build/src/expressions/function_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./let */ "./node_modules/@abaplint/transpiler/build/src/expressions/let.js"), exports);
 __exportStar(__webpack_require__(/*! ./message_number */ "./node_modules/@abaplint/transpiler/build/src/expressions/message_number.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_chain.js"), exports);
-__exportStar(__webpack_require__(/*! ./cond_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_param */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_param.js"), exports);
-__exportStar(__webpack_require__(/*! ./new_object */ "./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_parameters */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_source.js"), exports);
+__exportStar(__webpack_require__(/*! ./new_object */ "./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./parameter_list_s */ "./node_modules/@abaplint/transpiler/build/src/expressions/parameter_list_s.js"), exports);
 __exportStar(__webpack_require__(/*! ./parameter_list_t */ "./node_modules/@abaplint/transpiler/build/src/expressions/parameter_list_t.js"), exports);
 __exportStar(__webpack_require__(/*! ./parameter_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/parameter_name.js"), exports);
@@ -79788,6 +79793,8 @@ __exportStar(__webpack_require__(/*! ./sql_source */ "./node_modules/@abaplint/t
 __exportStar(__webpack_require__(/*! ./sql_target */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_target.js"), exports);
 __exportStar(__webpack_require__(/*! ./string_template_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/string_template_source.js"), exports);
 __exportStar(__webpack_require__(/*! ./string_template */ "./node_modules/@abaplint/transpiler/build/src/expressions/string_template.js"), exports);
+__exportStar(__webpack_require__(/*! ./switch_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/switch_body.js"), exports);
+__exportStar(__webpack_require__(/*! ./table_expression */ "./node_modules/@abaplint/transpiler/build/src/expressions/table_expression.js"), exports);
 __exportStar(__webpack_require__(/*! ./target_field */ "./node_modules/@abaplint/transpiler/build/src/expressions/target_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./target */ "./node_modules/@abaplint/transpiler/build/src/expressions/target.js"), exports);
 __exportStar(__webpack_require__(/*! ./type_name_or_infer */ "./node_modules/@abaplint/transpiler/build/src/expressions/type_name_or_infer.js"), exports);
@@ -80715,6 +80722,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);
                 }
@@ -80770,6 +80780,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() !== "#") {
@@ -81628,7 +81649,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 + ")";
             }
@@ -81640,7 +81661,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()) {
@@ -81661,10 +81682,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 + "}";
@@ -81677,6 +81697,103 @@ exports.StringTemplateSourceTranspiler = StringTemplateSourceTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/switch_body.js":
+/*!********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/switch_body.js ***!
+  \********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SwitchBodyTranspiler = void 0;
+const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const type_name_or_infer_1 = __webpack_require__(/*! ./type_name_or_infer */ "./node_modules/@abaplint/transpiler/build/src/expressions/type_name_or_infer.js");
+const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js");
+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
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/table_expression.js":
 /*!*************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/table_expression.js ***!
@@ -81956,7 +82073,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);
                 }
@@ -87247,7 +87364,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-cli",
-  "version": "2.11.63",
+  "version": "2.11.65",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.191",
-    "@abaplint/transpiler": "^2.11.63",
+    "@abaplint/core": "^2.113.192",
+    "@abaplint/transpiler": "^2.11.65",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.3.0",
     "@types/progress": "^2.0.7",