datagrok-tools 4.13.48 → 4.13.50

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Datagrok-tools changelog
 
+## 4.13.50 (2024-12-30)
+
+### Features
+
+* Added testToWorker order for testsAll
+
+## 4.13.49 (2024-12-26)
+
+### Features
+
+* Removed load npm
+* Added ability to set vue as external lib for check
+
 ## 4.13.48 (2024-12-25)
 
 ### Features

package/bin/commands/check.js

@@ -401,6 +401,9 @@ var sharedLibExternals = {
   },
   'common/codemirror/codemirror.js': {
     'codemirror': 'CodeMirror'
+  },
+  'common/vue.js': {
+    'vue': 'Vue'
   }
 };
 function checkPackageFile(packagePath, json, options) {

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/grok.js

@@ -14,8 +14,7 @@ const commands = {
   link: require('./commands/link').link,
   publish: require('./commands/publish').publish,
   test: require('./commands/test').test,
-  testall: require('./commands/test-all').testAll,
-  loadnpm: require('./commands/load').loadNPM,
+  testall: require('./commands/test-all').testAll, 
 };
 
 const command = argv['_'][0];

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.48",
+  "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": {

package/bin/commands/load.js

@@ -1,62 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.loadNPM = loadNPM;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _fs = _interopRequireDefault(require("fs"));
-var _os = _interopRequireDefault(require("os"));
-var _path = _interopRequireDefault(require("path"));
-var _jsYaml = _interopRequireDefault(require("js-yaml"));
-var utils = _interopRequireWildcard(require("../utils/utils"));
-var _testUtils = require("../utils/test-utils");
-var _puppeteer = _interopRequireDefault(require("puppeteer"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
-var confPath = _path["default"].join(grokDir, 'config.yaml');
-function loadNPM(_x) {
-  return _loadNPM.apply(this, arguments);
-}
-function _loadNPM() {
-  _loadNPM = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(args) {
-    var config, params, out, browser, page, testingResults;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
-            encoding: 'utf-8'
-          }));
-          utils.setHost(args.host, config);
-          params = Object.assign({}, _testUtils.defaultLaunchParameters);
-          _context.next = 5;
-          return (0, _testUtils.getBrowserPage)(_puppeteer["default"], params);
-        case 5:
-          out = _context.sent;
-          browser = out.browser;
-          page = out.page;
-          _context.next = 10;
-          return page.evaluate(function () {
-            return new Promise(function (resolve, reject) {
-              window.grok.functions.call("installPackages:test", {}).then(function (results) {
-                resolve(results);
-              })["catch"](function (e) {
-                resolve(e);
-              });
-            });
-          });
-        case 10:
-          testingResults = _context.sent;
-          process.exit(0);
-        case 12:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _loadNPM.apply(this, arguments);
-}