datagrok-tools 4.13.38 → 4.13.39

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Datagrok-tools changelog
 
 
+## 4.13.39 (2024-11-26)
+
+### Features
+
+* Grok publish added ability to link packages
+* Grok test log for multiple workers fix
+
 ## 4.13.38 (2024-11-15)
 
 ### Features

package/bin/commands/help.js

@@ -10,7 +10,7 @@ var HELP_INIT = "\nUsage: grok init\n\nModify a package template by adding confi
 var HELP_API = "\nUsage: grok api\n\nCreate wrapper functions for package scripts and queries\n";
 var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file\n\nOptions:\n[--reset] [--server] [--alias] [-k | --key]\n\n--reset     Restore the default config file template\n--server    Use to add a server to the config (`grok config add --alias alias --server url --key key`)\n--alias     Use in conjunction with the `server` option to set the server name\n--key       Use in conjunction with the `server` option to set the developer key\n--default   Use in conjunction with the `server` option to set the added server as default\n";
 var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok create         Create a package in the current working directory\ngrok create <name>  Create a package in a folder with the specified name\n\nPlease note that the package name may only include letters, numbers, underscores, or hyphens\n\nOptions:\n[--eslint] [--ide] [--js | --ts] [--test]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--js        Create a JavaScript package\n--ts        Create a TypeScript package (default)\n--test      Add tests support (TypeScript packages only)\n";
-var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix] [--all] [--refresh]\n\n--all             Publish all available packages \n--refresh         Publish all available already loaded packages \n\nRunning `grok publish` is the same as running `grok publish defaultHost --build --debug`\n";
+var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix] [--all] [--refresh] [--link]\n\n--all             Publish all available packages \n--refresh         Publish all available already loaded packages \n--link  \t        Link the package to local utils\n\nRunning `grok publish` is the same as running `grok publish defaultHost --build --debug`\n";
 var HELP_CHECK = "\nUsage: grok check\n\nOptions:\n[-r | --recursive]\n\n--recursive       Check all packages in the current directory\n\nCheck package content (function signatures, import statements of external modules, etc.)\n";
 var HELP_TEST = "\nUsage: grok test\n\nOptions:\n[--package] [--category] [--test] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link] [--catchUnhandled] [--report] [--record] [--verbose] [--platform] [--benchmark] [--stress-test]\n\n--package           Specify a package name to run tests for\n--category          Specify a category name to run tests for\n--test              Specify a test name to run \n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\n--link  \t          Link the package to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--platform          Runs only platform tests (applicable for ApiTests package only)\n--core              Runs package & core tests (applicable  for DevTools package only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n \nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
 var HELP_TESTALL = "\nUsage: grok testall\n\nOptions:\n[--packages] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link-package] [--catchUnhandled] [--report] [--record] [--verbose] [--benchmark] [--stress-test] [--order] [--tags] [--testRepeat] [--workersCount]\n\n--packages          Specify a packages names to run tests for\n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies packages author (default=false)\n--skip-build        Skip the packages build step\n--skip-publish      Skip the packages publication step\n--link-package  \t  Link the packages to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--core              Runs packages & core tests (applicable  for DevTools packages only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n--order             Specify order for tests invocation\n--tags              Filter tests by tag name for run\n--testRepeat        Set amount of tests repeats\n--workersCount      Set amount of workers for tests run\n\nRun tests of all or specified packages \n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";

package/bin/commands/publish.js

