datagrok-tools 4.1.16 → 4.1.20

package/bin/commands/add.js

@@ -271,7 +271,7 @@ function add(args) {
 
       var view = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'view.js'), 'utf8');
 
-      contents = insertName(name, "import {#{NAME}} from './#{NAME_LOWERCASE}';\n");
+      contents = insertName(name, "import {#{NAME}} from './".concat(utils.camelCaseToKebab(name), "';\n"));
       contents += _fs["default"].readFileSync(packageEntry, 'utf8');
       contents += insertName(name, view);
 
@@ -306,7 +306,7 @@ function add(args) {
 
       var viewer = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'viewer.js'), 'utf8');
 
-      contents = insertName(name, "import {#{NAME}} from './#{NAME_LOWERCASE}';\n");
+      contents = insertName(name, "import {#{NAME}} from './".concat(utils.camelCaseToKebab(name), "';\n"));
       contents += _fs["default"].readFileSync(packageEntry, 'utf8');
       contents += insertName(name, viewer);
 

package/bin/commands/api.js

@@ -77,7 +77,7 @@ function generateQueryWrappers() {
           var q = _step2.value;
           var name = utils.getScriptName(q, utils.commentMap[utils.queryExtension]);
           if (!name) continue;
-          var tb = new utils.TemplateBuilder(utils.queryWrapperTemplate).replace('QUERY_NAME', name).replace('QUERY_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package.name);
+          var tb = new utils.TemplateBuilder(utils.queryWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package.name);
           var inputs = utils.getScriptInputs(q, utils.commentMap[utils.queryExtension]);
           var outputType = utils.getScriptOutputType(q, utils.commentMap[utils.queryExtension]);
           tb.replace('PARAMS_OBJECT', inputs).replace('TYPED_PARAMS', inputs) // The query output, if omitted, is a dataframe
@@ -98,7 +98,9 @@ function generateQueryWrappers() {
 
   var srcDir = _path["default"].join(curDir, 'src');
 
-  var queryFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, 'queries-api.ts');
+  var queryFileName = 'queries-api.ts';
+
+  var queryFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, queryFileName);
 
   if (_fs["default"].existsSync(queryFilePath)) {
     console.log("The file ".concat(queryFilePath, " already exists\nRewriting its contents..."));
@@ -107,6 +109,8 @@ function generateQueryWrappers() {
   var sep = '\n';
 
   _fs["default"].writeFileSync(queryFilePath, utils.dgImports + sep + wrappers.join(sep.repeat(2)) + sep, 'utf8');
+
+  console.log("Successfully generated file ".concat(queryFileName).concat(sep));
 }
 
 function generateScriptWrappers() {
@@ -154,7 +158,7 @@ function generateScriptWrappers() {
       var inputs = utils.getScriptInputs(script);
       var outputType = utils.getScriptOutputType(script);
       tb.replace('PARAMS_OBJECT', inputs).replace('TYPED_PARAMS', inputs).replace('OUTPUT_TYPE', outputType);
-      wrappers.push(tb.build());
+      wrappers.push(tb.build(1));
     };
 
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -170,15 +174,20 @@ function generateScriptWrappers() {
 
   var srcDir = _path["default"].join(curDir, 'src');
 
-  var funcFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, 'scripts-api.ts');
+  var funcFileName = 'scripts-api.ts';
+
+  var funcFilePath = _path["default"].join(_fs["default"].existsSync(srcDir) ? srcDir : curDir, funcFileName);
 
   if (_fs["default"].existsSync(funcFilePath)) {
     console.log("The file ".concat(funcFilePath, " already exists\nRewriting its contents..."));
   }
 
   var sep = '\n';
+  var scriptApi = new utils.TemplateBuilder(utils.namespaceTemplate).replace('PACKAGE_NAMESPACE', _package.name).replace('NAME', wrappers.join(sep.repeat(2)));
+
+  _fs["default"].writeFileSync(funcFilePath, utils.dgImports + sep + scriptApi.build() + sep, 'utf8');
 
-  _fs["default"].writeFileSync(funcFilePath, utils.dgImports + sep + wrappers.join(sep.repeat(2)) + sep, 'utf8');
+  console.log("Successfully generated file ".concat(funcFileName).concat(sep));
 }
 
 function api(args) {

package/bin/commands/config.js

@@ -46,127 +46,233 @@ function generateKeyQ(server, url) {
   var question = {
     name: server,
     type: 'input',
-    message: "Developer key (get it from ".concat(origin, "/u):"),
+    message: "Developer key (get it from ".concat(origin, "/u or press ENTER to skip):"),
     validate: validateKey
   };
 
   if (server.startsWith('local')) {
-    question.message = "Developer key for ".concat(origin);
+    question.message = "Developer key for ".concat(origin, " (press ENTER to skip):");
   }
 
   return question;
 }
 
+function addNewServer(_x) {
+  return _addNewServer.apply(this, arguments);
+}
+
+function _addNewServer() {
+  _addNewServer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
+    var addServer, name, url, key;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!true) {
+              _context2.next = 21;
+              break;
+            }
+
+            _context2.next = 3;
+            return _inquirer["default"].prompt({
+              name: 'add-server',
+              type: 'confirm',
+              message: 'Do you want to add a server?',
+              "default": false
+            });
+
+          case 3:
+            addServer = _context2.sent['add-server'];
+
+            if (!addServer) {
+              _context2.next = 18;
+              break;
+            }
+
+            _context2.next = 7;
+            return _inquirer["default"].prompt({
+              name: 'server-name',
+              type: 'input',
+              message: 'Enter a name:'
+            });
+
+          case 7:
+            name = _context2.sent['server-name'];
+            _context2.next = 10;
+            return _inquirer["default"].prompt({
+              name: 'server-url',
+              type: 'input',
+              message: 'Enter a URL:'
+            });
+
+          case 10:
+            url = _context2.sent['server-url'];
+            _context2.next = 13;
+            return _inquirer["default"].prompt(generateKeyQ(name, url));
+
+          case 13:
+            _context2.t0 = name;
+            key = _context2.sent[_context2.t0];
+            config.servers[name] = {
+              url: url,
+              key: key
+            };
+            _context2.next = 19;
+            break;
+
+          case 18:
+            return _context2.abrupt("break", 21);
+
+          case 19:
+            _context2.next = 0;
+            break;
+
+          case 21:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _addNewServer.apply(this, arguments);
+}
+
 function config(args) {
   var nOptions = Object.keys(args).length - 1;
+  var interactiveMode = args['_'].length === 1 && (nOptions < 1 || nOptions === 1 && args.reset);
+  var hasAddServerCommand = args['_'].length === 2 && args['_'][1] === 'add' && args.server && args.key && args.k && args.alias && (nOptions === 4 || nOptions === 5 && args["default"]);
+  if (!interactiveMode && !hasAddServerCommand) return false;
 
-  if (args['_'].length === 1 && (nOptions < 1 || nOptions === 1 && args.reset)) {
-    if (!_fs["default"].existsSync(grokDir)) {
-      _fs["default"].mkdirSync(grokDir);
-    }
-
-    if (!_fs["default"].existsSync(confPath) || args.reset) {
-      _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(confTemplate));
-    }
+  if (!_fs["default"].existsSync(grokDir)) {
+    _fs["default"].mkdirSync(grokDir);
+  }
 
-    var _config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
-      encoding: 'utf-8'
-    }));
+  if (!_fs["default"].existsSync(confPath) || args.reset) {
+    _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(confTemplate));
+  }
 
