@abaplint/transpiler 2.5.66 → 2.5.68

package/build/src/statements/class_implementation.js

@@ -22,7 +22,7 @@ class ClassImplementationTranspiler {
         return new chunk_1.Chunk().append(ret + ` {
 static INTERNAL_TYPE = 'CLAS';
 static IMPLEMENTED_INTERFACES = [${this.findImplementedClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
-static ATTRIBUTES = {};`, node, traversal);
+static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {
         if (def === undefined || scope === undefined) {

package/build/src/structures/interface.d.ts

@@ -4,7 +4,6 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class InterfaceTranspiler implements IStructureTranspiler {
     transpile(node: abaplint.Nodes.StructureNode, traversal: Traversal): Chunk;
-    private buildAttributes;
     private buildTypes;
     private buildConstants;
 }

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 = {${this.buildAttributes(def)}};\n`;
+                ret += `static ATTRIBUTES = {${traversal.buildAttributes(def)}};\n`;
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {
                 ret += "}\n";
@@ -29,18 +29,6 @@ class InterfaceTranspiler {
         ret += this.buildTypes(def);
         return new chunk_1.Chunk(ret);
     }
-    buildAttributes(idef) {
-        const attr = [];
-        for (const a of (idef === null || idef === void 0 ? void 0 : idef.getAttributes().getAll()) || []) {
-            const type = new transpile_types_1.TranspileTypes().toType(a.getType());
-            attr.push(`"${a.getName().toUpperCase()}": {"type": ${type}, "visibility": "U", "is_constant": " "}`);
-        }
-        for (const a of (idef === null || idef === void 0 ? void 0 : idef.getAttributes().getConstants()) || []) {
-            const type = new transpile_types_1.TranspileTypes().toType(a.getType());
-            attr.push(`"${a.getName().toUpperCase()}": {"type": ${type}, "visibility": "U", "is_constant": "X"}`);
-        }
-        return attr.join(",\n");
-    }
     buildTypes(idef) {
         if (idef === undefined) {
             return "";

package/build/src/traversal.d.ts

@@ -24,6 +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;
     isBuiltinMethod(token: abaplint.Token): boolean;
     findMethodReference(token: abaplint.Token, scope: ISpaghettiScopeNode | undefined): undefined | {
         def: abaplint.Types.MethodDefinition;

package/build/src/traversal.js

@@ -169,6 +169,19 @@ class Traversal {
         }
         return undefined;
     }
+    buildAttributes(def) {
+        const attr = [];
+        // TODO: visibility is wrong for classes
+        for (const a of (def === null || def === void 0 ? void 0 : def.getAttributes().getAll()) || []) {
+            const type = new transpile_types_1.TranspileTypes().toType(a.getType());
+            attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "U", "is_constant": " "}`);
+        }
+        for (const a of (def === null || def === void 0 ? void 0 : def.getAttributes().getConstants()) || []) {
+            const type = new transpile_types_1.TranspileTypes().toType(a.getType());
+            attr.push(`"${a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "U", "is_constant": "X"}`);
+        }
+        return attr.join(",\n");
+    }
     isBuiltinMethod(token) {
         const scope = this.findCurrentScopeByToken(token);
         if (scope === undefined) {

package/package.json

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