@abaplint/transpiler 2.6.29 → 2.6.31

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

@@ -5,5 +5,5 @@ import { Chunk } from "../chunk";
 export declare class ClassImplementationTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
     private findImplementedInterface;
-    private findImplementedClass;
+    private findImplementedByClass;
 }

package/build/src/statements/class_implementation.js

@@ -22,8 +22,8 @@ class ClassImplementationTranspiler {
         return new chunk_1.Chunk().append(ret + ` {
 static INTERNAL_TYPE = 'CLAS';
 static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
-static IMPLEMENTED_INTERFACES = [${this.findImplementedClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
-static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
+static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
+static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {
         if (def === undefined || scope === undefined) {
@@ -36,7 +36,7 @@ static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
         }
         return list;
     }
-    findImplementedClass(traversal, def, scope) {
+    findImplementedByClass(traversal, def, scope) {
         if (def === undefined || scope === undefined) {
             return [];
         }
@@ -48,7 +48,7 @@ static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
         let sup = def.getSuperClass();
         while (sup !== undefined) {
             const sdef = traversal.findClassDefinition(sup, scope);
-            list.push(...this.findImplementedClass(traversal, sdef, scope));
+            list.push(...this.findImplementedByClass(traversal, sdef, scope));
             sup = sdef === null || sdef === void 0 ? void 0 : sdef.getSuperClass();
         }
         return list;

package/build/src/structures/interface.js

@@ -14,11 +14,12 @@ class InterfaceTranspiler {
         const def = traversal.getInterfaceDefinition(node.getFirstToken());
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.Interface) {
+                const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
                 name = (_a = c.findDirectExpression(abaplint.Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toLowerCase();
                 name = traversal_1.Traversal.escapeNamespace(name);
                 ret += `class ${name} {\n`;
                 ret += `static INTERNAL_TYPE = 'INTF';\n`;
-                ret += `static ATTRIBUTES = {${traversal.buildAttributes(def)}};\n`;
+                ret += `static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};\n`;
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {
                 ret += "}\n";

package/build/src/traversal.d.ts

@@ -24,7 +24,7 @@ export declare class Traversal {
     private isClassAttribute;
     prefixAndName(t: abaplint.Token, filename?: string): string;
     private isStaticClassAttribute;
-    buildAttributes(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
+    buildAttributes(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined, scope: abaplint.ISpaghettiScopeNode | undefined, prefix?: string): string[];
     isBuiltinMethod(token: abaplint.Token): boolean;
     findMethodReference(token: abaplint.Token, scope: ISpaghettiScopeNode | undefined): undefined | {
         def: abaplint.Types.MethodDefinition;

package/build/src/traversal.js

@@ -169,10 +169,13 @@ class Traversal {
         }
         return undefined;
     }
-    buildAttributes(def) {
+    buildAttributes(def, scope, prefix = "") {
         var _a, _b;
         const attr = [];
-        for (const a of ((_a = def === null || def === void 0 ? void 0 : def.getAttributes()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        if (def === undefined) {
+            return attr;
+        }
+        for (const a of ((_a = def.getAttributes()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             let runtime = "";
             switch (a.getVisibility()) {
@@ -185,9 +188,9 @@ class Traversal {
                 default:
                     runtime = "U";
             }
-            attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": " "}`);
+            attr.push(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": " "}`);
         }
-        for (const a of ((_b = def === null || def === void 0 ? void 0 : def.getAttributes()) === null || _b === void 0 ? void 0 : _b.getConstants()) || []) {
+        for (const a of ((_b = def.getAttributes()) === null || _b === void 0 ? void 0 : _b.getConstants()) || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             let runtime = "";
             switch (a.getVisibility()) {
@@ -200,9 +203,13 @@ class Traversal {
                 default:
                     runtime = "U";
             }
-            attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": "X"}`);
+            attr.push(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": "X"}`);
+        }
+        for (const impl of def.getImplementing()) {
+            const idef = this.findInterfaceDefinition(impl.name, scope);
+            attr.push(...this.buildAttributes(idef, scope, impl.name.toUpperCase() + "~"));
         }
-        return attr.join(",\n");
+        return attr;
     }
     isBuiltinMethod(token) {
         const scope = this.findCurrentScopeByToken(token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.29",
+  "version": "2.6.31",
   "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.16",
+    "@abaplint/core": "^2.97.17",
     "source-map": "^0.7.4"
   },
   "devDependencies": {