-    console.log("Your config file (".concat(confPath, "):"));
-    console.log(_config);
-    var valRes = (0, _configValidator.validateConf)(_config);
+  var config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
+    encoding: 'utf-8'
+  }));
 
-    if (!_config || !valRes.value) {
-      console.log(valRes.message);
+  if (hasAddServerCommand) {
+    try {
+      new URL(args.server);
+    } catch (error) {
+      console.error('URL parsing error. Please, provide a valid server URL.');
       return false;
     }
 
-    if (valRes.warnings.length) console.log(valRes.warnings.join('\n'));
-    (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var answers, server, url, question, devKey, defaultServer;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              _context.next = 3;
-              return _inquirer["default"].prompt({
-                name: 'edit-config',
-                type: 'confirm',
-                message: 'Do you want to edit it?',
-                "default": false
-              });
-
-            case 3:
-              answers = _context.sent;
-
-              if (!answers['edit-config']) {
-                _context.next = 22;
-                break;
-              }
-
-              _context.t0 = _regenerator["default"].keys(_config.servers);
-
-            case 6:
-              if ((_context.t1 = _context.t0()).done) {
-                _context.next = 17;
-                break;
-              }
-
-              server = _context.t1.value;
-              url = _config['servers'][server]['url'];
-              question = generateKeyQ(server, url);
-              question["default"] = _config['servers'][server]['key'];
-              _context.next = 13;
-              return _inquirer["default"].prompt(question);
-
-            case 13:
-              devKey = _context.sent;
-              _config['servers'][server]['key'] = devKey[server];
-              _context.next = 6;
-              break;
+    config.servers[args.alias] = {
+      url: args.server,
+      key: args.key
+    };
+    console.log('Successfully added the server.');
+    console.log("Use this command to deploy packages: grok publish ".concat(args.alias));
+
+    if (args["default"]) {
+      config["default"] = args.alias;
+    }
+  }
+
+  console.log("Your config file (".concat(confPath, "):"));
+  console.log(config);
+  var valRes = (0, _configValidator.validateConf)(config);
+
+  if (!config || !valRes.value) {
+    console.log(valRes.message);
+    return false;
+  }
 
-            case 17:
-              _context.next = 19;
-              return _inquirer["default"].prompt({
-                name: 'default-server',
-                type: 'input',
-                message: 'Your default server:',
-                validate: function validate(server) {
-                  if (server in _config.servers) {
-                    return true;
-                  } else {
-                    return 'Only one of the specified servers may be chosen as default';
-                  }
-                },
-                "default": _config["default"]
-              });
-
-            case 19:
-              defaultServer = _context.sent;
-              _config["default"] = defaultServer['default-server'];
-
-              _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(_config));
-
-            case 22:
-              _context.next = 29;
+  if (valRes.warnings.length) console.log(valRes.warnings.join('\n'));
+  (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var answers, server, url, question, devKey, defaultServer;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return _inquirer["default"].prompt({
+              name: 'edit-config',
+              type: 'confirm',
+              message: 'Do you want to edit it?',
+              "default": false
+            });
+
+          case 3:
+            answers = _context.sent;
+
+            if (!answers['edit-config']) {
+              _context.next = 23;
               break;
+            }
+
+            _context.t0 = _regenerator["default"].keys(config.servers);
 
-            case 24:
-              _context.prev = 24;
-              _context.t2 = _context["catch"](0);
-              console.error('The file is corrupted. Please run `grok config --reset` to restore the default template');
-              console.error(_context.t2);
-              return _context.abrupt("return", false);
-
-            case 29:
-            case "end":
-              return _context.stop();
-          }
+          case 6:
+            if ((_context.t1 = _context.t0()).done) {
+              _context.next = 17;
+              break;
+            }
+
+            server = _context.t1.value;
+            url = config['servers'][server]['url'];
+            question = generateKeyQ(server, url);
+            question["default"] = config['servers'][server]['key'];
+            _context.next = 13;
+            return _inquirer["default"].prompt(question);
+
+          case 13:
+            devKey = _context.sent;
+            config['servers'][server]['key'] = devKey[server];
+            _context.next = 6;
+            break;
+
+          case 17:
+            _context.next = 19;
+            return addNewServer(config);
+
+          case 19:
+            _context.next = 21;
+            return _inquirer["default"].prompt({
+              name: 'default-server',
+              type: 'input',
+              message: 'Your default server:',
+              validate: function validate(server) {
+                if (server in config.servers) {
+                  return true;
+                } else {
+                  return 'Only one of the specified servers may be chosen as default';
+                }
+              },
+              "default": config["default"]
+            });
+
+          case 21:
+            defaultServer = _context.sent;
+            config["default"] = defaultServer['default-server']; // fs.writeFileSync(confPath, yaml.dump(config));
+
+          case 23:
+            _context.next = 30;
+            break;
+
+          case 25:
+            _context.prev = 25;
+            _context.t2 = _context["catch"](0);
+            console.error('The file is corrupted. Please run `grok config --reset` to restore the default template');
+            console.error(_context.t2);
+            return _context.abrupt("return", false);
+
+          case 30:
+          case "end":
+            return _context.stop();
         }
