@abaplint/transpiler-cli 2.11.45 → 2.11.47

package/build/bundle.js

@@ -6514,7 +6514,7 @@ class Select extends combi_1.Expression {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
         const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
         const bypass = (0, combi_1.str)("BYPASSING BUFFER");
-        const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields);
+        const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields, version_1.Version.OpenABAP);
         // todo, HINTS cannot be anywhere, need an expression dedicated for strict sql
         const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, _1.SQLClient, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
         const permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), where, _1.SQLClient, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
@@ -6815,7 +6815,7 @@ class Source extends combi_1.Expression {
         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 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)));
+        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);
         const exact = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("EXACT", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, rparen, (0, combi_1.optPrio)(after)));
         const filter = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("FILTER", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.FilterBody, rparen));
@@ -24851,7 +24851,7 @@ class FieldChain {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -27832,16 +27832,39 @@ exports.SwitchBody = SwitchBody;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TableExpression = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 class TableExpression {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, rowType) {
         if (node === undefined) {
             return;
         }
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
+        let context = rowType;
+        if (context instanceof basic_1.TableType) {
+            context = context.getRowType();
+        }
+        if (node.getChildren().length === 3) {
+            const s = node.findDirectExpression(Expressions.Source);
+            source_1.Source.runSyntax(s, input, context);
+        }
+        else if (node.findDirectTokenByText("INDEX")) {
+            const s = node.findDirectExpression(Expressions.Source);
             source_1.Source.runSyntax(s, input);
         }
+        else {
+            let fieldType = undefined;
+            for (const c of node.getChildren()) {
+                if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.ComponentChainSimple) {
+                    fieldType = component_chain_1.ComponentChain.runSyntax(context, c, input);
+                }
+                else if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.Source) {
+                    source_1.Source.runSyntax(c, input, fieldType);
+                }
+            }
+        }
     }
 }
 exports.TableExpression = TableExpression;
@@ -27959,7 +27982,7 @@ class Target {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -53822,7 +53845,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.183";
+        return "2.113.185";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -74840,7 +74863,9 @@ ENDFORM.`,
                 continue;
             }
             const prev = statements[i - 1];
-            if (prev && prev.get() instanceof Statements.Return) {
+            if (prev
+                && prev.get() instanceof Statements.Return
+                && prev.getChildren().length === 2) {
                 if (this.conf.allowEmpty === true && statementCounter === 2) {
                     continue;
                 }
@@ -74851,6 +74876,7 @@ ENDFORM.`,
             const prevprev = statements[i - 2];
             if (prev && prevprev
                 && prevprev.get() instanceof Statements.Return
+                && prevprev.getChildren().length === 2
                 && prev.get() instanceof Statements.EndIf) {
                 const fix = edit_helper_1.EditHelper.deleteStatement(file, prevprev);
                 issues.push(issue_1.Issue.atStatement(file, prevprev, message, this.getMetadata().key, this.getConfig().severity, fix));
@@ -78879,6 +78905,87 @@ exports.CondTranspiler = CondTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js":
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/cond_body.js ***!
+  \******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CondBodyTranspiler = 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 cond_1 = __webpack_require__(/*! ./cond */ "./node_modules/@abaplint/transpiler/build/src/expressions/cond.js");
+const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/transpiler/build/src/expressions/source.js");
+class CondBodyTranspiler {
+    transpile(typ, body, traversal) {
+        if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
+            throw new Error("CondBodyTranspiler, Expected TypeNameOrInfer");
+        }
+        else if (body.findDirectExpression(core_1.Expressions.Let)) {
+            throw new Error("CondBodyTranspiler, Let not supported, todo");
+        }
+        const whenThen = [];
+        const expressions = [];
+        for (const c of body.getChildren()) {
+            if (c instanceof core_1.Nodes.TokenNode) {
+                if (c.concatTokens() === "ELSE") {
+                    break;
+                }
+            }
+            else {
+                expressions.push(c);
+            }
+        }
+        for (let i = 0; i < expressions.length; i = i + 2) {
+            whenThen.push({ when: expressions[i], then: expressions[i + 1] });
+        }
+        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 { when, then } of whenThen) {
+            let condition = "";
+            if (when.get() instanceof core_1.Expressions.Cond) {
+                condition = new cond_1.CondTranspiler().transpile(when, traversal).getCode();
+            }
+            else {
+                throw new Error("CondBodyTranspiler, Expected Cond, todo, " + when.get().constructor.name);
+            }
+            let value = "";
+            if (then.get() instanceof core_1.Expressions.Source) {
+                value = new source_1.SourceTranspiler().transpile(then, traversal).getCode();
+            }
+            else {
+                throw new Error("CondBodyTranspiler, Expected Source, todo, " + then.get().constructor.name);
+            }
+            ret.appendString(`if (${condition}) { return ${value}; }\n`);
+        }
+        const els = body.findExpressionAfterToken("ELSE");
+        if (els) {
+            if (!(els.get() instanceof core_1.Expressions.Source)) {
+                throw new Error("CondBodyTranspiler, Expected Source, todo, " + els.get().constructor.name);
+            }
+            const value = new source_1.SourceTranspiler().transpile(els, traversal).getCode();
+            ret.appendString(`return ${value};\n`);
+        }
+        else {
+            ret.appendString(`return ${target};\n`);
+        }
+        ret.appendString("})()))");
+        return ret;
+    }
+}
+exports.CondBodyTranspiler = CondBodyTranspiler;
+//# sourceMappingURL=cond_body.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/cond_sub.js":
 /*!*****************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/cond_sub.js ***!
@@ -79540,6 +79647,7 @@ __exportStar(__webpack_require__(/*! ./let */ "./node_modules/@abaplint/transpil
 __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);
