@abaplint/transpiler 2.6.16 → 2.6.18

package/build/src/chunk.d.ts

@@ -13,6 +13,6 @@ export declare class Chunk {
     stripLastNewline(): void;
     getCode(): string;
     toString(): string;
-    runIndentationLogic(): this;
+    runIndentationLogic(ignoreSourceMap?: boolean): this;
     getMap(generatedFilename: string): string;
 }

package/build/src/chunk.js

@@ -46,7 +46,7 @@ class Chunk {
         const lines = this.raw.split("\n");
         const lineCount = lines.length;
         const lastLine = lines[lines.length - 1];
-        append.mappings.forEach(m => {
+        for (const m of append.mappings) {
             // original stays the same, but adjust the generated positions
             const add = m;
             if (add.generated.line === 1 && this.raw.endsWith("\n") === false) {
@@ -56,7 +56,7 @@ class Chunk {
                 add.generated.line += lineCount - 1;
             }
             this.mappings.push(add);
-        });
+        }
         this.raw += append.getCode();
         return this;
     }
@@ -108,10 +108,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;

package/build/src/handlers/handle_abap.js

@@ -11,7 +11,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?
@@ -27,7 +27,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 = {
@@ -43,7 +43,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;

package/build/src/statements/assign.js

@@ -7,7 +7,7 @@ const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 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();
@@ -59,8 +59,13 @@ 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();
+                    if (s === "me") {
+                        options.push(`dynamicSource: this.me`);
+                    }
+                    else {
+                        options.push(`dynamicSource: (() => {try { return ${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();

package/build/src/traversal.js

@@ -460,7 +460,7 @@ class Traversal {
         }
         const name = def.getName();
         if (def.isGlobal() === false) {
-            const prefix = this.buildPrefix(def);
+            const prefix = this.buildPrefix();
             return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
         }
         else {
@@ -506,7 +506,7 @@ class Traversal {
         }
         if (def) {
             if (def.isGlobal() === false) {
-                const prefix = this.buildPrefix(def);
+                const prefix = this.buildPrefix();
                 return `abap.Classes['${prefix}-${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}']`;
             }
             else {
@@ -518,13 +518,8 @@ class Traversal {
             return "abap.Classes['" + name.toUpperCase() + "']";
         }
     }
-    buildPrefix(def) {
-        const file = this.reg.getFileByName(def.getFilename());
-        if (file === undefined) {
-            return "NOT_FOUND";
-        }
-        const obj = this.reg.findObjectForFile(file);
-        return (obj === null || obj === void 0 ? void 0 : obj.getType()) + "-" + (obj === null || obj === void 0 ? void 0 : obj.getName());
+    buildPrefix() {
+        return this.obj.getType() + "-" + this.obj.getName();
     }
     ////////////////////////////
     traverseStructure(node) {

package/build/src/types.d.ts

@@ -55,4 +55,6 @@ export interface ITranspilerOptions {
     keywords?: string[];
     /** dont insert into REPOSRC */
     skipReposrc?: boolean;
+    /** ignore source map */
+    ignoreSourceMap?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.16",
+  "version": "2.6.18",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.97.10",
+    "@abaplint/core": "^2.97.12",
     "source-map": "^0.7.4"
   },
   "devDependencies": {