@abaplint/transpiler 2.5.47 → 2.5.49

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

@@ -40,6 +40,8 @@ export * from "./source_field_symbol";
 export * from "./source_field";
 export * from "./source";
 export * from "./sql_cond";
+export * from "./sql_field";
+export * from "./sql_from_source";
 export * from "./sql_from";
 export * from "./sql_join";
 export * from "./sql_source_simple";

package/build/src/expressions/index.js

@@ -56,6 +56,8 @@ __exportStar(require("./source_field_symbol"), exports);
 __exportStar(require("./source_field"), exports);
 __exportStar(require("./source"), exports);
 __exportStar(require("./sql_cond"), exports);
+__exportStar(require("./sql_field"), exports);
+__exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);
 __exportStar(require("./sql_join"), exports);
 __exportStar(require("./sql_source_simple"), exports);

package/build/src/expressions/sql_cond.js

@@ -6,6 +6,7 @@ const traversal_1 = require("../traversal");
 const chunk_1 = require("../chunk");
 const simple_source3_1 = require("./simple_source3");
 const field_chain_1 = require("./field_chain");
+const sql_field_name_1 = require("./sql_field_name");
 class SQLCondTranspiler {
     transpile(node, traversal) {
         var _a;
@@ -58,11 +59,15 @@ class SQLCondTranspiler {
         if (c.getChildren().length !== 3) {
             return this.basicConditionNew(c, traversal, filename);
         }
-        const fieldName = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        let fieldName = undefined;
+        const fieldNameExpression = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
+        if (fieldNameExpression) {
+            fieldName = new sql_field_name_1.SQLFieldNameTranspiler().transpile(fieldNameExpression, traversal).getCode();
+        }
         const operator = c.findDirectExpression(abaplint.Expressions.SQLCompareOperator);
         const source = c.findDirectExpression(abaplint.Expressions.SQLSource);
         if (fieldName && source && operator === undefined && c.findDirectTokenByText("LIKE")) {
-            ret += fieldName.concatTokens() + " LIKE ";
+            ret += fieldName + " LIKE ";
             ret += this.sqlSource(source, traversal, filename);
             return ret;
         }
@@ -76,7 +81,7 @@ class SQLCondTranspiler {
         else if (op.toUpperCase() === "NE") {
             op = "<>";
         }
-        ret += fieldName.concatTokens() + " " + op + " ";
+        ret += fieldName + " " + op + " ";
         ret += this.sqlSource(source, traversal, filename);
         return ret;
     }
@@ -117,8 +122,9 @@ class SQLCondTranspiler {
             if (ret !== "") {
                 ret += " ";
             }
-            if (child.get() instanceof abaplint.Expressions.SQLFieldName) {
-                ret += child.concatTokens();
+            if (child.get() instanceof abaplint.Expressions.SQLFieldName
+                && child instanceof abaplint.Nodes.ExpressionNode) {
+                ret += new sql_field_name_1.SQLFieldNameTranspiler().transpile(child, traversal).getCode();
             }
             else if (child.get() instanceof abaplint.Expressions.SQLSource
                 && child instanceof abaplint.Nodes.ExpressionNode) {

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

@@ -0,0 +1,7 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class SQLFieldTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/sql_field.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFieldTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const sql_field_name_1 = require("./sql_field_name");
+class SQLFieldTranspiler {
+    transpile(node, traversal) {
+        const chunk = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            if (c instanceof abaplint.Nodes.TokenNode) {
+                // 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 {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+        }
+        return chunk;
+    }
+}
+exports.SQLFieldTranspiler = SQLFieldTranspiler;
+//# sourceMappingURL=sql_field.js.map

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

@@ -0,0 +1,7 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class SQLFieldNameTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, _traversal: Traversal): Chunk;
+}

package/build/src/expressions/sql_field_name.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFieldNameTranspiler = void 0;
+const chunk_1 = require("../chunk");
+class SQLFieldNameTranspiler {
+    transpile(node, _traversal) {
+        const chunk = new chunk_1.Chunk();
+        let concat = node.concatTokens();
+        if (concat.includes("~") && concat.split("~")[0].includes("/")) {
+            concat = "'" + concat.replace("~", "'~");
+        }
+        chunk.appendString(concat);
+        return chunk;
+    }
+}
+exports.SQLFieldNameTranspiler = SQLFieldNameTranspiler;
+//# sourceMappingURL=sql_field_name.js.map

package/build/src/expressions/sql_from.js

@@ -4,19 +4,32 @@ exports.SQLFromTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const sql_join_1 = require("./sql_join");
+const sql_from_source_1 = require("./sql_from_source");
 class SQLFromTranspiler {
     transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNode) {
+                // keywords
                 chunk.appendString(c.concatTokens() + " ");
             }
             else if (c.get() instanceof abaplint.Expressions.SQLJoin) {
                 chunk.appendChunk(new sql_join_1.SQLJoinTranspiler().transpile(c, traversal));
                 chunk.appendString(" ");
             }
+            else if (c.get() instanceof abaplint.Expressions.SQLFromSource) {
+                chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(c, traversal));
+            }
             else {
-                chunk.appendString(c.concatTokens() + " ");
+                if (c.findFirstExpression(abaplint.Expressions.Dynamic)) {
+                    chunk.appendString(c.concatTokens() + " ");
+                }
+                else if (c.concatTokens().includes("/")) {
+                    chunk.appendString("'" + c.concatTokens() + "' ");
+                }
+                else {
+                    chunk.appendString(c.concatTokens() + " ");
+                }
             }
         }
         return chunk;

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

@@ -0,0 +1,7 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class SQLFromSourceTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, _traversal: Traversal): Chunk;
+}

package/build/src/expressions/sql_from_source.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLFromSourceTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+class SQLFromSourceTranspiler {
+    transpile(node, _traversal) {
+        const chunk = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            if (c instanceof abaplint.Nodes.TokenNode) {
+                // keywords
+                chunk.appendString(c.concatTokens() + " ");
+            }
+            else if (c.get() instanceof abaplint.Expressions.DatabaseTable && c.concatTokens().includes("/")) {
+                chunk.appendString("'" + c.concatTokens() + "' ");
+            }
+            else {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+        }
+        return chunk;
+    }
+}
+exports.SQLFromSourceTranspiler = SQLFromSourceTranspiler;
+//# sourceMappingURL=sql_from_source.js.map

package/build/src/expressions/sql_join.js

@@ -4,16 +4,21 @@ exports.SQLJoinTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const sql_cond_1 = require("./sql_cond");
+const sql_from_source_1 = require("./sql_from_source");
 class SQLJoinTranspiler {
     transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNode) {
+                // keywords
                 chunk.appendString(c.concatTokens() + " ");
             }
             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 {
                 chunk.appendString(c.concatTokens() + " ");
             }

package/build/src/statements/select.js

@@ -22,14 +22,17 @@ class SelectTranspiler {
         let select = "SELECT ";
         const fieldList = node.findFirstExpression(abaplint.Expressions.SQLFieldList)
             || node.findFirstExpression(abaplint.Expressions.SQLFieldListLoop);
-        if ((fieldList === null || fieldList === void 0 ? void 0 : fieldList.getChildren().length) === 1) {
-            select += fieldList.concatTokens();
-        }
-        else {
-            // add commas between field names, this is required for SQLite, and easy to remove in other clients?
-            select += fieldList === null || fieldList === void 0 ? void 0 : fieldList.findAllExpressions(abaplint.Expressions.SQLField).map(e => e.concatTokens()).join(", ");
+        const fields = [];
+        for (const f of (fieldList === null || fieldList === void 0 ? void 0 : fieldList.getChildren()) || []) {
+            if (f instanceof abaplint.Nodes.ExpressionNode && f.get() instanceof abaplint.Expressions.SQLField) {
+                const code = new expressions_1.SQLFieldTranspiler().transpile(f, traversal).getCode();
+                fields.push(code);
+            }
+            else {
+                fields.push(f.concatTokens());
+            }
         }
-        select += " ";
+        select += fields.join(", ") + " ";
         const from = node.findFirstExpression(abaplint.Expressions.SQLFrom);
         if (from) {
             select += new sql_from_1.SQLFromTranspiler().transpile(from, traversal).getCode();
@@ -83,6 +86,10 @@ class SelectTranspiler {
             const faeTranspiled = new expressions_1.SQLSourceTranspiler().transpile(fn, traversal).getCode();
             select = select.replace(new RegExp(" " + escapeRegExp(faeTranspiled), "g"), " " + unique);
             select = select.replace(unique + ".get().table_line.get()", unique + ".get()"); // there can be only one?
+            let by = `Object.keys(${target}.getRowType().get())`;
+            if (keys.length > 0) {
+                by = JSON.stringify(keys);
+            }
             const code = `if (${faeTranspiled}.array().length === 0) {
   throw "FAE, todo, empty table";
 } else {
@@ -90,8 +97,8 @@ class SelectTranspiler {
   for await (const ${unique} of abap.statements.loop(${faeTranspiled})) {
     await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
   }
-  abap.statements.sort(${target}, {by: Object.keys(${target}.getRowType().get()).map(k => { return {component: k}; })});
-  await abap.statements.deleteInternal(${target}, {adjacent: true});
+  abap.statements.sort(${target}, {by: ${by}.map(k => { return {component: k}; })});
+  await abap.statements.deleteInternal(${target}, {adjacent: true, by: ${by}});
   abap.builtin.sy.get().dbcnt.set(${target}.array().length);
 }`;
             return new chunk_1.Chunk().append(code, node, traversal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.5.47",
+  "version": "2.5.49",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",