datagrok-tools 4.7.8 → 4.7.10

package/bin/commands/check.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.check = check;
 exports.checkFuncSignatures = checkFuncSignatures;
 exports.checkImportStatements = checkImportStatements;
+exports.checkPackageFile = checkPackageFile;
 exports.extractExternals = extractExternals;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -220,10 +221,31 @@ function checkFuncSignatures(packagePath, files) {
         message: message
       };
     },
-    fileViewer: function fileViewer(_ref3) {
+    viewer: function viewer(_ref3) {
       var inputs = _ref3.inputs,
-          outputs = _ref3.outputs,
-          tags = _ref3.tags;
+          outputs = _ref3.outputs;
+      var value = true;
+      var message = '';
+
+      if (inputs.length !== 0) {
+        value = false;
+        message += 'Viewer functions should take no arguments\n';
+      }
+
+      if (outputs.length > 1 || outputs.length === 1 && outputs[0].type !== 'viewer') {
+        value = false;
+        message += 'Viewers must have one output of type "viewer"\n';
+      }
+
+      return {
+        value: value,
+        message: message
+      };
+    },
+    fileViewer: function fileViewer(_ref4) {
+      var inputs = _ref4.inputs,
+          outputs = _ref4.outputs,
+          tags = _ref4.tags;
       var value = true;
       var message = '';
 
@@ -249,8 +271,8 @@ function checkFuncSignatures(packagePath, files) {
         message: message
       };
     },
-    fileExporter: function fileExporter(_ref4) {
-      var description = _ref4.description;
+    fileExporter: function fileExporter(_ref5) {
+      var description = _ref5.description;
       var value = true;
       var message = '';
 
@@ -264,8 +286,8 @@ function checkFuncSignatures(packagePath, files) {
         message: message
       };
     },
-    packageSettingsEditor: function packageSettingsEditor(_ref5) {
-      var outputs = _ref5.outputs;
+    packageSettingsEditor: function packageSettingsEditor(_ref6) {
+      var outputs = _ref6.outputs;
       var value = true;
       var message = '';
 

package/bin/commands/publish.js

@@ -62,7 +62,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, uploadPromise, log;
+    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, packageWarnings, uploadPromise, log;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -179,6 +179,8 @@ function _processPackage() {
             });
             funcWarnings = (0, _check.checkFuncSignatures)(curDir, funcFiles);
             contentValidationLog += funcWarnings.join('\n') + (funcWarnings.length ? '\n' : '');
+            packageWarnings = (0, _check.checkPackageFile)(curDir);
+            contentValidationLog += packageWarnings.join('\n') + (packageWarnings.length ? '\n' : '');
             console.log("Checks finished in ".concat(Date.now() - checkStart, " ms"));
             files.forEach(function (file) {
               var fullPath = file;
@@ -265,21 +267,21 @@ function _processPackage() {
             })["catch"](function (error) {
               console.error(error);
             });
-            _context3.next = 50;
+            _context3.next = 52;
             return zip.finalize();
 
-          case 50:
-            _context3.prev = 50;
-            _context3.next = 53;
+          case 52:
+            _context3.prev = 52;
+            _context3.next = 55;
             return uploadPromise;
 
-          case 53:
+          case 55:
             log = _context3.sent;
 
             _fs["default"].unlinkSync('zip');
 
             if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 61;
+              _context3.next = 63;
               break;
             }
 
@@ -287,29 +289,29 @@ function _processPackage() {
             console.error(log['innerMessage']);
             return _context3.abrupt("return", 1);
 
-          case 61:
+          case 63:
             console.log(log);
             color.warn(contentValidationLog);
 
-          case 63:
-            _context3.next = 69;
+          case 65:
+            _context3.next = 71;
             break;
 
-          case 65:
-            _context3.prev = 65;
-            _context3.t1 = _context3["catch"](50);
+          case 67:
+            _context3.prev = 67;
+            _context3.t1 = _context3["catch"](52);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
 
-          case 69:
+          case 71:
             return _context3.abrupt("return", 0);
 
-          case 70:
+          case 72:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[3, 14], [50, 65]]);
+    }, _callee3, null, [[3, 14], [52, 67]]);
   }));
   return _processPackage.apply(this, arguments);
 }

package/package.json

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