@abaplint/transpiler 2.10.43 → 2.10.45

package/build/src/statements/class_implementation.js

@@ -22,7 +22,7 @@ class ClassImplementationTranspiler {
 static INTERNAL_TYPE = 'CLAS';
 static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
 static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
-static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};
+static ATTRIBUTES = {${Array.from(traversal.buildAttributes(def, scope)).join(",\n")}};
 static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {

package/build/src/structures/interface.js

@@ -18,7 +18,7 @@ class InterfaceTranspiler {
                 name = traversal_1.Traversal.escapeNamespace(name);
                 ret += `class ${name} {\n`;
                 ret += `static INTERNAL_TYPE = 'INTF';\n`;
-                ret += `static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};\n`;
+                ret += `static ATTRIBUTES = {${Array.from(traversal.buildAttributes(def, scope)).join(",\n")}};\n`;
                 ret += `static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};\n`;
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {

package/build/src/traversal.d.ts

@@ -28,7 +28,7 @@ export declare class Traversal {
     private isStaticClassAttribute;
     buildMethods(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined, _scope: abaplint.ISpaghettiScopeNode | undefined): string[];
     private mapVisibility;
-    buildAttributes(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined, scope: abaplint.ISpaghettiScopeNode | undefined, prefix?: string): string[];
+    buildAttributes(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined, scope: abaplint.ISpaghettiScopeNode | undefined, prefix?: string): Set<string>;
     isBuiltinMethod(token: abaplint.Token): boolean;
     isSQLConversion(token: abaplint.Token): string | undefined;
     findMethodReference(token: abaplint.Token, scope: ISpaghettiScopeNode | undefined): undefined | {

package/build/src/traversal.js

@@ -226,7 +226,8 @@ class Traversal {
         }
     }
     buildAttributes(def, scope, prefix = "") {
-        const attr = [];
+        // using a Set to avoid duplicates from nested identical interfaces
+        const attr = new Set();
         if (def === undefined) {
             return attr;
         }
@@ -234,7 +235,7 @@ class Traversal {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             const runtime = this.mapVisibility(a.getVisibility());
             const isClass = a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) ? "X" : " ";
-            attr.push(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": " ", "is_class": "${isClass}"}`);
+            attr.add(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": " ", "is_class": "${isClass}"}`);
         }
         for (const a of def.getAttributes()?.getConstants() || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
@@ -249,11 +250,11 @@ class Traversal {
                 default:
                     runtime = "U";
             }
-            attr.push(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": "X", "is_class": "X"}`);
+            attr.add(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": "X", "is_class": "X"}`);
         }
         for (const impl of def.getImplementing()) {
             const idef = this.findInterfaceDefinition(impl.name, scope);
-            attr.push(...this.buildAttributes(idef, scope, impl.name.toUpperCase() + "~"));
+            this.buildAttributes(idef, scope, impl.name.toUpperCase() + "~").forEach(a => attr.add(a));
         }
         return attr;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.43",
+  "version": "2.10.45",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.108",
+    "@abaplint/core": "^2.113.110",
     "source-map": "^0.7.4"
   },
   "devDependencies": {