@abaplint/transpiler 2.13.30 → 2.13.32

package/build/src/expressions/sql_cond.js

@@ -86,7 +86,8 @@ class SQLCondTranspiler {
         return c.appendString(ret.trim());
     }
     sqlIn(c, traversal, filename, table) {
-        const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName)
+            || c.findDirectExpression(abaplint.Expressions.SQLAliasField);
         const sqlin = c.findDirectExpression(abaplint.Expressions.SQLIn);
         const source = c.findFirstExpression(abaplint.Expressions.SimpleSource3);
         if (fieldName === undefined || sqlin === undefined || source === undefined) {
@@ -117,7 +118,8 @@ class SQLCondTranspiler {
             return this.basicConditionNew(c, traversal, filename, table);
         }
         let fieldName = undefined;
-        const fieldNameExpression = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        const fieldNameExpression = c.findDirectExpression(abaplint.Expressions.SQLFieldName)
+            || c.findDirectExpression(abaplint.Expressions.SQLAliasField);
         if (fieldNameExpression) {
             fieldName = new sql_field_name_1.SQLFieldNameTranspiler().transpile(fieldNameExpression, traversal).getCode();
         }
@@ -190,7 +192,8 @@ class SQLCondTranspiler {
             if (ret !== "") {
                 ret += " ";
             }
-            if (child.get() instanceof abaplint.Expressions.SQLFieldName
+            if ((child.get() instanceof abaplint.Expressions.SQLFieldName
+                || child.get() instanceof abaplint.Expressions.SQLAliasField)
                 && child instanceof abaplint.Nodes.ExpressionNode) {
                 ret += new sql_field_name_1.SQLFieldNameTranspiler().transpile(child, traversal).getCode();
             }

package/build/src/expressions/sql_field_and_value.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLFieldAndValueTranspiler = void 0;
 const abaplint = __importStar(require("@abaplint/core"));
 const chunk_1 = require("../chunk");
+const sql_field_name_1 = require("./sql_field_name");
 class SQLFieldAndValueTranspiler {
     transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
@@ -45,12 +46,19 @@ class SQLFieldAndValueTranspiler {
             if (concat === "=") {
                 chunk.appendString(" = ");
             }
+            else if (n.get() instanceof abaplint.Expressions.SQLFieldName) {
+                chunk.appendString(new sql_field_name_1.SQLFieldNameTranspiler().transpile(n, traversal).getCode());
+            }
             else if (n.get() instanceof abaplint.Expressions.SQLSource) {
                 const source = traversal.traverse(n);
                 // todo: value conversion? abap vs db, traversal.isSQLConversion
                 // todo: integers?
                 chunk.appendString("'\" + " + source.getCode() + ".get() + \"'");
             }
+            else if (n instanceof abaplint.Nodes.TokenNode) {
+                // operators/keywords, eg. the "+" in "field = field + value"
+                chunk.appendString(" " + concat + " ");
+            }
             else {
                 chunk.appendString(traversal.traverse(n).getCode() + " ");
             }

package/build/src/expressions/sql_from.js

@@ -46,6 +46,10 @@ class SQLFromTranspiler {
                 // keywords
                 chunk.appendString(c.concatTokens() + " ");
             }
+            else if (c.get() instanceof abaplint.Expressions.SQLFromBody) {
+                // newer abaplint versions wrap the sources in a SQLFromBody expression
+                chunk.appendChunk(this.transpile(c, traversal));
+            }
             else if (c.get() instanceof abaplint.Expressions.SQLJoin) {
                 chunk.appendChunk(new sql_join_1.SQLJoinTranspiler().transpile(c, traversal));
                 chunk.appendString(" ");

package/build/src/expressions/sql_join.js

@@ -49,8 +49,15 @@ class SQLJoinTranspiler {
             else if (c.get() instanceof abaplint.Expressions.SQLCond) {
                 chunk.appendChunk(new sql_cond_1.SQLCondTranspiler().transpile(c, traversal));
             }
-            else if (c.get() instanceof abaplint.Expressions.SQLFromSource) {
-                chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(c, traversal));
+            else if (c.get() instanceof abaplint.Expressions.SQLJoinSource) {
+                // the join source is wrapped in a SQLJoinSource expression
+                const source = c.findDirectExpression(abaplint.Expressions.SQLFromSource);
+                if (source) {
+                    chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(source, traversal));
+                }
+                else {
+                    chunk.appendString(c.concatTokens() + " ");
+                }
             }
             else {
                 chunk.appendString(c.concatTokens() + " ");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.30",
+  "version": "2.13.32",
   "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.31",
+    "@abaplint/core": "^2.119.54",
     "source-map": "^0.7.6"
   },
   "devDependencies": {