@abaplint/transpiler-cli 2.14.4 → 2.14.6

package/build/bundle.js

@@ -112454,7 +112454,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class ParameterNameTranspiler {
     transpile(node, traversal) {
         const nameToken = node.getFirstToken();
-        const name = traversal_1.Traversal.escapeNamespace(nameToken.getStr().toLowerCase());
+        const name = traversal_1.Traversal.escapeNamespace(nameToken.getStr().toLowerCase().replace(/^!/, ""));
         return new chunk_1.Chunk().append(name, nameToken, traversal);
     }
 }
@@ -112478,7 +112478,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class ParameterSTranspiler {
     transpile(node, traversal) {
         const nameToken = node.findDirectExpression(core_1.Expressions.ParameterName)?.getFirstToken();
-        const name = nameToken?.getStr().toLowerCase();
+        const name = nameToken?.getStr().toLowerCase().replace(/^!/, "");
         const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source));
         return new chunk_1.Chunk().append(name + ": ", nameToken || node, traversal).appendChunk(source);
     }
@@ -112503,7 +112503,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 class ParameterTTranspiler {
     transpile(node, traversal) {
         const nameToken = node.findDirectExpression(core_1.Expressions.ParameterName)?.getFirstToken();
-        const name = nameToken?.getStr();
+        const name = nameToken?.getStr().replace(/^!/, "");
         const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Target));
         return new chunk_1.Chunk().append(name + ": ", nameToken || node, traversal).appendChunk(source);
     }
