datagrok-tools 4.13.19 → 4.13.21

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Datagrok-tools changelog
 
 
+## 4.13.21 (2024-09-17)
+
+### Features
+
+* Grok check updated for release candidate versions
+
+## 4.13.20 (2024-08-28)
+
+### Features
+
+* Grok link command fixes 
+
 ## 4.13.19 (2024-08-27)
 
 ### Features

package/bin/commands/check.js

@@ -27,6 +27,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var warns = ['Latest package version', 'Datagrok API version should contain'];
 function check(args) {
   var nOptions = Object.keys(args).length - 1;
   if (args['_'].length !== 1 || nOptions > 2 || nOptions > 0 && !args.r && !args.recursive) return false;
@@ -59,7 +60,9 @@ function runChecks(packagePath) {
   }));
   var webpackConfigPath = _path["default"].join(packagePath, 'webpack.config.js');
   var isWebpack = _fs["default"].existsSync(webpackConfigPath);
+  var isReleaseCandidateVersion = false;
   var externals = null;
+  if (/\d+.\d+.\d+-rc(.[A-Za-z0-9]*.[A-Za-z0-9]*)?/.test(json.version)) isReleaseCandidateVersion = true;
   if (isWebpack) {
     var content = _fs["default"].readFileSync(webpackConfigPath, {
       encoding: 'utf-8'
@@ -73,9 +76,10 @@ function runChecks(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
+    externals: externals,
+    isReleaseCandidateVersion: isReleaseCandidateVersion
   })));
