@abaplint/transpiler 2.7.7 → 2.7.8

package/build/src/index.js

@@ -33,17 +33,17 @@ class Transpiler {
         return new Transpiler().run(reg);
     }
     async run(reg, progress) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         reg.parse();
         new keywords_1.Keywords((_a = this.options) === null || _a === void 0 ? void 0 : _a.keywords).handle(reg);
         this.validate(reg);
         const dbSetup = new db_1.DatabaseSetup(reg).run(this.options);
         const output = {
             objects: [],
-            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_b = this.options) === null || _b === void 0 ? void 0 : _b.skip, (_c = this.options) === null || _c === void 0 ? void 0 : _c.only),
-            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_d = this.options) === null || _d === void 0 ? void 0 : _d.skip, (_e = this.options) === null || _e === void 0 ? void 0 : _e.only),
-            initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_f = this.options) === null || _f === void 0 ? void 0 : _f.extraSetup),
-            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_g = this.options) === null || _g === void 0 ? void 0 : _g.extraSetup, true),
+            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_b = this.options) === null || _b === void 0 ? void 0 : _b.skip),
+            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_c = this.options) === null || _c === void 0 ? void 0 : _c.skip),
+            initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_d = this.options) === null || _d === void 0 ? void 0 : _d.extraSetup),
+            initializationScript2: new unit_test_1.UnitTest().initializationScript(reg, dbSetup, (_e = this.options) === null || _e === void 0 ? void 0 : _e.extraSetup, true),
             databaseSetup: dbSetup,
             reg: reg,
         };

package/build/src/types.d.ts

@@ -47,8 +47,8 @@ export interface ITranspilerOptions {
     skipConstants?: boolean;
     /** sets behavior for unknown types, either fail at compile- or run-time */
     unknownTypes?: "compileError" | "runtimeError";
+    /** list of unit tests to skip */
     skip?: TestMethodList;
-    only?: TestMethodList;
     /** extra setup script to be executed during initialization */
     extraSetup?: string;
     /** list of keywords to rename, if not supplied default will be used */

package/build/src/unit_test.d.ts

@@ -8,8 +8,9 @@ export type TestMethodList = {
 export declare class UnitTest {
     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;
+    unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList): string;
+    private getSortedTests;
+    unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList): string;
     private buildImports;
     private hasClassConstructor;
 }

package/build/src/unit_test.js

@@ -44,7 +44,7 @@ export async function initializeABAP() {\n`;
         // 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, _only) {
+    unitTestScriptOpen(reg, _skip) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
 import path from "path";
@@ -99,7 +99,91 @@ run().then(() => {
 });`;
         return ret;
     }
-    unitTestScript(reg, skip, _only) {
+    getSortedTests(reg) {
+        const tests = [];
+        for (const obj of reg.getObjects()) {
+            if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
+                continue;
+            }
+            const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
+            if (hasTestFile === false) {
+                continue;
+            }
+            for (const file of obj.getABAPFiles()) {
+                for (const def of file.getInfo().listClassDefinitions()) {
+                    if (def.isForTesting === false
+                        || def.isGlobal === true
+                        || def.methods.length === 0
+                        || def.isAbstract === true) {
+                        // todo, fix, there might be global test methods
+                        continue;
+                    }
+                    const methods = [];
+                    for (const m of def.methods) {
+                        if (m.isForTesting === false) {
+                            continue;
+                        }
+                        methods.push(m.name);
+                    }
+                    tests.push({
+                        obj,
+                        localClass: def.name,
+                        riskLevel: def.riskLevel,
+                        duration: def.duration,
+                        methods: methods,
+                    });
+                }
+            }
+        }
+        const toNumber = (riskLevel, duration) => {
+            let int = 0;
+            switch (riskLevel) {
+                case abaplint.Info.RiskLevel.harmless:
+                    int = 10;
+                    break;
+                case abaplint.Info.RiskLevel.critical:
+                    int = 20;
+                    break;
+                case abaplint.Info.RiskLevel.dangerous:
+                    int = 30;
+                    break;
+                default:
+                    break;
+            }
+            switch (duration) {
+                case abaplint.Info.Duration.short:
+                    int += 1;
+                    break;
+                case abaplint.Info.Duration.medium:
+                    int += 2;
+                    break;
+                case abaplint.Info.Duration.long:
+                    int += 3;
+                    break;
+                default:
+                    break;
+            }
+            return int;
+        };
+        tests.sort((a, b) => {
+            const ai = toNumber(a.riskLevel, a.duration);
+            const bi = toNumber(b.riskLevel, b.duration);
+            let ret = ai - bi;
+            if (ret === 0) {
+                // if risk and duration are equal, then sort by name
+                if (a.obj.getName() < b.obj.getName()) {
+                    ret = -1;
+                }
+                if (a.obj.getName() > b.obj.getName()) {
+                    ret = 1;
+                }
+                ret = 0;
+            }
+            return ret;
+        });
+        return tests;
+    }
+    unitTestScript(reg, skip) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
 import path from "path";