@@ -52,73 +52,72 @@ function _processPackage() {
           timestamps = {};
           url = "".concat(host, "/packages/dev/").concat(devKey, "/").concat(packageName);
           if (!debug) {
-            _context2.next = 19;
+            _context2.next = 18;
             break;
           }
           _context2.prev = 3;
-          console.log(url);
-          _context2.next = 7;
+          _context2.next = 6;
           return (0, _nodeFetch["default"])(url + '/timestamps');
-        case 7:
-          _context2.next = 9;
+        case 6:
+          _context2.next = 8;
           return _context2.sent.json();
-        case 9:
+        case 8:
           timestamps = _context2.sent;
           if (!(timestamps['#type'] === 'ApiError')) {
-            _context2.next = 13;
+            _context2.next = 12;
             break;
           }
           color.error(timestamps.message);
           return _context2.abrupt("return", 1);
-        case 13:
-          _context2.next = 19;
+        case 12:
+          _context2.next = 18;
           break;
-        case 15:
-          _context2.prev = 15;
+        case 14:
+          _context2.prev = 14;
           _context2.t0 = _context2["catch"](3);
           console.error(_context2.t0);
           return _context2.abrupt("return", 1);
-        case 19:
+        case 18:
           zip = (0, _archiverPromise["default"])('zip', {
             store: false
           }); // Gather the files
           localTimestamps = {};
-          _context2.next = 23;
+          _context2.next = 22;
           return (0, _ignoreWalk["default"])({
             path: '.',
             ignoreFiles: ['.npmignore', '.gitignore', '.grokignore'],
             includeEmpty: false,
             follow: true
           });
-        case 23:
+        case 22:
           files = _context2.sent;
           isWebpack = _fs["default"].existsSync('webpack.config.js');
           if (!(!rebuild && isWebpack)) {
-            _context2.next = 35;
+            _context2.next = 34;
             break;
           }
           if (!_fs["default"].existsSync('dist/package.js')) {
-            _context2.next = 33;
+            _context2.next = 32;
             break;
           }
-          _context2.next = 29;
+          _context2.next = 28;
           return (0, _ignoreWalk["default"])({
             path: './dist',
             ignoreFiles: [],
             includeEmpty: false,
             follow: true
           });
-        case 29:
+        case 28:
           distFiles = _context2.sent;
           distFiles.forEach(function (df) {
             files.push("dist/".concat(df));
           });
-          _context2.next = 35;
+          _context2.next = 34;
           break;
-        case 33:
+        case 32:
           color.warn('File `dist/package.js` not found. Building the package on the server side...\n' + 'Next time, please build your package locally with Webpack beforehand\n' + 'or run `grok publish` with the `--rebuild` option');
           rebuild = true;
-        case 35:
+        case 34:
           contentValidationLog = '';
           console.log('Starting package checks...');
           checkStart = Date.now();
@@ -208,14 +207,14 @@ function _processPackage() {
             console.log("Adding ".concat(canonicalRelativePath, "..."));
           });
           if (!errs.length) {
-            _context2.next = 56;
+            _context2.next = 55;
             break;
           }
           errs.forEach(function (e) {
             return color.error(e);
           });
           return _context2.abrupt("return", 1);
-        case 56:
+        case 55:
           zip.append(JSON.stringify(localTimestamps), {
             name: 'timestamps.json'
           });
@@ -260,41 +259,41 @@ function _processPackage() {
           })["catch"](function (error) {
             console.error(error);
           });
-          _context2.next = 62;
+          _context2.next = 61;
           return zip.finalize();
-        case 62:
-          _context2.prev = 62;
-          _context2.next = 65;
+        case 61:
+          _context2.prev = 61;
+          _context2.next = 64;
           return uploadPromise;
-        case 65:
+        case 64:
           log = _context2.sent;
           _fs["default"].unlinkSync('zip');
           if (!(log['#type'] === 'ApiError')) {
-            _context2.next = 74;
+            _context2.next = 73;
             break;
           }
           color.error(log['message']);
           console.error(log['innerMessage']);
           console.log(log);
           return _context2.abrupt("return", 1);
-        case 74:
+        case 73:
           console.log(log);
           color.warn(contentValidationLog);
-        case 76:
-          _context2.next = 82;
+        case 75:
+          _context2.next = 81;
           break;
-        case 78:
-          _context2.prev = 78;
-          _context2.t1 = _context2["catch"](62);
+        case 77:
+          _context2.prev = 77;
+          _context2.t1 = _context2["catch"](61);
           console.error(_context2.t1);
           return _context2.abrupt("return", 1);
-        case 82:
+        case 81:
           return _context2.abrupt("return", 0);
-        case 83:
+        case 82:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 15], [62, 78]]);
+    }, _callee2, null, [[3, 14], [61, 77]]);
   }));
   return _processPackage.apply(this, arguments);
 }
@@ -338,14 +337,27 @@ function _publish() {
         case 18:
           console.log('Loading packages:');
           _context3.next = 21;
-          return (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, false, args.release);
+          return (0, _testUtils.loadPackages)(curDir, packagesToLoad.join(' '), host, false, false, args.link, args.release);
         case 21:
-          _context3.next = 25;
+          _context3.next = 32;
           break;
         case 23:
-          _context3.next = 25;
+          if (!args.link) {
+            _context3.next = 30;
+            break;
+          }
+          _context3.next = 26;
+          return utils.runScript("npm install", curDir);
+        case 26:
+          _context3.next = 28;
+          return utils.runScript("grok link", curDir);
+        case 28:
+          _context3.next = 30;
+          return utils.runScript("npm run build", curDir);
+        case 30:
+          _context3.next = 32;
           return publishPackage(args);
-        case 25:
+        case 32:
         case "end":
           return _context3.stop();
       }

