datagrok-tools 4.13.41 → 4.13.44

package/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Datagrok-tools changelog
 
 
-## 4.13.41 (2024-11-29)
+## 4.13.44 (2024-12-06)
+
+### Features
+
+* Test fixed infinite testing 
+
+## 4.13.43 (2024-12-02)
+
+### Features
+
+* Publish visual updates
+
+## 4.13.42 (2024-11-29)
 
 ### Features
 

package/bin/commands/publish.js

@@ -310,7 +310,7 @@ function _publish() {
             encoding: 'utf-8'
           }));
           if (!(args.refresh || args.all)) {
-            _context3.next = 28;
+            _context3.next = 27;
             break;
           }
           if (_path["default"].basename(curDir) !== 'packages') curDir = _path["default"].dirname(curDir);
@@ -328,49 +328,48 @@ function _publish() {
           token = _context3.sent;
           url = "".concat(baseUrl, "/packages/published/current");
           packagesToLoad = ['all'];
-          console.log(url);
           if (!args.refresh) {
-            _context3.next = 23;
+            _context3.next = 22;
             break;
           }
-          _context3.next = 20;
+          _context3.next = 19;
           return (0, _nodeFetch["default"])(url, {
             method: 'GET',
             headers: {
               'Authorization': token // Attach cookies here
             }
           });
-        case 20:
-          _context3.next = 22;
+        case 19:
+          _context3.next = 21;
           return _context3.sent.json();
-        case 22:
+        case 21:
           packagesToLoad = _context3.sent.map(function (item) {
             return item.name;
           });
-        case 23:
+        case 22:
           console.log('Loading packages:');
-          _context3.next = 26;
+          _context3.next = 25;
           return (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, args.link, args.release);
-        case 26:
-          _context3.next = 37;
+        case 25:
+          _context3.next = 36;
           break;
-        case 28:
+        case 27:
           if (!args.link) {
-            _context3.next = 35;
+            _context3.next = 34;
             break;
           }
-          _context3.next = 31;
+          _context3.next = 30;
           return utils.runScript("npm install", curDir);
-        case 31:
-          _context3.next = 33;
+        case 30:
+          _context3.next = 32;
           return utils.runScript("grok link", curDir);
-        case 33:
-          _context3.next = 35;
+        case 32:
+          _context3.next = 34;
           return utils.runScript("npm run build", curDir);
-        case 35:
-          _context3.next = 37;
+        case 34:
+          _context3.next = 36;
           return publishPackage(args);
-        case 37:
+        case 36:
         case "end":
           return _context3.stop();
       }

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable max-len */
 var testInvocationTimeout = 3600000;
-var availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag'];
+var availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag', 'ci-cd'];
 var curDir = process.cwd();
 var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
@@ -137,7 +137,7 @@ function _runTesting() {
           workerId = 1;
           _context3.next = 14;
           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, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
+            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) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -149,6 +149,7 @@ function _runTesting() {
                     record: (_args$record = args.record) !== null && _args$record !== void 0 ? _args$record : false,
                     report: (_args$report = args.report) !== null && _args$report !== void 0 ? _args$report : false,
                     verbose: (_args$verbose = args.verbose) !== null && _args$verbose !== void 0 ? _args$verbose : false,
+                    ciCd: (_args$ciCd = args['ci-cd']) !== null && _args$ciCd !== void 0 ? _args$ciCd : false,
                     stopOnTimeout: true
                   }, workerId, testInvocationTimeout);
                 case 2:
@@ -159,7 +160,7 @@ function _runTesting() {
                   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.verbosePassed.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !r.verboseSkipped.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !r.verboseFailed.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !new RegExp("".concat(testData.params.category.trim(), "[^\\n]*: (before|after)")).test(r.verboseFailed)) testsLeft.push(testData);
                       if (r.verboseFailed.includes("".concat(testData.params.category, ": ").concat(testData.params.test, " :  Error:"))) {
                         testsToReproduce.push(testData);
                       }
@@ -242,7 +243,7 @@ function reproducedTest(_x3, _x4) {
 }
 function _reproducedTest() {
   _reproducedTest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(args, testsToReproduce) {
-    var res, _iterator4, _step4, _args$benchmark2, _test3, r;
+    var res, _iterator4, _step4, _args$benchmark2, _args$ciCd2, _test3, r;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -265,7 +266,8 @@ function _reproducedTest() {
             report: false,
             verbose: false,
             stopOnTimeout: true,
-            reproduce: true
+            reproduce: true,
+            ciCd: (_args$ciCd2 = args['ci-cd']) !== null && _args$ciCd2 !== void 0 ? _args$ciCd2 : false
           }, 0, testInvocationTimeout);
         case 8:
           r = _context4.sent;

package/bin/utils/test-utils.js

@@ -368,7 +368,7 @@ function _loadPackages() {
             break;
           }
           _context6.prev = 14;
-          console.log("Loading package ".concat(dirName));
+          process.stdout.write("Building and publishing ".concat(dirName, "..."));
           if (!(skipPublish != true)) {
             _context6.next = 27;
             break;
@@ -394,13 +394,13 @@ function _loadPackages() {
           return utils.runScript("grok publish ".concat(hostString).concat(release ? ' --release' : ''), packageDir);
         case 27:
           packagesToRun.set(dirName, true);
-          console.log("Package published ".concat(dirName));
+          process.stdout.write(" success!\n");
           _context6.next = 34;
           break;
         case 31:
           _context6.prev = 31;
           _context6.t0 = _context6["catch"](14);
-          console.log("Package wasn't published ".concat(dirName));
+          process.stdout.write(" fail!\n");
         case 34:
           _context6.next = 39;
           break;
@@ -664,6 +664,7 @@ function _runWorker() {
                   return page.evaluate(function (testData, options) {
                     if (options.benchmark) window.DG.Test.isInBenchmark = true;
                     if (options.reproduce) window.DG.Test.isReproducing = true;
+                    if (options.ciCd) window.DG.Test.isCiCd = true;
                     return new Promise(function (resolve, reject) {
                       window.DG.Utils.executeTests(testData, options.stopOnTimeout).then(function (results) {
                         resolve(results);

package/bin/utils/utils.js

@@ -334,7 +334,7 @@ function _runScript() {
           _context2.prev = 11;
           _context2.t0 = _context2["catch"](1);
           console.error("Execution failed: ".concat(_context2.t0.message));
-          throw new Error("Cant run script");
+          throw new Error("Cant run script ".concat(script));
         case 15:
         case "end":
           return _context2.stop();

package/package.json

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