@abaplint/transpiler 2.13.26 → 2.13.28

package/build/src/expressions/sql_cond.js

@@ -21,7 +21,7 @@ class SQLCondTranspiler {
                 if (c.findDirectExpression(abaplint.Expressions.Dynamic)) {
                     const chain = c.findDirectExpression(abaplint.Expressions.Dynamic)?.findFirstExpression(abaplint.Expressions.FieldChain);
                     if (chain) {
-                        const code = new field_chain_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
+                        const code = new field_chain_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
                         ret += `" + abap.expandDynamic(${code}, (name) => {try { return eval(name);} catch {}}) + "`;
                     }
                     else {

package/build/src/statements/select.d.ts

@@ -5,5 +5,7 @@ import { Chunk } from "../chunk";
 export declare class SelectTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal, targetOverride?: string): Chunk;
     private findTable;
+    private dynamicSelectList;
+    private dynamicSQLClause;
     private isWhereExpression;
 }

package/build/src/statements/select.js

@@ -75,12 +75,29 @@ class SelectTranspiler {
         if (orderBy) {
             select += new expressions_1.SQLOrderByTranspiler().transpile(orderBy, traversal).getCode();
         }
+        const fieldListDynamics = new Set(fieldList.findAllExpressionsRecursive(abaplint.Expressions.Dynamic));
+        const groupByDynamics = new Set(groupBy?.findAllExpressionsRecursive(abaplint.Expressions.Dynamic) || []);
+        const orderByDynamics = new Set(orderBy?.findAllExpressionsRecursive(abaplint.Expressions.Dynamic) || []);
         for (const d of node.findAllExpressionsRecursive(abaplint.Expressions.Dynamic)) {
             const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
             if (chain) {
-                const code = new expressions_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
                 const search = d.concatTokens();
-                select = select.replace(search, `" + ${code} + "`);
+                if (fieldListDynamics.has(d)) {
+                    const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
+                    select = select.replace(search, `" + ${this.dynamicSelectList(code)} + "`);
+                }
+                else if (groupByDynamics.has(d)) {
+                    const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
+                    select = select.replace("GROUP BY " + search, `" + ${this.dynamicSQLClause("GROUP BY", code)} + "`);
+                }
+                else if (orderByDynamics.has(d)) {
+                    const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
+                    select = select.replace("ORDER BY " + search, `" + ${this.dynamicSQLClause("ORDER BY", code)} + "`);
+                }
+                else {
+                    const code = new expressions_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
+                    select = select.replace(search, `" + ${code} + "`);
+                }
             }
         }
         const concat = node.concatTokens().toUpperCase();
@@ -142,6 +159,16 @@ class SelectTranspiler {
         }
         return { table: tabl, keys };
     }
+    dynamicSelectList(code) {
+        return `(${code} instanceof abap.types.Table || ${code} instanceof abap.types.HashedTable`
+            + ` ? (${code}.array().length === 0 ? "*" : ${code}.array().map(row => row.get()).join(", "))`
+            + ` : ${code}.get())`;
+    }
+    dynamicSQLClause(keyword, code) {
+        return `(${code} instanceof abap.types.Table || ${code} instanceof abap.types.HashedTable`
+            + ` ? (${code}.array().length === 0 ? "" : "${keyword} " + ${code}.array().map(row => row.get()).join(" "))`
+            + ` : "${keyword} " + ${code}.get())`;
+    }
     isWhereExpression(node, expression) {
         // check if previous token before sqlCond is "WHERE". It could also be "ON" in case of join condition
         let prevToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.26",
+  "version": "2.13.28",
   "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.119.19",
+    "@abaplint/core": "^2.119.24",
     "source-map": "^0.7.6"
   },
   "devDependencies": {