datagrok-tools 4.4.3 → 4.4.4

package/bin/commands/add.js

@@ -17,6 +17,8 @@ var _entHelpers = require("../utils/ent-helpers");
 
 var utils = _interopRequireWildcard(require("../utils/utils"));
 
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
@@ -49,14 +51,14 @@ function add(args) {
   var packagePath = _path["default"].join(curDir, 'package.json'); // Package directory check
 
 
-  if (!_fs["default"].existsSync(packagePath)) return console.log('`package.json` not found');
+  if (!_fs["default"].existsSync(packagePath)) return color.error('`package.json` not found');
 
   try {
     var _package = JSON.parse(_fs["default"].readFileSync(packagePath, {
       encoding: 'utf-8'
     }));
   } catch (error) {
-    console.error("Error while reading ".concat(packagePath, ":"));
+    color.error("Error while reading ".concat(packagePath, ":"));
     console.error(error);
   } // TypeScript package check
 
@@ -68,7 +70,7 @@ function add(args) {
 
   function validateName(name) {
     if (!/^([A-Za-z])+([A-Za-z\d])*$/.test(name)) {
-      return console.log('The name may only include letters and numbers. It cannot start with a digit');
+      return color.error('The name may only include letters and numbers. It cannot start with a digit');
     }
 
     return true;
@@ -110,7 +112,7 @@ function add(args) {
       }
 
       if (!Object.keys(utils.scriptLangExtMap).includes(lang)) {
-        console.log('Unsupported language:', lang);
+        color.error("Unsupported language: ".concat(lang));
         console.log('You can add a script in one of the following languages:');
         console.log(Object.keys(utils.scriptLangExtMap).join(', '));
         return false;
@@ -118,14 +120,14 @@ function add(args) {
 
 
       if (!validateName(name)) return false;
-      if (tag && tag !== 'panel') return console.log('Currently, you can only add the `panel` tag'); // Create the folder `scripts` if it doesn't exist yet
+      if (tag && tag !== 'panel') return color.error('Currently, you can only add the `panel` tag'); // Create the folder `scripts` if it doesn't exist yet
 
       if (!_fs["default"].existsSync(scriptsDir)) _fs["default"].mkdirSync(scriptsDir);
 
       var scriptPath = _path["default"].join(scriptsDir, name + '.' + utils.scriptLangExtMap[lang]);
 
       if (_fs["default"].existsSync(scriptPath)) {
-        return console.log("The file with the script already exists: ".concat(scriptPath));
+        return color.error("The file with the script already exists: ".concat(scriptPath));
       } // Copy the script template
 
 
@@ -172,7 +174,7 @@ function add(args) {
       if (!validateName(name)) return false;
 
       if (tag && tag !== 'panel' && tag !== 'init') {
-        return console.log('Currently, you can only add the `panel` or `init` tag');
+        return color.error('Currently, you can only add the `panel` or `init` tag');
       } // Create src/package.js if it doesn't exist yet
 
 
@@ -198,7 +200,7 @@ function add(args) {
       var connectPath = _path["default"].join(connectDir, "".concat(name, ".json"));
 
       if (_fs["default"].existsSync(connectPath)) {
-        return console.log("The connection file already exists: ".concat(connectPath));
+        return color.error("The connection file already exists: ".concat(connectPath));
       }
 
       var connectionTemplate = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'connection.json'), 'utf8');
@@ -252,7 +254,7 @@ function add(args) {
       if (!validateName(name)) return false;
 
       if (!name.endsWith('View')) {
-        console.log("For consistency reasons, we recommend postfixing classes with 'View'");
+        color.warn("For consistency reasons, we recommend postfixing classes with 'View'");
       } // Create src/package.js if it doesn't exist yet
 
 
@@ -261,7 +263,7 @@ function add(args) {
       var viewPath = _path["default"].join(srcDir, utils.camelCaseToKebab(name) + ext);
 
       if (_fs["default"].existsSync(viewPath)) {
-        return console.log("The view file already exists: ".concat(viewPath));
+        return color.error("The view file already exists: ".concat(viewPath));
       }
 
       var viewClass = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'view-class' + ext), 'utf8');
@@ -287,7 +289,7 @@ function add(args) {
       if (!validateName(name)) return false;
 
       if (!name.endsWith('Viewer')) {
-        console.log("For consistency reasons, we recommend postfixing classes with 'Viewer'");
+        color.warn("For consistency reasons, we recommend postfixing classes with 'Viewer'");
       } // Create src/package.js if it doesn't exist yet
 
 
@@ -296,7 +298,7 @@ function add(args) {
       var viewerPath = _path["default"].join(srcDir, utils.camelCaseToKebab(name) + ext);
 
       if (_fs["default"].existsSync(viewerPath)) {
-        return console.log("The viewer file already exists: ".concat(viewerPath));
+        return color.error("The viewer file already exists: ".concat(viewerPath));
       }
 
       var viewerClass = _fs["default"].readFileSync(_path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'entity-template', 'viewer-class' + ext), 'utf8');
@@ -331,7 +333,7 @@ function add(args) {
 
       contents = _fs["default"].readFileSync(detectorsPath, 'utf8');
       var idx = contents.search(/(?<=PackageDetectors extends DG.Package\s*{\s*(\r\n|\r|\n)).*/);
-      if (idx === -1) return console.log('Detectors class not found');
+      if (idx === -1) return color.error('Detectors class not found');
       contents = contents.slice(0, idx) + detector + contents.slice(idx);
 
       for (var _i2 = 0, _arr2 = ['NAME', 'NAME_PREFIX', 'PACKAGE_DETECTORS_NAME']; _i2 < _arr2.length; _i2++) {

package/bin/commands/api.js

@@ -17,6 +17,8 @@ var _ignoreWalk = _interopRequireDefault(require("ignore-walk"));
 
 var utils = _interopRequireWildcard(require("../utils/utils"));
 
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
@@ -33,7 +35,8 @@ function generateQueryWrappers() {
   var queriesDir = _path["default"].join(curDir, 'queries');
 
   if (!_fs["default"].existsSync(queriesDir)) {
-    console.log("Directory ".concat(queriesDir, " not found\nSkipping API generation for queries..."));
+    color.warn("Directory ".concat(queriesDir, " not found"));
+    console.log('Skipping API generation for queries...');
     return;
   }
 
@@ -103,14 +106,15 @@ function generateQueryWrappers() {
   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..."));
+    color.warn("The file ".concat(queryFilePath, " already exists"));
+    console.log('Rewriting its contents...');
   }
 
   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));
+  color.success("Successfully generated file ".concat(queryFileName).concat(sep));
 }
 
 function generateScriptWrappers() {
@@ -119,7 +123,8 @@ function generateScriptWrappers() {
   var scriptsDir = _path["default"].join(curDir, 'scripts');
 
   if (!_fs["default"].existsSync(scriptsDir)) {
-    console.log("Directory ".concat(scriptsDir, " not found\nSkipping API generation for scripts..."));
+    color.warn("Directory ".concat(scriptsDir, " not found"));
+    console.log('Skipping API generation for scripts...');
     return;
   }
 
@@ -179,7 +184,8 @@ function generateScriptWrappers() {
   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..."));
+    color.warn("The file ".concat(funcFilePath, " already exists"));
+    console.log('Rewriting its contents...');
   }
 
   var sep = '\n';
@@ -187,7 +193,7 @@ function generateScriptWrappers() {
 
   _fs["default"].writeFileSync(funcFilePath, utils.dgImports + sep + scriptApi.build() + sep, 'utf8');
 
-  console.log("Successfully generated file ".concat(funcFileName).concat(sep));
+  color.success("Successfully generated file ".concat(funcFileName).concat(sep));
 }
 
 function api(args) {
@@ -195,7 +201,7 @@ function api(args) {
   if (args['_'].length !== 1 || nOptions > 0) return false;
 
   if (!utils.isPackageDir(process.cwd())) {
-    console.log('File `package.json` not found. Run the command from the package directory');
+    color.error('File `package.json` not found. Run the command from the package directory');
     return false;
   }
 

package/bin/commands/config.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -23,6 +25,12 @@ var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
 var _configValidator = require("../validators/config-validator");
 
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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; }
+
 var confTemplateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'config-template.yaml');
 
 var confTemplate = _jsYaml["default"].load(_fs["default"].readFileSync(confTemplateDir, {
@@ -159,7 +167,7 @@ function config(args) {
     try {
       new URL(args.server);
     } catch (error) {
-      console.error('URL parsing error. Please, provide a valid server URL.');
+      color.error('URL parsing error. Please, provide a valid server URL.');
       return false;
     }
 
@@ -167,7 +175,7 @@ function config(args) {
       url: args.server,
       key: args.key
     };
-    console.log('Successfully added the server.');
+    color.success('Successfully added the server.');
     console.log("Use this command to deploy packages: grok publish ".concat(args.alias));
 
     if (args["default"]) {
@@ -180,11 +188,11 @@ function config(args) {
   var valRes = (0, _configValidator.validateConf)(config);
 
   if (!config || !valRes.value) {
-    console.log(valRes.message);
+    color.error(valRes.message);
     return false;
   }
 
-  if (valRes.warnings.length) console.log(valRes.warnings.join('\n'));
+  if (valRes.warnings.length) color.warn(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) {
@@ -260,7 +268,7 @@ function config(args) {
           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');
+            color.error('The file is corrupted. Please run `grok config --reset` to restore the default template');
             console.error(_context.t2);
             return _context.abrupt("return", false);
 

package/bin/commands/create.js

@@ -25,6 +25,8 @@ var _entHelpers = require("../utils/ent-helpers");
 
 var utils = _interopRequireWildcard(require("../utils/utils"));
 
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+
 var _configValidator = require("../validators/config-validator");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -118,7 +120,7 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
             '@types/jest': '^27.0.0'
           }, ts ? {
             'ts-jest': '^27.0.0',
-            'puppeteer': 'latest'
+            'puppeteer': '^13.7.0'
           } : {});
           Object.assign(_package.scripts, {
             'test': 'jest'
@@ -192,7 +194,7 @@ function create(args) {
   var confTest = (0, _configValidator.validateConf)(config);
 
   if (!confTest.value) {
-    console.log(confTest.message);
+    color.error(confTest.message);
     return false;
   }
 
@@ -213,7 +215,7 @@ function create(args) {
 
     if (!utils.isEmpty(packageDir)) {
       console.log();
-      console.log('The package directory should be empty');
+      color.error('The package directory should be empty');
       return false;
     }
 
@@ -261,7 +263,7 @@ function create(args) {
       if (err) throw err;else console.log(stderr, stdout);
     });
   } else {
-    console.log('Package name may only include letters, numbers, underscores, or hyphens');
+    color.error('Package name may only include letters, numbers, underscores, or hyphens');
   }
 
   return true;

package/bin/commands/publish.js

@@ -30,6 +30,8 @@ var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
 var utils = _interopRequireWildcard(require("../utils/utils"));
 
+var color = _interopRequireWildcard(require("../utils/color-utils"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
@@ -86,7 +88,7 @@ function _processPackage() {
               break;
             }
 
-            console.log(timestamps.message);
+            color.error(timestamps.message);
             return _context3.abrupt("return", 1);
 
           case 12:
@@ -118,7 +120,7 @@ function _processPackage() {
             isWebpack = _fs["default"].existsSync('webpack.config.js');
 
             if (!(!rebuild && isWebpack)) {
-              _context3.next = 36;
+              _context3.next = 34;
               break;
             }
 
@@ -140,16 +142,14 @@ function _processPackage() {
             distFiles.forEach(function (df) {
               files.push("dist/".concat(df));
             });
-            _context3.next = 36;
+            _context3.next = 34;
             break;
 
           case 32:
-            console.log("File 'dist/package.js' not found. Building the package on the server side...");
-            console.log("Next time, please build your package locally with Webpack beforehand");
-            console.log("or run `grok publish` with the `--rebuild` option");
+            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 36:
+          case 34:
             contentValidationLog = '';
             files.forEach(function (file) {
               var fullPath = file;
@@ -215,7 +215,7 @@ function _processPackage() {
                         case 7:
                           _context2.prev = 7;
                           _context2.t0 = _context2["catch"](0);
-                          console.log(response);
+                          console.error(response);
 
                         case 10:
                         case "end":
@@ -236,51 +236,51 @@ function _processPackage() {
             })["catch"](function (error) {
               console.error(error);
             });
-            _context3.next = 44;
+            _context3.next = 42;
             return zip.finalize();
 
-          case 44:
-            _context3.prev = 44;
-            _context3.next = 47;
+          case 42:
+            _context3.prev = 42;
+            _context3.next = 45;
             return uploadPromise;
 
-          case 47:
+          case 45:
             log = _context3.sent;
 
             _fs["default"].unlinkSync('zip');
 
             if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 55;
+              _context3.next = 53;
               break;
             }
 
-            console.log(log['message']);
-            console.log(log['innerMessage']);
+            color.error(log['message']);
+            console.error(log['innerMessage']);
             return _context3.abrupt("return", 1);
 
-          case 55:
+          case 53:
             console.log(log);
-            console.log(contentValidationLog);
+            color.warn(contentValidationLog);
 
-          case 57:
-            _context3.next = 63;
+          case 55:
+            _context3.next = 61;
             break;
 
-          case 59:
-            _context3.prev = 59;
-            _context3.t1 = _context3["catch"](44);
+          case 57:
+            _context3.prev = 57;
+            _context3.t1 = _context3["catch"](42);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
 
-          case 63:
+          case 61:
             return _context3.abrupt("return", 0);
 
-          case 64:
+          case 62:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[3, 14], [44, 59]]);
+    }, _callee3, null, [[3, 14], [42, 57]]);
   }));
   return _processPackage.apply(this, arguments);
 }
@@ -293,8 +293,13 @@ function publish(args) {
     return ['build', 'rebuild', 'debug', 'release', 'k', 'key', 'suffix'].includes(option);
   })) return false;
 
-  if (args.build && args.rebuild || args.debug && args.release) {
-    console.log('You have used incompatible options');
+  if (args.build && args.rebuild) {
+    color.error('Incompatible options: --build and --rebuild');
+    return false;
+  }
+
+  if (args.debug && args.release) {
+    color.error('Incompatible options: --debug and --release');
     return false;
   } // Create `config.yaml` if it doesn't exist yet
 
@@ -317,16 +322,16 @@ function publish(args) {
     if (url.endsWith('/')) url = url.slice(0, -1);
     if (url in urls) key = config['servers'][urls[url]]['key'];
   } catch (error) {
-    if (!(host in config.servers)) return console.log("Unknown server alias. Please add it to ".concat(confPath));
+    if (!(host in config.servers)) return color.error("Unknown server alias. Please add it to ".concat(confPath));
     url = config['servers'][host]['url'];
     key = config['servers'][host]['key'];
   } // Update the developer key
 
 
   if (args.key) key = args.key;
-  if (key === '') return console.log('Please provide the key with `--key` option or add it by running `grok config`'); // Get the package name
+  if (key === '') return color.warn('Please provide the key with `--key` option or add it by running `grok config`'); // Get the package name
 
-  if (!_fs["default"].existsSync(packDir)) return console.log('`package.json` doesn\'t exist');
+  if (!_fs["default"].existsSync(packDir)) return color.error('`package.json` doesn\'t exist');
 
   var _package = JSON.parse(_fs["default"].readFileSync(packDir, {
     encoding: 'utf-8'

package/bin/utils/color-utils.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.warn = exports.success = exports.info = exports.fail = exports.error = void 0;
+
+var error = function error(s) {
+  return console.log('\x1b[31m%s\x1b[0m', s);
+};
+
+exports.error = error;
+
+var info = function info(s) {
+  return console.log('\x1b[32m%s\x1b[0m', s);
+};
+
+exports.info = info;
+
+var warn = function warn(s) {
+  return console.log('\x1b[33m%s\x1b[0m', s);
+};
+
+exports.warn = warn;
+var success = info;
+exports.success = success;
+var fail = error;
+exports.fail = fail;

package/package.json

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