datagrok-tools 4.8.4 → 4.10.0

package/bin/commands/publish.js

@@ -1,65 +1,42 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.processPackage = processPackage;
 exports.publish = publish;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _archiverPromise = _interopRequireDefault(require("archiver-promise"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _os = _interopRequireDefault(require("os"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _ignoreWalk = _interopRequireDefault(require("ignore-walk"));
-
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
-
 var _check = require("./check");
-
 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; }
-
 // @ts-ignore
+
 // @ts-ignore
-var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 
+var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
-
 var confTemplateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'config-template.yaml');
-
 var confTemplate = _jsYaml["default"].load(_fs["default"].readFileSync(confTemplateDir, {
   encoding: 'utf-8'
 }));
-
 var curDir = process.cwd();
-
 var packDir = _path["default"].join(curDir, 'package.json');
-
 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'];
-
 function processPackage(_x, _x2, _x3, _x4, _x5, _x6) {
   return _processPackage.apply(this, arguments);
 }
-
 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;
@@ -70,46 +47,36 @@ function _processPackage() {
             // Get the server timestamps
             timestamps = {};
             url = "".concat(host, "/packages/dev/").concat(devKey, "/").concat(packageName);
-
             if (!debug) {
               _context3.next = 18;
               break;
             }
-
             _context3.prev = 3;
             _context3.next = 6;
             return (0, _nodeFetch["default"])(url + '/timestamps');
-
           case 6:
             _context3.next = 8;
             return _context3.sent.json();
-
           case 8:
             timestamps = _context3.sent;
-
             if (!(timestamps['#type'] === 'ApiError')) {
               _context3.next = 12;
               break;
             }
-
             color.error(timestamps.message);
             return _context3.abrupt("return", 1);
-
           case 12:
             _context3.next = 18;
             break;
-
           case 14:
             _context3.prev = 14;
             _context3.t0 = _context3["catch"](3);
             console.error(_context3.t0);
             return _context3.abrupt("return", 1);
-
           case 18:
             zip = (0, _archiverPromise["default"])('zip', {
               store: false
             }); // Gather the files
-
             localTimestamps = {};
             _context3.next = 22;
             return (0, _ignoreWalk["default"])({
@@ -118,21 +85,17 @@ function _processPackage() {
               includeEmpty: false,
               follow: true
             });
-
           case 22:
             files = _context3.sent;
             isWebpack = _fs["default"].existsSync('webpack.config.js');
-
             if (!(!rebuild && isWebpack)) {
               _context3.next = 34;
               break;
             }
-
             if (!_fs["default"].existsSync('dist/package.js')) {
               _context3.next = 32;
               break;
             }
-
             _context3.next = 28;
             return (0, _ignoreWalk["default"])({
               path: './dist',
@@ -140,7 +103,6 @@ function _processPackage() {
               includeEmpty: false,
               follow: true
             });
-
           case 28:
             distFiles = _context3.sent;
             distFiles.forEach(function (df) {
@@ -148,11 +110,9 @@ function _processPackage() {
             });
             _context3.next = 34;
             break;
-
           case 32:
             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 34:
             contentValidationLog = '';
             console.log('Starting package checks...');
@@ -160,20 +120,17 @@ function _processPackage() {
             jsTsFiles = files.filter(function (f) {
               return !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts'));
             });
-
             if (isWebpack) {
               webpackConfigPath = _path["default"].join(curDir, 'webpack.config.js');
               content = _fs["default"].readFileSync(webpackConfigPath, {
                 encoding: 'utf-8'
               });
               externals = (0, _check.extractExternals)(content);
-
               if (externals) {
                 importWarnings = (0, _check.checkImportStatements)(curDir, jsTsFiles, externals);
                 contentValidationLog += importWarnings.join('\n') + (importWarnings.length ? '\n' : '');
               }
             }
-
             funcFiles = jsTsFiles.filter(function (f) {
               return packageFiles.includes(f);
             });
@@ -184,35 +141,26 @@ function _processPackage() {
             console.log("Checks finished in ".concat(Date.now() - checkStart, " ms"));
             files.forEach(function (file) {
               var fullPath = file;
-
               var relativePath = _path["default"].relative(curDir, fullPath);
-
               var canonicalRelativePath = relativePath.replace(/\\/g, '/');
               if (canonicalRelativePath.includes('/.')) return;
               if (canonicalRelativePath.startsWith('.')) return;
               if (relativePath.startsWith('node_modules')) return;
               if (relativePath.startsWith('dist') && rebuild) return;
-
               if (relativePath.startsWith('src') && !rebuild && isWebpack) {
                 if (!relativePath.startsWith('src/package') && !relativePath.startsWith('src\\package')) return;
               }
-
               if (relativePath.startsWith('upload.keys.json')) return;
               if (relativePath === 'zip') return;
-
               if (!utils.checkScriptLocation(canonicalRelativePath)) {
                 contentValidationLog += "Warning: file `".concat(canonicalRelativePath, "`") + " should be in directory `".concat(_path["default"].basename(curDir), "/scripts/`\n");
               }
-
               var t = _fs["default"].statSync(fullPath).mtime.toUTCString();
-
               localTimestamps[canonicalRelativePath] = t;
-
               if (debug && timestamps[canonicalRelativePath] === t) {
                 console.log("Skipping ".concat(canonicalRelativePath));
                 return;
               }
-
               zip.append(_fs["default"].createReadStream(fullPath), {
                 name: relativePath
               });
@@ -220,8 +168,9 @@ function _processPackage() {
             });
             zip.append(JSON.stringify(localTimestamps), {
               name: 'timestamps.json'
-            }); // Upload
+            });
 
+            // Upload
             url += "?debug=".concat(debug.toString(), "&rebuild=").concat(rebuild.toString());
             if (suffix) url += "&suffix=".concat(suffix.toString());
             uploadPromise = new Promise(function (resolve, reject) {
@@ -238,16 +187,13 @@ function _processPackage() {
                           _context2.prev = 0;
                           _context2.next = 3;
                           return body.text();
-
                         case 3:
                           response = _context2.sent;
                           return _context2.abrupt("return", JSON.parse(response));
-
                         case 7:
                           _context2.prev = 7;
                           _context2.t0 = _context2["catch"](0);
                           console.error(response);
-
                         case 10:
                         case "end":
                           return _context2.stop();
@@ -255,7 +201,6 @@ function _processPackage() {
                     }
                   }, _callee2, null, [[0, 7]]);
                 }));
-
                 return function (_x7) {
                   return _ref2.apply(this, arguments);
                 };
@@ -269,43 +214,33 @@ function _processPackage() {
             });
             _context3.next = 52;
             return zip.finalize();
-
           case 52:
             _context3.prev = 52;
             _context3.next = 55;
             return uploadPromise;
-
           case 55:
             log = _context3.sent;
-
             _fs["default"].unlinkSync('zip');
-
             if (!(log['#type'] === 'ApiError')) {
               _context3.next = 63;
               break;
             }
-
             color.error(log['message']);
             console.error(log['innerMessage']);
             return _context3.abrupt("return", 1);
-
           case 63:
             console.log(log);
             color.warn(contentValidationLog);
-
           case 65:
             _context3.next = 71;
             break;
-
           case 67:
             _context3.prev = 67;
             _context3.t1 = _context3["catch"](52);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
-
           case 71:
             return _context3.abrupt("return", 0);
-
           case 72:
           case "end":
             return _context3.stop();
@@ -315,7 +250,6 @@ function _processPackage() {
   }));
   return _processPackage.apply(this, arguments);
 }
-
 function publish(args) {
   var nOptions = Object.keys(args).length - 1;
   var nArgs = args['_'].length;
@@ -323,31 +257,28 @@ function publish(args) {
   if (!Object.keys(args).slice(1).every(function (option) {
     return ['build', 'rebuild', 'debug', 'release', 'k', 'key', 'suffix'].includes(option);
   })) return false;
-
   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
-
+  }
 
+  // Create `config.yaml` if it doesn't exist yet
   if (!_fs["default"].existsSync(grokDir)) _fs["default"].mkdirSync(grokDir);
   if (!_fs["default"].existsSync(confPath)) _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(confTemplate));
-
   var config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
     encoding: 'utf-8'
   }));