package/bin/commands/test.js

@@ -88,17 +88,18 @@ function runTesting(_x2) {
   return _runTesting.apply(this, arguments);
 }
 function _runTesting() {
-  _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args) {
+  _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, _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) {
+    var testsObj, parsed, organized, filtered, _iterator, _step, element, testsResults, r, workerId;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           color.info('Loading tests...');
-          _context2.next = 3;
+          _context3.next = 3;
           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 = _context2.sent;
+          testsObj = _context3.sent;
+          console.log(testsObj);
           parsed = (0, _orderFunctions.setAlphabeticalOrder)(testsObj, 1, 1);
           organized = parsed[0].map(function (testObj) {
             return {
@@ -132,93 +133,106 @@ function _runTesting() {
           }
           color.info('Starting tests...');
           testsResults = [];
-        case 10:
-          _context2.next = 12;
-          return (0, _testUtils.runWorker)(organized, {
-            benchmark: (_args$benchmark = args.benchmark) !== null && _args$benchmark !== void 0 ? _args$benchmark : false,
-            catchUnhandled: (_args$catchUnhandled = args.catchUnhandled) !== null && _args$catchUnhandled !== void 0 ? _args$catchUnhandled : false,
-            gui: (_args$gui = args.gui) !== null && _args$gui !== void 0 ? _args$gui : false,
-            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,
-            stopOnTimeout: true
-          }, 1, testInvocationTimeout);
-        case 12:
-          r = _context2.sent;
-          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);
+          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;
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return (0, _testUtils.runWorker)(organized, {
+                    benchmark: (_args$benchmark = args.benchmark) !== null && _args$benchmark !== void 0 ? _args$benchmark : false,
+                    catchUnhandled: (_args$catchUnhandled = args.catchUnhandled) !== null && _args$catchUnhandled !== void 0 ? _args$catchUnhandled : false,
+                    gui: (_args$gui = args.gui) !== null && _args$gui !== void 0 ? _args$gui : false,
+                    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,
+                    stopOnTimeout: true
+                  }, workerId, testInvocationTimeout);
+                case 2:
+                  r = _context2.sent;
+                  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 = 31;
+                    break;
+                  }
+                  _context2.next = 10;
+                  return reproducedTest(args, testsToReproduce);
+                case 10:
+                  reproduced = _context2.sent;
+                  _iterator3 = _createForOfIteratorHelper(testsToReproduce);
+                  _context2.prev = 12;
+                  _iterator3.s();
+                case 14:
+                  if ((_step3 = _iterator3.n()).done) {
+                    _context2.next = 23;
+                    break;
+                  }
+                  _test2 = _step3.value;
+                  _reproducedTest2 = reproduced.get(_test2);
+                  if (!(_reproducedTest2 && !_reproducedTest2.failed)) {
+                    _context2.next = 21;
+                    break;
+                  }
+                  _context2.next = 20;
+                  return updateResultsByReproduced(r, _reproducedTest2, _test2);
+                case 20:
+                  r = _context2.sent;
+                case 21:
+                  _context2.next = 14;
+                  break;
+                case 23:
+                  _context2.next = 28;
+                  break;
+                case 25:
+                  _context2.prev = 25;
+                  _context2.t0 = _context2["catch"](12);
+                  _iterator3.e(_context2.t0);
+                case 28:
+                  _context2.prev = 28;
+                  _iterator3.f();
+                  return _context2.finish(28);
+                case 31:
+                  testsResults.push(r);
+                  organized = testsLeft;
+                  workerId++;
+                case 34:
+                  if (r.failed) {
+                    _context2.next = 0;
+                    break;
+                  }
+                case 35:
+                case "end":
+                  return _context2.stop();
               }
-            }
-          } 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 43:
-          if (r.failed) {
-            _context2.next = 10;
-            break;
-          }
-        case 44:
-          _context2.next = 46;
+            }, _callee2, null, [[12, 25, 28, 31]]);
+          })), testInvocationTimeout);
+        case 14:
+          _context3.next = 16;
           return (0, _testUtils.mergeWorkersResults)(testsResults);
-        case 46:
-          return _context2.abrupt("return", _context2.sent);
-        case 47:
+        case 16:
+          return _context3.abrupt("return", _context3.sent);
+        case 17:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[22, 35, 38, 41]]);
+    }, _callee3);
   }));
   return _runTesting.apply(this, arguments);
 }
