@abaplint/transpiler-cli 2.6.17 → 2.6.19

package/build/bundle.js

@@ -67228,10 +67228,13 @@ class Chunk {
     toString() {
         throw "error, dont toString a Chunk";
     }
-    runIndentationLogic() {
+    runIndentationLogic(ignoreSourceMap = false) {
         let i = 0;
         let line = 1;
         const output = [];
+        if (ignoreSourceMap === true) {
+            this.mappings = [];
+        }
         for (const l of this.raw.split("\n")) {
             if (l.startsWith("}")) {
                 i = i - 1;
@@ -70124,7 +70127,7 @@ class HandleABAP {
         this.options = options;
     }
     runObject(obj, reg) {
-        var _a, _b;
+        var _a, _b, _c;
         let ret = [];
         if (obj instanceof abaplint.Objects.Program && obj.isInclude() === true) {
             // includes are only compiled along with the programs where its used?
@@ -70140,7 +70143,7 @@ class HandleABAP {
             const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, this.options).traverse(rearranged);
             chunk.appendChunk(contents);
             chunk.stripLastNewline();
-            chunk.runIndentationLogic();
+            chunk.runIndentationLogic((_b = this.options) === null || _b === void 0 ? void 0 : _b.ignoreSourceMap);
             const exports = this.findExports(file.getStructure());
             const filename = file.getFilename().replace(".abap", ".mjs").toLowerCase();
             const output = {
@@ -70156,7 +70159,7 @@ class HandleABAP {
             ret.push(output);
         }
         ret = this.rearrangeClassLocals(obj, ret);
-        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.addCommonJS) === true) {
+        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.addCommonJS) === true) {
             ret.map(output => output.chunk = this.addImportsAndExports(output));
         }
         return ret;
@@ -71242,7 +71245,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class AssignTranspiler {
     transpile(node, traversal) {
-        var _a;
+        var _a, _b;
         const assignSource = node.findDirectExpression(abaplint.Expressions.AssignSource);
         const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressions(abaplint.Expressions.Source).map(e => new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode())) || [];
         const fs = new expressions_1.FieldSymbolTranspiler().transpile(node.findDirectExpression(abaplint.Expressions.FSTarget), traversal).getCode();
@@ -71294,8 +71297,11 @@ class AssignTranspiler {
             if ((first === null || first === void 0 ? void 0 : first.get()) instanceof abaplint.Expressions.Dynamic && first instanceof abaplint.Nodes.ExpressionNode) {
                 const firstFirst = first.getChildren()[1];
                 if ((firstFirst === null || firstFirst === void 0 ? void 0 : firstFirst.get()) instanceof abaplint.Expressions.Constant) {
-                    const s = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/);
-                    options.push(`dynamicSource: (() => {try { return ${s}; } catch {}})()`);
+                    const s = (_b = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/)) === null || _b === void 0 ? void 0 : _b.toString();
+                    options.push(`dynamicSource: (() => {
+            try { return ${s}; } catch {}
+            try { return this.${s}; } catch {}
+          })()`);
                 }
                 else if ((firstFirst === null || firstFirst === void 0 ? void 0 : firstFirst.get()) instanceof abaplint.Expressions.FieldChain && firstFirst instanceof abaplint.Nodes.ExpressionNode) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(firstFirst, traversal).getCode();
@@ -71307,7 +71313,11 @@ class AssignTranspiler {
                 }
             }
             else if ((first === null || first === void 0 ? void 0 : first.get()) instanceof abaplint.Expressions.Source && first instanceof abaplint.Nodes.ExpressionNode) {
-                options.push(`dynamicSource: (() => {try { return ${first.concatTokens()}; } catch {}})()`);
+                const name = first.concatTokens().toLowerCase();
+                options.push(`dynamicSource: (() => {
+          try { return ${name}; } catch {}
+          try { return this.${name}; } catch {}
+        })()`);
             }
         }
         if (concat.endsWith(" CASTING.") || concat.includes(" CASTING TYPE ")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.6.17",
+  "version": "2.6.19",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,7 +25,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.17",
+    "@abaplint/transpiler": "^2.6.19",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",