@abaplint/transpiler 2.3.58 → 2.3.60

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

@@ -19,6 +19,8 @@ export * from "./field_length";
 export * from "./field_offset";
 export * from "./field_symbol";
 export * from "./function_exporting";
+export * from "./sql_from";
+export * from "./sql_join";
 export * from "./function_parameters";
 export * from "./message_number";
 export * from "./method_call_body";

package/build/src/expressions/index.js

@@ -35,6 +35,8 @@ __exportStar(require("./field_length"), exports);
 __exportStar(require("./field_offset"), exports);
 __exportStar(require("./field_symbol"), exports);
 __exportStar(require("./function_exporting"), exports);
+__exportStar(require("./sql_from"), exports);
+__exportStar(require("./sql_join"), exports);
 __exportStar(require("./function_parameters"), exports);
 __exportStar(require("./message_number"), exports);
 __exportStar(require("./method_call_body"), exports);

package/build/src/expressions/sql_from.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 SQLFromTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/sql_from.js

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

package/build/src/expressions/sql_join.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 SQLJoinTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+}

package/build/src/expressions/sql_join.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLJoinTranspiler = void 0;
+const abaplint = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const sql_cond_1 = require("./sql_cond");
+class SQLJoinTranspiler {
+    transpile(node, traversal) {
+        const chunk = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            if (c instanceof abaplint.Nodes.TokenNode) {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+            else if (c.get() instanceof abaplint.Expressions.SQLCond) {
+                chunk.appendChunk(new sql_cond_1.SQLCondTranspiler().transpile(c, traversal));
+            }
+            else {
+                chunk.appendString(c.concatTokens() + " ");
+            }
+        }
+        return chunk;
+    }
+}
+exports.SQLJoinTranspiler = SQLJoinTranspiler;
+//# sourceMappingURL=sql_join.js.map

package/build/src/statements/replace.js

@@ -32,15 +32,15 @@ class ReplaceTranspiler {
         if (type === "REGEX") {
             extra.push("regex: " + new expressions_1.SourceTranspiler().transpile(sources[0], traversal).getCode());
         }
-        if (o === undefined && o === undefined) {
+        if (o === undefined && o === undefined && type !== "REGEX") {
             extra.push("of: " + new expressions_1.SourceTranspiler().transpile(sources[0], traversal).getCode());
         }
         if (concat.includes(" IGNORING CASE")) {
             extra.push("ignoringCase: true");
         }
         return new chunk_1.Chunk()
-            .append("abap.statements.replace({target:", node, traversal)
-            .appendString(target + ", all:" + all + ", " + extra.join(","))
+            .append("abap.statements.replace({target: ", node, traversal)
+            .appendString(target + ", all: " + all + ", " + extra.join(", "))
             .append("});", node.getLastToken(), traversal);
     }
 }

package/build/src/statements/select.js

@@ -5,9 +5,10 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const expressions_1 = require("../expressions");
 const unique_identifier_1 = require("../unique_identifier");
+const sql_from_1 = require("../expressions/sql_from");
 class SelectTranspiler {
     transpile(node, traversal, targetOverride) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         let target = "undefined";
         if (targetOverride) {
             target = targetOverride;
@@ -26,7 +27,10 @@ class SelectTranspiler {
             select += fieldList === null || fieldList === void 0 ? void 0 : fieldList.findAllExpressions(abaplint.Expressions.SQLField).map(e => e.concatTokens()).join(", ");
         }
         select += " ";
-        select += ((_a = node.findFirstExpression(abaplint.Expressions.SQLFrom)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + " ";
+        const from = node.findFirstExpression(abaplint.Expressions.SQLFrom);
+        if (from) {
+            select += new sql_from_1.SQLFromTranspiler().transpile(from, traversal).getCode();
+        }
         let where = undefined;
         for (const sqlCond of node.findAllExpressions(abaplint.Expressions.SQLCond)) {
             if (this.isWhereExpression(node, sqlCond)) {
@@ -72,7 +76,7 @@ class SelectTranspiler {
         }
         if (node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            const faeName = (_d = (_c = (_b = node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(abaplint.Expressions.SQLSource)) === null || _c === void 0 ? void 0 : _c.concatTokens()) === null || _d === void 0 ? void 0 : _d.toLowerCase();
+            const faeName = (_c = (_b = (_a = node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(abaplint.Expressions.SQLSource)) === null || _b === void 0 ? void 0 : _b.concatTokens()) === null || _c === void 0 ? void 0 : _c.toLowerCase();
             select = select.replace(new RegExp(" " + faeName, "g"), " " + unique);
             select = select.replace(unique + ".get().table_line.get()", unique + ".get()"); // there can be only one?
             const code = `if (${faeName}.array().length === 0) {

package/package.json

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