@@ -226,22 +240,22 @@ function reproducedTest(_x3, _x4) {
   return _reproducedTest.apply(this, arguments);
 }
 function _reproducedTest() {
-  _reproducedTest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(args, testsToReproduce) {
+  _reproducedTest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(args, testsToReproduce) {
     var res, _iterator4, _step4, _args$benchmark2, _test3, r;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           res = new Map();
           _iterator4 = _createForOfIteratorHelper(testsToReproduce);
-          _context3.prev = 2;
+          _context4.prev = 2;
           _iterator4.s();
         case 4:
           if ((_step4 = _iterator4.n()).done) {
-            _context3.next = 12;
+            _context4.next = 12;
             break;
           }
           _test3 = _step4.value;
-          _context3.next = 8;
+          _context4.next = 8;
           return (0, _testUtils.runWorker)([_test3], {
             benchmark: (_args$benchmark2 = args.benchmark) !== null && _args$benchmark2 !== void 0 ? _args$benchmark2 : false,
             catchUnhandled: false,
@@ -251,31 +265,31 @@ function _reproducedTest() {
             verbose: false,
             stopOnTimeout: true,
             reproduce: true
-          }, 1, testInvocationTimeout);
+          }, 0, testInvocationTimeout);
         case 8:
-          r = _context3.sent;
+          r = _context4.sent;
           if (_test3.params.category && _test3.params.test) res.set(_test3, r);
         case 10:
-          _context3.next = 4;
+          _context4.next = 4;
           break;
         case 12:
-          _context3.next = 17;
+          _context4.next = 17;
           break;
         case 14:
-          _context3.prev = 14;
-          _context3.t0 = _context3["catch"](2);
-          _iterator4.e(_context3.t0);
+          _context4.prev = 14;
+          _context4.t0 = _context4["catch"](2);
+          _iterator4.e(_context4.t0);
         case 17:
-          _context3.prev = 17;
+          _context4.prev = 17;
           _iterator4.f();
-          return _context3.finish(17);
+          return _context4.finish(17);
         case 20:
-          return _context3.abrupt("return", res);
+          return _context4.abrupt("return", res);
         case 21:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3, null, [[2, 14, 17, 20]]);
+    }, _callee4, null, [[2, 14, 17, 20]]);
   }));
   return _reproducedTest.apply(this, arguments);
 }
@@ -283,10 +297,10 @@ 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) {
+  _updateResultsByReproduced = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(curentResult, reproducedResult, testsParams) {
     var table2Dict, table1, table2, flakingMap;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           table2Dict = {};
           table1 = readCSVResultData(curentResult.csv);
@@ -307,12 +321,12 @@ function _updateResultsByReproduced() {
           });
           ;
           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);
+          return _context5.abrupt("return", curentResult);
         case 10:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4);
+    }, _callee5);
   }));
   return _updateResultsByReproduced.apply(this, arguments);
 }

package/bin/utils/test-utils.js

@@ -349,13 +349,13 @@ function _loadPackages() {
           _iterator2.s();
         case 6:
           if ((_step2 = _iterator2.n()).done) {
-            _context6.next = 40;
+            _context6.next = 41;
             break;
           }
           dirName = _step2.value;
           packageDir = _path["default"].join(packagesDir, dirName);
           if (_fs["default"].lstatSync(packageDir).isFile()) {
-            _context6.next = 38;
+            _context6.next = 39;
             break;
           }
           _context6.prev = 10;
@@ -364,64 +364,65 @@ function _loadPackages() {
           }));
           packageFriendlyName = packagesToRun.get((_spaceToCamelCase$toL = (0, _utils.spaceToCamelCase)((_ref6 = (_ref7 = (_packageJsonData$frie = packageJsonData["friendlyName"]) !== null && _packageJsonData$frie !== void 0 ? _packageJsonData$frie : packageJsonData["name"].split("/")[1]) !== null && _ref7 !== void 0 ? _ref7 : packageJsonData["name"]) !== null && _ref6 !== void 0 ? _ref6 : '').toLocaleLowerCase()) !== null && _spaceToCamelCase$toL !== void 0 ? _spaceToCamelCase$toL : "");
           if (!(utils.isPackageDir(packageDir) && (packageFriendlyName !== undefined || packagesToLoad === "all"))) {
-            _context6.next = 33;
+            _context6.next = 34;
             break;
           }
           _context6.prev = 14;
+          console.log("Loading package ".concat(dirName));
           if (!(skipPublish != true)) {
-            _context6.next = 26;
+            _context6.next = 27;
             break;
           }