-      }, _callee, null, [[0, 24]]);
-    }))();
-    return true;
-  }
+      }
+    }, _callee, null, [[0, 25]]);
+  }))();
+
+  _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));
+
+  return true;
 }

package/bin/commands/help.js

@@ -7,7 +7,7 @@ exports.help = void 0;
 var HELP = "\nUsage: grok <command>\n\nDatagrok's package management tool\n\nCommands:\n    add       Add an object template\n    api       Create wrapper functions\n    config    Create and manage config files\n    create    Create a package\n    publish   Upload a package\n    migrate   Switch to `grok` tools\n\nTo get help on a particular command, use:\n    grok <command> --help\n\nRead more about the package development workflow:\nhttps://datagrok.ai/help/develop/develop\n";
 var HELP_ADD = "\nUsage: grok add <entity> <name>\n\nAdd an object template to your package:\n\ngrok add app <name>\ngrok add connection <name>\ngrok add detector <semantic-type-name>\ngrok add function [tag] <name>\ngrok add query <name>\ngrok add script [tag] <language> <name>\ngrok add view <name>\ngrok add viewer <name>\n\nPlease note that entity names may only include letters and numbers\n\nSupported languages for scripts:\njavascript, julia, node, octave, python, r\n\nAvailable tags:\npanel, init\n";
 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]\n\n--reset     Restore the default config file template\n";
