datagrok-tools 4.13.9 → 4.13.11

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Datagrok-tools changelog
 
 
+## 4.13.11 (2024-07-30)
+
+### Bug Fixes
+
+* Added commit label to context panel for 'manually' published versions
+
+## 4.13.10 (2024-07-29)
+
+### Bug Fixes
+
+* Added ability to select test by args variable 
+
 ## 4.13.9 (2024-07-29)
 
 ### Bug Fixes

package/bin/commands/publish.js

@@ -26,6 +26,8 @@ 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; } // @ts-ignore
 // @ts-ignore
+var _require = require('child_process'),
+  exec = _require.exec;
 var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var confTemplateDir = _path["default"].join(_path["default"].dirname(_path["default"].dirname(__dirname)), 'config-template.yaml');
@@ -352,25 +354,39 @@ function publish(args) {
         case 0:
           code = 0;
           _context.prev = 1;
-          _context.next = 4;
+          exec('git rev-parse HEAD', function (error, stdout, stderr) {
+            if (error) {
+              console.error("Error executing command: ".concat(error.message));
+              return;
+            }
+            if (stderr) {
+              console.error("Standard Error: ".concat(stderr));
+              return;
+            }
+            if (!args.suffix && stdout) args.suffix = stdout.toString().substring(0, 8);
+          });
+          _context.next = 5;
+          return utils.delay(100);
+        case 5:
+          _context.next = 7;
           return processPackage(!args.release, Boolean(args.rebuild), url, key, packageName, args.suffix);
-        case 4:
+        case 7:
           code = _context.sent;
-          _context.next = 11;
+          _context.next = 14;
           break;
-        case 7:
-          _context.prev = 7;
+        case 10:
+          _context.prev = 10;
           _context.t0 = _context["catch"](1);
           console.error(_context.t0);
           code = 1;
-        case 11:
+        case 14:
           console.log("Exiting with code ".concat(code));
           process.exit(code);
-        case 13:
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 7]]);
+    }, _callee, null, [[1, 10]]);
   })));
   return true;
 }

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category'];
+  var commandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -55,6 +55,10 @@ function test(args) {
   if (args.category) {
     categoryToCheck = args.category.toString();
   }
+  var testToCheck = undefined;
+  if (args.category && args.test) {
+    testToCheck = args.test.toString();
+  }
   if (args["package"]) {
     process.env.TARGET_PACKAGE = utils.kebabToCamelCase(args["package"]);
   } else {
@@ -192,7 +196,8 @@ function test(args) {
                 return new Promise(function (resolve, reject) {
                   var params = {
                     testContext: testContext,
-                    category: options.category
+                    category: options.category,
+                    test: options.test
                   };
                   if (options.path) {
                     var split = options.path.split(' -- ');
@@ -318,7 +323,8 @@ function test(args) {
               record: args.record,
               benchmark: args.benchmark,
               core: args.core,
-              category: categoryToCheck
+              category: categoryToCheck,
+              test: testToCheck
             });
           case 12:
             r = _context3.sent;

package/bin/utils/utils.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.absUrlRegex = exports.TemplateBuilder = void 0;
 exports.camelCaseToKebab = camelCaseToKebab;
 exports.checkScriptLocation = checkScriptLocation;
-exports.dgToTsTypeMap = exports.dgImports = exports.commentMap = void 0;
+exports.commentMap = void 0;
+exports.delay = delay;
+exports.dgToTsTypeMap = exports.dgImports = void 0;
 exports.friendlyNameToName = friendlyNameToName;
 exports.getParam = getParam;
 exports.getScriptInputs = getScriptInputs;
@@ -23,14 +25,37 @@ exports.removeScope = removeScope;
 exports.scriptWrapperTemplate = exports.scriptLangExtMap = exports.scriptExtensions = exports.replacers = void 0;
 exports.spaceToCamelCase = spaceToCamelCase;
 exports.wordsToCamelCase = wordsToCamelCase;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 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; }
+/* Waits [ms] milliseconds */
+function delay(_x) {
+  return _delay.apply(this, arguments);
+}
+function _delay() {
+  _delay = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ms) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return new Promise(function (r) {
+            return setTimeout(r, ms);
+          });
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _delay.apply(this, arguments);
+}
 function isEmpty(dir) {
   return _fs["default"].readdirSync(dir).length === 0;
 }

package/package.json

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