datagrok-tools 4.13.49 → 4.13.50

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Datagrok-tools changelog
 
+## 4.13.50 (2024-12-30)
+
+### Features
+
+* Added testToWorker order for testsAll
+
 ## 4.13.49 (2024-12-26)
 
 ### Features

package/bin/commands/test-all.js

@@ -26,6 +26,7 @@ var order = /*#__PURE__*/function (order) {
   order[order["alphabetical"] = 1] = "alphabetical";
   order[order["packageRandom"] = 2] = "packageRandom";
   order[order["packageAlphabetical"] = 3] = "packageAlphabetical";
+  order[order["testToWorker"] = 4] = "testToWorker";
   return order;
 }(order || {});
 function getEnumOrder(orderStr) {
@@ -46,6 +47,9 @@ function getEnumOrder(orderStr) {
     case "packageatoz":
       return order.packageAlphabetical;
       break;
+    case "testtoworker":
+      return order.testToWorker;
+      break;
   }
   return order.random;
 }
@@ -54,7 +58,7 @@ var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var csvReportDir = _path["default"].join(curDir, 'test-report.csv');
 var testInvocationTimeout = 7200000;
-var orderingFunctions = new Map([[order.random, _orderFunctions.setRandomOrder], [order.alphabetical, _orderFunctions.setAlphabeticalOrder], [order.packageRandom, _orderFunctions.setPackageRandomOrder], [order.packageAlphabetical, _orderFunctions.setPackageAlphabeticalOrder]]);
+var orderingFunctions = new Map([[order.random, _orderFunctions.setRandomOrder], [order.alphabetical, _orderFunctions.setAlphabeticalOrder], [order.packageRandom, _orderFunctions.setPackageRandomOrder], [order.packageAlphabetical, _orderFunctions.setPackageAlphabeticalOrder], [order.testToWorker, _orderFunctions.setTestToWorkerOrder]]);
 var workersStarted = 0;
 function testAll(_x) {
   return _testAll.apply(this, arguments);

package/bin/utils/order-functions.js

@@ -8,6 +8,7 @@ exports.setAlphabeticalOrder = setAlphabeticalOrder;
 exports.setPackageAlphabeticalOrder = setPackageAlphabeticalOrder;
 exports.setPackageRandomOrder = setPackageRandomOrder;
 exports.setRandomOrder = setRandomOrder;
+exports.setTestToWorkerOrder = setTestToWorkerOrder;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -103,40 +104,61 @@ function setPackageAlphabeticalOrder(tests, workersAmount, testRepeats) {
   }
   return splittedTestsArray;
 }
+function setTestToWorkerOrder(tests, workersAmount, testRepeats) {
+  var splittedTestsArray = [];
+  if (workersAmount > tests.length) workersAmount = tests.length;
+  var orderedTests = shuffle(tests);
+  for (var i = 0; i < workersAmount; i++) {
+    splittedTestsArray.push([]);
+    var _iterator5 = _createForOfIteratorHelper(orderedTests),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var test = _step5.value;
+        splittedTestsArray[splittedTestsArray.length - 1].push(_objectSpread({}, test));
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+  }
+  return splittedTestsArray;
+}
 function alphabeticalSortFunction(test1, test2) {
   return "".concat(test1.category, ": ").concat(test1.name, "s").localeCompare("".concat(test2.category, ": ").concat(test2.name, "s"));
 }
 function splitTestsByPackages(tests) {
   var resultMap = new Map();
-  var _iterator5 = _createForOfIteratorHelper(tests),
-    _step5;
+  var _iterator6 = _createForOfIteratorHelper(tests),
+    _step6;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var test = _step5.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var test = _step6.value;
       if (resultMap.has(test.packageName)) resultMap.get(test.packageName).push(test);else resultMap.set(test.packageName, [test]);
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator5.f();
+    _iterator6.f();
   }
   return resultMap;
 }
 function repeatTests(tests, testRepeats) {
   var repeatedTests = [];
-  var _iterator6 = _createForOfIteratorHelper(tests),
-    _step6;
+  var _iterator7 = _createForOfIteratorHelper(tests),
+    _step7;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var test = _step6.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var test = _step7.value;
       for (var i = 0; i < testRepeats; i++) {
         repeatedTests.push(_objectSpread({}, test));
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator6.f();
+    _iterator7.f();
   }
   return repeatedTests;
 }

package/package.json

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