@abaplint/transpiler-cli 2.10.38 → 2.10.40

package/build/bundle.js

@@ -80657,6 +80657,7 @@ const handle_smim_1 = __webpack_require__(/*! ./handlers/handle_smim */ "./node_
 const handle_msag_1 = __webpack_require__(/*! ./handlers/handle_msag */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_msag.js");
 const handle_oa2p_1 = __webpack_require__(/*! ./handlers/handle_oa2p */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_oa2p.js");
 const handle_fugr_1 = __webpack_require__(/*! ./handlers/handle_fugr */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_fugr.js");
+const initialization_1 = __webpack_require__(/*! ./initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -80681,8 +80682,8 @@ class Transpiler {
             objects: [],
             unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, this.options?.skip),
             unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, this.options?.skip),
-            initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, this.options?.extraSetup),
-            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, this.options?.extraSetup, true),
+            initializationScript: new initialization_1.Initialization().script(reg, dbSetup, this.options?.extraSetup),
+            initializationScript2: new initialization_1.Initialization().script(reg, dbSetup, this.options?.extraSetup, true),
             databaseSetup: dbSetup,
             reg: reg,
         };
@@ -80745,6 +80746,135 @@ exports.Transpiler = Transpiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/initialization.js":
+/*!***********************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/initialization.js ***!
+  \***********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Initialization = void 0;
+exports.escapeNamespaceFilename = escapeNamespaceFilename;
+const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+function escapeNamespaceFilename(filename) {
+    // ES modules are resolved and cached as URLs. This means that special characters must be
+    // percent-encoded, such as # with %23 and ? with %3F.
+    return filename.replace(/\//g, "%23");
+}
+class Initialization {
+    script(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();\n`;
+        }
+        ret += `${this.buildImports(reg, useImport)}
+
+  export async function initializeABAP() {\n`;
+        ret += `  const sqlite = [];\n`;
+        for (const i of dbSetup.schemas.sqlite) {
+            ret += `  sqlite.push(\`${i}\`);\n`;
+        }
+        ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
+        ret += `  const pg = [];\n`;
+        for (const i of dbSetup.schemas.pg) {
+            ret += `  pg.push(\`${i}\`);\n`;
+        }
+        ret += `  const snowflake = [];\n`;
+        for (const i of dbSetup.schemas.snowflake) {
+            ret += `  snowflake.push(\`${i}\`);\n`;
+        }
+        ret += `  const schemas = {sqlite, hdb, pg, snowflake};\n`;
+        ret += `\n`;
+        ret += `  const insert = [];\n`;
+        for (const i of dbSetup.insert) {
+            ret += `  insert.push(\`${i}\`);\n`;
+        }
+        ret += `\n`;
+        if (extraSetup === undefined || extraSetup === "") {
+            ret += `// no setup logic specified in config\n`;
+        }
+        else {
+            ret += `  const {setup} = await import("${extraSetup}");\n` +
+                `  await setup(globalThis.abap, schemas, insert);\n`;
+        }
+        ret += `}`;
+        return ret;
+    }
+    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
+        const list = [];
+        const late = [];
+        const imp = (filename) => {
+            if (useImport === true) {
+                return `import "./${filename}.mjs";`;
+            }
+            else {
+                return `await import("./${filename}.mjs");`;
+            }
+        };
+        for (const obj of reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.Table
+                || obj instanceof abaplint.Objects.DataElement
+                || obj instanceof abaplint.Objects.LockObject
+                || obj instanceof abaplint.Objects.MessageClass
+                || obj instanceof abaplint.Objects.MIMEObject
+                || obj instanceof abaplint.Objects.Oauth2Profile
+                || obj instanceof abaplint.Objects.WebMIME
+                || obj instanceof abaplint.Objects.TypePool
+                || obj instanceof abaplint.Objects.TableType) {
+                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+            }
+        }
+        for (const obj of reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.FunctionGroup) {
+                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.fugr`));
+            }
+            else if (obj instanceof abaplint.Objects.Class) {
+                if (obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
+                    && this.hasClassConstructor(reg, obj)) {
+                    // this will not solve all problems with class constors 100%, but probably good enough
+                    late.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+                }
+                else {
+                    list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+                }
+            }
+            else if (obj instanceof abaplint.Objects.Interface) {
+                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+            }
+        }
+        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) {
+        if (clas.getDefinition()?.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR") !== undefined) {
+            return true;
+        }
+        const sup = clas.getDefinition()?.getSuperClass();
+        if (sup !== undefined) {
+            const superClass = reg.getObject("CLAS", sup);
+            if (superClass) {
+                return this.hasClassConstructor(reg, superClass);
+            }
+        }
+        return false;
+    }
+}
+exports.Initialization = Initialization;
+//# sourceMappingURL=initialization.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/keywords.js":
 /*!*****************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/keywords.js ***!
@@ -88897,56 +89027,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.UnitTest = void 0;
 /* eslint-disable max-len */
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const initialization_1 = __webpack_require__(/*! ./initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
 class UnitTest {
-    // todo, move this method somewhere else, its much more than just unit test relevant
-    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();\n`;
-        }
-        ret += `${this.buildImports(reg, useImport)}
-
-export async function initializeABAP() {\n`;
-        ret += `  const sqlite = [];\n`;
-        for (const i of dbSetup.schemas.sqlite) {
-            ret += `  sqlite.push(\`${i}\`);\n`;
-        }
-        ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
-        ret += `  const pg = [];\n`;
-        for (const i of dbSetup.schemas.pg) {
-            ret += `  pg.push(\`${i}\`);\n`;
-        }
-        ret += `  const snowflake = [];\n`;
-        for (const i of dbSetup.schemas.snowflake) {
-            ret += `  snowflake.push(\`${i}\`);\n`;
-        }
-        ret += `  const schemas = {sqlite, hdb, pg, snowflake};\n`;
-        ret += `\n`;
-        ret += `  const insert = [];\n`;
-        for (const i of dbSetup.insert) {
-            ret += `  insert.push(\`${i}\`);\n`;
-        }
-        ret += `\n`;
-        if (extraSetup === undefined || extraSetup === "") {
-            ret += `// no setup logic specified in config\n`;
-        }
-        else {
-            ret += `  const {setup} = await import("${extraSetup}");\n` +
-                `  await setup(globalThis.abap, schemas, insert);\n`;
-        }
-        ret += `}`;
-        return ret;
-    }
-    escapeNamespace(filename) {
-        // ES modules are resolved and cached as URLs. This means that special characters must be percent-encoded, such as # with %23 and ? with %3F.
-        return filename.replace(/\//g, "%23");
-    }
     unitTestScriptOpen(reg, _skip) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
@@ -88968,7 +89050,7 @@ async function run() {
             }
             const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
             if (hasTestFile === true) {
-                ret += `  await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
+                ret += `  await import("./${(0, initialization_1.escapeNamespaceFilename)(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
             }
             for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
@@ -89030,7 +89112,8 @@ run().then(() => {
                     }
                     tests.push({
                         obj,
-                        localClass: def.name,
+                        filename: `./${(0, initialization_1.escapeNamespaceFilename)(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs`,
+                        localClass: def.name.toLowerCase(),
                         riskLevel: def.riskLevel,
                         duration: def.duration,
                         methods: methods,
@@ -89086,65 +89169,53 @@ run().then(() => {
         return tests;
     }
     unitTestScript(reg, skip) {
+        const callSpecial = (name) => {
+            let ret = "";
+            ret += `if (test.${name}) await test.${name}();\n`;
+            ret += `        if (test.FRIENDS_ACCESS_INSTANCE.${name}) await test.FRIENDS_ACCESS_INSTANCE.${name}();\n`;
+            ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}) await test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}();`;
+            return ret;
+        };
         let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
+/* eslint-disable max-len */
 import {initializeABAP} from "./init.mjs";
-import runtime from "@abaplint/runtime";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+function getData() {
+  const ret = [];\n`;
+        for (const st of this.getSortedTests(reg)) {
+            const methods = [];
+            for (const m of st.methods) {
+                const skipThis = (skip || []).some(a => a.object.toUpperCase() === st.obj.getName().toUpperCase()
+                    && a.class.toUpperCase() === st.localClass.toUpperCase()
+                    && a.method.toUpperCase() === m.toUpperCase());
+                methods.push({
+                    name: m,
+                    skip: skipThis,
+                });
+            }
+            ret += `  ret.push({objectName: "${st.obj.getName()}", localClass: "${st.localClass}", methods: ${JSON.stringify(methods)}, filename: "${st.filename}"});\n`;
+        }
+        ret += `  return ret;
+}
 
 async function run() {
   await initializeABAP();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
-  try {\n`;
-        for (const st of this.getSortedTests(reg)) {
-            ret += `// --------------------------------------------\n`;
-            ret += `    clas = unit.addObject("${st.obj.getName()}");\n`;
-            const lc = st.localClass.toLowerCase();
-            ret += `    {
-        const {${lc}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
-        locl = clas.addTestClass("${lc}");
-        if (${lc}.class_setup) await ${lc}.class_setup();\n`;
-            for (const m of st.methods) {
-                const skipThis = (skip || []).some(a => a.object === st.obj.getName() && a.class === lc && a.method === m);
-                if (skipThis) {
-                    ret += `  console.log('${st.obj.getName()}: running ${lc}->${m}, skipped');\n`;
-                    ret += `  meth = locl.addMethod("${m}");\n`;
-                    ret += `  meth.skip();\n`;
-                    continue;
-                }
-                const callSpecial = (name) => {
-                    let ret = "";
-                    ret += `        if (test.${name}) await test.${name}();\n`;
-                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.${name}) await test.FRIENDS_ACCESS_INSTANCE.${name}();\n`;
-                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}) await test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}();\n`;
-                    return ret;
-                };
-                ret += `      {\n        const test = await (new ${lc}()).constructor_();\n`;
-                ret += callSpecial("setup");
-                ret += `        console.log("${st.obj.getName()}: running ${lc}->${m}");\n`;
-                ret += `        meth = locl.addMethod("${m}");\n`;
-                ret += `        await test.FRIENDS_ACCESS_INSTANCE.${m}();\n`;
-                ret += `        meth.pass();\n`;
-                ret += callSpecial("teardown");
-                ret += `      }\n`;
-            }
-            ret += `      if (${lc}.class_teardown) await ${lc}.class_teardown();\n`;
-            ret += `    }\n`;
-        }
-        ret += `// -------------------END-------------------
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-  } catch (e) {
-    if (meth) {
-      meth.fail();
+  for (const st of getData()) {
+    const imported = await import(st.filename);
+    const localClass = imported[st.localClass];
+    if (localClass.class_setup) await localClass.class_setup();
+    for (const m of st.methods) {
+      if (m.skip) {
+        console.log(st.objectName + ": running " + st.localClass + "->" + m.name + ", skipped");
+      } else {
+        const test = await (new localClass()).constructor_();
+        ${callSpecial("setup")}
+        console.log(st.objectName + ": running " + st.localClass + "->" + m.name);
+        await test.FRIENDS_ACCESS_INSTANCE[m.name]();
+        ${callSpecial("teardown")}
+      }
     }
-    fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
-    throw e;
+    if (localClass.class_teardown) await localClass.class_teardown();
   }
 }
 
@@ -89156,67 +89227,6 @@ run().then(() => {
 });`;
         return ret;
     }
-    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
-        const list = [];
-        const late = [];
-        const imp = (filename) => {
-            if (useImport === true) {
-                return `import "./${filename}.mjs";`;
-            }
-            else {
-                return `await import("./${filename}.mjs");`;
-            }
-        };
-        for (const obj of reg.getObjects()) {
-            if (obj instanceof abaplint.Objects.Table
-                || obj instanceof abaplint.Objects.DataElement
-                || obj instanceof abaplint.Objects.LockObject
-                || obj instanceof abaplint.Objects.MessageClass
-                || obj instanceof abaplint.Objects.MIMEObject
-                || obj instanceof abaplint.Objects.Oauth2Profile
-                || obj instanceof abaplint.Objects.WebMIME
-                || obj instanceof abaplint.Objects.TypePool
-                || 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) {
-                list.push(imp(`${this.escapeNamespace(obj.getName().toLowerCase())}.fugr`));
-            }
-            else if (obj instanceof abaplint.Objects.Class) {
-                if (obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
-                    && 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()}`));
-                }
-                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(), ...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) {
-        if (clas.getDefinition()?.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR") !== undefined) {
-            return true;
-        }
-        const sup = clas.getDefinition()?.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-cli",
-  "version": "2.10.38",
+  "version": "2.10.40",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -28,7 +28,7 @@
   "license": "MIT",
   "devDependencies": {
     "@abaplint/core": "^2.113.108",
-    "@abaplint/transpiler": "^2.10.38",
+    "@abaplint/transpiler": "^2.10.40",
     "@types/glob": "^8.1.0",
     "@types/node": "^22.14.0",
     "@types/progress": "^2.0.7",
@@ -37,6 +37,6 @@
     "ts-json-schema-generator": "^2.4.0",
     "typescript": "^5.8.3",
     "webpack-cli": "^6.0.1",
-    "webpack": "^5.99.2"
+    "webpack": "^5.99.5"
   }
 }