+var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file\n\nOptions:\n[--reset] [--server] [--alias] [--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] [--ts]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--ts        Create a TypeScript package\n";
 var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [--key] [--suffix]\n\nRunning `grok publish` is the same as running `grok publish defaultHost --build --debug`\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";

package/bin/utils/ent-helpers.js

@@ -27,7 +27,7 @@ var query = function query(queryName) {
 };
 
 var script = function script(scriptName, packageName) {
-  return "\nThe script ".concat(scriptName, " has been created. To call it from a JavaScript file, use:\n\n  await grok.functions.call('").concat(packageName, ":").concat(scriptName, "', { params });\n  \nRead more at https://datagrok.ai/help/develop/scripting\nSee examples at https://public.datagrok.ai/scripts,\nhttps://public.datagrok.ai/js/samples/scripting/scripting");
+  return "\nThe script ".concat(scriptName, " has been created. To call it from a JavaScript file, use:\n\n  await grok.functions.call('").concat(packageName, ":").concat(scriptName, "', { params });\n  \nRead more at https://datagrok.ai/help/compute/scripting\nSee examples at https://public.datagrok.ai/scripts,\nhttps://public.datagrok.ai/js/samples/scripting/scripting");
 };
 
 var view = function view(viewName) {

package/bin/utils/utils.js

@@ -18,7 +18,7 @@ exports.isEmpty = isEmpty;
 exports.isPackageDir = isPackageDir;
 exports.kebabToCamelCase = kebabToCamelCase;
 exports.mapURL = mapURL;
-exports.queryWrapperTemplate = exports.queryExtension = void 0;
+exports.queryWrapperTemplate = exports.queryExtension = exports.namespaceTemplate = void 0;
 exports.removeScope = removeScope;
 exports.scriptWrapperTemplate = exports.scriptLangExtMap = exports.scriptExtensions = exports.replacers = void 0;
 exports.spaceToCamelCase = spaceToCamelCase;
@@ -99,15 +99,21 @@ function friendlyNameToName(s) {
   var firstUpper = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var out = '';
   var cap = true;
+  var firstWordUpperCase = false;
   var start = true;
   s = ((_s = s) !== null && _s !== void 0 ? _s : '').trim();
   var letterRegex = /[A-Za-z]/;
   var digitRegex = /\d/;
 
+  var isUpper = function isUpper(s) {
+    return /[A-Z]/.test(s);
+  };
+
   for (var i = 0; i < s.length; i++) {
     if (!letterRegex.test(s[i]) && !digitRegex.test(s[i])) cap = true;else {
       if (start && digitRegex.test(s[i])) continue;
-      out += start && !firstUpper ? s[i].toLowerCase() : cap ? s[i].toUpperCase() : s[i];
+      firstWordUpperCase = start ? isUpper(s[i]) : firstWordUpperCase && isUpper(s[i]);
+      out += !firstUpper && (start || firstWordUpperCase && !cap) ? s[i].toLowerCase() : cap ? s[i].toUpperCase() : s[i];
       cap = false;
       start = false;
     }
@@ -136,16 +142,10 @@ var replacers = {
     return s.replace(/#{PACKAGE_NAMESPACE}/g, kebabToCamelCase(removeScope(name)));
   },
   FUNC_NAME: function FUNC_NAME(s, name) {
-    return s.replace(/#{FUNC_NAME}/g, name.includes('-') ? kebabToCamelCase(name) : name.includes(' ') ? spaceToCamelCase(name) : name[0].toUpperCase() + name.slice(1));
+    return s.replace(/#{FUNC_NAME}/g, friendlyNameToName(name));
   },
   FUNC_NAME_LOWERCASE: function FUNC_NAME_LOWERCASE(s, name) {
-    return s.replace(/#{FUNC_NAME_LOWERCASE}/g, name.includes('-') ? kebabToCamelCase(name, false) : name.includes(' ') ? spaceToCamelCase(name, false) : wordsToCamelCase(name, false));
-  },
-  QUERY_NAME: function QUERY_NAME(s, name) {
-    return s.replace(/#{QUERY_NAME}/g, friendlyNameToName(name));
-  },
-  QUERY_NAME_LOWERCASE: function QUERY_NAME_LOWERCASE(s, name) {
-    return s.replace(/#{QUERY_NAME_LOWERCASE}/g, friendlyNameToName(name, false));
+    return s.replace(/#{FUNC_NAME_LOWERCASE}/g, friendlyNameToName(name, false));
   },
   PARAMS_OBJECT: function PARAMS_OBJECT(s, params) {
     return s.replace(/#{PARAMS_OBJECT}/g, params.length ? "{ ".concat(params.map(function (p) {
@@ -179,6 +179,14 @@ var TemplateBuilder = /*#__PURE__*/function () {
   }, {
     key: "build",
     value: function build() {
+      var indent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+
+      if (indent) {
+        this.template = this.template.split(TemplateBuilder.sep).map(function (line) {
+          return ' '.repeat(indent * TemplateBuilder.indentSize) + line;
+        }).join(TemplateBuilder.sep);
+      }
+
       return this.template;
     }
   }]);
@@ -186,6 +194,8 @@ var TemplateBuilder = /*#__PURE__*/function () {
 }();
 
 exports.TemplateBuilder = TemplateBuilder;
+(0, _defineProperty2["default"])(TemplateBuilder, "sep", '\n');
+(0, _defineProperty2["default"])(TemplateBuilder, "indentSize", 2);
 var scriptLangExtMap = {
   javascript: 'js',
   julia: 'jl',
@@ -303,5 +313,7 @@ var dgImports = "import * as grok from 'datagrok-api/grok';\nimport * as DG from
 exports.dgImports = dgImports;
 var scriptWrapperTemplate = "export async function #{FUNC_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n  return await grok.functions.call('#{PACKAGE_NAMESPACE}:#{FUNC_NAME}', #{PARAMS_OBJECT});\n}";
 exports.scriptWrapperTemplate = scriptWrapperTemplate;
-var queryWrapperTemplate = "export async function #{QUERY_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n  return await grok.data.query('#{PACKAGE_NAMESPACE}:#{QUERY_NAME}', #{PARAMS_OBJECT});\n}";
-exports.queryWrapperTemplate = queryWrapperTemplate;
+var queryWrapperTemplate = "export async function #{FUNC_NAME_LOWERCASE}(#{TYPED_PARAMS}): Promise<#{OUTPUT_TYPE}> {\n  return await grok.data.query('#{PACKAGE_NAMESPACE}:#{FUNC_NAME}', #{PARAMS_OBJECT});\n}";
+exports.queryWrapperTemplate = queryWrapperTemplate;
+var namespaceTemplate = "export namespace #{PACKAGE_NAMESPACE} {\n#{NAME}\n}";
+exports.namespaceTemplate = namespaceTemplate;

package/entity-template/view-class.ts

@@ -22,7 +22,7 @@ export class #{NAME} extends DG.ViewBase {
   }
 
   get helpUrl() {
-    return '/help/develop/jupyter-notebook.md';
+    return '/help/compute/jupyter-notebook.md';
   }
 
   get name() {

package/package-template/.eslintrc.json

@@ -21,6 +21,15 @@
     ],
     "require-jsdoc": "off",
     "spaced-comment": "off",
-    "linebreak-style": "off"
+    "linebreak-style": "off",
+    "curly": [
+      "error",
+      "multi-or-nest"
+    ],
+    "brace-style": [
+      "error",
+      "1tbs",
+      { "allowSingleLine": true }
+    ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.1.16",
+  "version": "4.1.20",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -18,6 +18,7 @@
     "path": "^0.12.7"
   },
   "scripts": {
+    "link": "npm link",
     "prepublishOnly": "babel bin --extensions .ts -d bin",
     "babel": "babel bin --extensions .ts -d bin"
   },

package/src/test-utils.ts

@@ -1,84 +0,0 @@
-import * as path from "path";
-import * as os from "os";
-import * as fs from "fs";
-import * as yaml from 'js-yaml';
-import { Config, Indexable } from "../bin/utils/utils";
-const fetch = require('node-fetch');
-
-export async function getToken(url: string, key: string) {
-  let response = await fetch(`${url}/users/login/dev/${key}`, {method: 'POST'});
-  let json = await response.json();
-  if (json.isSuccess == true)
-    return json.token;
-  else
-    throw 'Unable to login to server. Check your dev key';
-}
-
-export async function getWebUrl(url: string, token: string) {
-  let response = await fetch(`${url}/admin/plugins/admin/settings`, {headers: {Authorization: token}});
-  let json = await response.json();
-  return json.settings.webRoot;
-}
-
-const grokDir = path.join(os.homedir(), '.grok');
-const confPath = path.join(grokDir, 'config.yaml');
-
-function mapURL(conf: Config): Indexable {
-  let urls: Indexable = {};
-  for (let server in conf.servers) {
-    urls[conf['servers'][server]['url']] = conf['servers'][server];
-  }
-  return urls;
-}
-
-export function getDevKey(hostKey: string): {url: string, key: string} {
-  let config = yaml.load(fs.readFileSync(confPath, 'utf8')) as any;
-  let host = hostKey == '' ? config.default : hostKey;
-  host = host.trim();
-  let urls = mapURL(config);
-  let key = '';
-  let url = '';
-  try {
-    let url = new URL(host).href;
-    if (url.endsWith('/')) url = url.slice(0, -1);
-    if (url in urls) key = config['servers'][urls[url]]['key'];
-  } catch (error) {
-    if (config['servers'][host] == null)
-      throw `Unknown server alias. Please add it to ${confPath}`;
-    url = config['servers'][host]['url'];
-    key = config['servers'][host]['key'];
-  }
-  return {url, key};
-}
-
-export async function getBrowserPage(puppeteer: any): Promise<{browser: any, page: any}> {
-  let url:string = process.env.HOST ?? '';
-  let cfg = getDevKey(url);
-  url = cfg.url;
-
-  let key = cfg.key;
-  let token = await getToken(url, key);
-  url = await getWebUrl(url, token);
-  console.log(`Using web root: ${url}`);
-
-  let browser = await puppeteer.launch({
-    args: ['--disable-dev-shm-usage', '--disable-features=site-per-process'],
-    ignoreHTTPSErrors: true,
-  });
-
-  let page = await browser.newPage();
-  await page.goto(`${url}/oauth/`);
-  await page.setCookie({name: 'auth', value: token});
-  await page.evaluate((token: any) => {
-    window.localStorage.setItem('auth', token);
-  }, token);
-  await page.goto(url);
-  try {
-    await page.waitForSelector('.grok-preloader');
-    console.log('got preloader');
-    await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 100000});
-  } catch (error) {
-    throw error;
-  }
-  return {browser, page};
-}