datagrok-tools 4.12.12 → 4.12.14

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Datagrok-tools changelog
 
-## 4.12.12 (WIP)
+## 4.12.13 (2023-08-17)
+
+### Bug Fixes
+
+* Datagrok API version check fix
+* Check Changelog fix
+* Sync --csv and --verbose flags
+
+## 4.12.12 (2023-08-07)
 
 ### Features
 

package/bin/commands/check.js

@@ -69,7 +69,7 @@ function runChecks(packagePath) {
     isWebpack: isWebpack,
     externals: externals
   })));
-  if (!json.servicePackage) warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
+  warnings.push.apply(warnings, (0, _toConsumableArray2["default"])(checkChangelog(packagePath, json)));
   if (warnings.length) {
     console.log("Checking package ".concat(_path["default"].basename(packagePath), "..."));
     warn(warnings);
@@ -374,7 +374,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.');else if (!(api.startsWith('^') || api.startsWith('>'))) warnings.push('File "package.json": Datagrok API version should contain "^" or ">" symbol, otherwise it is locked to the single Datagrok version.');
+    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 > | >= | ~ | ^ | < | <=');
   }
   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.');
@@ -418,6 +418,7 @@ function checkPackageFile(packagePath, json, options) {
 }
 function checkChangelog(packagePath, json) {
   var _h2$0$match, _h2$, _h2$$match;
+  if (json.servicePackage) return [];
   var warnings = [];
   var clf;
   try {
@@ -425,18 +426,18 @@ function checkChangelog(packagePath, json) {
       encoding: 'utf-8'
     });
   } catch (e) {
-    return ['CHANGELOG.md file does not exist'];
+    return ['CHANGELOG.md file does not exist\n'];
   }
   var regex = /^##[^#].*$/gm;
   var h2 = clf.match(regex);
-  if (!h2) return ['No versions found in CHANGELOG.md'];
+  if (!h2) return ['No versions found in CHANGELOG.md\n'];
   regex = /^## \d+\.\d+\.\d+ \((\d{4}-\d{2}-\d{2}|WIP)\)$/;
   var _iterator7 = _createForOfIteratorHelper(h2),
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
       var h = _step7.value;
-      if (!regex.test(h)) warnings.push("CHANGELOG: '".concat(h, "' does not match the h2 format, expected: ## <version> (<release date> | WIP)"));
+      if (!regex.test(h)) warnings.push("CHANGELOG: '".concat(h, "' does not match the h2 format, expected: ## <version> (<release date> | WIP)\n"));
     }
   } catch (err) {
     _iterator7.e(err);
@@ -446,7 +447,7 @@ function checkChangelog(packagePath, json) {
   regex = /^## (\d+\.\d+\.\d+)/;
   var v1 = (_h2$0$match = h2[0].match(regex)) === null || _h2$0$match === void 0 ? void 0 : _h2$0$match[1];
   var v2 = (_h2$ = h2[1]) === null || _h2$ === void 0 ? void 0 : (_h2$$match = _h2$.match(regex)) === null || _h2$$match === void 0 ? void 0 : _h2$$match[1];
-  if (v1 !== json.version && v2 !== json.version) warnings.push("Latest package version (".concat(json.version, ") is not in CHANGELOG"));
+  if (v1 !== json.version && v2 !== json.version) warnings.push("Latest package version (".concat(json.version, ") is not in CHANGELOG\n"));
   return warnings;
 }
 function warn(warnings) {

package/bin/commands/test.js

@@ -205,6 +205,8 @@ function test(args) {
                           failReport += "Test result : Failed : ".concat(cTime.get(i), " : ").concat(targetPackage, ".").concat(cCat.get(i), ".").concat(cName.get(i), " : ").concat(cMessage.get(i), "\n");
                         }
                       }
+                      // if (!options.verbose)
+                      //   df.rows.removeWhere((r: any) => r.get('success'));
                       var csv = df.toCsv();
                       resolve({
                         failReport: failReport,
@@ -261,6 +263,7 @@ function test(args) {
               _context3.next = 12;
               return runTest(7200000, {
                 category: args.category,
+                verbose: args.verbose,
                 catchUnhandled: args.catchUnhandled,
                 report: args.report,
                 record: args.record

package/bin/utils/utils.js

@@ -189,7 +189,7 @@ exports.queryExtension = queryExtension;
 var scriptExtensions = ['.jl', '.m', '.py', '.R'];
 exports.scriptExtensions = scriptExtensions;
 function checkScriptLocation(filepath) {
-  if (!(filepath.startsWith('scripts/') || filepath.startsWith('projects/')) && scriptExtensions.some(function (ext) {
+  if (!(filepath.startsWith('scripts/') || filepath.startsWith('projects/') || filepath.startsWith('dockerfiles/')) && scriptExtensions.some(function (ext) {
     return filepath.endsWith(ext);
   })) {
     return false;

package/package.json

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