@abaplint/transpiler-cli 2.11.74 → 2.11.76

package/build/bundle.js

@@ -6846,7 +6846,7 @@ class Source extends combi_1.Expression {
         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), version_1.Version.OpenABAP);
-        const reduce = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("REDUCE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ReduceBody, rparen, (0, combi_1.optPrio)(after)));
+        const reduce = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("REDUCE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ReduceBody, rparen, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const prefix1 = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WDashW), (0, combi_1.tok)(tokens_1.WPlusW));
         const ret = (0, combi_1.seq)((0, combi_1.starPrio)(prefix1), (0, combi_1.altPrio)(filter, reff, corr, conv, value, cond, exact, swit, reduce, old));
         return ret;
@@ -7235,7 +7235,7 @@ const sql_function_1 = __webpack_require__(/*! ./sql_function */ "./node_modules
 const sql_path_1 = __webpack_require__(/*! ./sql_path */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_path.js");
 class SQLField extends combi_1.Expression {
     getRunnable() {
-        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2));
+        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant);
         const sub = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW))));
@@ -7651,9 +7651,10 @@ class SQLIn extends combi_1.Expression {
     getRunnable() {
         const val = new _1.SQLSource();
         const short = new _1.SQLSourceNoSpace();
-        const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, short), val), (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, short, version_1.Version.OpenABAP), val), (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", (0, combi_1.altPrio)(short, val))), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew)); // version is a guess, https://github.com/abaplint/abaplint/issues/2530
+        // version is a guess, https://github.com/abaplint/abaplint/issues/2530
+        const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew, version_1.Version.OpenABAP));
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
         const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
         return inn;