-
   var host = config["default"];
   var urls = utils.mapURL(config);
   if (nArgs === 2) host = args['_'][1];
   var key = '';
-  var url = ''; // The host can be passed either as a URL or an alias
+  var url = '';
 
+  // The host can be passed either as a URL or an alias
   try {
     url = new URL(host).href;
     if (url.endsWith('/')) url = url.slice(0, -1);
@@ -356,20 +287,20 @@ function publish(args) {
     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
-
+  }
 
+  // Update the developer key
   if (args.key) key = args.key;
-  if (key === '') return color.warn('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 color.error('`package.json` doesn\'t exist');
-
   var _package = JSON.parse(_fs["default"].readFileSync(packDir, {
     encoding: 'utf-8'
   }));
+  var packageName = _package.name;
 
-  var packageName = _package.name; // Upload the package
-
+  // Upload the package
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   process.on('beforeExit', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var code;
@@ -381,22 +312,18 @@ function publish(args) {
             _context.prev = 1;
             _context.next = 4;
             return processPackage(!args.release, Boolean(args.rebuild), url, key, packageName, args.suffix);
-
           case 4:
             code = _context.sent;
             _context.next = 11;
             break;
-
           case 7:
             _context.prev = 7;
             _context.t0 = _context["catch"](1);
             console.error(_context.t0);
             code = 1;
-
           case 11:
             console.log("Exiting with code ".concat(code));
             process.exit(code);
-
           case 13:
           case "end":
             return _context.stop();

package/bin/commands/test.js

@@ -1,68 +1,45 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.test = test;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _child_process = require("child_process");
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _os = _interopRequireDefault(require("os"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _puppeteer = _interopRequireDefault(require("puppeteer"));
-
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
-
 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 || _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'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
-
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
-
   var confPath = _path["default"].join(grokDir, 'config.yaml');
-
   if (nArgs > 1 || options.length > commandOptions.length || options.length > 0 && !options.every(function (op) {
     return commandOptions.includes(op);
   })) return false;
-
   if (!utils.isPackageDir(curDir)) {
     color.error('File `package.json` not found. Run the command from the package directory');
     return false;
   }
-
   if (!_fs["default"].existsSync(confPath)) {
     color.error("File `".concat(confPath, "` not found. Run `grok config` to set up the config file"));
     return false;
   }
-
   var config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
     encoding: 'utf-8'
   }));
-
   if (args.host) {
     if (args.host in config.servers) {
       process.env.HOST = args.host;
@@ -75,11 +52,9 @@ function test(args) {
     process.env.HOST = config["default"];
     console.log('Environment variable `HOST` is set to', config["default"]);
   }
-
   var packageData = JSON.parse(_fs["default"].readFileSync(_path["default"].join(curDir, 'package.json'), {
     encoding: 'utf-8'
   }));
-
   if (packageData.name) {
     process.env.TARGET_PACKAGE = utils.kebabToCamelCase(utils.removeScope(packageData.name));
     console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
@@ -87,7 +62,6 @@ function test(args) {
     color.error('Invalid package name. Set the `name` field in `package.json`');
     return false;
   }
-
   if (args['skip-build']) {
     if (args['skip-publish']) test();else publish(test);
   } else {
@@ -95,11 +69,9 @@ function test(args) {
       return publish(test);
     });
   }
-
   function build(callback) {
     (0, _child_process.exec)('npm run build', function (err, stdout, stderr) {
       color.info("Building package...");
-
       if (err) {
         console.log(stdout);
         throw err;
@@ -107,11 +79,9 @@ function test(args) {
         console.log(stdout);
         color.warn(stderr);
       }
-
       callback();
     });
   }
-
   function publish(callback) {
     (0, _child_process.exec)("grok publish ".concat(process.platform === 'win32' ? '%HOST%' : '${HOST}'), function (err, stdout, stderr) {
       color.info("Publishing package \"".concat(process.env.TARGET_PACKAGE, "\" to ").concat(process.env.HOST, "..."));
@@ -122,13 +92,11 @@ function test(args) {
       callback();
     });
   }
-
   function test() {
     color.info('Starting tests...');
     var P_START_TIMEOUT = 3600000;
     var browser;
     var page;
-
     function init(timeout) {
       var params = Object.assign({}, testUtils.defaultLaunchParameters);
       if (args.gui) params['headless'] = false;
@@ -141,19 +109,16 @@ function test(args) {
                 _context.prev = 0;
                 _context.next = 3;
                 return testUtils.getBrowserPage(_puppeteer["default"], params);
-
               case 3:
                 out = _context.sent;
                 browser = out.browser;
                 page = out.page;
                 _context.next = 11;
                 break;
-
               case 8:
                 _context.prev = 8;
                 _context.t0 = _context["catch"](0);
                 throw _context.t0;
-
               case 11:
               case "end":
                 return _context.stop();
@@ -162,11 +127,9 @@ function test(args) {
         }, _callee, null, [[0, 8]]);
       })));
     }
-
     function runTest(timeout) {
       return testUtils.runWithTimeout(timeout, /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _process$env$TARGET_P;
-
         var targetPackage, r;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) {
@@ -182,7 +145,6 @@ function test(args) {
                       var skipReport = '';
                       var passReport = '';
                       var failReport = '';
-
                       if (df == null) {
                         failed = true;
                         failReport = 'Fail reason: No package tests found';
@@ -193,14 +155,12 @@ function test(args) {
                           failed: failed
                         });
                       }
-
                       var cStatus = df.columns.byName('success');
                       var cSkipped = df.columns.byName('skipped');
                       var cMessage = df.columns.byName('result');
                       var cCat = df.columns.byName('category');
                       var cName = df.columns.byName('name');
                       var cTime = df.columns.byName('ms');
-
                       for (var i = 0; i < df.rowCount; i++) {
                         if (cStatus.get(i)) {
                           if (cSkipped.get(i)) {
@@ -213,7 +173,6 @@ function test(args) {
                           failReport += "Test result : Failed : ".concat(cTime.get(i), " : ").concat(targetPackage, ".").concat(cCat.get(i), ".").concat(cName.get(i), " : ").concat(cMessage.get(i), "\n");
                         }
                       }
-
                       var csv = df.toCsv();
                       resolve({
                         failReport: failReport,
@@ -227,11 +186,9 @@ function test(args) {
                     });
                   });
                 }, targetPackage);
-
               case 4:
                 r = _context2.sent;
                 return _context2.abrupt("return", r);
-
               case 6:
               case "end":
                 return _context2.stop();
@@ -240,7 +197,6 @@ function test(args) {
         }, _callee2);
       })));
     }
