datagrok-tools 4.13.45 → 4.13.47

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Datagrok-tools changelog
 
+## 4.13.47 (2024-12-25)
+
+### Features
+
+* Fixed category selection for test
+
+## 4.13.46 (2024-12-23)
+
+### Features
+
+* Improved error handling:
+  - Different exit codes for package errors / grok script errors
+  - Graceful error handling when testing non-existing packages
 
 ## 4.13.45 (2024-12-12)
 

package/bin/commands/test.js

@@ -68,7 +68,7 @@ function _test() {
           res = _context.sent;
           if (args.csv) (0, _testUtils.saveCsvResults)([res.csv], csvReportDir);
           (0, _testUtils.printWorkersResult)(res, args.verbose);
-          if (!res) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
+          if (res.failed) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
           return _context.abrupt("return", true);
         case 20:
         case "end":
@@ -90,8 +90,8 @@ function runTesting(_x2) {
 }
 function _runTesting() {
   _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(args) {
-    var _process$env$TARGET_P;
-    var testsObj, parsed, organized, filtered, _iterator, _step, element, testsResults, r, workerId;
+    var _process$env$TARGET_P, _args$category;
+    var testsObj, parsed, organized, filtered, categoryRegex, _iterator, _step, element, testsResults, r, workerId;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -100,8 +100,22 @@ function _runTesting() {
           return (0, _testUtils.loadTestsList)([(_process$env$TARGET_P = process.env.TARGET_PACKAGE) !== null && _process$env$TARGET_P !== void 0 ? _process$env$TARGET_P : ''], args.core);
         case 3:
           testsObj = _context3.sent;
-          console.log(testsObj);
           parsed = (0, _orderFunctions.setAlphabeticalOrder)(testsObj, 1, 1);
+          if (!(parsed.length == 0)) {
+            _context3.next = 7;
+            break;
+          }
+          return _context3.abrupt("return", {
+            failed: true,
+            verbosePassed: 'Package not found',
+            verboseSkipped: 'Package not found',
+            verboseFailed: 'Package not found',
+            passedAmount: 0,
+            skippedAmount: 0,
+            failedAmount: 0,
+            csv: ''
+          });
+        case 7:
           organized = parsed[0].map(function (testObj) {
             return {
               "package": testObj.packageName,
@@ -116,12 +130,13 @@ function _runTesting() {
             };
           });
           filtered = [];
+          categoryRegex = new RegExp("".concat((_args$category = args.category) === null || _args$category === void 0 ? void 0 : _args$category.replaceAll(' ', ''), ".*"));
           if (args.category) {
             _iterator = _createForOfIteratorHelper(organized);
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
                 element = _step.value;
-                if (element.params.category === args.category) {
+                if (categoryRegex.test(element.params.category.replaceAll(' ', ''))) {
                   if (element.params.test === args.test || !args.test) filtered.push(element);
                 }
               }
@@ -132,10 +147,14 @@ function _runTesting() {
             }
             organized = filtered;
           }
+          if (args.verbose) {
+            console.log(filtered);
+            console.log("Tests total: ".concat(filtered.length));
+          }
           color.info('Starting tests...');
           testsResults = [];
           workerId = 1;
-          _context3.next = 14;
+          _context3.next = 17;
           return (0, _testUtils.timeout)( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, _args$ciCd, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
@@ -225,12 +244,12 @@ function _runTesting() {
               }
             }, _callee2, null, [[12, 25, 28, 31]]);
           })), testInvocationTimeout);
-        case 14:
-          _context3.next = 16;
+        case 17:
+          _context3.next = 19;
           return (0, _testUtils.mergeWorkersResults)(testsResults);
-        case 16:
+        case 19:
           return _context3.abrupt("return", _context3.sent);
-        case 17:
+        case 20:
         case "end":
           return _context3.stop();
       }

package/bin/grok.js

@@ -31,7 +31,7 @@ if (command in commands) {
   } catch (err) { 
     console.error(err);
     console.log(help[command]);
-    exitWithCode(1);
+    exitWithCode(255);
   }
 } else 
   console.log(help.help);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.13.45",
+  "version": "4.13.47",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {