@abaplint/transpiler 1.7.1 → 1.7.2

package/build/src/traversal.d.ts

@@ -31,6 +31,7 @@ export declare class Traversal {
     isInterfaceAttribute(token: abaplint.Token): string | undefined;
     private findReadOrWriteReference;
     buildConstructorContents(scope: abaplint.ISpaghettiScopeNode | undefined, def: abaplint.IClassDefinition, inputName: string): string;
+    private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined): string;

package/build/src/traversal.js

@@ -258,30 +258,6 @@ class Traversal {
             // for now just pass the same input
             ret += `await super.constructor_(${inputName});\n`;
         }
-        /*
-        for (const n in vars) {
-          const identifier = vars[n];
-          if (identifier.getMeta().includes(abaplint.IdentifierMeta.Static) === true) {
-            continue;
-          }
-          const name = n.toLowerCase().replace("~", "$");
-          if (name === "super") {
-            continue; // todo, https://github.com/abaplint/transpiler/issues/133
-          }
-    
-          // todo, better handling of variables from interfaces, it should only initialize those that are directly implemented
-          if (def.getAttributes().findByName(name) === undefined
-              && name.includes("$") === false
-              && name !== "me") {
-            continue;
-          }
-    
-          ret += "this." + name + " = " + new TranspileTypes().toType(identifier.getType()) + ";\n";
-          if (name === "me") {
-            ret += "this.me.set(this);\n";
-          }
-        }
-        */
         ret += "this.me = new abap.types.ABAPObject();\n";
         ret += "this.me.set(this);\n";
         for (const a of def.getAttributes().getAll()) {
@@ -293,18 +269,7 @@ class Traversal {
         }
         // attributes from directly implemented interfaces(not interfaces implemented in super classes)
         for (const i of def.getImplementing()) {
-            let intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(i.name);
-            if (intf === undefined) {
-                const iglobal = this.reg.getObject("INTF", i.name);
-                intf = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
-            }
-            for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
-                if (a.getMeta().includes("static" /* Static */) === true) {
-                    continue;
-                }
-                const name = i.name.toLowerCase() + "$" + a.getName().toLowerCase();
-                ret += "this." + name + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
-            }
+            ret += this.dataFromInterfaces(i.name, scope);
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases().getAll()) {
@@ -316,6 +281,25 @@ class Traversal {
         }
         return ret;
     }
+    dataFromInterfaces(name, scope) {
+        let ret = "";
+        let intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
+        if (intf === undefined) {
+            const iglobal = this.reg.getObject("INTF", name);
+            intf = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
+        }
+        for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
+            if (a.getMeta().includes("static" /* Static */) === true) {
+                continue;
+            }
+            const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
+            ret += "this." + n + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+        }
+        for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
+            ret += this.dataFromInterfaces(i.name, scope);
+        }
+        return ret;
+    }
     determineType(node, scope) {
         var _a;
         if (scope === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",