datagrok-tools 4.13.5 → 4.13.6

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Datagrok-tools changelog
 
 
+## 4.13.6 (2024-07-15)
+
+### Bug Fixes
+
+* Splitt warnings and errors in grok check command
+
 ## 4.13.4 (2024-06-25)
 
 ### Bug Fixes

package/bin/commands/check.js

@@ -9,6 +9,7 @@ exports.check = check;
 exports.checkChangelog = checkChangelog;
 exports.checkFuncSignatures = checkFuncSignatures;
 exports.checkImportStatements = checkImportStatements;
+exports.checkNpmIgnore = checkNpmIgnore;
 exports.checkPackageFile = checkPackageFile;
 exports.checkSourceMap = checkSourceMap;
 exports.extractExternals = extractExternals;
@@ -50,6 +51,7 @@ function runChecks(packagePath) {
   var funcFiles = jsTsFiles.filter(function (f) {
     return packageFiles.includes(f);
   });
+  var errors = [];
   var warnings = [];
   var packageFilePath = _path["default"].join(packagePath, 'package.json');
   var json = JSON.parse(_fs["default"].readFileSync(packageFilePath, {
@@ -63,19 +65,25 @@ function runChecks(packagePath) {
       encoding: 'utf-8'
     });
     externals = extractExternals(content);
-    if (externals) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkImportStatements(packagePath, jsTsFiles, externals)));
+    if (externals) errors.push.apply(errors, (0, _toConsumableArray2["default"])(checkImportStatements(packagePath, jsTsFiles, externals)));
   }
-  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkSourceMap(packagePath)));
-  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkFuncSignatures(packagePath, funcFiles)));
-  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath, json, {
+  errors.push.apply(errors, (0, _toConsumableArray2["default"])(checkSourceMap(packagePath)));
+  errors.push.apply(errors, (0, _toConsumableArray2["default"])(checkNpmIgnore(packagePath)));
+  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkScriptNames(packagePath)));
+  errors.push.apply(errors, (0, _toConsumableArray2["default"])(checkFuncSignatures(packagePath, funcFiles)));
+  errors.push.apply(errors, (0, _toConsumableArray2["default"])(checkPackageFile(packagePath, json, {
     isWebpack: isWebpack,
     externals: externals
   })));
   warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
   if (warnings.length) {
-    console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
+    console.log("".concat(_path["default"].basename(packagePath), " warnings"));
     warn(warnings);
-    if (json.version.startsWith('0') || warnings.every(function (w) {
+  }
+  if (errors.length) {
+    console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
+    showError(errors);
+    if (json.version.startsWith('0') || errors.every(function (w) {
       return warns.some(function (ww) {
         return w.includes(ww);
       });
@@ -513,6 +521,66 @@ function checkSourceMap(packagePath) {
   }
   return warnings;
 }
+function checkNpmIgnore(packagePath) {
+  var warnings = [];
+  if (_fs["default"].existsSync(packagePath + '\\.npmignore')) {
+    var npmIgnoreContent = _fs["default"].readFileSync(packagePath + '\\.npmignore', {
+      encoding: 'utf-8'
+    });
+    var _iterator10 = _createForOfIteratorHelper(npmIgnoreContent.split('\n')),
+      _step10;
+    try {
+      for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+        var _row$match;
+        var row = _step10.value;
+        if ((((_row$match = row.match(new RegExp('\\s*dist\\/?\\s*$'))) === null || _row$match === void 0 ? void 0 : _row$match.length) || -1) > 0) {
+          warnings.push('there is dist directory in .npmignore');
+          break;
+        }
+      }
+    } catch (err) {
+      _iterator10.e(err);
+    } finally {
+      _iterator10.f();
+    }
+  } else warnings.push('.npmignore doesnt exists');
+  return warnings;
+}
+function checkScriptNames(packagePath) {
+  var warnings = [];
+  try {
+    if (_fs["default"].existsSync(packagePath)) {
+      var filesInDirectory = getAllFilesInDirectory(packagePath);
+      for (var _i2 = 0, _filesInDirectory = filesInDirectory; _i2 < _filesInDirectory.length; _i2++) {
+        var _fileName$match;
+        var fileName = _filesInDirectory[_i2];
+        if (((_fileName$match = fileName.match(new RegExp('^[A-Za-z0-9._-]*$'))) === null || _fileName$match === void 0 ? void 0 : _fileName$match.length) !== 1) warnings.push("".concat(fileName, ": file name contains inappropriate symbols"));
+      }
+    }
+  } catch (err) {}
+  return warnings;
+}
+function getAllFilesInDirectory(directoryPath) {
+  var excludedFilesToCheck = ['node_modules', 'dist'];
+  var fileNames = [];
+  var entries = _fs["default"].readdirSync(directoryPath);
+  entries.forEach(function (entry) {
+    var entryPath = _path["default"].join(directoryPath, entry);
+    var stat = _fs["default"].statSync(entryPath);
+    if (stat.isFile()) {
+      fileNames.push(entry);
+    } else if (stat.isDirectory() && !excludedFilesToCheck.includes(entry)) {
+      var subDirectoryFiles = getAllFilesInDirectory(entryPath);
+      fileNames = fileNames.concat(subDirectoryFiles);
+    }
+  });
+  return fileNames;
+}
+function showError(errors) {
+  errors.forEach(function (w) {
+    return color.error(w);
+  });
+}
 function warn(warnings) {
   warnings.forEach(function (w) {
     return color.warn(w);
@@ -526,11 +594,11 @@ function getFuncMetadata(script) {
     inputs: [],
     outputs: []
   };
-  var _iterator10 = _createForOfIteratorHelper(script.split('\n')),
-    _step10;
+  var _iterator11 = _createForOfIteratorHelper(script.split('\n')),
+    _step11;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var line = _step10.value;
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var line = _step11.value;
       if (!line) continue;
       var match = line.match(utils.paramRegex);
       if (match) {
@@ -562,9 +630,9 @@ function getFuncMetadata(script) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator10.f();
+    _iterator11.f();
   }
   return funcData;
 }

package/package.json

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