-          _context6.next = 18;
+          _context6.next = 19;
           return utils.runScript("npm install", packageDir);
-        case 18:
+        case 19:
           if (!linkPackage) {
-            _context6.next = 21;
+            _context6.next = 22;
             break;
           }
-          _context6.next = 21;
+          _context6.next = 22;
           return utils.runScript("grok link", packageDir);
-        case 21:
+        case 22:
           if (!(skipBuild != true)) {
-            _context6.next = 24;
+            _context6.next = 25;
             break;
           }
-          _context6.next = 24;
+          _context6.next = 25;
           return utils.runScript("npm run build", packageDir);
-        case 24:
-          _context6.next = 26;
+        case 25:
+          _context6.next = 27;
           return utils.runScript("grok publish ".concat(hostString).concat(release ? ' --release' : ''), packageDir);
-        case 26:
+        case 27:
           packagesToRun.set(dirName, true);
           console.log("Package published ".concat(dirName));
-          _context6.next = 33;
+          _context6.next = 34;
           break;
-        case 30:
-          _context6.prev = 30;
+        case 31:
+          _context6.prev = 31;
           _context6.t0 = _context6["catch"](14);
           console.log("Package wasn't published ".concat(dirName));
-        case 33:
-          _context6.next = 38;
+        case 34:
+          _context6.next = 39;
           break;
-        case 35:
-          _context6.prev = 35;
+        case 36:
+          _context6.prev = 36;
           _context6.t1 = _context6["catch"](10);
           if (utils.isPackageDir(packageDir) && (packagesToRun.get((0, _utils.spaceToCamelCase)(dirName).toLocaleLowerCase()) !== undefined || packagesToLoad === "all")) console.log("Couldn't read package.json  ".concat(dirName));
-        case 38:
+        case 39:
           _context6.next = 6;
           break;
-        case 40:
-          _context6.next = 45;
+        case 41:
+          _context6.next = 46;
           break;
-        case 42:
-          _context6.prev = 42;
+        case 43:
+          _context6.prev = 43;
           _context6.t2 = _context6["catch"](4);
           _iterator2.e(_context6.t2);
-        case 45:
-          _context6.prev = 45;
+        case 46:
+          _context6.prev = 46;
           _iterator2.f();
-          return _context6.finish(45);
-        case 48:
+          return _context6.finish(46);
+        case 49:
           console.log();
           return _context6.abrupt("return", Array.from(packagesToRun).filter(function (_ref2) {
             var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
@@ -433,11 +434,11 @@ function _loadPackages() {
               key = _ref5[0];
             return key;
           }));
-        case 51:
+        case 52:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[4, 42, 45, 48], [10, 35], [14, 30]]);
+    }, _callee6, null, [[4, 43, 46, 49], [10, 36], [14, 31]]);
   }));
   return _loadPackages.apply(this, arguments);
 }

package/package-template/src/package-test.ts

@@ -1,5 +1,5 @@
 import { runTests, tests, TestContext , initAutoTests as initTests } from '@datagrok-libraries/utils/src/test';
-import { DataFrame } from 'datagrok-api/dg';
+import * as DG from 'datagrok-api/dg';
 
 export let _package = new DG.Package();
 export { tests };
@@ -9,7 +9,7 @@ export { tests };
 //input: string test {optional: true}
 //input: object testContext {optional: true}
 //output: dataframe result
-export async function test(category: string, test: string, testContext: TestContext): Promise<DataFrame> {
+export async function test(category: string, test: string, testContext: TestContext): Promise<DG.DataFrame> {
   const data = await runTests({ category, test, testContext });
   return DG.DataFrame.fromObjects(data)!;
 }

package/package-template/src/package.js

@@ -1,3 +1,7 @@
+/* Do not change these import lines to match external modules in webpack configuration */
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
 
 export const _package = new DG.Package();
 

package/package.json

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

package/package-template/src/global.d.ts

@@ -1,13 +0,0 @@
-import * as grokNamespace from 'datagrok-api/grok';
-import * as uiNamespace from 'datagrok-api/ui';
-import * as DGNamespace from 'datagrok-api/dg';
-import * as rxjsNamespace from 'rxjs';
-import $Namespace from 'cash-dom';
-
-declare global {
-    const grok: typeof grokNamespace;
-    const ui: typeof uiNamespace;
-    const DG: typeof DGNamespace;
-    const rjxs: typeof rxjsNamespace;
-    const $: typeof $Namespace;
-}