@@ -116,54 +200,86 @@ async function run() {
   let locl;
   let meth;
   try {\n`;
-        for (const obj of reg.getObjects()) {
-            if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
-                continue;
-            }
+        for (const st of this.getSortedTests(reg)) {
             ret += `// --------------------------------------------\n`;
-            ret += `    clas = unit.addObject("${obj.getName()}");\n`;
-            for (const file of obj.getABAPFiles()) {
+            ret += `    clas = unit.addObject("${st.obj.getName()}");\n`;
+            ret += `    {
+        const {${st.localClass}} = await import("./${this.escapeNamespace(st.obj.getName().toLowerCase())}.${st.obj.getType().toLowerCase()}.testclasses.mjs");
+        locl = clas.addTestClass("${st.localClass}");
+        if (${st.localClass}.class_setup) await ${st.localClass}.class_setup();\n`;
+            for (const m of st.methods) {
+                const skipThis = (skip || []).some(a => a.object === st.obj.getName() && a.class === st.localClass && a.method === m);
+                if (skipThis) {
+                    ret += `  console.log('${st.obj.getName()}: running ${st.localClass}->${m}, skipped');\n`;
+                    ret += `  meth = locl.addMethod("${m}");\n`;
+                    ret += `  meth.skip();\n`;
+                    continue;
+                }
+                ret += `      {\n        const test = await (new ${st.localClass}()).constructor_();\n`;
+                ret += `        if (test.setup) await test.setup();\n`;
+                ret += `        console.log("${st.obj.getName()}: running ${st.localClass}->${m}");\n`;
+                ret += `        meth = locl.addMethod("${m}");\n`;
+                ret += `        await test.${m}();\n`;
+                ret += `        meth.pass();\n`;
+                ret += `        if (test.teardown) await test.teardown();\n`;
+                ret += `      }\n`;
+            }
+            ret += `      if (${st.localClass}.class_teardown) await ${st.localClass}.class_teardown();\n`;
+            ret += `    }\n`;
+        }
+        /*
+            for (const obj of reg.getObjects()) {
+              if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
+                continue;
+              }
+              ret += `// --------------------------------------------\n`;
+              ret += `    clas = unit.addObject("${obj.getName()}");\n`;
+              for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
-                    if (def.isForTesting === false
-                        || def.isGlobal === true
-                        || def.methods.length === 0
-                        || def.isAbstract === true) {
-                        // todo, fix, there might be global test methods
-                        continue;
+                  if (def.isForTesting === false
+                      || def.isGlobal === true
+                      || def.methods.length === 0
+                      || def.isAbstract === true) {
+                    // todo, fix, there might be global test methods
+                    continue;
+                  }
+                  const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
+                  if (hasTestFile === false) {
+                    break;
+                  }
+                  ret += `    {
+              const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
+              locl = clas.addTestClass("${def.name}");
+              if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
+        
+                  for (const m of def.methods) {
+                    if (m.isForTesting === false) {
+                      continue;
                     }
-                    const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
-                    if (hasTestFile === false) {
-                        break;
+                    const skipThis = (skip || []).some(a => a.object === obj.getName() && a.class === def.name && a.method === m.name);
+                    if (skipThis) {
+                      ret += `  console.log('${obj.getName()}: running ${def.name}->${m.name}, skipped');\n`;
+                      ret += `  meth = locl.addMethod("${m.name}");\n`;
+                      ret += `  meth.skip();\n`;
+                      continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
-      locl = clas.addTestClass("${def.name}");
-      if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
-                    for (const m of def.methods) {
-                        if (m.isForTesting === false) {
-                            continue;
-                        }
-                        const skipThis = (skip || []).some(a => a.object === obj.getName() && a.class === def.name && a.method === m.name);
-                        if (skipThis) {
-                            ret += `  console.log('${obj.getName()}: running ${def.name}->${m.name}, skipped');\n`;
-                            ret += `  meth = locl.addMethod("${m.name}");\n`;
-                            ret += `  meth.skip();\n`;
-                            continue;
-                        }
-                        ret += `      {\n        const test = await (new ${def.name}()).constructor_();\n`;
-                        ret += `        if (test.setup) await test.setup();\n`;
-                        ret += `        console.log("${obj.getName()}: running ${def.name}->${m.name}");\n`;
-                        ret += `        meth = locl.addMethod("${m.name}");\n`;
-                        ret += `        await test.${m.name}();\n`;
-                        ret += `        meth.pass();\n`;
-                        ret += `        if (test.teardown) await test.teardown();\n`;
-                        ret += `      }\n`;
-                    }
-                    ret += `      if (${def.name}.class_teardown) await ${def.name}.class_teardown();\n`;
-                    ret += `    }\n`;
+        
+                    ret += `      {\n        const test = await (new ${def.name}()).constructor_();\n`;
+                    ret += `        if (test.setup) await test.setup();\n`;
+                    ret += `        console.log("${obj.getName()}: running ${def.name}->${m.name}");\n`;
+                    ret += `        meth = locl.addMethod("${m.name}");\n`;
+                    ret += `        await test.${m.name}();\n`;
+                    ret += `        meth.pass();\n`;
+                    ret += `        if (test.teardown) await test.teardown();\n`;
+                    ret += `      }\n`;
+                  }
+        
+                  ret += `      if (${def.name}.class_teardown) await ${def.name}.class_teardown();\n`;
+                  ret += `    }\n`;
                 }
+              }
             }
-        }
+            */
         ret += `// -------------------END-------------------
     fs.writeFileSync(__dirname + path.sep + "_output.xml", unit.xUnitXML());
   } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.7.7",
+  "version": "2.7.8",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.101.0",
+    "@abaplint/core": "^2.101.2",
     "source-map": "^0.7.4"
   },
   "devDependencies": {