datagrok-tools 4.12.9 → 4.12.11

package/bin/commands/check.js

@@ -19,6 +19,7 @@ var _path = _interopRequireDefault(require("path"));
 var _ignoreWalk = _interopRequireDefault(require("ignore-walk"));
 var utils = _interopRequireWildcard(require("../utils/utils"));
 var color = _interopRequireWildcard(require("../utils/color-utils"));
+var testUtils = _interopRequireWildcard(require("../utils/test-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 || _typeof3(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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
@@ -28,72 +29,78 @@ function check(args) {
   var nOptions = Object.keys(args).length - 1;
   if (args['_'].length !== 1 || nOptions > 2 || nOptions > 0 && !args.r && !args.recursive) return false;
   var curDir = process.cwd();
-  if (args.recursive) {
-    var runChecksRec = function runChecksRec(dir) {
-      var files = _fs["default"].readdirSync(dir);
-      var _iterator = _createForOfIteratorHelper(files),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var file = _step.value;
-          var filepath = _path["default"].join(dir, file);
-          var stats = _fs["default"].statSync(filepath);
-          if (stats.isDirectory()) {
-            if (utils.isPackageDir(filepath)) runChecks(filepath);else {
-              if (file !== 'node_modules' && !file.startsWith('.')) runChecksRec(_path["default"].join(dir, file));
-            }
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    };
-    runChecksRec(curDir);
-  } else {
+  if (args.recursive) return runChecksRec(curDir);else {
     if (!utils.isPackageDir(curDir)) {
       color.error('File `package.json` not found. Run the command from the package directory');
       return false;
     }
-    runChecks(curDir);
+    return runChecks(curDir);
   }
-  function runChecks(packagePath) {
-    var files = _ignoreWalk["default"].sync({
-      path: packagePath,
-      ignoreFiles: ['.npmignore', '.gitignore']
-    });
-    var jsTsFiles = files.filter(function (f) {
-      return !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts'));
-    });
-    var packageFiles = ['src/package.ts', 'src/detectors.ts', 'src/package.js', 'src/detectors.js', 'src/package-test.ts', 'src/package-test.js', 'package.js', 'detectors.js'];
-    var funcFiles = jsTsFiles.filter(function (f) {
-      return packageFiles.includes(f);
+}
+function runChecks(packagePath) {
+  var files = _ignoreWalk["default"].sync({
+    path: packagePath,
+    ignoreFiles: ['.npmignore', '.gitignore']
+  });
+  var jsTsFiles = files.filter(function (f) {
+    return !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts'));
+  });
+  var packageFiles = ['src/package.ts', 'src/detectors.ts', 'src/package.js', 'src/detectors.js', 'src/package-test.ts', 'src/package-test.js', 'package.js', 'detectors.js'];
+  var funcFiles = jsTsFiles.filter(function (f) {
+    return packageFiles.includes(f);
+  });
+  var warnings = [];
+  var packageFilePath = _path["default"].join(packagePath, 'package.json');
+  var json = JSON.parse(_fs["default"].readFileSync(packageFilePath, {
+    encoding: 'utf-8'
+  }));
+  var webpackConfigPath = _path["default"].join(packagePath, 'webpack.config.js');
+  var isWebpack = _fs["default"].existsSync(webpackConfigPath);
+  var externals = null;
+  if (isWebpack) {
+    var content = _fs["default"].readFileSync(webpackConfigPath, {
+      encoding: 'utf-8'
     });
-    var warnings = [];
-    var webpackConfigPath = _path["default"].join(packagePath, 'webpack.config.js');
-    var isWebpack = _fs["default"].existsSync(webpackConfigPath);
-    var externals = null;
-    if (isWebpack) {
-      var content = _fs["default"].readFileSync(webpackConfigPath, {
-        encoding: 'utf-8'
-      });
-      externals = extractExternals(content);
-      if (externals) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkImportStatements(packagePath, jsTsFiles, externals)));
-    }
-    warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkFuncSignatures(packagePath, funcFiles)));
-    warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath, {
-      isWebpack: isWebpack,
-      externals: externals
-    })));
-    warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath)));
-    if (warnings.length) {
-      console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
-      warn(warnings);
-    } else console.log("Checking package ".concat(_path["default"].basename(packagePath), "...\t\t\t\u2713 OK"));
+    externals = extractExternals(content);
+    if (externals) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkImportStatements(packagePath, jsTsFiles, externals)));
+  }
+  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkFuncSignatures(packagePath, funcFiles)));
+  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath, json, {
+    isWebpack: isWebpack,
+    externals: externals
+  })));
+  if (!json.servicePackage) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
+  if (warnings.length) {
+    console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
+    warn(warnings);
+    if (json.version.startsWith('0') || warnings.length === 1 && warnings[0].startsWith('Latest package version')) return true;
+    testUtils.exitWithCode(1);
   }
+  console.log("Checking package ".concat(_path["default"].basename(packagePath), "...\t\t\t\u2713 OK"));
   return true;
 }