@@ -80495,6 +80603,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.CorrespondingBody) {
                     continue;
                 }
+                else if (c.get() instanceof core_1.Expressions.CondBody) {
+                    continue;
+                }
                 else {
                     ret.appendString("SourceUnknown$" + c.get().constructor.name);
                 }
@@ -80539,6 +80650,17 @@ class SourceTranspiler {
                 }
                 ret.appendChunk(new corresponding_body_1.CorrespondingBodyTranspiler().transpile(typ, correspondingBody, traversal));
             }
+            else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "COND") {
+                const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+                if (typ === undefined) {
+                    throw new Error("TypeNameOrInfer not found in CondBody");
+                }
+                const condBody = node.findDirectExpression(core_1.Expressions.CondBody);
+                if (condBody === undefined) {
+                    throw new Error("CondBody not found");
+                }
+                ret.appendChunk(new _1.CondBodyTranspiler().transpile(typ, condBody, 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() !== "#") {
@@ -102905,12 +103027,8 @@ function writeObjects(outputFiles, config, outputFolder, files) {
         fs.writeFileSync(outputFolder + path.sep + output.filename, contents);
     }
 }
-async function run() {
-    console.log("Transpiler CLI");
-    const config = config_1.TranspilerConfig.find(process.argv[2]);
+async function build(config, files) {
     const libFiles = await loadLib(config);
-    const files = await file_operations_1.FileOperations.loadFiles(config);
-    console.log("\nBuilding");
     const t = new Transpiler.Transpiler(config.options);
     const reg = new abaplint.Registry();
     for (const f of files) {
@@ -102921,6 +103039,14 @@ async function run() {
     }
     reg.parse();
     const output = await t.run(reg, new Progress());
+    return output;
+}
+async function run() {
+    console.log("Transpiler CLI");
+    const config = config_1.TranspilerConfig.find(process.argv[2]);
+    const files = await file_operations_1.FileOperations.loadFiles(config);
+    console.log("\nBuilding");
+    const output = await build(config, files);
     console.log("\nOutput");
     const outputFolder = config.output_folder;
     if (!fs.existsSync(outputFolder)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.45",
+  "version": "2.11.47",
   "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.183",
-    "@abaplint/transpiler": "^2.11.45",
+    "@abaplint/core": "^2.113.185",
+    "@abaplint/transpiler": "^2.11.47",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.3.0",
     "@types/progress": "^2.0.7",