@abaplint/transpiler 2.11.74 → 2.11.76

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

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

package/build/src/expressions/reduce_body.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReduceBodyTranspiler = void 0;
+const core_1 = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
+const target_1 = require("./target");
+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

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

@@ -1,7 +1,7 @@
 import { AbstractType, Nodes } from "@abaplint/core";
+import { Chunk } from "../chunk";
 import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
-import { Chunk } from "../chunk";
 export declare class SourceTranspiler implements IExpressionTranspiler {
     private readonly addGet;
     constructor(addGet?: boolean);

package/build/src/expressions/source.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceTranspiler = void 0;
 const core_1 = require("@abaplint/core");
 const _1 = require(".");
-const constant_1 = require("./constant");
 const chunk_1 = require("../chunk");
-const transpile_types_1 = require("../transpile_types");
-const value_body_1 = require("./value_body");
+const constant_1 = require("./constant");
 const corresponding_body_1 = require("./corresponding_body");
 const filter_body_1 = require("./filter_body");
+const reduce_body_1 = require("./reduce_body");
+const transpile_types_1 = require("../transpile_types");
+const value_body_1 = require("./value_body");
 class SourceTranspiler {
     addGet;
     constructor(addGet = false) {
@@ -97,6 +98,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;
                 }
@@ -180,6 +184,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() !== "#") {

package/build/src/expressions/sql_cond.js

@@ -69,7 +69,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);

package/build/src/expressions/sql_field.js

@@ -4,17 +4,25 @@ exports.SQLFieldTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const sql_field_name_1 = require("./sql_field_name");
+const field_chain_1 = require("./field_chain");
 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() + " ");
             }

package/build/src/expressions/sql_field_list.js

@@ -17,6 +17,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 !== ",") {

package/build/src/expressions/value_body.js

@@ -50,13 +50,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());
@@ -85,7 +91,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",
-  "version": "2.11.74",
+  "version": "2.11.76",
   "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.196",
+    "@abaplint/core": "^2.113.198",
     "source-map": "^0.7.6"
   },
   "devDependencies": {