-
     (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var r;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
@@ -250,34 +206,26 @@ function test(args) {
               _context3.prev = 0;
               _context3.next = 3;
               return init(P_START_TIMEOUT);
-
             case 3:
               color.success('Initialization completed.');
               _context3.next = 10;
               break;
-
             case 6:
               _context3.prev = 6;
               _context3.t0 = _context3["catch"](0);
               color.error('Initialization failed.');
               throw _context3.t0;
-
             case 10:
               _context3.next = 12;
               return runTest(7200000);
-
             case 12:
               r = _context3.sent;
-
               if (r.csv && args.csv) {
                 _fs["default"].writeFileSync(_path["default"].join(curDir, 'test-report.csv'), r.csv, 'utf8');
-
                 color.info('Saved `test-report.csv`\n');
               }
-
               if (r.passReport) console.log(r.passReport);
               if (r.skipReport) console.log(r.skipReport);
-
               if (r.failed) {
                 console.log(r.failReport);
                 color.fail('Tests failed.');
@@ -285,17 +233,15 @@ function test(args) {
               } else {
                 color.success('Tests passed.');
                 testUtils.exitWithCode(0);
-              } //@ts-ignore
-
+              }
 
+              //@ts-ignore
               if (!(browser != null)) {
                 _context3.next = 20;
                 break;
               }
-
               _context3.next = 20;
               return browser.close();
-
             case 20:
             case "end":
               return _context3.stop();
@@ -304,6 +250,5 @@ function test(args) {
       }, _callee3, null, [[0, 6]]);
     }))();
   }
-
   return true;
 }

package/bin/grok.js

@@ -12,7 +12,6 @@ const commands = {
   create: require('./commands/create').create,
   init: require('./commands/init').init,
   link: require('./commands/link').link,
-  unlink: require('./commands/link').unlink,
   publish: require('./commands/publish').publish,
   test: require('./commands/test').test,
 };

package/bin/utils/color-utils.js

@@ -4,23 +4,17 @@ 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;