@abaplint/transpiler 2.0.51 → 2.0.54

package/build/src/index.js

@@ -28,7 +28,7 @@ class Transpiler {
         return new Transpiler().run(reg);
     }
     async run(reg, progress) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         reg.parse();
         new keywords_1.Keywords().handle(reg);
         this.validate(reg);
@@ -38,6 +38,7 @@ class Transpiler {
             unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_a = this.options) === null || _a === void 0 ? void 0 : _a.skip, (_b = this.options) === null || _b === void 0 ? void 0 : _b.only),
             unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_c = this.options) === null || _c === void 0 ? void 0 : _c.skip, (_d = this.options) === null || _d === void 0 ? void 0 : _d.only),
             initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_e = this.options) === null || _e === void 0 ? void 0 : _e.extraSetup),
+            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_f = this.options) === null || _f === void 0 ? void 0 : _f.extraSetup, true),
             databaseSetup: dbSetup,
             reg: reg,
         };

package/build/src/types.d.ts

@@ -17,6 +17,7 @@ export interface IOutput {
     unitTestScript: string;
     unitTestScriptOpen: string;
     initializationScript: string;
+    initializationScript2: string;
     databaseSetup: DatabaseSetupResult;
 }
 export interface IRequire {

package/build/src/unit_test.d.ts

@@ -6,7 +6,7 @@ export declare type TestMethodList = {
     method: string;
 }[];
 export declare class UnitTest {
-    initializationScript(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, extraSetup?: string): string;
+    initializationScript(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, extraSetup?: string, useImport?: boolean): string;
     private escapeNamespace;
     unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): string;
     unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList, _only?: TestMethodList): string;

package/build/src/unit_test.js

@@ -5,11 +5,18 @@ exports.UnitTest = void 0;
 const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this method somewhere else, its much more than just unit test relevant
-    initializationScript(reg, dbSetup, extraSetup) {
-        let ret = `/* eslint-disable import/newline-after-import */
+    initializationScript(reg, dbSetup, extraSetup, useImport) {
+        let ret = "";
+        if (useImport === true) {
+            ret = `/* eslint-disable import/newline-after-import */
+import "./_top.mjs";\n`;
+        }
+        else {
+            ret = `/* eslint-disable import/newline-after-import */
 import runtime from "@abaplint/runtime";
-globalThis.abap = new runtime.ABAP();
-${this.buildImports(reg)}
+globalThis.abap = new runtime.ABAP();\n`;
+        }
+        ret += `${this.buildImports(reg, useImport)}
 
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = \`${dbSetup.schemas.sqlite}\`;\n`;
@@ -67,7 +74,7 @@ async function run() {
                         ret += `  ls_input.get().class_name.set("${obj.getName()}");
   ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
   ls_input.get().method_name.set("${m.name.toUpperCase()}");
-  abap.statements.append({source: ls_input, target: lt_input});`;
+  abap.statements.append({source: ls_input, target: lt_input});\n`;
                     }
                 }
             }
@@ -146,13 +153,13 @@ async function run() {
         }
         ret += `// -------------------END-------------------
     console.log(abap.console.get());
-    fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
   } catch (e) {
     if (meth) {
       meth.fail();
     }
     console.log(abap.console.get());
-    fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
     throw e;
   }
 }
@@ -165,37 +172,38 @@ run().then(() => {
 });`;
         return ret;
     }
-    buildImports(reg) {
-        // note: ES modules are hoised, so use the dynamic import()
+    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
         const list = [];
-        for (const obj of reg.getObjects()) {
-            if (obj instanceof abaplint.Objects.Table) {
-                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.tabl.mjs");`);
+        const imp = (filename) => {
+            if (useImport === true) {
+                return `import "./${filename}.mjs";`;
             }
-            else if (obj instanceof abaplint.Objects.DataElement) {
-                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.dtel.mjs");`);
+            else {
+                return `await import("./${filename}.mjs");`;
             }
-            else if (obj instanceof abaplint.Objects.TableType) {
-                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.ttyp.mjs");`);
+        };
+        for (const obj of reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.Table
+                || obj instanceof abaplint.Objects.DataElement
+                || obj instanceof abaplint.Objects.TableType) {
+                list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
             }
         }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.FunctionGroup) {
                 for (const m of obj.getModules()) {
-                    list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.fugr.${m.getName().toLowerCase()}.mjs");`);
+                    list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.fugr.${m.getName().toLowerCase()}`));
                 }
             }
-            else if (obj instanceof abaplint.Objects.Class) {
-                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.clas.mjs");`);
-            }
-            else if (obj instanceof abaplint.Objects.Interface) {
-                list.push(`await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.intf.mjs");`);
+            else if (obj instanceof abaplint.Objects.Class
+                || obj instanceof abaplint.Objects.Interface) {
+                list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
             }
         }
-        list.sort();
-        return list.join("\n");
+        return list.sort().join("\n");
     }
 }
 exports.UnitTest = UnitTest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.0.51",
+  "version": "2.0.54",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.91.5",
+    "@abaplint/core": "^2.91.6",
     "source-map": "^0.7.4"
   },
   "devDependencies": {