+function runChecksRec(dir) {
+  var files = _fs["default"].readdirSync(dir);
+  var _iterator = _createForOfIteratorHelper(files),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var file = _step.value;
+      var filepath = _path["default"].join(dir, file);
+      var stats = _fs["default"].statSync(filepath);
+      if (stats.isDirectory()) {
+        if (utils.isPackageDir(filepath)) return runChecks(filepath);else {
+          if (file !== 'node_modules' && !file.startsWith('.')) runChecksRec(_path["default"].join(dir, file));
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return false;
+}
 function extractExternals(config) {
   var externalsRegex = /(?<=externals)\s*:\s*(\{[\S\s]*?\})/;
   var match = config.match(externalsRegex);
@@ -277,7 +284,7 @@ function checkFuncSignatures(packagePath, files) {
       var outputs = _ref7.outputs;
       var value = true;
       var message = '';
-      if (outputs.length === 1 && outputs[0].type === 'widget') {
+      if (!(outputs.length === 1 && outputs[0].type === 'widget')) {
         value = false;
         message += 'Package settings editors must have one output of type "widget"\n';
       }
@@ -338,12 +345,9 @@ var sharedLibExternals = {
     'codemirror': 'CodeMirror'
   }
 };
-function checkPackageFile(packagePath, options) {
+function checkPackageFile(packagePath, json, options) {
+  var _json$devDependencies, _json$devDependencies2, _json$dependencies;
   var warnings = [];
-  var packageFilePath = _path["default"].join(packagePath, 'package.json');
-  var json = JSON.parse(_fs["default"].readFileSync(packageFilePath, {
-    encoding: 'utf-8'
-  }));
   var isPublicPackage = _path["default"].basename(_path["default"].dirname(packagePath)) === 'packages' && _path["default"].basename(_path["default"].dirname(_path["default"].dirname(packagePath))) === 'public';
   if (!json.description) warnings.push('File "package.json": "description" field is empty. Provide a package description.');
   if (Array.isArray(json.properties) && json.properties.length > 0) {
@@ -362,6 +366,9 @@ function checkPackageFile(packagePath, options) {
   }
   if (json.repository == null && isPublicPackage) warnings.push('File "package.json": add the "repository" field.');
   if (json.author == null && isPublicPackage) warnings.push('File "package.json": add the "author" field.');
+  if (json.version.includes('beta') && isPublicPackage) warnings.push('File "package.json": public package cannot be beta version.');
+  var dt = (_json$devDependencies = (_json$devDependencies2 = json.devDependencies) === null || _json$devDependencies2 === void 0 ? void 0 : _json$devDependencies2['datagrok-tools']) !== null && _json$devDependencies !== void 0 ? _json$devDependencies : (_json$dependencies = json.dependencies) === null || _json$dependencies === void 0 ? void 0 : _json$dependencies['datagrok-tools'];
+  if (dt && dt !== 'latest') warnings.push('File "package.json": "datagrok-tools" dependency must be "latest" version.');
   if (Array.isArray(json.sources) && json.sources.length > 0) {
     var _iterator6 = _createForOfIteratorHelper(json.sources),
       _step6;
@@ -400,7 +407,8 @@ function checkPackageFile(packagePath, options) {
   }
   return warnings;
 }
-function checkChangelog(packagePath) {
+function checkChangelog(packagePath, json) {
+  var _h2$0$match;
   var warnings = [];
   var clf;
   try {
@@ -426,6 +434,9 @@ function checkChangelog(packagePath) {
   } finally {
     _iterator7.f();
   }
+  regex = /^## (\d+\.\d+\.\d+)/;
+  var v = (_h2$0$match = h2[0].match(regex)) === null || _h2$0$match === void 0 ? void 0 : _h2$0$match[1];
+  if (v && v !== json.version) warnings.push("Latest package version (".concat(json.version, ") is not in CHANGELOG"));
   return warnings;
 }
 function warn(warnings) {

package/bin/commands/publish.js

@@ -39,7 +39,7 @@ function processPackage(_x, _x2, _x3, _x4, _x5, _x6) {
 }
 function _processPackage() {
   _processPackage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(debug, rebuild, host, devKey, packageName, suffix) {
-    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, packageWarnings, uploadPromise, log;
+    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, packageFilePath, json, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, packageWarnings, changelogWarnings, uploadPromise, log;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -120,6 +120,10 @@ function _processPackage() {
             jsTsFiles = files.filter(function (f) {
               return !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts'));
             });
+            packageFilePath = _path["default"].join(curDir, 'package.json');
+            json = JSON.parse(_fs["default"].readFileSync(packageFilePath, {
+              encoding: 'utf-8'
+            }));
             if (isWebpack) {
               webpackConfigPath = _path["default"].join(curDir, 'webpack.config.js');
               content = _fs["default"].readFileSync(webpackConfigPath, {
@@ -136,8 +140,10 @@ function _processPackage() {
             });
             funcWarnings = (0, _check.checkFuncSignatures)(curDir, funcFiles);
             contentValidationLog += funcWarnings.join('\n') + (funcWarnings.length ? '\n' : '');
-            packageWarnings = (0, _check.checkPackageFile)(curDir);
+            packageWarnings = (0, _check.checkPackageFile)(curDir, json);
             contentValidationLog += packageWarnings.join('\n') + (packageWarnings.length ? '\n' : '');
+            changelogWarnings = (0, _check.checkChangelog)(curDir, json);
+            contentValidationLog += changelogWarnings.join('\n') + (packageWarnings.length ? '\n' : '');
             console.log("Checks finished in ".concat(Date.now() - checkStart, " ms"));
             files.forEach(function (file) {
               var fullPath = file;
@@ -212,41 +218,41 @@ function _processPackage() {
             })["catch"](function (error) {
               console.error(error);
             });
-            _context3.next = 52;
+            _context3.next = 56;
             return zip.finalize();
-          case 52:
-            _context3.prev = 52;
-            _context3.next = 55;
+          case 56:
+            _context3.prev = 56;
+            _context3.next = 59;
             return uploadPromise;
-          case 55:
+          case 59:
             log = _context3.sent;
             _fs["default"].unlinkSync('zip');
             if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 63;
+              _context3.next = 67;
               break;
             }
             color.error(log['message']);
             console.error(log['innerMessage']);
             return _context3.abrupt("return", 1);
-          case 63:
+          case 67:
             console.log(log);
             color.warn(contentValidationLog);
-          case 65:
-            _context3.next = 71;
+          case 69:
+            _context3.next = 75;
             break;
-          case 67:
-            _context3.prev = 67;
-            _context3.t1 = _context3["catch"](52);
+          case 71:
+            _context3.prev = 71;
+            _context3.t1 = _context3["catch"](56);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
-          case 71:
+          case 75:
             return _context3.abrupt("return", 0);
-          case 72:
+          case 76:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[3, 14], [52, 67]]);
+    }, _callee3, null, [[3, 14], [56, 71]]);
   }));
   return _processPackage.apply(this, arguments);
 }

package/bin/grok.js

@@ -21,11 +21,18 @@ if (command in commands) {
   try {
     if (!commands[command](argv)) {
       console.log(help[command]);
+      exitWithCode(1);
     }
   } catch (err) {
     console.error(err);
     console.log(help[command]);
+    exitWithCode(1);
   }
 } else {
   console.log(help.help);
 }
+
+function exitWithCode(code) {
+  console.log(`Exiting with code ${code}`);
+  process.exit(code);
+}

package/bin/utils/test-utils.js

@@ -28,7 +28,7 @@ var fetch = require('node-fetch');
 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'],
+  args: ['--disable-dev-shm-usage', '--disable-features=site-per-process', '--window-size=1920,1080'],
   ignoreHTTPSErrors: true,
   headless: 'new',
   protocolTimeout: 0
@@ -164,50 +164,54 @@ function _getBrowserPage() {
           case 17:
             page = _context4.sent;
             _context4.next = 20;
-            return page.setDefaultNavigationTimeout(0);
+            return page.setViewport({
+              width: 1920,
+              height: 1080
+            });
           case 20:
-            _context4.next = 22;
+            page.setDefaultNavigationTimeout(0);
+            _context4.next = 23;
             return page["goto"]("".concat(url, "/oauth/"));
-          case 22:
-            _context4.next = 24;
+          case 23:
+            _context4.next = 25;
             return page.setCookie({
               name: 'auth',
               value: token
             });
-          case 24:
-            _context4.next = 26;
+          case 25:
+            _context4.next = 27;
             return page.evaluate(function (token) {
               window.localStorage.setItem('auth', token);
             }, token);
-          case 26:
-            _context4.next = 28;
+          case 27:
+            _context4.next = 29;
             return page["goto"](url);
-          case 28:
-            _context4.prev = 28;
-            _context4.next = 31;
+          case 29:
+            _context4.prev = 29;
+            _context4.next = 32;
             return page.waitForFunction(function () {
               return document.querySelector('.grok-preloader') == null;
             }, {
               timeout: 3600000
             });
-          case 31:
-            _context4.next = 36;
+          case 32:
+            _context4.next = 37;
             break;
-          case 33:
-            _context4.prev = 33;
-            _context4.t0 = _context4["catch"](28);
+          case 34:
+            _context4.prev = 34;
+            _context4.t0 = _context4["catch"](29);
             throw _context4.t0;
-          case 36:
+          case 37:
             return _context4.abrupt("return", {
               browser: browser,
               page: page
             });
-          case 37:
+          case 38:
           case "end":
             return _context4.stop();
         }
       }
-    }, _callee4, null, [[28, 33]]);
+    }, _callee4, null, [[29, 34]]);
   }));
   return _getBrowserPage.apply(this, arguments);
 }
@@ -264,8 +268,8 @@ var recorderConfig = {
   fps: 25,
   ffmpeg_Path: null,
   videoFrame: {
-    width: 1024,
-    height: 768
+    width: 1280,
+    height: 630
   },
   videoCrf: 18,
   videoCodec: 'libx264',
@@ -273,7 +277,7 @@ var recorderConfig = {
   videoBitrate: 1000,
   autopad: {
     color: 'black'
-  },
-  aspectRatio: '4:3'
+  }
+  // aspectRatio: '16:9',
 };
 exports.recorderConfig = recorderConfig;

package/package.json

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