@abaplint/transpiler-cli 2.6.29 → 2.6.31

package/build/bundle.js

@@ -19568,16 +19568,19 @@ class CurrentScope {
         if (name === undefined) {
             return { found: false };
         }
-        let RTTIPrefix = "";
+        let prefixRTTI = "";
         if (this.parentObj.getType() === "PROG") {
-            RTTIPrefix = "\\PROGRAM=" + this.parentObj.getName();
+            prefixRTTI = "\\PROGRAM=" + this.parentObj.getName();
         }
         else if (this.parentObj.getType() === "CLAS") {
-            RTTIPrefix = "\\CLASS-POOL=" + this.parentObj.getName();
+            prefixRTTI = "\\CLASS-POOL=" + this.parentObj.getName();
         }
         const findLocalClass = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findClassDefinition(name);
         if (findLocalClass) {
-            return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: RTTIPrefix + "\\CLASS=" + findLocalClass.getName() };
+            if (findLocalClass.isGlobal() === true) {
+                prefixRTTI = "";
+            }
+            return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS", RTTIName: prefixRTTI + "\\CLASS=" + findLocalClass.getName() };
         }
         const globalClas = this.reg.getObject("CLAS", name);
         if (globalClas) {
@@ -19585,7 +19588,10 @@ class CurrentScope {
         }
         const findLocalInterface = (_b = this.current) === null || _b === void 0 ? void 0 : _b.findInterfaceDefinition(name);
         if (findLocalInterface) {
-            return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: RTTIPrefix + "\\INTERFACE=" + findLocalInterface.getName() };
+            if (findLocalInterface.isGlobal() === true) {
+                prefixRTTI = "";
+            }
+            return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF", RTTIName: prefixRTTI + "\\INTERFACE=" + findLocalInterface.getName() };
         }
         const globalIntf = this.reg.getObject("INTF", name);
         if (globalIntf) {
@@ -46517,7 +46523,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.16";
+        return "2.97.17";
     }
     getDDICReferences() {
         return this.references;
@@ -72004,8 +72010,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) {
@@ -72018,7 +72024,7 @@ static ATTRIBUTES = {${traversal.buildAttributes(def)}};`, node, traversal);
         }
         return list;
     }
-    findImplementedClass(traversal, def, scope) {
+    findImplementedByClass(traversal, def, scope) {
         if (def === undefined || scope === undefined) {
             return [];
         }
@@ -72030,7 +72036,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;
@@ -77132,11 +77138,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";
@@ -77880,10 +77887,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()) {
@@ -77896,9 +77906,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()) {
@@ -77911,9 +77921,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-cli",
-  "version": "2.6.29",
+  "version": "2.6.31",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.29",
+    "@abaplint/transpiler": "^2.6.31",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^18.15.13",
-    "@abaplint/core": "^2.97.16",
+    "@types/node": "^18.16.0",
+    "@abaplint/core": "^2.97.17",
     "progress": "^2.0.3",
     "webpack": "^5.80.0",
     "webpack-cli": "^5.0.2",