datagrok-tools 4.13.52 → 4.13.54

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Datagrok-tools changelog
 
+## 4.13.54 (2025-01-06)
+
+### Features
+
+* Grok check regex update
+
+
+## 4.13.53 (2025-01-06)
+
+### Features
+
+* Updated csv output for test all(added workes id)
+
+
 ## 4.13.52 (2024-12-30)
 
 ### Features

package/bin/commands/check.js

@@ -247,6 +247,7 @@ function checkFuncSignatures(packagePath, files) {
       var message = '';
       if (inputs.length !== 0) {
         value = false;
+        console.log(inputs);
         message += 'Viewer functions should take no arguments\n';
       }
       if (outputs.length > 1 || outputs.length === 1 && outputs[0].type !== 'viewer') {
@@ -369,7 +370,9 @@ function checkFuncSignatures(packagePath, files) {
         });
         if (roles.length > 1) warnings.push("File ".concat(file, ", function ").concat(f.name, ": several function roles are used (").concat(roles.join(', '), ")"));else if (roles.length === 1) {
           var vr = checkFunctions[roles[0]](f);
-          if (!vr.value) warnings.push("File ".concat(file, ", function ").concat(f.name, ":\n").concat(vr.message));
+          if (!vr.value) {
+            warnings.push("File ".concat(file, ", function ").concat(f.name, ":\n").concat(vr.message));
+          }
         }
         if (f.isInvalidateOnWithoutCache) warnings.push("File ".concat(file, ", function ").concat(f.name, ": Can't use invalidateOn without cache, please follow this example: 'meta.cache.invalidateOn'"));
         if (f.cache) if (!utils.cahceValues.includes(f.cache)) warnings.push("File ".concat(file, ", function ").concat(f.name, ": unsupposed variable for cache : ").concat(f.cache));
@@ -630,6 +633,7 @@ function getFuncMetadata(script, fileExtention) {
     for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
       var line = _step11.value;
       if (!line) continue;
+      if (data.name === 'MCL' || data.name === 'MCLClustering') console.log(line);
       //@ts-ignore
       var match = line.match(utils.fileParamRegex[fileExtention]);
       if (match) {
@@ -661,6 +665,7 @@ function getFuncMetadata(script, fileExtention) {
       if (isHeader) {
         var nm = line.match(utils.nameRegex);
         if (nm && !match) {
+          if (data.name === 'MCL' || data.name === 'MCLClustering') console.log(data);
           data.name = data.name || nm[1];
           funcData.push(data);
           data = {

package/bin/commands/test-all.js

@@ -16,6 +16,7 @@ var utils = _interopRequireWildcard(require("../utils/utils"));
 var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
 var testUtils = _testUtils;
 var _orderFunctions = require("../utils/order-functions");
+var Papa = _interopRequireWildcard(require("papaparse"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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; } } }; }
@@ -271,7 +272,7 @@ function runTests(_x5, _x6) {
 }
 function _runTests() {
   _runTests = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(browsersOrder, browserOptions) {
-    var browsersCommands, _iterator3, _step3, browserOrder, browsersPromises, _i, _browsersCommands, browserCommands, resultObjects;
+    var browsersCommands, _iterator3, _step3, browserOrder, browsersPromises, _i, _browsersCommands, browserCommands, resultObjects, i;
     return _regenerator["default"].wrap(function _callee4$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
@@ -308,12 +309,59 @@ function _runTests() {
           return Promise.all(browsersPromises);
         case 7:
           resultObjects = _context5.sent;
-          return _context5.abrupt("return", resultObjects);
+          i = 0;
         case 9:
+          if (!(i < resultObjects.length)) {
+            _context5.next = 16;
+            break;
+          }
+          _context5.next = 12;
+          return addBrowserColumn(resultObjects[i].csv, i);
+        case 12:
+          resultObjects[i].csv = _context5.sent;
+        case 13:
+          i++;
+          _context5.next = 9;
+          break;
+        case 16:
+          return _context5.abrupt("return", resultObjects);
+        case 17:
         case "end":
           return _context5.stop();
       }
     }, _callee4);
   }));
   return _runTests.apply(this, arguments);
+}
+function addBrowserColumn(_x7, _x8) {
+  return _addBrowserColumn.apply(this, arguments);
+}
+function _addBrowserColumn() {
+  _addBrowserColumn = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(csv, workerNumber) {
+    var result;
+    return _regenerator["default"].wrap(function _callee5$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          result = "";
+          Papa.parse(csv, {
+            header: true,
+            skipEmptyLines: true,
+            complete: function complete(results) {
+              var dataWithDefaultColumn = results.data.map(function (row) {
+                row["worker"] = workerNumber;
+                return row;
+              });
+              result = Papa.unparse(dataWithDefaultColumn, {
+                header: true
+              });
+            }
+          });
+          return _context6.abrupt("return", result);
+        case 3:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee5);
+  }));
+  return _addBrowserColumn.apply(this, arguments);
 }

package/bin/utils/utils.js

@@ -261,7 +261,7 @@ var fileParamRegex = exports.fileParamRegex = {
   sql: new RegExp("^--\\s*((?:".concat(headerTags.join('|'), ")[^:]*): *([^\\s\\[\\{]+) ?([^\\s\\[\\{]+)?[^\\n]*$"))
 };
 var nameAnnRegex = exports.nameAnnRegex = /\/\/\s*(name[^:]*): ([^\n\r\[\{]+)/;
-var nameRegex = exports.nameRegex = /(?:|static|export\s+function|export\s+async\s+function)\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?)\).*/;
+var nameRegex = exports.nameRegex = /(?:|(?:static)(?:export )(?:async )function )\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?).*/;
 var absUrlRegex = exports.absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');
 function getScriptOutputType(script) {
   var comment = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#';

package/package.json

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