@@ -115523,6 +115523,16 @@ const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/t
 class ValueBodyLineTranspiler {
     transpile(rowType, line, traversal, extraFields) {
         const ret = new chunk_1.Chunk();
+        const lines = line.findDirectExpression(core_1.Expressions.ValueBodyLines);
+        if (lines) {
+            const source = traversal.traverse(lines.findDirectExpression(core_1.Expressions.Source)).getCode();
+            const from = lines.findExpressionAfterToken("FROM");
+            const to = lines.findExpressionAfterToken("TO");
+            const fromCode = from ? traversal.traverse(from).getCode() : "undefined";
+            const toCode = to ? ", " + traversal.traverse(to).getCode() : "";
+            const range = from || to ? ", " + fromCode + toCode : "";
+            return ret.appendString(`.appendLines(${source}${range})`);
+        }
         ret.appendString(`.appendThis(${transpile_types_1.TranspileTypes.toType(rowType)}`);
         for (const child of line.getChildren()) {
             if (child instanceof core_1.Nodes.TokenNode) {
@@ -116051,11 +116061,11 @@ class HandleSMIM {
         obj.parse();
         const dataFile = obj.getDataFile();
         const dataFilename = dataFile ? this.layout.file({ name: obj.getName(), type: obj.getType() }, dataFile.getFilename()) : undefined;
-        const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
-  "objectType": "SMIM",
-  "filename": ${JSON.stringify(dataFilename)},
-  "url": ${JSON.stringify(obj.getURL())},
-  "class": ${JSON.stringify(obj.getClass())},
+        const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
+  "objectType": "SMIM",
+  "filename": ${JSON.stringify(dataFilename)},
+  "url": ${JSON.stringify(obj.getURL())},
+  "class": ${JSON.stringify(obj.getClass())},
 };`);
         const output = {
             object: {
@@ -116342,9 +116352,9 @@ class HandleW3MI {
         obj.parse();
         const dataFile = obj.getDataFile();
         const dataFilename = dataFile ? this.layout.file({ name: obj.getName(), type: obj.getType() }, dataFile.getFilename()) : undefined;
-        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${(0, w3mi_name_1.w3miObjectName)(obj)}"] = {
-  "objectType": "W3MI",
-  "filename": ${JSON.stringify(dataFilename)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${(0, w3mi_name_1.w3miObjectName)(obj)}"] = {
+  "objectType": "W3MI",
+  "filename": ${JSON.stringify(dataFilename)},
 };`);
         const output = {
             object: {
@@ -116624,12 +116634,12 @@ class Initialization {
     script(reg, dbSetup, options, useImport) {
         let ret = "";
         if (useImport === true) {
-            ret = `/* eslint-disable import/newline-after-import */
+            ret = `/* eslint-disable import/newline-after-import */
 import "./_top.mjs";\n`;
         }
         else {
-            ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
+            ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();\n`;
         }
         if (options?.setup?.filename === undefined || options?.setup?.filename === "") {
@@ -129568,21 +129578,20 @@ class TryTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         const catches = node.findDirectStructures(abaplint.Structures.Catch);
-        const cleanup = node.findDirectStructures(abaplint.Structures.Cleanup);
-        let catchCode = this.buildCatchCode(catches, traversal);
+        const cleanup = node.findDirectStructure(abaplint.Structures.Cleanup);
+        // the CATCH blocks and the CLEANUP block become one javascript catch
+        let handlerCode = this.buildHandlerCode(catches, cleanup, traversal);
         for (const c of node.getChildren()) {
-            if (c.get() instanceof abaplint.Structures.Catch) {
-                if (catchCode) {
-                    ret.appendChunk(catchCode);
+            if (c.get() instanceof abaplint.Structures.Catch
+                || c.get() instanceof abaplint.Structures.Cleanup) {
+                if (handlerCode) {
+                    ret.appendChunk(handlerCode);
                 }
-                catchCode = undefined;
-            }
-            else if (c.get() instanceof abaplint.Structures.Cleanup) {
-                ret.appendString(`} finally {\n// Transpiler todo: CLEANUP ignored\n`);
+                handlerCode = undefined;
             }
             else if (c.get() instanceof abaplint.Statements.Try
                 || c.get() instanceof abaplint.Statements.EndTry) {
-                if (catches.length === 0 && cleanup.length === 0) {
+                if (catches.length === 0 && cleanup === undefined) {
                     continue;
                 }
                 ret.appendChunk(traversal.traverse(c));
@@ -129594,11 +129603,11 @@ class TryTranspiler {
         return ret;
     }
     /////////////////////
-    buildCatchCode(nodes, traversal) {
+    buildHandlerCode(nodes, cleanup, traversal) {
         let ret = "";
         let first = true;
-        if (nodes.length === 0) {
-            return new chunk_1.Chunk(ret);
+        if (nodes.length === 0 && cleanup === undefined) {
+            return undefined;
         }
         ret += `} catch (e) {\n`;
         for (const n of nodes) {
@@ -129620,12 +129629,29 @@ class TryTranspiler {
             }
             ret += "}";
         }
-        // "else" unhandled in this TRY-CATCH, or a javascript runtime error
-        ret += ` else {\n` +
-            `throw e;\n` +
-            `}\n`;
+        // unhandled in this TRY-CATCH, or a javascript runtime error
+        const unhandled = this.buildCleanupCode(cleanup, traversal) + `throw e;\n`;
+        ret += nodes.length > 0 ? ` else {\n` + unhandled + `}\n` : unhandled;
         return new chunk_1.Chunk(ret);
     }
+    /** CLEANUP runs when a class based exception leaves the TRY block, not for an exception raised
+     * in a CATCH block of the same TRY, and not for javascript runtime errors */
+    buildCleanupCode(cleanup, traversal) {
+        if (cleanup === undefined) {
+            return "";
+        }
+        const cxRoot = traversal.lookupClassOrInterface("CX_ROOT", cleanup.getFirstToken());
+        let ret = `if (${cxRoot} && e instanceof ${cxRoot}) {\n`;
+        const intoNode = cleanup.findDirectStatement(abaplint.Statements.Cleanup)?.findExpressionAfterToken("INTO");
+        if (intoNode) {
+            ret += traversal.traverse(intoNode).getCode() + ".set(e);\n";
+        }
+        const body = cleanup.findDirectStructure(abaplint.Structures.Body);
+        if (body) {
+            ret += traversal.traverse(body).getCode();
+        }
+        return ret + `}\n`;
+    }
 }
 exports.TryTranspiler = TryTranspiler;
 //# sourceMappingURL=try.js.map
@@ -130427,7 +130453,7 @@ class Traversal {
         return false;
     }
     prefixAndName(t, filename) {
-        let name = t.getStr().toLowerCase();
+        let name = t.getStr().toLowerCase().replace(/^!/, "");
         if (filename && this.getCurrentObject().getABAPFileByName(filename) === undefined) {
             // the prefix is from a different object
             const file = this.reg.getFileByName(filename);
@@ -130887,8 +130913,8 @@ class Traversal {
             ret += "const sup = super();\n";
         }
         const cName = Traversal.escapeNamespace(def.getName().toLowerCase());
-        ret += `this.me = new abap.types.ABAPObject();
-this.me.set(this);
+        ret += `this.me = new abap.types.ABAPObject();
+this.me.set(this);
 this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         ret += this.buildFriendsAccess(def, def.getSuperClass() !== undefined);
         ret += this.buildThisAttributes(def, cName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.14.4",
+  "version": "2.14.6",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -28,7 +28,7 @@
   "license": "MIT",
   "devDependencies": {
     "@abaplint/core": "^2.120.77",
-    "@abaplint/transpiler": "^2.14.4",
+    "@abaplint/transpiler": "^2.14.6",
     "@types/glob": "^9.0.0",
     "@types/node": "^26.6.2",
     "@types/progress": "^2.0.7",