datagrok-tools 4.12.13 → 4.12.15

package/bin/commands/check.js

@@ -426,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);
@@ -447,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

@@ -184,6 +184,7 @@ function test(args) {
                           failed: failed,
                           countReport: countReport
                         });
+                        return;
                       }
                       var cStatus = df.columns.byName('success');
                       var cSkipped = df.columns.byName('skipped');
@@ -205,9 +206,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(function (r) {
-                        return r.get('success');
-                      });
+                      // if (!options.verbose)
+                      //   df.rows.removeWhere((r: any) => r.get('success'));
                       var csv = df.toCsv();
                       resolve({
                         failReport: failReport,
@@ -218,7 +218,18 @@ function test(args) {
                         countReport: countReport
                       });
                     })["catch"](function (e) {
-                      return reject(e);
+                      var stack = window.DG.Logger.translateStackTrace(e.stack);
+                      resolve({
+                        failReport: "".concat(e.message, "\n").concat(stack),
+                        skipReport: '',
+                        passReport: '',
+                        failed: true,
+                        csv: '',
+                        countReport: {
+                          skip: 0,
+                          pass: 0
+                        }
+                      });
                     });
                   });
                 }, targetPackage, options, new testUtils.TestContext(options.catchUnhandled, options.report));

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.13",
+  "version": "4.12.15",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {

package/tsconfig.json

@@ -5,7 +5,7 @@
     "noEmitOnError": true,
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "target": "ES2022",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
     "module": "ES2022",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     "lib": ["ES2022", "DOM"],                             /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */