datagrok-tools 4.12.18 → 4.12.20

package/bin/commands/publish.js

@@ -19,8 +19,8 @@ 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; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 // @ts-ignore
 
 // @ts-ignore
@@ -41,216 +41,212 @@ 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, 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) {
-          case 0:
-            // 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:
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // Get the server timestamps
+          timestamps = {};
+          url = "".concat(host, "/packages/dev/").concat(devKey, "/").concat(packageName);
+          if (!debug) {
             _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"])({
-              path: '.',
-              ignoreFiles: ['.npmignore', '.gitignore', '.grokignore'],
-              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',
-              ignoreFiles: [],
-              includeEmpty: false,
-              follow: true
-            });
-          case 28:
-            distFiles = _context3.sent;
-            distFiles.forEach(function (df) {
-              files.push("dist/".concat(df));
-            });
+          }
+          _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"])({
+            path: '.',
+            ignoreFiles: ['.npmignore', '.gitignore', '.grokignore'],
+            includeEmpty: false,
+            follow: true
+          });
+        case 22:
+          files = _context3.sent;
+          isWebpack = _fs["default"].existsSync('webpack.config.js');
+          if (!(!rebuild && isWebpack)) {
             _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...');
-            checkStart = Date.now();
-            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, {
+          }
+          if (!_fs["default"].existsSync('dist/package.js')) {
+            _context3.next = 32;
+            break;
+          }
+          _context3.next = 28;
+          return (0, _ignoreWalk["default"])({
+            path: './dist',
+            ignoreFiles: [],
+            includeEmpty: false,
+            follow: true
+          });
+        case 28:
+          distFiles = _context3.sent;
+          distFiles.forEach(function (df) {
+            files.push("dist/".concat(df));
+          });
+          _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...');
+          checkStart = Date.now();
+          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, {
               encoding: 'utf-8'
-            }));
-            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);
-            });
-            funcWarnings = (0, _check.checkFuncSignatures)(curDir, funcFiles);
-            contentValidationLog += funcWarnings.join('\n') + (funcWarnings.length ? '\n' : '');
-            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;
-              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
-              });
-              console.log("Adding ".concat(canonicalRelativePath, "..."));
             });
-            zip.append(JSON.stringify(localTimestamps), {
-              name: 'timestamps.json'
+            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);
+          });
+          funcWarnings = (0, _check.checkFuncSignatures)(curDir, funcFiles);
+          contentValidationLog += funcWarnings.join('\n') + (funcWarnings.length ? '\n' : '');
+          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;
+            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
             });
+            console.log("Adding ".concat(canonicalRelativePath, "..."));
+          });
+          zip.append(JSON.stringify(localTimestamps), {
+            name: 'timestamps.json'
+          });
 
-            // Upload
-            url += "?debug=".concat(debug.toString(), "&rebuild=").concat(rebuild.toString());
-            if (suffix) url += "&suffix=".concat(suffix.toString());
-            uploadPromise = new Promise(function (resolve, reject) {
-              (0, _nodeFetch["default"])(url, {
-                method: 'POST',
-                body: zip
-              }).then( /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(body) {
-                  var response;
-                  return _regenerator["default"].wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                          _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();
-                      }
-                    }
-                  }, _callee2, null, [[0, 7]]);
-                }));
-                return function (_x7) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()).then(function (j) {
-                return resolve(j);
-              })["catch"](function (err) {
-                reject(err);
-              });
-            })["catch"](function (error) {
-              console.error(error);
+          // Upload
+          url += "?debug=".concat(debug.toString(), "&rebuild=").concat(rebuild.toString());
+          if (suffix) url += "&suffix=".concat(suffix.toString());
+          uploadPromise = new Promise(function (resolve, reject) {
+            (0, _nodeFetch["default"])(url, {
+              method: 'POST',
+              body: zip
+            }).then( /*#__PURE__*/function () {
+              var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(body) {
+                var response;
+                return _regenerator["default"].wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      _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();
+                  }
+                }, _callee2, null, [[0, 7]]);
+              }));
+              return function (_x7) {
+                return _ref2.apply(this, arguments);
+              };
+            }()).then(function (j) {
+              return resolve(j);
+            })["catch"](function (err) {
+              reject(err);
             });
-            _context3.next = 56;
-            return zip.finalize();
-          case 56:
-            _context3.prev = 56;
-            _context3.next = 59;
-            return uploadPromise;
-          case 59:
-            log = _context3.sent;
-            _fs["default"].unlinkSync('zip');
-            if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 67;
-              break;
-            }
-            color.error(log['message']);
-            console.error(log['innerMessage']);
-            return _context3.abrupt("return", 1);
-          case 67:
-            console.log(log);
-            color.warn(contentValidationLog);
-          case 69:
-            _context3.next = 75;
+          })["catch"](function (error) {
+            console.error(error);
+          });
+          _context3.next = 56;
+          return zip.finalize();
+        case 56:
+          _context3.prev = 56;
+          _context3.next = 59;
+          return uploadPromise;
+        case 59:
+          log = _context3.sent;
+          _fs["default"].unlinkSync('zip');
+          if (!(log['#type'] === 'ApiError')) {
+            _context3.next = 67;
             break;
-          case 71:
-            _context3.prev = 71;
-            _context3.t1 = _context3["catch"](56);
-            console.error(_context3.t1);
-            return _context3.abrupt("return", 1);
-          case 75:
-            return _context3.abrupt("return", 0);
-          case 76:
-          case "end":
-            return _context3.stop();
-        }
+          }
+          color.error(log['message']);
+          console.error(log['innerMessage']);
+          return _context3.abrupt("return", 1);
+        case 67:
+          console.log(log);
+          color.warn(contentValidationLog);
+        case 69:
+          _context3.next = 75;
+          break;
+        case 71:
+          _context3.prev = 71;
+          _context3.t1 = _context3["catch"](56);
+          console.error(_context3.t1);
+          return _context3.abrupt("return", 1);
+        case 75:
+          return _context3.abrupt("return", 0);
+        case 76:
+        case "end":
+          return _context3.stop();
       }
     }, _callee3, null, [[3, 14], [56, 71]]);
   }));
@@ -307,33 +303,31 @@ function publish(args) {
   var packageName = _package.name;
 
   // Upload the package
-  process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+  process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
   process.on('beforeExit', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var code;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            code = 0;
-            _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();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          code = 0;
+          _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();
       }
     }, _callee, null, [[1, 7]]);
   })));