datagrok-tools 4.13.35 → 4.13.37

package/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Datagrok-tools changelog
 
 
+## 4.13.37 (2024-11-15)
+
+### Features
+
+* Output fixes
+## 4.13.36 (2024-11-15)
+
+### Features
+
+* Grok test reopens on each failed test
+
 ## 4.13.35 (2024-11-4)
 
 ### Features

package/bin/commands/test.js

@@ -14,6 +14,7 @@ var _path = _interopRequireDefault(require("path"));
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 var utils = _interopRequireWildcard(require("../utils/utils"));
 var color = _interopRequireWildcard(require("../utils/color-utils"));
+var Papa = _interopRequireWildcard(require("papaparse"));
 var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
 var testUtils = _testUtils;
 var _orderFunctions = require("../utils/order-functions");
@@ -34,7 +35,7 @@ function test(_x) {
 }
 function _test() {
   _test = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(args) {
-    var config, packageJsonData, packageName, packagesDir, categoryToCheck, testToCheck, res;
+    var config, packageJsonData, packageName, packagesDir, res;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -49,32 +50,26 @@ function _test() {
           }));
           packageName = args["package"] ? utils.kebabToCamelCase(args["package"]) : utils.kebabToCamelCase(utils.removeScope(packageJsonData.name));
           packagesDir = _path["default"].basename(curDir) === "packages" ? curDir : _path["default"].dirname(curDir);
-          categoryToCheck = undefined;
-          testToCheck = undefined;
-          if (args.category) {
-            categoryToCheck = args.category.toString();
-            if (args.test) testToCheck = args.test.toString();
-          }
           console.log('Environment variable `TARGET_PACKAGE` is set to', packageName);
           if (args.platform && packageName !== 'ApiTests') color.warn('--platform flag can only be used in the ApiTests package');
           if (args.core && packageName !== 'DevTools') color.warn('--core flag can only be used in the DevTools package');
           if (args["package"]) {
-            _context.next = 16;
+            _context.next = 13;
             break;
           }
-          _context.next = 16;
+          _context.next = 13;
           return testUtils.loadPackages(packagesDir, packageName, args.host, args['skip-publish'], args['skip-build'], args.link);
-        case 16:
+        case 13:
           process.env.TARGET_PACKAGE = packageName;
-          _context.next = 19;
-          return runTesting(args, categoryToCheck, testToCheck);
-        case 19:
+          _context.next = 16;
+          return runTesting(args);
+        case 16:
           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);
           return _context.abrupt("return", true);
-        case 24:
+        case 21:
         case "end":
           return _context.stop();
       }
@@ -89,13 +84,13 @@ function isArgsValid(args) {
   })) return false;
   return true;
 }
-function runTesting(_x2, _x3, _x4) {
+function runTesting(_x2) {
   return _runTesting.apply(this, arguments);
 }
 function _runTesting() {
-  _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args, categoryToCheck, testToCheck) {
+  _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args) {
     var _process$env$TARGET_P;
-    var testsObj, parsed, organized, filtered, _iterator, _step, element, testsResults, r, _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, testsLeft, _iterator2, _step2, testData;
+    var testsObj, parsed, organized, filtered, _iterator, _step, element, testsResults, r, _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -150,35 +145,187 @@ function _runTesting() {
           }, 1, testInvocationTimeout);
         case 12:
           r = _context2.sent;
-          testsResults.push(r);
           testsLeft = [];
+          testsToReproduce = [];
           _iterator2 = _createForOfIteratorHelper(organized);
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               testData = _step2.value;
               if (!r.csv.includes("".concat(testData.params.category, ",").concat(testData.params.test))) testsLeft.push(testData);
+              if (r.verboseFailed.includes("".concat(testData.params.category, ": ").concat(testData.params.test, " :  Error:"))) {
+                testsToReproduce.push(testData);
+              }
             }
           } catch (err) {
             _iterator2.e(err);
           } finally {
             _iterator2.f();
           }
+          if (!(testsToReproduce.length > 0)) {
+            _context2.next = 41;
+            break;
+          }
+          _context2.next = 20;
+          return reproducedTest(args, testsToReproduce);
+        case 20:
+          reproduced = _context2.sent;
+          _iterator3 = _createForOfIteratorHelper(testsToReproduce);
+          _context2.prev = 22;
+          _iterator3.s();
+        case 24:
+          if ((_step3 = _iterator3.n()).done) {
+            _context2.next = 33;
+            break;
+          }
+          _test2 = _step3.value;
+          _reproducedTest2 = reproduced.get(_test2);
+          if (!(_reproducedTest2 && !_reproducedTest2.failed)) {
+            _context2.next = 31;
+            break;
+          }
+          _context2.next = 30;
+          return updateResultsByReproduced(r, _reproducedTest2, _test2);
+        case 30:
+          r = _context2.sent;
+        case 31:
+          _context2.next = 24;
+          break;
+        case 33:
+          _context2.next = 38;
+          break;
+        case 35:
+          _context2.prev = 35;
+          _context2.t0 = _context2["catch"](22);
+          _iterator3.e(_context2.t0);
+        case 38:
+          _context2.prev = 38;
+          _iterator3.f();
+          return _context2.finish(38);
+        case 41:
+          testsResults.push(r);
           organized = testsLeft;
