@abaplint/transpiler-cli 2.7.7 → 2.7.9

package/build/bundle.js

@@ -17769,7 +17769,7 @@ exports.With = With;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MethodParameterDirection = exports.AttributeLevel = void 0;
+exports.RiskLevel = exports.Duration = exports.MethodParameterDirection = exports.AttributeLevel = void 0;
 // Only helper functions to get data from single file, no type information
 var AttributeLevel;
 (function (AttributeLevel) {
@@ -17784,6 +17784,18 @@ var MethodParameterDirection;
     MethodParameterDirection["Changing"] = "changing";
     MethodParameterDirection["Returning"] = "returning";
 })(MethodParameterDirection = exports.MethodParameterDirection || (exports.MethodParameterDirection = {}));
+var Duration;
+(function (Duration) {
+    Duration["short"] = "SHORT";
+    Duration["medium"] = "MEDIUM";
+    Duration["long"] = "LONG";
+})(Duration = exports.Duration || (exports.Duration = {}));
+var RiskLevel;
+(function (RiskLevel) {
+    RiskLevel["harmless"] = "HARMLESS";
+    RiskLevel["critical"] = "CRITICAL";
+    RiskLevel["dangerous"] = "DANGEROUS";
+})(RiskLevel = exports.RiskLevel || (exports.RiskLevel = {}));
 //# sourceMappingURL=_abap_file_information.js.map
 
 /***/ }),