-  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
+  if (!isReleaseCandidateVersion) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
   if (warnings.length) {
     console.log("".concat(_path["default"].basename(packagePath), " warnings"));
     warn(warnings);
@@ -93,7 +97,6 @@ function runChecks(packagePath) {
   console.log("Checking package ".concat(_path["default"].basename(packagePath), "...\t\t\t\u2713 OK"));
   return true;
 }
-var warns = ['Latest package version', 'Datagrok API version should contain'];
 function runChecksRec(dir) {
   var files = _fs["default"].readdirSync(dir);
   var _iterator = _createForOfIteratorHelper(files),
@@ -424,7 +427,7 @@ function checkPackageFile(packagePath, json, options) {
   if (json.version.includes('beta') && isPublicPackage) warnings.push('File "package.json": public package cannot be beta version.');
   var api = (_json$dependencies = json.dependencies) === null || _json$dependencies === void 0 ? void 0 : _json$dependencies['datagrok-api'];
   if (api) {
-    if (api === '../../js-api') {} else if (api === 'latest') warnings.push('File "package.json": you should specify Datagrok API version constraint (for example ^1.16.0, >=1.16.0).');else if (!/^(\^|>|<|~).+/.test(api)) warnings.push('File "package.json": Datagrok API version should starts with > | >= | ~ | ^ | < | <=');
+    if (api === '../../js-api') {} else if (api === 'latest') warnings.push('File "package.json": you should specify Datagrok API version constraint (for example ^1.16.0, >=1.16.0).');else if ((options === null || options === void 0 ? void 0 : options.isReleaseCandidateVersion) === false && !/^(\^|>|<|~).+/.test(api)) warnings.push('File "package.json": Datagrok API version should starts with > | >= | ~ | ^ | < | <=');
   }
   var dt = (_json$devDependencies = (_json$devDependencies2 = json.devDependencies) === null || _json$devDependencies2 === void 0 ? void 0 : _json$devDependencies2['datagrok-tools']) !== null && _json$devDependencies !== void 0 ? _json$devDependencies : (_json$dependencies2 = json.dependencies) === null || _json$dependencies2 === void 0 ? void 0 : _json$dependencies2['datagrok-tools'];
   if (dt && dt !== 'latest') warnings.push('File "package.json": "datagrok-tools" dependency must be "latest" version.');
@@ -464,6 +467,30 @@ function checkPackageFile(packagePath, json, options) {
       _iterator8.f();
     }
   }
+  if ((options === null || options === void 0 ? void 0 : options.isReleaseCandidateVersion) === true) {
+    var hasRCDependency = false;
+    for (var _i2 = 0, _Object$keys = Object.keys((_json$dependencies3 = json.dependencies) !== null && _json$dependencies3 !== void 0 ? _json$dependencies3 : {}); _i2 < _Object$keys.length; _i2++) {
+      var _json$dependencies3, _json$dependencies4;
+      var dependency = _Object$keys[_i2];
+      if (/\d+.\d+.\d+-rc(.[A-Za-z0-9]*.[A-Za-z0-9]*)?/.test(((_json$dependencies4 = json.dependencies) !== null && _json$dependencies4 !== void 0 ? _json$dependencies4 : {})[dependency])) {
+        hasRCDependency = true;
+        break;
+      }
+    }
+    if (!hasRCDependency) {
+      for (var _i3 = 0, _Object$keys2 = Object.keys((_json$dependencies5 = json.dependencies) !== null && _json$dependencies5 !== void 0 ? _json$dependencies5 : {}); _i3 < _Object$keys2.length; _i3++) {
+        var _json$dependencies5, _json$dependencies6, _json$devDependencies3;
+        var _dependency = _Object$keys2[_i3];
+        console.log(_dependency);
+        console.log(((_json$dependencies6 = json.dependencies) !== null && _json$dependencies6 !== void 0 ? _json$dependencies6 : {})[_dependency]);
+        if (/\d+.\d+.\d+-rc(.[A-Za-z0-9]*.[A-Za-z0-9]*)?/.test(((_json$devDependencies3 = json.devDependencies) !== null && _json$devDependencies3 !== void 0 ? _json$devDependencies3 : {})[_dependency])) {
+          hasRCDependency = true;
+          break;
+        }
+      }
+    }
+    if (!hasRCDependency) warnings.push('Release candidate error: Current package doesnt have any dependencies from any release candidate package ');
+  }
   return warnings;
 }
 function checkChangelog(packagePath, json) {
@@ -551,9 +578,9 @@ function checkScriptNames(packagePath) {
   try {
     if (_fs["default"].existsSync(packagePath)) {
       var filesInDirectory = getAllFilesInDirectory(packagePath);
-      for (var _i2 = 0, _filesInDirectory = filesInDirectory; _i2 < _filesInDirectory.length; _i2++) {
+      for (var _i4 = 0, _filesInDirectory = filesInDirectory; _i4 < _filesInDirectory.length; _i4++) {
         var _fileName$match;
-        var fileName = _filesInDirectory[_i2];
+        var fileName = _filesInDirectory[_i4];
         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"));
       }
     }

package/bin/commands/link.js

@@ -18,13 +18,13 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable valid-jsdoc */
 var execAsync = (0, _util.promisify)(_child_process.exec);
-var repositoryDirNameRegex = new RegExp('\\public$');
+var repositoryDirNameRegex = new RegExp(_path["default"].join('1', '2')[1] + 'public$');
 var curDir = process.cwd();
 var devMode = false;
 var repositoryDir = curDir;
 var localPackageDependencies;
 var packagesToLink;
-while (repositoryDir.length > 0) {
+while (_path["default"].dirname(repositoryDir) !== repositoryDir) {
   if (repositoryDirNameRegex.test(repositoryDir)) break;
   repositoryDir = _path["default"].dirname(repositoryDir);
 }
@@ -49,8 +49,9 @@ function _link() {
           _context.next = 6;
           return linkPackages();
         case 6:
+          console.log('Package linked');
           return _context.abrupt("return", true);
-        case 7:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -65,7 +66,6 @@ function collectPackagesData() {
   var result = [];
   result = result.concat(collectPacakgeDataFromJsonObject(json.dependencies));
   if (devMode) result = result.concat(collectPacakgeDataFromJsonObject(json.devDependencies));
-  console.log(JSON.stringify(result).toString());
   return result;
 }
 function collectPacakgeDataFromJsonObject(object) {

package/package.json

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