@@ -53885,7 +53886,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.196";
+        return "2.113.198";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -80641,6 +80642,87 @@ exports.ReceiveParametersTranspiler = ReceiveParametersTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/reduce_body.js":
+/*!********************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/reduce_body.js ***!
+  \********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ReduceBodyTranspiler = 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 transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const target_1 = __webpack_require__(/*! ./target */ "./node_modules/@abaplint/transpiler/build/src/expressions/target.js");
+class ReduceBodyTranspiler {
+    transpile(typ, body, traversal) {
+        if (!(typ.get() instanceof core_1.Expressions.TypeNameOrInfer)) {
+            throw new Error("ReduceBodyTranspiler, Expected TypeNameOrInfer");
+        }
+        else if (body.findDirectExpression(core_1.Expressions.Let) !== undefined) {
+            return new chunk_1.Chunk(`(() => { throw new Error("ReduceBodyTranspiler LET, not supported, transpiler"); })()`);
+        }
+        const forExpressions = body.findDirectExpressions(core_1.Expressions.For);
+        const forExpression = forExpressions[0];
+        if (forExpressions.length === 0) {
+            throw new Error("ReduceBodyTranspiler, expected FOR");
+        }
+        else if (forExpressions.length > 1) {
+            throw new Error("ReduceBodyTranspiler, multiple FOR not supported, " + body.concatTokens());
+        }
+        else if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "GROUPS"].some(token => forExpressions[0].findDirectTokenByText(token))) {
+            throw new Error("ValueBody FOR todo, " + body.concatTokens());
+        }
+        const loopExpression = forExpression.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
+        const loopSource = traversal.traverse(loopExpression?.findDirectExpression(core_1.Expressions.Source)).getCode();
+        const loopVariable = traversal.traverse(loopExpression?.findDirectExpression(core_1.Expressions.TargetField)).getCode();
+        //    const type = new TypeNameOrInfer().findType(typ, traversal);
+        //    const target = TranspileTypes.toType(type);
+        const ret = new chunk_1.Chunk();
+        ret.appendString("(await (async () => {\n");
+        let loopWhere = "";
+        const whereNode = forExpression?.findDirectExpression(core_1.Expressions.ComponentCond);
+        if (whereNode) {
+            const where = traversal.traverse(whereNode).getCode();
+            loopWhere = `, {"where": async ` + where + `}`;
+        }
+        /*
+        const returnId = UniqueIdentifier.get();
+        ret.appendString(`const ${returnId} = ${target};\n`);
+        */
+        let returnField = "";
+        for (const init of body.findDirectExpressions(core_1.Expressions.InlineFieldDefinition)) {
+            const fieldName = init.findDirectExpression(core_1.Expressions.Field).concatTokens().toLowerCase();
+            returnField = fieldName;
+            const scope = traversal.findCurrentScopeByToken(init.getFirstToken());
+            const variable = scope?.findVariable(fieldName);
+            if (variable === undefined) {
+                throw new Error(`ReduceBodyTranspiler: variable ${fieldName} not found`);
+            }
+            ret.appendString(transpile_types_1.TranspileTypes.declare(variable) + `\n`);
+        }
+        ret.appendString(`for await (const ${loopVariable} of abap.statements.loop(${loopSource}${loopWhere})) {\n`);
+        for (const nextChild of body.findDirectExpression(core_1.Expressions.ReduceNext)?.getChildren() || []) {
+            if (nextChild.get() instanceof core_1.Expressions.SimpleTarget && nextChild instanceof core_1.Nodes.ExpressionNode) {
+                ret.appendString(new target_1.TargetTranspiler().transpile(nextChild, traversal).getCode() + ".set(");
+            }
+            else if (nextChild.get() instanceof core_1.Expressions.Source && nextChild instanceof core_1.Nodes.ExpressionNode) {
+                ret.appendString(traversal.traverse(nextChild).getCode() + ");\n");
+            }
+        }
+        ret.appendString(`}\n`);
+        ret.appendString(`return ${returnField};\n`);
+        ret.appendString("})())");
+        return ret;
+    }
+}
+exports.ReduceBodyTranspiler = ReduceBodyTranspiler;
+//# sourceMappingURL=reduce_body.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/simple_source1.js":
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/simple_source1.js ***!
@@ -80741,12 +80823,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SourceTranspiler = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
-const constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@abaplint/transpiler/build/src/expressions/constant.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
-const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
-const value_body_1 = __webpack_require__(/*! ./value_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/value_body.js");
+const constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@abaplint/transpiler/build/src/expressions/constant.js");
 const corresponding_body_1 = __webpack_require__(/*! ./corresponding_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/corresponding_body.js");
 const filter_body_1 = __webpack_require__(/*! ./filter_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/filter_body.js");
+const reduce_body_1 = __webpack_require__(/*! ./reduce_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/reduce_body.js");
+const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+const value_body_1 = __webpack_require__(/*! ./value_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/value_body.js");
 class SourceTranspiler {
     addGet;
     constructor(addGet = false) {
@@ -80835,6 +80918,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.CondBody) {
                     continue;
                 }
+                else if (c.get() instanceof core_1.Expressions.ReduceBody) {
+                    continue;
+                }
                 else if (c.get() instanceof core_1.Expressions.SwitchBody) {
                     continue;
                 }
@@ -80918,6 +81004,17 @@ class SourceTranspiler {
                 }
                 ret.appendChunk(new filter_body_1.FilterBodyTranspiler().transpile(typ, filterBody, traversal));
             }
+            else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "REDUCE") {
+                const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+                if (typ === undefined) {
+                    throw new Error("TypeNameOrInfer not found in ReduceBody");
+                }
+                const reduceBody = node.findDirectExpression(core_1.Expressions.ReduceBody);
+                if (reduceBody === undefined) {
+                    throw new Error("ReduceBody not found");
+                }
+                ret.appendChunk(new reduce_body_1.ReduceBodyTranspiler().transpile(typ, reduceBody, 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() !== "#") {
@@ -81119,7 +81216,7 @@ class SQLCondTranspiler {
         }
         else {
             const cond = [];
-            for (const s of sqlin.findDirectExpressions(abaplint.Expressions.SQLSource)) {
+            for (const s of sqlin.findDirectExpressions(abaplint.Expressions.SQLSource).concat(sqlin.findDirectExpressions(abaplint.Expressions.SQLSourceNoSpace))) {
                 const field = new sql_field_name_1.SQLFieldNameTranspiler().transpile(fieldName, traversal).getCode();
                 const sourc = this.sqlSource(s, traversal, filename, table);
                 cond.push(field + " = " + sourc);
@@ -81242,17 +81339,25 @@ exports.SQLFieldTranspiler = void 0;
 const abaplint = __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 sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/transpiler/build/src/expressions/sql_field_name.js");
+const field_chain_1 = __webpack_require__(/*! ./field_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/field_chain.js");
 class SQLFieldTranspiler {
     transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNode) {
+                const concat = c.concatTokens();
+                if (concat === "@") {
+                    continue;
+                }
                 // keywords
                 chunk.appendString(c.concatTokens() + " ");
             }
             else if (c.get() instanceof abaplint.Expressions.SQLFieldName) {
                 chunk.appendChunk(new sql_field_name_1.SQLFieldNameTranspiler().transpile(c, traversal));
             }
+            else if (c.get() instanceof abaplint.Expressions.SimpleFieldChain2) {
+                chunk.appendString(`'" + ` + new field_chain_1.FieldChainTranspiler().transpile(c, traversal).getCode() + `.get() + "' `);
+            }
             else {
                 chunk.appendString(c.concatTokens() + " ");
             }
@@ -81331,6 +81436,10 @@ class SQLFieldListTranspiler {
                 const code = new sql_field_name_1.SQLFieldNameTranspiler().transpile(f, traversal).getCode();
                 fields.push(code);
             }
+            else if (f instanceof abaplint.Nodes.ExpressionNode && f.get() instanceof abaplint.Expressions.SQLFieldList) {
+                // todo, I have no idea why its nested like this when there is just one field
+                return new SQLFieldListTranspiler().transpile(f, traversal);
+            }
             else {
                 const concat = f.concatTokens();
                 if (concat !== ",") {
@@ -82224,13 +82333,19 @@ class ValueBodyTranspiler {
                 ret.appendString(".set(" + source.getCode() + ".clone())");
             }
             else if (child.get() instanceof core_1.Expressions.For && child instanceof core_1.Nodes.ExpressionNode) {
-                if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "WHERE", "GROUPS"].some(token => child.findDirectTokenByText(token))) {
+                if (["THEN", "UNTIL", "WHILE", "FROM", "TO", "GROUPS"].some(token => child.findDirectTokenByText(token))) {
                     throw new Error("ValueBody FOR todo, " + body.concatTokens());
                 }
                 const loop = child.findDirectExpression(core_1.Expressions.InlineLoopDefinition);
                 if (loop === undefined) {
                     throw new Error("ValueBody FOR todo, " + body.concatTokens());
                 }
+                let loopWhere = "";
+                const whereNode = child?.findDirectExpression(core_1.Expressions.ComponentCond);
+                if (whereNode) {
+                    const where = traversal.traverse(whereNode).getCode();
+                    loopWhere = `, {"where": async ` + where + `}`;
+                }
                 const base = loop.findDirectExpression(core_1.Expressions.ValueBase);
                 if (base) {
                     throw new Error("ValueBody FOR todo, base, " + body.concatTokens());
@@ -82259,7 +82374,7 @@ class ValueBodyTranspiler {
                 ret = new chunk_1.Chunk().appendString(`await (async () => {
 ${targetDeclare}
 const VAL = ${val};
-for await (const unique1 of abap.statements.loop(${source})) {
+for await (const unique1 of abap.statements.loop(${source}${loopWhere})) {
   ${targetAction}
   VAL`);
                 post = ";\n}\nreturn VAL;\n})()";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.74",
+  "version": "2.11.76",
   "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.196",
-    "@abaplint/transpiler": "^2.11.74",
+    "@abaplint/core": "^2.113.198",
+    "@abaplint/transpiler": "^2.11.76",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.3.1",
     "@types/progress": "^2.0.7",