@@ -17978,6 +17990,26 @@ class ABAPFileInformation {
             const containsGlobal = found.findFirstExpression(Expressions.ClassGlobal);
             const cdef = found.findFirstStatement(Statements.ClassDefinition);
             const concat = (cdef === null || cdef === void 0 ? void 0 : cdef.concatTokens().toUpperCase()) || "";
+            let riskLevel;
+            if (concat.includes("RISK LEVEL CRITICAL")) {
+                riskLevel = _abap_file_information_1.RiskLevel.critical;
+            }
+            else if (concat.includes("RISK LEVEL DANGEROUS")) {
+                riskLevel = _abap_file_information_1.RiskLevel.dangerous;
+            }
+            else if (concat.includes("RISK LEVEL HARMLESS")) {
+                riskLevel = _abap_file_information_1.RiskLevel.harmless;
+            }
+            let duration;
+            if (concat.includes("DURATION SHORT")) {
+                duration = _abap_file_information_1.Duration.short;
+            }
+            else if (concat.includes("DURATION LONG")) {
+                duration = _abap_file_information_1.Duration.long;
+            }
+            else if (concat.includes("DURATION MEDIUM")) {
+                duration = _abap_file_information_1.Duration.medium;
+            }
             this.classes.push({
                 name: className.getStr(),
                 identifier: new _identifier_1.Identifier(className, this.filename),
@@ -17987,6 +18019,8 @@ class ABAPFileInformation {
                 superClassName,
                 interfaces: this.getImplementing(found),
                 isForTesting: concat.includes(" FOR TESTING"),
+                duration,
+                riskLevel,
                 isAbstract: (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined,
                 isSharedMemory: concat.includes(" SHARED MEMORY ENABLED"),
                 isFinal: found.findFirstExpression(Expressions.ClassFinal) !== undefined,
@@ -40754,6 +40788,99 @@ exports.AssignmentServiceToAuthorizationGroup = AssignmentServiceToAuthorization
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/objects/atc_check_category.js":
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/objects/atc_check_category.js ***!
+  \*****************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ATCCheckCategory = void 0;
+const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
+class ATCCheckCategory extends _abstract_object_1.AbstractObject {
+    getType() {
+        return "CHKC";
+    }
+    getAllowedNaming() {
+        return {
+            maxLength: 30,
+            allowNamespace: true,
+        };
+    }
+    getDescription() {
+        // todo
+        return undefined;
+    }
+}
+exports.ATCCheckCategory = ATCCheckCategory;
+//# sourceMappingURL=atc_check_category.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/objects/atc_check_object.js":
+/*!***************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/objects/atc_check_object.js ***!
+  \***************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ATCCheckObject = void 0;
+const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
+class ATCCheckObject extends _abstract_object_1.AbstractObject {
+    getType() {
+        return "CHKO";
+    }
+    getAllowedNaming() {
+        return {
+            maxLength: 30,
+            allowNamespace: true,
+        };
+    }
+    getDescription() {
+        // todo
+        return undefined;
+    }
+}
+exports.ATCCheckObject = ATCCheckObject;
+//# sourceMappingURL=atc_check_object.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/objects/atc_check_variant.js":
+/*!****************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/objects/atc_check_variant.js ***!
+  \****************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ATCCheckVariant = void 0;
+const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node_modules/@abaplint/core/build/src/objects/_abstract_object.js");
+class ATCCheckVariant extends _abstract_object_1.AbstractObject {
+    getType() {
+        return "CHKV";
+    }
+    getAllowedNaming() {
+        return {
+            maxLength: 30,
+            allowNamespace: true,
+        };
+    }
+    getDescription() {
+        // todo
+        return undefined;
+    }
+}
+exports.ATCCheckVariant = ATCCheckVariant;
+//# sourceMappingURL=atc_check_variant.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/objects/authorization_check_field.js":
 /*!************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/objects/authorization_check_field.js ***!
@@ -43456,6 +43583,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./activation_variant */ "./node_modules/@abaplint/core/build/src/objects/activation_variant.js"), exports);
 __exportStar(__webpack_require__(/*! ./api_release_state */ "./node_modules/@abaplint/core/build/src/objects/api_release_state.js"), exports);
 __exportStar(__webpack_require__(/*! ./assignment_service_to_authorization_group */ "./node_modules/@abaplint/core/build/src/objects/assignment_service_to_authorization_group.js"), exports);
+__exportStar(__webpack_require__(/*! ./atc_check_category */ "./node_modules/@abaplint/core/build/src/objects/atc_check_category.js"), exports);
+__exportStar(__webpack_require__(/*! ./atc_check_object */ "./node_modules/@abaplint/core/build/src/objects/atc_check_object.js"), exports);
+__exportStar(__webpack_require__(/*! ./atc_check_variant */ "./node_modules/@abaplint/core/build/src/objects/atc_check_variant.js"), exports);
 __exportStar(__webpack_require__(/*! ./authorization_check_field */ "./node_modules/@abaplint/core/build/src/objects/authorization_check_field.js"), exports);
 __exportStar(__webpack_require__(/*! ./authorization_group */ "./node_modules/@abaplint/core/build/src/objects/authorization_group.js"), exports);
 __exportStar(__webpack_require__(/*! ./authorization_object_class */ "./node_modules/@abaplint/core/build/src/objects/authorization_object_class.js"), exports);
@@ -46933,7 +47063,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.0";
+        return "2.101.3";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -50127,6 +50257,9 @@ class CloudTypes {
             || obj instanceof Objects.InboundService
             || obj instanceof Objects.Interface
             || obj instanceof Objects.LockObject
+            || obj instanceof Objects.ATCCheckCategory
+            || obj instanceof Objects.ATCCheckObject
+            || obj instanceof Objects.ATCCheckVariant
             || obj instanceof Objects.MessageClass
             || obj instanceof Objects.Package
             || obj instanceof Objects.RestrictionType
@@ -71862,17 +71995,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,
         };
@@ -79506,7 +79639,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";
@@ -79561,7 +79694,90 @@ 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;
+                }
+                else if (a.obj.getName() > b.obj.getName()) {
+                    ret = 1;
+                }
+            }
+            return ret;
+        });
+        return tests;
+    }
+    unitTestScript(reg, skip) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
 import path from "path";
@@ -79578,54 +79794,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;
-                    }
-                    const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
-                    if (hasTestFile === false) {
-                        break;
+                  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;
                     }
-                    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`;
+                    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 += `      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-cli",
-  "version": "2.7.7",
+  "version": "2.7.9",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.7.7",
+    "@abaplint/transpiler": "^2.7.9",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.2.1",
-    "@abaplint/core": "^2.101.0",
+    "@types/node": "^20.2.3",
+    "@abaplint/core": "^2.101.3",
     "progress": "^2.0.3",
     "webpack": "^5.83.1",
     "webpack-cli": "^5.1.1",