datagrok-tools 4.13.46 → 4.13.48

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Datagrok-tools changelog
 
+## 4.13.48 (2024-12-25)
+
+### Features
+
+* Added load npm
+
+## 4.13.47 (2024-12-25)
+
+### Features
+
+* Fixed category selection for test
+
 ## 4.13.46 (2024-12-23)
 
 ### Features

package/bin/commands/load.js

@@ -0,0 +1,62 @@
+"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);
+}

package/bin/commands/test.js

@@ -68,7 +68,7 @@ function _test() {
           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);
+          if (res.failed) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
           return _context.abrupt("return", true);
         case 20:
         case "end":
@@ -90,8 +90,8 @@ function runTesting(_x2) {
 }
 function _runTesting() {
   _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, workerId;
+    var _process$env$TARGET_P, _args$category;
+    var testsObj, parsed, organized, filtered, categoryRegex, _iterator, _step, element, testsResults, r, workerId;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -100,10 +100,9 @@ function _runTesting() {
           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 = _context3.sent;
-          console.log(testsObj);
           parsed = (0, _orderFunctions.setAlphabeticalOrder)(testsObj, 1, 1);
           if (!(parsed.length == 0)) {
-            _context3.next = 8;
+            _context3.next = 7;
             break;
           }
           return _context3.abrupt("return", {
@@ -116,7 +115,7 @@ function _runTesting() {
             failedAmount: 0,
             csv: ''
           });
-        case 8:
+        case 7:
           organized = parsed[0].map(function (testObj) {
             return {
               "package": testObj.packageName,
@@ -131,12 +130,13 @@ function _runTesting() {
             };
           });
           filtered = [];
+          categoryRegex = new RegExp("".concat((_args$category = args.category) === null || _args$category === void 0 ? void 0 : _args$category.replaceAll(' ', ''), ".*"));
           if (args.category) {
             _iterator = _createForOfIteratorHelper(organized);
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
                 element = _step.value;
-                if (element.params.category === args.category) {
+                if (categoryRegex.test(element.params.category.replaceAll(' ', ''))) {
                   if (element.params.test === args.test || !args.test) filtered.push(element);
                 }
               }
@@ -147,10 +147,14 @@ function _runTesting() {
             }
             organized = filtered;
           }
+          if (args.verbose) {
+            console.log(filtered);
+            console.log("Tests total: ".concat(filtered.length));
+          }
           color.info('Starting tests...');
           testsResults = [];
           workerId = 1;
-          _context3.next = 16;
+          _context3.next = 17;
           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, _args$ciCd, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
@@ -240,12 +244,12 @@ function _runTesting() {
               }
             }, _callee2, null, [[12, 25, 28, 31]]);
           })), testInvocationTimeout);
-        case 16:
-          _context3.next = 18;
+        case 17:
+          _context3.next = 19;
           return (0, _testUtils.mergeWorkersResults)(testsResults);
-        case 18:
-          return _context3.abrupt("return", _context3.sent);
         case 19:
+          return _context3.abrupt("return", _context3.sent);
+        case 20:
         case "end":
           return _context3.stop();
       }

package/bin/grok.js

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

package/package.json

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