@abaplint/transpiler 2.1.84 → 2.1.86

package/build/src/expressions/target.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TargetTranspiler = void 0;
 const core_1 = require("@abaplint/core");
+const traversal_1 = require("../traversal");
 const _1 = require(".");
 const chunk_1 = require("../chunk");
 class TargetTranspiler {
@@ -22,9 +23,9 @@ class TargetTranspiler {
             }
             else if (c.get() instanceof core_1.Expressions.AttributeName) {
                 const intf = traversal.isInterfaceAttribute(c.getFirstToken());
-                let name = c.getFirstToken().getStr().replace("~", "$").toLowerCase();
+                let name = traversal_1.Traversal.escapeClassName(c.getFirstToken().getStr()).replace("~", "$").toLowerCase();
                 if (intf && name.startsWith(intf) === false) {
-                    name = intf + "$" + name;
+                    name = traversal_1.Traversal.escapeClassName(intf) + "$" + name;
                 }
                 ret.append(name, c, traversal);
             }

package/build/src/requires.js

@@ -8,7 +8,7 @@ class Requires {
     }
     // todo, refactor this method
     find(obj, _node, filename) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const ret = [];
         if (obj.getType() === "INTF") {
             return [];
@@ -28,18 +28,18 @@ class Requires {
         if (obj.getType() === "CLAS") {
             // add the superclass
             const clas = obj;
-            const sup = (_b = (_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getSuperClass()) === null || _b === void 0 ? void 0 : _b.toLowerCase().replace(/\//g, "%23");
+            const sup = (_b = (_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getSuperClass()) === null || _b === void 0 ? void 0 : _b.toLowerCase().replace(/\//g, "#");
             if (sup) {
-                add({ filename: sup + ".clas.abap", name: sup });
+                add({ filename: sup + ".clas.abap", name: (_d = (_c = clas.getDefinition()) === null || _c === void 0 ? void 0 : _c.getSuperClass()) === null || _d === void 0 ? void 0 : _d.toLowerCase() });
             }
             for (const f of clas.getSequencedFiles()) {
                 if (filename.endsWith(".testclasses.abap")) {
                     // add the global class, in case its inherited by a local testclass
-                    add({ filename: ((_c = clas.getMainABAPFile()) === null || _c === void 0 ? void 0 : _c.getFilename()) || "", name: obj.getName().toLowerCase() });
+                    add({ filename: ((_e = clas.getMainABAPFile()) === null || _e === void 0 ? void 0 : _e.getFilename()) || "", name: obj.getName().toLowerCase() });
                 }
                 if (f.getFilename() === filename
                     || f.getFilename().endsWith(".clas.testclasses.abap")
-                    || f.getFilename() === ((_d = clas.getMainABAPFile()) === null || _d === void 0 ? void 0 : _d.getFilename())) {
+                    || f.getFilename() === ((_f = clas.getMainABAPFile()) === null || _f === void 0 ? void 0 : _f.getFilename())) {
                     continue;
                 }
                 let foo = f.getFilename();
@@ -77,7 +77,7 @@ class Requires {
         if (obj.getType() !== "INTF") {
             const cx = this.reg.getObject("CLAS", "CX_ROOT");
             if (cx && cx instanceof abaplint.ABAPObject) {
-                const main = (_e = cx.getMainABAPFile()) === null || _e === void 0 ? void 0 : _e.getFilename();
+                const main = (_g = cx.getMainABAPFile()) === null || _g === void 0 ? void 0 : _g.getFilename();
                 if (main) {
                     add({
                         filename: main,
@@ -93,7 +93,7 @@ class Requires {
                     }
                     const found = this.reg.getObject("CLAS", c.superClassName);
                     if (found && found instanceof abaplint.ABAPObject) {
-                        const main = (_f = found.getMainABAPFile()) === null || _f === void 0 ? void 0 : _f.getFilename();
+                        const main = (_h = found.getMainABAPFile()) === null || _h === void 0 ? void 0 : _h.getFilename();
                         if (main) {
                             add({
                                 filename: main,

package/build/src/statements/class_implementation.js

@@ -15,7 +15,7 @@ class ClassImplementationTranspiler {
             ret += " extends Error";
         }
         else if (def === null || def === void 0 ? void 0 : def.getSuperClass()) {
-            ret += " extends " + ((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            ret += " extends " + traversal_1.Traversal.escapeClassName((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
         }
         return new chunk_1.Chunk().append(ret + ` {
 static INTERNAL_TYPE = 'CLAS';

package/build/src/unit_test.d.ts

@@ -11,4 +11,5 @@ export declare class UnitTest {
     unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): string;
     unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList, _only?: TestMethodList): string;
     private buildImports;
+    private hasClassConstructor;
 }

package/build/src/unit_test.js

@@ -181,7 +181,6 @@ run().then(() => {
     buildImports(reg, useImport) {
         // note: ES modules are hoised, so use the dynamic import(), due to setting of globalThis.abap
         // some sorting required: eg. a class constructor using constant from interface
-        var _a;
         const list = [];
         const late = [];
         const imp = (filename) => {
@@ -207,7 +206,7 @@ run().then(() => {
             }
             else if (obj instanceof abaplint.Objects.Class) {
                 if (obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
-                    && ((_a = obj.getDefinition()) === null || _a === void 0 ? void 0 : _a.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR")) !== undefined) {
+                    && this.hasClassConstructor(reg, obj)) {
                     // this will not solve all problems with class constors 100%, but probably good enough
                     late.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
                 }
@@ -221,6 +220,22 @@ run().then(() => {
         }
         return [...list.sort(), ...late].join("\n");
     }
+    // class constructors might make early use of eg. constants from interfaces
+    // sub classes will import() super classes and trigger a class constructor of the super
+    hasClassConstructor(reg, clas) {
+        var _a, _b;
+        if (((_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR")) !== undefined) {
+            return true;
+        }
+        const sup = (_b = clas.getDefinition()) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+        if (sup !== undefined) {
+            const superClass = reg.getObject("CLAS", sup);
+            if (superClass) {
+                return this.hasClassConstructor(reg, superClass);
+            }
+        }
+        return false;
+    }
 }
 exports.UnitTest = UnitTest;
 //# sourceMappingURL=unit_test.js.map

package/package.json

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