datagrok-tools 4.10.4 → 4.11.0

package/bin/commands/help.js

@@ -12,7 +12,7 @@ var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file
 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]\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[--category] [--host] [--csv] [--gui] [--skip-build] [--skip-publish]\n\n--category       Specify a category name 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--skip-build     Skip the package build step\n--skip-publish   Skip the package publication step\n\nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
+var HELP_TEST = "\nUsage: grok test\n\nOptions:\n[--category] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--catchUnhandled] [--report]\n\n--category          Specify a category name 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 package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\n\nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
 var HELP_LINK = "\nUsage: grok link\n\nLink `datagrok-api` and libraries for local development\n\nOptions:\n[--local | --npm]\n\n--local   Default. Links libraries and updates package scripts (\"link-all\", \"build-all\")\n--npm     Unlinks local packages and runs `npm i`\n";
 var HELP_MIGRATE = "\nUsage: grok migrate\n\nSwitch to `grok` tools by copying your keys to the config\nfile and converting your scripts in the `package.json` file\n";
 var help = {

package/bin/commands/test.js

@@ -21,7 +21,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'csv', 'gui', 'skip-build', 'skip-publish', 'category'];
+  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'report', 'skip-build', 'skip-publish', 'category'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -139,10 +139,12 @@ function test(args) {
                 targetPackage = (_process$env$TARGET_P = process.env.TARGET_PACKAGE) !== null && _process$env$TARGET_P !== void 0 ? _process$env$TARGET_P : '#{PACKAGE_NAMESPACE}';
                 console.log("Testing ".concat(targetPackage, " package...\n"));
                 _context2.next = 4;
-                return page.evaluate(function (targetPackage, options) {
+                return page.evaluate(function (targetPackage, options, testContext) {
                   return new Promise(function (resolve, reject) {
-                    var testCall = "".concat(targetPackage, ":test(").concat(options.category ? "category=\"".concat(options.category, "\"") : '', ")");
-                    window.grok.functions.eval(testCall).then(function (df) {
+                    window.grok.functions.call("".concat(targetPackage, ":test"), {
+                      'category': options.category,
+                      'testContext': testContext
+                    }).then(function (df) {
                       var failed = false;
                       var skipReport = '';
                       var passReport = '';
@@ -187,7 +189,7 @@ function test(args) {
                       return reject(e);
                     });
                   });
-                }, targetPackage, options);
+                }, targetPackage, options, new testUtils.TestContext(options.catchUnhandled, options.report));
               case 4:
                 r = _context2.sent;
                 return _context2.abrupt("return", r);
@@ -220,7 +222,9 @@ function test(args) {
             case 10:
               _context3.next = 12;
               return runTest(7200000, {
-                category: args.category
+                category: args.category,
+                catchUnhandled: args.catchUnhandled,
+                report: args.report
               });
             case 12:
               r = _context3.sent;

package/bin/utils/test-utils.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultLaunchParameters = void 0;
+exports.defaultLaunchParameters = exports.TestContext = void 0;
 exports.exitWithCode = exitWithCode;
 exports.getBrowserPage = getBrowserPage;
 exports.getDevKey = getDevKey;
@@ -13,6 +13,8 @@ exports.getToken = getToken;
 exports.getWebUrl = getWebUrl;
 exports.runWithTimeout = runWithTimeout;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
@@ -26,7 +28,8 @@ var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var defaultLaunchParameters = {
   args: ['--disable-dev-shm-usage', '--disable-features=site-per-process'],
-  ignoreHTTPSErrors: true
+  ignoreHTTPSErrors: true,
+  headless: 'new'
 };
 exports.defaultLaunchParameters = defaultLaunchParameters;
 function getToken(_x, _x2) {
@@ -245,4 +248,12 @@ function runWithTimeout(timeout, f) {
 function exitWithCode(code) {
   console.log("Exiting with code ".concat(code));
   process.exit(code);
-}
+}
+var TestContext = function TestContext(catchUnhandled, report) {
+  (0, _classCallCheck2["default"])(this, TestContext);
+  (0, _defineProperty2["default"])(this, "catchUnhandled", true);
+  (0, _defineProperty2["default"])(this, "report", false);
+  if (catchUnhandled !== undefined) this.catchUnhandled = catchUnhandled;
+  if (report !== undefined) this.report = report;
+};
+exports.TestContext = TestContext;

package/package-template/package.json

@@ -10,6 +10,7 @@
     "@datagrok-libraries/utils": "latest"
   },
   "devDependencies": {
+    "datagrok-tools": "latest",
     "webpack": "latest",
     "webpack-cli": "latest"
   },

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "datagrok-tools",
-  "version": "4.10.4",
+  "version": "4.11.0",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
     "@babel/parser": "^7.21.2",
-    "@babel/traverse": "^7.21.2",
     "@babel/runtime": "^7.16.0",
+    "@babel/traverse": "^7.21.2",
     "archiver": "^4.0.2",
     "archiver-promise": "^1.0.0",
     "fs": "latest",
@@ -18,7 +18,7 @@
     "node-recursive-directory": "^1.2.0",
     "os": "^0.1.1",
     "path": "^0.12.7",
-    "puppeteer": "^13.7.0"
+    "puppeteer": "^20.3.0"
   },
   "scripts": {
     "link": "npm link",