@abaplint/transpiler 2.13.82 → 2.13.84

package/build/src/statements/commit.js

@@ -1,10 +1,54 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommitTranspiler = void 0;
+const abaplint = __importStar(require("@abaplint/core"));
 const chunk_1 = require("../chunk");
+const insert_database_1 = require("./insert_database");
 class CommitTranspiler {
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append("abap.statements.commit();", node, traversal);
+        const options = [];
+        const connection = node.findDirectExpression(abaplint.Expressions.DatabaseConnection);
+        if (connection) {
+            options.push(`"connection": ${(0, insert_database_1.findConnection)(connection, traversal)}`);
+        }
+        else if (node.findTokenSequencePosition("AND", "WAIT")) {
+            options.push(`"wait": true`);
+        }
+        const opt = options.length === 0 ? "" : `{${options.join(", ")}}`;
+        return new chunk_1.Chunk().append(`await abap.statements.commit(${opt});`, node, traversal);
     }
 }
 exports.CommitTranspiler = CommitTranspiler;

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

@@ -5,4 +5,4 @@ import { Chunk } from "../chunk";
 export declare class InsertDatabaseTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
 }
-export declare function findConnection(connection: abaplint.Nodes.ExpressionNode): string;
+export declare function findConnection(connection: abaplint.Nodes.ExpressionNode, traversal: Traversal): string;

package/build/src/statements/insert_database.js

@@ -63,19 +63,31 @@ class InsertDatabaseTranspiler {
         }
         const connection = node.findDirectExpression(abaplint.Expressions.DatabaseConnection);
         if (connection) {
-            const con = findConnection(connection);
-            options.push(`"connection": "${con}"`);
+            const con = findConnection(connection, traversal);
+            options.push(`"connection": ${con}`);
         }
         return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode()}, {${options.join(", ")}});`);
     }
 }
 exports.InsertDatabaseTranspiler = InsertDatabaseTranspiler;
-function findConnection(connection) {
+function findConnection(connection, traversal) {
+    const dynamic = connection.findDirectExpression(abaplint.Expressions.Dynamic);
+    if (dynamic) {
+        const field = dynamic.findFirstExpression(abaplint.Expressions.FieldChain);
+        if (field === undefined) {
+            throw new Error("findConnection: dynamic connection name not found");
+        }
+        const value = traversal.traverse(field).getCode();
+        return `${value}.get().trimEnd().toUpperCase()`;
+    }
     let con = connection.getLastToken().getStr().toUpperCase();
+    if (con.startsWith("'") && con.endsWith("'")) {
+        con = con.substring(1, con.length - 1).replace(/''/g, "'");
+    }
     if (con === "DEFAULT_") {
         // todo, workaround for replacing of keywords,
         con = "DEFAULT";
     }
-    return con;
+    return JSON.stringify(con);
 }
 //# sourceMappingURL=insert_database.js.map

package/build/src/statements/open_cursor.js

@@ -66,8 +66,8 @@ class OpenCursorTranspiler {
         const options = [];
         const connection = node.findDirectExpression(abaplint.Expressions.DatabaseConnection);
         if (connection) {
-            const con = (0, insert_database_1.findConnection)(connection);
-            options.push(`"connection": "${con}"`);
+            const con = (0, insert_database_1.findConnection)(connection, traversal);
+            options.push(`"connection": ${con}`);
         }
         return new chunk_1.Chunk().append(`await abap.statements.openCursor(${target}, "${select}", {${options.join(", ")}});`, node, traversal);
     }

package/build/src/statements/rollback.js

@@ -1,10 +1,51 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RollbackTranspiler = void 0;
+const abaplint = __importStar(require("@abaplint/core"));
 const chunk_1 = require("../chunk");
+const insert_database_1 = require("./insert_database");
 class RollbackTranspiler {
     transpile(node, traversal) {
-        return new chunk_1.Chunk().append("abap.statements.rollback();", node, traversal);
+        const options = [];
+        const connection = node.findDirectExpression(abaplint.Expressions.DatabaseConnection);
+        if (connection) {
+            options.push(`"connection": ${(0, insert_database_1.findConnection)(connection, traversal)}`);
+        }
+        const opt = options.length === 0 ? "" : `{${options.join(", ")}}`;
+        return new chunk_1.Chunk().append(`await abap.statements.rollback(${opt});`, node, traversal);
     }
 }
 exports.RollbackTranspiler = RollbackTranspiler;

package/build/src/structures/class_implementation.js

@@ -144,11 +144,13 @@ class ClassImplementationTranspiler {
             ret += traversal.setValues(attr.identifier, name);
         }
         for (const alias of cdef.getAliases()) {
-            const isStatic = staticAttributes.some(s => s.prefix.replace("$", "~") + s.identifier.getName() === alias.getComponent());
+            // note: the component is the raw source casing, so compare case insensitive
+            const component = alias.getComponent().toLowerCase();
+            const isStatic = staticAttributes.some(s => (s.prefix.replace("$", "~") + s.identifier.getName()).toLowerCase() === component);
             if (isStatic === false) {
                 continue;
             }
-            ret += traversal_1.Traversal.escapeNamespace(clasName) + "." + alias.getName().toLowerCase() + " = " + traversal_1.Traversal.escapeNamespace(clasName) + "." + traversal_1.Traversal.escapeNamespace(alias.getComponent().replace("~", "$")) + ";\n";
+            ret += traversal_1.Traversal.escapeNamespace(clasName) + "." + alias.getName().toLowerCase() + " = " + traversal_1.Traversal.escapeNamespace(clasName) + "." + traversal_1.Traversal.escapeNamespace(component.replace("~", "$")) + ";\n";
         }
         for (const e of cdef.getEvents()) {
             if (e.isStatic() === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.82",
+  "version": "2.13.84",
   "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.45",
+    "@abaplint/core": "^2.120.48",
     "source-map": "^0.8.0"
   },
   "devDependencies": {