@abaplint/transpiler 2.13.99 → 2.13.100

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

@@ -7,5 +7,6 @@ export declare class SelectTranspiler implements IStatementTranspiler {
     private findTable;
     private dynamicSelectList;
     private dynamicSQLClause;
+    private dynamicHavingClause;
     private isWhereExpression;
 }

package/build/src/statements/select.js

@@ -105,8 +105,18 @@ class SelectTranspiler {
         const having = node.findDirectExpression(abaplint.Expressions.Select)
             ?.findDirectExpression(abaplint.Expressions.SQLHaving);
         const havingCond = having?.findFirstExpression(abaplint.Expressions.SQLCond);
+        let dynamicHaving;
         if (havingCond) {
-            select += "HAVING " + new expressions_1.SQLCondTranspiler().transpile(havingCond, traversal, table).getCode() + " ";
+            const dynamic = havingCond.findFirstExpression(abaplint.Expressions.Dynamic);
+            const chain = dynamic?.findFirstExpression(abaplint.Expressions.FieldChain);
+            if (chain && havingCond.concatTokens() === dynamic?.concatTokens()) {
+                dynamicHaving = dynamic;
+                const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
+                select += `" + ${this.dynamicHavingClause(code)} + " `;
+            }
+            else {
+                select += "HAVING " + new expressions_1.SQLCondTranspiler().transpile(havingCond, traversal, table).getCode() + " ";
+            }
         }
         const upTo = node.findFirstExpression(abaplint.Expressions.SQLUpTo);
         if (upTo) {
@@ -126,6 +136,9 @@ class SelectTranspiler {
         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)) {
+            if (d === dynamicHaving) {
+                continue;
+            }
             const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
             if (chain) {
                 const search = d.concatTokens();
@@ -282,6 +295,13 @@ abap.builtin.sy.get().dbcnt.set(${target}.getArrayLength());
             + ` ? (${code}.array().length === 0 ? "" : "${keyword} " + ${code}.array().map(row => row.get()).join(", "))`
             + ` : (("" + ${code}.get()).trim() === "" ? "" : "${keyword} " + ${code}.get()))`;
     }
+    dynamicHavingClause(code) {
+        return `((value) => {
+const condition = value instanceof abap.types.Table || value instanceof abap.types.HashedTable
+  ? value.array().map(row => row.get()).join(" ") : value.get();
+return condition.trim() === "" ? "" : "HAVING " + abap.expandDynamic(condition, (name) => {try { return eval(name);} catch {}});
+})(${code})`;
+    }
     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.99",
+  "version": "2.13.100",
   "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.120.68",
+    "@abaplint/core": "^2.120.69",
     "source-map": "^0.8.0"
   },
   "devDependencies": {