@abaplint/transpiler 2.1.82 → 2.1.84

package/build/src/expressions/field_chain.js

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

package/build/src/unit_test.js

@@ -28,7 +28,7 @@ export async function initializeABAP() {\n`;
         ret += `  const schemas = {sqlite, hdb, pg};\n`;
         ret += `  const insert = [];\n`;
         for (const i of dbSetup.insert) {
-            ret += `insert.push(\`${i}\`);\n`;
+            ret += `  insert.push(\`${i}\`);\n`;
         }
         if (extraSetup === undefined) {
             ret += `// no setup logic specified in config\n`;
@@ -180,9 +180,10 @@ run().then(() => {
     }
     buildImports(reg, useImport) {
         // note: ES modules are hoised, so use the dynamic import(), due to setting of globalThis.abap
-        // todo, some sorting might be required? eg. a class constructor using constant from interface?
-        // temporary sorting: by filename
+        // some sorting required: eg. a class constructor using constant from interface
+        var _a;
         const list = [];
+        const late = [];
         const imp = (filename) => {
             if (useImport === true) {
                 return `import "./${filename}.mjs";`;
@@ -204,12 +205,21 @@ run().then(() => {
                     list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.fugr.${m.getName().toLowerCase()}`));
                 }
             }
-            else if (obj instanceof abaplint.Objects.Class
-                || obj instanceof abaplint.Objects.Interface) {
+            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 will not solve all problems with class constors 100%, but probably good enough
+                    late.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+                }
+                else {
+                    list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+                }
+            }
+            else if (obj instanceof abaplint.Objects.Interface) {
                 list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
             }
         }
-        return list.sort().join("\n");
+        return [...list.sort(), ...late].join("\n");
     }
 }
 exports.UnitTest = UnitTest;

package/package.json

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