@abaplint/transpiler 2.7.14 → 2.7.16

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

@@ -3,5 +3,7 @@ import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class DatabaseTableTranspiler implements IExpressionTranspiler {
+    private readonly prefix;
+    constructor(prefix?: boolean);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/database_table.js

@@ -1,20 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseTableTranspiler = void 0;
-const core_1 = require("@abaplint/core");
+const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class DatabaseTableTranspiler {
+    constructor(prefix = true) {
+        this.prefix = prefix;
+    }
     transpile(node, traversal) {
-        const ret = new chunk_1.Chunk();
-        const dyn = node.findDirectExpression(core_1.Expressions.Dynamic);
+        const chunk = new chunk_1.Chunk();
+        const concat = node.concatTokens();
+        let val = "";
+        if (this.prefix === true) {
+            val = `" + abap.dbo.schemaPrefix + "\\"" + abap.dbo.tablePrefix + "`;
+        }
+        else {
+            val = "\"";
+        }
+        const dyn = node.findDirectExpression(abaplint.Expressions.Dynamic);
         if (dyn) {
-            const sub = dyn.getChildren()[1];
-            return traversal.traverse(sub);
+            if (concat.startsWith("('")) {
+                val += concat.substring(2, concat.length - 2).toLowerCase();
+            }
+            else {
+                const foo = traversal.traverse(dyn.findDirectExpression(abaplint.Expressions.FieldChain));
+                if (this.prefix === false) {
+                    return foo;
+                }
+                val += "\" + " + foo.getCode() + ".get().trimEnd().toLowerCase() + \"";
+            }
+        }
+        else {
+            val += concat.toLowerCase();
+        }
+        if (this.prefix === true) {
+            val += "\\\"";
         }
         else {
-            ret.appendString('"' + node.concatTokens() + '"');
+            val += "\"";
         }
-        return ret;
+        return chunk.appendString(val);
     }
 }
 exports.DatabaseTableTranspiler = DatabaseTableTranspiler;

package/build/src/expressions/method_call_body.js

@@ -14,9 +14,14 @@ class MethodCallBodyTranspiler {
         let pt = false;
         for (const c of node.getChildren()) {
             if (c instanceof core_1.Nodes.TokenNode) {
-                // PARAMETER-TABLE
-                pt = true;
-                continue;
+                if (c.concatTokens().toUpperCase() === "PARAMETER") {
+                    // PARAMETER-TABLE
+                    pt = true;
+                }
+                else if (c.concatTokens().toUpperCase() === "EXCEPTION") {
+                    // todo: handle EXCEPTION-TABLE, for now just produce valid javascript
+                    return ret;
+                }
             }
             else if (c.get() instanceof abaplint.Expressions.MethodCallParam) {
                 ret.appendChunk(new method_call_param_1.MethodCallParamTranspiler(this.m).transpile(c, traversal));

package/build/src/expressions/sql_from.js

@@ -21,21 +21,8 @@ class SQLFromTranspiler {
                 chunk.appendChunk(new sql_from_source_1.SQLFromSourceTranspiler().transpile(c, traversal));
             }
             else {
-                if (c.findFirstExpression(abaplint.Expressions.Dynamic)) {
-                    let concat = c.concatTokens();
-                    if (concat.startsWith("'")) {
-                        // no escaping needed, guess its not possible to have table names with single or double quote part of name
-                        concat = "\\\"" + concat.substring(1, concat.length - 1) + "\\\"";
-                    }
-                    chunk.appendString(concat + " ");
-                }
-                else if (c.concatTokens().includes("/")) {
-                    chunk.appendString("\\\"" + c.concatTokens() + "\\\" ");
-                }
-                else {
-                    const concat = c.concatTokens();
-                    chunk.appendString(concat + " ");
-                }
+                const concat = c.concatTokens();
+                chunk.appendString(concat + " ");
             }
         }
         return chunk;

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

@@ -3,5 +3,5 @@ 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;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/sql_from_source.js

@@ -3,23 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLFromSourceTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const database_table_1 = require("./database_table");
 class SQLFromSourceTranspiler {
-    transpile(node, _traversal) {
+    transpile(node, traversal) {
         const chunk = new chunk_1.Chunk();
         for (const c of node.getChildren()) {
+            const concat = c.concatTokens();
             if (c instanceof abaplint.Nodes.TokenNode) {
                 // keywords
-                chunk.appendString(c.concatTokens() + " ");
+                chunk.appendString(concat + " ");
             }
-            else if (c.get() instanceof abaplint.Expressions.DatabaseTable && c.concatTokens().includes("/")) {
-                chunk.appendString("\\\"" + c.concatTokens() + "\\\" ");
-            }
-            else if (c.get() instanceof abaplint.Expressions.DatabaseTable && c.concatTokens().startsWith("('")) {
-                const concat = c.concatTokens();
-                chunk.appendString("\\\"" + concat.substring(2, concat.length - 2).toLowerCase() + "\\\" ");
+            else if (c.get() instanceof abaplint.Expressions.DatabaseTable) {
+                chunk.appendChunk(new database_table_1.DatabaseTableTranspiler().transpile(c, traversal));
+                chunk.appendString(" ");
             }
             else {
-                chunk.appendString(c.concatTokens() + " ");
+                chunk.appendString(concat + " ");
             }
         }
         return chunk;

package/build/src/statements/delete_database.js

@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteDatabaseTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class DeleteDatabaseTranspiler {
     transpile(node, traversal) {
-        const table = traversal.traverse(node.findFirstExpression(abaplint.Expressions.DatabaseTable));
+        const dbtab = node.findFirstExpression(abaplint.Expressions.DatabaseTable);
+        if (dbtab === undefined) {
+            throw new Error("internal error, InsertDatabaseTranspiler");
+        }
+        const table = new expressions_1.DatabaseTableTranspiler(false).transpile(dbtab, traversal);
         const options = [];
         const tab = node.findExpressionAfterToken("TABLE");
         if (tab) {

package/build/src/statements/insert_database.js

@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertDatabaseTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class InsertDatabaseTranspiler {
     transpile(node, traversal) {
-        const table = traversal.traverse(node.findFirstExpression(abaplint.Expressions.DatabaseTable));
+        const dbtab = node.findFirstExpression(abaplint.Expressions.DatabaseTable);
+        if (dbtab === undefined) {
+            throw new Error("internal error, InsertDatabaseTranspiler");
+        }
+        const table = new expressions_1.DatabaseTableTranspiler(false).transpile(dbtab, traversal);
         const options = [];
         const values = node.findExpressionAfterToken("VALUES");
         if (values) {
@@ -22,7 +27,7 @@ class InsertDatabaseTranspiler {
             const tvalues = traversal.traverse(fromTable);
             options.push(`"table": ` + tvalues.getCode());
         }
-        return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode().toLowerCase()}, {${options.join(", ")}});`);
+        return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode()}, {${options.join(", ")}});`);
     }
 }
 exports.InsertDatabaseTranspiler = InsertDatabaseTranspiler;

package/build/src/statements/modify_database.js

@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModifyDatabaseTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class ModifyDatabaseTranspiler {
     transpile(node, traversal) {
-        const table = traversal.traverse(node.findFirstExpression(abaplint.Expressions.DatabaseTable));
+        const dbtab = node.findFirstExpression(abaplint.Expressions.DatabaseTable);
+        if (dbtab === undefined) {
+            throw new Error("internal error, ModifyDatabaseTranspiler");
+        }
+        const table = new expressions_1.DatabaseTableTranspiler(false).transpile(dbtab, traversal);
         const options = [];
         const tab = node.findExpressionAfterToken("TABLE");
         if (tab) {

package/build/src/statements/update_database.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateDatabaseTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
+const expressions_1 = require("../expressions");
 class UpdateDatabaseTranspiler {
     transpile(node, traversal) {
         var _a;
-        const table = traversal.traverse(node.findFirstExpression(abaplint.Expressions.DatabaseTable));
+        const dbtab = node.findFirstExpression(abaplint.Expressions.DatabaseTable);
+        if (dbtab === undefined) {
+            throw new Error("internal error, UpdateDatabaseTranspiler");
+        }
+        const table = new expressions_1.DatabaseTableTranspiler(false).transpile(dbtab, traversal);
         const options = [];
         const cond = node.findFirstExpression(abaplint.Expressions.SQLCond);
         if (cond) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.7.14",
+  "version": "2.7.16",
   "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.101.6",
+    "@abaplint/core": "^2.101.7",
     "source-map": "^0.7.4"
   },
   "devDependencies": {