datagrok-tools 4.6.1 → 4.6.3

package/bin/commands/check.js

@@ -8,6 +8,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.check = check;
+exports.checkFuncSignatures = checkFuncSignatures;
+exports.checkImportStatements = checkImportStatements;
+exports.extractExternals = extractExternals;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -121,7 +124,7 @@ function checkImportStatements(packagePath, files, externals) {
     if (key.includes('/')) modules.push(key.split('/', 1)[0]);
   }
 
-  var importRegex = new RegExp("import\\s+.*(".concat(modules.join('|'), ").*(?=\\s+?)"), 'g');
+  var importRegex = new RegExp("^(?!\\/{2})\\s*import\\s+.*(".concat(modules.join('|'), ").*(?=\\s+?)"), 'g');
   var validImportRegex = new RegExp("import\\s+.*(".concat(Object.keys(externals).join('|'), ")['\"]{1}"));
   var warnings = [];
 

package/bin/commands/config.js

@@ -216,7 +216,7 @@ function config(args) {
             answers = _context.sent;
 
             if (!answers['edit-config']) {
-              _context.next = 23;
+              _context.next = 24;
               break;
             }
 
@@ -263,25 +263,27 @@ function config(args) {
 
           case 21:
             defaultServer = _context.sent;
-            config["default"] = defaultServer['default-server']; // fs.writeFileSync(confPath, yaml.dump(config));
+            config["default"] = defaultServer['default-server'];
 
-          case 23:
-            _context.next = 30;
+            _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));
+
+          case 24:
+            _context.next = 31;
             break;
 
-          case 25:
-            _context.prev = 25;
+          case 26:
+            _context.prev = 26;
             _context.t2 = _context["catch"](0);
             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);
 
-          case 30:
+          case 31:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 25]]);
+    }, _callee, null, [[0, 26]]);
   }))();
 
   _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));

package/bin/commands/publish.js

@@ -28,6 +28,8 @@ 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"));
@@ -52,13 +54,15 @@ 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, uploadPromise, log;
+    var timestamps, url, zip, localTimestamps, files, isWebpack, distFiles, contentValidationLog, checkStart, jsTsFiles, webpackConfigPath, content, externals, importWarnings, funcFiles, funcWarnings, uploadPromise, log;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -151,6 +155,31 @@ function _processPackage() {
 
           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'));
+            });
+
+            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' : '');
+            console.log("Checks finished in ".concat(Date.now() - checkStart, " ms"));
             files.forEach(function (file) {
               var fullPath = file;
 
@@ -236,21 +265,21 @@ function _processPackage() {
             })["catch"](function (error) {
               console.error(error);
             });
-            _context3.next = 42;
+            _context3.next = 50;
             return zip.finalize();
 
-          case 42:
-            _context3.prev = 42;
-            _context3.next = 45;
+          case 50:
+            _context3.prev = 50;
+            _context3.next = 53;
             return uploadPromise;
 
-          case 45:
+          case 53:
             log = _context3.sent;
 
             _fs["default"].unlinkSync('zip');
 
             if (!(log['#type'] === 'ApiError')) {
-              _context3.next = 53;
+              _context3.next = 61;
               break;
             }
 
@@ -258,29 +287,29 @@ function _processPackage() {
             console.error(log['innerMessage']);
             return _context3.abrupt("return", 1);
 
-          case 53:
+          case 61:
             console.log(log);
             color.warn(contentValidationLog);
 
-          case 55:
-            _context3.next = 61;
+          case 63:
+            _context3.next = 69;
             break;
 
-          case 57:
-            _context3.prev = 57;
-            _context3.t1 = _context3["catch"](42);
+          case 65:
+            _context3.prev = 65;
+            _context3.t1 = _context3["catch"](50);
             console.error(_context3.t1);
             return _context3.abrupt("return", 1);
 
-          case 61:
+          case 69:
             return _context3.abrupt("return", 0);
 
-          case 62:
+          case 70:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[3, 14], [42, 57]]);
+    }, _callee3, null, [[3, 14], [50, 65]]);
   }));
   return _processPackage.apply(this, arguments);
 }
@@ -294,7 +323,7 @@ function publish(args) {
   })) return false;
 
   if (args.build && args.rebuild) {
-    color.error('Incompatible options: --build and');
+    color.error('Incompatible options: --build and --rebuild');
     return false;
   }
 

package/package.json

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