-        case 18:
-          if (r.verboseFailed.includes('EXECUTION TIMEOUT')) {
+        case 43:
+          if (r.verboseFailed.includes('Error')) {
             _context2.next = 10;
             break;
           }
-        case 19:
-          _context2.next = 21;
+        case 44:
+          _context2.next = 46;
           return (0, _testUtils.mergeWorkersResults)(testsResults);
-        case 21:
+        case 46:
           return _context2.abrupt("return", _context2.sent);
-        case 22:
+        case 47:
         case "end":
           return _context2.stop();
       }
-    }, _callee2);
+    }, _callee2, null, [[22, 35, 38, 41]]);
   }));
   return _runTesting.apply(this, arguments);
+}
+function reproducedTest(_x3, _x4) {
+  return _reproducedTest.apply(this, arguments);
+}
+function _reproducedTest() {
+  _reproducedTest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(args, testsToReproduce) {
+    var res, _iterator4, _step4, _args$benchmark2, _test3, r;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          res = new Map();
+          _iterator4 = _createForOfIteratorHelper(testsToReproduce);
+          _context3.prev = 2;
+          _iterator4.s();
+        case 4:
+          if ((_step4 = _iterator4.n()).done) {
+            _context3.next = 12;
+            break;
+          }
+          _test3 = _step4.value;
+          _context3.next = 8;
+          return (0, _testUtils.runWorker)([_test3], {
+            benchmark: (_args$benchmark2 = args.benchmark) !== null && _args$benchmark2 !== void 0 ? _args$benchmark2 : false,
+            catchUnhandled: false,
+            gui: false,
+            record: false,
+            report: false,
+            verbose: false,
+            stopOnTimeout: true,
+            reproduce: true
+          }, 1, testInvocationTimeout);
+        case 8:
+          r = _context3.sent;
+          if (_test3.params.category && _test3.params.test) res.set(_test3, r);
+        case 10:
+          _context3.next = 4;
+          break;
+        case 12:
+          _context3.next = 17;
+          break;
+        case 14:
+          _context3.prev = 14;
+          _context3.t0 = _context3["catch"](2);
+          _iterator4.e(_context3.t0);
+        case 17:
+          _context3.prev = 17;
+          _iterator4.f();
+          return _context3.finish(17);
+        case 20:
+          return _context3.abrupt("return", res);
+        case 21:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[2, 14, 17, 20]]);
+  }));
+  return _reproducedTest.apply(this, arguments);
+}
+function updateResultsByReproduced(_x5, _x6, _x7) {
+  return _updateResultsByReproduced.apply(this, arguments);
+}
+function _updateResultsByReproduced() {
+  _updateResultsByReproduced = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(curentResult, reproducedResult, testsParams) {
+    var table2Dict, table1, table2, flakingMap;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          table2Dict = {};
+          table1 = readCSVResultData(curentResult.csv);
+          table2 = readCSVResultData(reproducedResult.csv);
+          flakingMap = {};
+          table2.rows.forEach(function (row) {
+            var key = "".concat(row['category'], ",").concat(row['name']);
+            flakingMap[key] = row['flaking'];
+          });
+          table1.rows.forEach(function (row) {
+            var key = "".concat(row['category'], ",").concat(row['name']);
+            if (key in flakingMap) {
+              row['flaking'] = flakingMap[key];
+            }
+          });
+          curentResult.csv = Papa.unparse(table1.rows, {
+            columns: table1.headers
+          });
+          ;
+          curentResult.verboseFailed = curentResult.verboseFailed.replaceAll("".concat(testsParams.params.category, ": ").concat(testsParams.params.test, " :  Error:"), "".concat(testsParams.params.category, ": ").concat(testsParams.params.test, " : Flaking Error:"));
+          return _context4.abrupt("return", curentResult);
+        case 10:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _updateResultsByReproduced.apply(this, arguments);
+}
+function readCSVResultData(data) {
+  var parsed = Papa.parse(data, {
+    header: true,
+    skipEmptyLines: true
+  });
+  if (parsed.errors.length > 0) {
+    throw new Error("Error parsing CSV file: ".concat(parsed.errors[0].message));
+  }
+  return {
+    headers: parsed.meta.fields || [],
+    rows: parsed.data
+  };
 }

package/bin/utils/test-utils.js

@@ -662,6 +662,7 @@ function _runWorker() {
                   _context9.next = 22;
                   return page.evaluate(function (testData, options) {
                     if (options.benchmark) window.DG.Test.isInBenchmark = true;
+                    if (options.reproduce) window.DG.Test.isReproducing = true;
                     return new Promise(function (resolve, reject) {
                       window.DG.Utils.executeTests(testData, options.stopOnTimeout).then(function (results) {
                         resolve(results);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.13.35",
+  "version": "4.13.37",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -17,6 +17,7 @@
     "node-fetch": "^2.7.0",
     "node-recursive-directory": "^1.2.0",
     "os": "^0.1.2",
+    "papaparse": "^5.4.1",
     "path": "^0.12.7",
     "puppeteer": "^22.10.0",
     "puppeteer-screen-recorder": "3.0.3"
@@ -53,6 +54,7 @@
     "@types/inquirer": "^8.2.10",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^16.18.70",
+    "@types/papaparse": "^5.3.15",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.56.0",