@abaplint/transpiler 2.0.33 → 2.0.36

package/build/src/requires.js

@@ -8,7 +8,7 @@ class Requires {
     }
     // todo, refactor this method
     find(obj, _node, filename) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const ret = [];
         if (obj.getType() === "INTF") {
             return [];
@@ -85,6 +85,24 @@ class Requires {
                     });
                 }
             }
+            // include global super classes for local class definitions
+            for (const f of obj.getSequencedFiles()) {
+                for (const c of f.getInfo().listClassDefinitions()) {
+                    if (c.superClassName === undefined) {
+                        continue;
+                    }
+                    const found = this.reg.getObject("CLAS", c.superClassName);
+                    if (found && found instanceof abaplint.ABAPObject) {
+                        const main = (_f = found.getMainABAPFile()) === null || _f === void 0 ? void 0 : _f.getFilename();
+                        if (main) {
+                            add({
+                                filename: main,
+                                name: found.getName().toLowerCase(),
+                            });
+                        }
+                    }
+                }
+            }
         }
         return ret;
     }

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

@@ -4,4 +4,5 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class DataTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    static buildValue(node: abaplint.Nodes.StatementNode, name: string, traversal: Traversal): string;
 }

package/build/src/statements/data.js

@@ -21,6 +21,16 @@ class DataTranspiler {
         if (found === undefined) {
             throw new Error("DataTranspiler, var not found, \"" + token.getStr() + "\"");
         }
+        const value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        const ret = new chunk_1.Chunk()
+            .appendString("let ")
+            .append(found.getName().toLowerCase(), token, traversal)
+            .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
+            .append(";", node.getLastToken(), traversal)
+            .append(value, node.getLastToken(), traversal);
+        return ret;
+    }
+    static buildValue(node, name, traversal) {
         let value = "";
         const val = node.findFirstExpression(abaplint.Expressions.Value);
         if (val) {
@@ -30,20 +40,14 @@ class DataTranspiler {
             }
             if (int) {
                 const escaped = new constant_1.ConstantTranspiler().escape(int.concatTokens());
-                value = "\n" + found.getName().toLowerCase() + ".set(" + escaped + ");";
+                value = "\n" + name + ".set(" + escaped + ");";
             }
             else if (val.getChildren()[1].get() instanceof abaplint.Expressions.SimpleFieldChain) {
                 const s = new expressions_1.FieldChainTranspiler().transpile(val.getChildren()[1], traversal).getCode();
-                value = "\n" + found.getName().toLowerCase() + ".set(" + s + ");";
+                value = "\n" + name + ".set(" + s + ");";
             }
         }
-        const ret = new chunk_1.Chunk()
-            .appendString("let ")
-            .append(found.getName().toLowerCase(), token, traversal)
-            .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
-            .append(";", node.getLastToken(), traversal)
-            .append(value, node.getLastToken(), traversal);
-        return ret;
+        return value;
     }
 }
 exports.DataTranspiler = DataTranspiler;

package/build/src/structures/data.js

@@ -6,11 +6,19 @@ const statements_1 = require("../statements");
 const chunk_1 = require("../chunk");
 class DataTranspiler {
     transpile(node, traversal) {
+        var _a, _b;
         const begin = node.findDirectStatement(abaplint.Statements.DataBegin);
         if (begin === undefined) {
             return new chunk_1.Chunk("");
         }
+        const topName = (_a = begin.findDirectExpression(abaplint.Expressions.DefinitionName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toLowerCase();
         const chunk = new statements_1.DataTranspiler().transpile(begin, traversal);
+        for (const d of node.findDirectStatements(abaplint.Statements.Data)) {
+            const subName = (_b = d.findFirstExpression(abaplint.Expressions.DefinitionName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toLowerCase();
+            if (subName && topName) {
+                chunk.appendString(statements_1.DataTranspiler.buildValue(d, topName + ".get()." + subName, traversal));
+            }
+        }
         chunk.appendString("\n");
         return chunk;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.0.33",
+  "version": "2.0.36",
   "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.91.1",
+    "@abaplint/core": "^2.91.2",
     "source-map": "^0.7.4"
   },
   "devDependencies": {