@abaplint/transpiler-cli 2.5.27 → 2.5.29

package/build/bundle.js

@@ -21639,6 +21639,7 @@ const structure_type_1 = __webpack_require__(/*! ../../types/basic/structure_typ
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const types_1 = __webpack_require__(/*! ../../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 class ComponentChain {
     runSyntax(context, node, scope, filename) {
         const children = node.getChildren();
@@ -21684,22 +21685,22 @@ class ComponentChain {
                 }
                 else if (context instanceof basic_1.ObjectReferenceType) {
                     const id = context.getIdentifier();
-                    if (id instanceof types_1.InterfaceDefinition || id instanceof types_1.ClassDefinition) {
-                        const found = id.getAttributes().findByName(name);
-                        context = found === null || found === void 0 ? void 0 : found.getType();
-                        if (context === undefined) {
-                            throw new Error("Attribute \"" + name + "\" not found");
-                        }
-                        else {
-                            const extra = {
-                                ooName: id.getName(),
-                                ooType: id instanceof types_1.ClassDefinition ? "CLAS" : "INTF"
-                            };
-                            scope.addReference(child.getFirstToken(), found, _reference_1.ReferenceType.DataWriteReference, filename, extra);
-                        }
+                    const def = scope.findObjectDefinition(id.getName());
+                    if (def === undefined) {
+                        throw new Error(id.getName() + " not found in scope");
+                    }
+                    const helper = new _object_oriented_1.ObjectOriented(scope);
+                    const found = helper.searchAttributeName(def, name);
+                    context = found === null || found === void 0 ? void 0 : found.getType();
+                    if (context === undefined) {
+                        throw new Error("Attribute \"" + name + "\" not found");
                     }
                     else {
-                        throw new Error("ComponentChain, unexpected type2");
+                        const extra = {
+                            ooName: id.getName(),
+                            ooType: id instanceof types_1.ClassDefinition ? "CLAS" : "INTF"
+                        };
+                        scope.addReference(child.getFirstToken(), found, _reference_1.ReferenceType.DataWriteReference, filename, extra);
                     }
                 }
                 else {
@@ -46209,7 +46210,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.36";
+        return "2.95.38";
     }
     getDDICReferences() {
         return this.references;
@@ -75891,7 +75892,7 @@ class ClassImplementationTranspiler {
         return false;
     }
     /** Finds static attributes + constants including those from interfaces (from superclass is ingored) */
-    findStaticAttributes(cdef, scope) {
+    findStaticAttributes(cdef, scope, traversal) {
         const ret = [];
         ret.push(...cdef.getAttributes().getStatic().map(a => { return { identifier: a, prefix: "" }; }));
         ret.push(...cdef.getAttributes().getConstants().map(a => { return { identifier: a, prefix: "" }; }));
@@ -75901,14 +75902,17 @@ class ClassImplementationTranspiler {
             if (i === undefined) {
                 break;
             }
-            const intf = scope.findInterfaceDefinition(i.name);
+            const intf = traversal.findInterfaceDefinition(i.name, scope);
             if (intf === undefined) {
                 continue;
             }
-            // todo, constants from interface?
             implementing.push(...intf.getImplementing());
-            ret.push(...intf.getAttributes().getStatic().map(a => { return { identifier: a, prefix: intf.getName().toLowerCase() + "$" }; }));
-            ret.push(...intf.getAttributes().getConstants().map(a => { return { identifier: a, prefix: intf.getName().toLowerCase() + "$" }; }));
+            ret.push(...intf.getAttributes().getStatic().map(a => {
+                return { identifier: a, prefix: intf.getName().toLowerCase() + "$" };
+            }));
+            ret.push(...intf.getAttributes().getConstants().map(a => {
+                return { identifier: a, prefix: intf.getName().toLowerCase() + "$" };
+            }));
         }
         return ret;
     }
@@ -75942,7 +75946,7 @@ class ClassImplementationTranspiler {
         }
         let ret = "";
         const clasName = node.getFirstToken().getStr().toLowerCase();
-        const staticAttributes = this.findStaticAttributes(cdef, scope);
+        const staticAttributes = this.findStaticAttributes(cdef, scope, traversal);
         for (const attr of staticAttributes) {
             const name = traversal_1.Traversal.escapeNamespace(clasName) + "." + traversal_1.Traversal.escapeNamespace(attr.prefix) + traversal_1.Traversal.escapeNamespace(attr.identifier.getName().toLowerCase());
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.27",
+  "version": "2.5.29",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.27",
+    "@abaplint/transpiler": "^2.5.29",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.36",
+    "@abaplint/core": "^2.95.38",
     "progress": "^2.0.3",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.0.1",