datagrok-tools 4.13.53 → 4.13.54

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Datagrok-tools changelog
 
+## 4.13.54 (2025-01-06)
+
+### Features
+
+* Grok check regex update
+
+
 ## 4.13.53 (2025-01-06)
 
 ### 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/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.53",
+  "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": {