@abaplint/transpiler-cli 2.13.27 → 2.13.28

package/build/bundle.js

@@ -84539,7 +84539,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 {
@@ -92542,6 +92542,8 @@ class SelectTranspiler {
             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) {
@@ -92550,6 +92552,14 @@ class SelectTranspiler {
                     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} + "`);
@@ -92620,6 +92630,11 @@ class SelectTranspiler {
             + ` ? (${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-cli",
-  "version": "2.13.27",
+  "version": "2.13.28",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -28,7 +28,7 @@
   "license": "MIT",
   "devDependencies": {
     "@abaplint/core": "^2.119.24",
-    "@abaplint/transpiler": "^2.13.27",
+    "@abaplint/transpiler": "^2.13.28",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.12.2",
     "@types/progress": "^2.0.7",