datagrok-tools 4.12.15 → 4.12.17

package/bin/commands/check.js

@@ -297,20 +297,62 @@ function checkFuncSignatures(packagePath, files) {
         value: value,
         message: message
       };
+    },
+    params: function params(_ref8) {
+      var inputs = _ref8.inputs,
+        outputs = _ref8.outputs;
+      var value = true;
+      var message = '';
+      var _iterator4 = _createForOfIteratorHelper(inputs),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var input = _step4.value;
+          if (!(input.name && input.type)) {
+            value = false;
+            message += "Function has no name or type of input parameter\n";
+          }
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      var _iterator5 = _createForOfIteratorHelper(outputs),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var output = _step5.value;
+          if (!(output.name && output.type)) {
+            value = false;
+            message += "Function has no name or type of output parameter\n";
+          }
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      return {
+        value: value,
+        message: message
+      };
     }
   };
   var functionRoles = Object.keys(checkFunctions);
-  var _iterator4 = _createForOfIteratorHelper(files),
-    _step4;
+  var _iterator6 = _createForOfIteratorHelper(files),
+    _step6;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var file = _step4.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var file = _step6.value;
       var content = _fs["default"].readFileSync(_path["default"].join(packagePath, file), {
         encoding: 'utf-8'
       });
       var functions = getFuncMetadata(content);
       var _loop = function _loop() {
         var f = _functions[_i];
+        var paramsCheck = checkFunctions.params(f);
+        if (!paramsCheck.value) warnings.push("File ".concat(file, ", function ").concat(f.name, ":\n").concat(paramsCheck.message));
         var roles = functionRoles.filter(function (role) {
           var _f$tags;
           return (_f$tags = f.tags) === null || _f$tags === void 0 ? void 0 : _f$tags.includes(role);
@@ -327,9 +369,9 @@ function checkFuncSignatures(packagePath, files) {
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator4.f();
+    _iterator6.f();
   }
   return warnings;
 }
@@ -356,17 +398,17 @@ function checkPackageFile(packagePath, json, options) {
   var isPublicPackage = _path["default"].basename(_path["default"].dirname(packagePath)) === 'packages' && _path["default"].basename(_path["default"].dirname(_path["default"].dirname(packagePath))) === 'public';
   if (!json.description) warnings.push('File "package.json": "description" field is empty. Provide a package description.');
   if (Array.isArray(json.properties) && json.properties.length > 0) {
-    var _iterator5 = _createForOfIteratorHelper(json.properties),
-      _step5;
+    var _iterator7 = _createForOfIteratorHelper(json.properties),
+      _step7;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var propInfo = _step5.value;
+      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+        var propInfo = _step7.value;
         if ((0, _typeof2["default"])(propInfo) !== 'object') warnings.push('File "package.json": Invalid property annotation in the "properties" field.');else if (!propInfo.name) warnings.push('File "package.json": Add a property name for each property in the "properties" field.');else if (!utils.propertyTypes.includes(propInfo.propertyType)) warnings.push("File \"package.json\": Invalid property type for property ".concat(propInfo.name, "."));
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator7.e(err);
     } finally {
-      _iterator5.f();
+      _iterator7.f();
     }
   }
   if (json.repository == null && isPublicPackage) warnings.push('File "package.json": add the "repository" field.');
@@ -379,11 +421,11 @@ function checkPackageFile(packagePath, json, options) {
   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.');
   if (Array.isArray(json.sources) && json.sources.length > 0) {
-    var _iterator6 = _createForOfIteratorHelper(json.sources),
-      _step6;
+    var _iterator8 = _createForOfIteratorHelper(json.sources),
+      _step8;
     try {
-      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-        var source = _step6.value;
+      for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+        var source = _step8.value;
         if (typeof source !== 'string') warnings.push("File \"package.json\": Only file paths and URLs are allowed in sources. Modify the source ".concat(source));
         if (utils.absUrlRegex.test(source)) continue;
         if (source.startsWith('common/')) {
@@ -409,9 +451,9 @@ function checkPackageFile(packagePath, json, options) {
         if (!_fs["default"].existsSync(_path["default"].join(packagePath, source))) warnings.push("Source ".concat(source, " not found in the package."));
       }
     } catch (err) {
-      _iterator6.e(err);
+      _iterator8.e(err);
     } finally {
-      _iterator6.f();
+      _iterator8.f();
     }
   }
   return warnings;
@@ -432,17 +474,17 @@ function checkChangelog(packagePath, json) {
   var h2 = clf.match(regex);
   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;
+  var _iterator9 = _createForOfIteratorHelper(h2),
+    _step9;
   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)\n"));
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var h = _step9.value;
+      if (!regex.test(h)) warnings.push("CHANGELOG: '".concat(h, "' does not match the h2 format, expected: ## <version> (<yyyy-mm-dd> | WIP)\n"));
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator7.f();
+    _iterator9.f();
   }
   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];
@@ -463,27 +505,30 @@ function getFuncMetadata(script) {
     inputs: [],
     outputs: []
   };
-  var _iterator8 = _createForOfIteratorHelper(script.split('\n')),
-    _step8;
+  var _iterator10 = _createForOfIteratorHelper(script.split('\n')),
+    _step10;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var line = _step8.value;
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var line = _step10.value;
       if (!line) continue;
       var match = line.match(utils.paramRegex);
       if (match) {
+        var _line$match;
         if (!isHeader) isHeader = true;
         var param = match[1];
-        if (param === 'name') data.name = match[2];else if (param === 'description') data.description = match[2];else if (param === 'input') data.inputs.push({
-          type: match[2]
+        if (param === 'name') data.name = (_line$match = line.match(utils.nameAnnRegex)) === null || _line$match === void 0 ? void 0 : _line$match[2];else if (param === 'description') data.description = match[2];else if (param === 'input') data.inputs.push({
+          type: match[2],
+          name: match[3]
         });else if (param === 'output') data.outputs.push({
-          type: match[2]
+          type: match[2],
+          name: match[3]
         });else if (param === 'tags') data.tags = match.input && match[3] ? match.input.split(':')[1].split(',').map(function (t) {
           return t.trim();
         }) : [match[2]];
       }
       if (isHeader) {
         var nm = line.match(utils.nameRegex);
-        if (nm && !line.match(utils.paramRegex)) {
+        if (nm && !match) {
           data.name = data.name || nm[1];
           funcData.push(data);
           data = {
@@ -496,9 +541,9 @@ function getFuncMetadata(script) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator8.f();
+    _iterator10.f();
   }
   return funcData;
 }

package/bin/commands/test.js

@@ -22,7 +22,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'report', 'skip-build', 'skip-publish', 'category', 'record', 'verbose'];
+  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'report', 'skip-build', 'skip-publish', 'category', 'record', 'verbose', 'benchmark'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -161,6 +161,7 @@ function test(args) {
                 console.log("Testing ".concat(targetPackage, " package...\n"));
                 _context2.next = 11;
                 return page.evaluate(function (targetPackage, options, testContext) {
+                  if (options.benchmark) window.DG.Test.isInBenchmark = true;
                   return new Promise(function (resolve, reject) {
                     window.grok.functions.call("".concat(targetPackage, ":test"), {
                       'category': options.category,
@@ -206,8 +207,9 @@ 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'));
+                      if (!options.verbose) df.rows.removeWhere(function (r) {
+                        return r.get('success');
+                      });
                       var csv = df.toCsv();
                       resolve({
                         failReport: failReport,
@@ -278,7 +280,8 @@ function test(args) {
                 verbose: args.verbose,
                 catchUnhandled: args.catchUnhandled,
                 report: args.report,
-                record: args.record
+                record: args.record,
+                benchmark: args.benchmark
               });
             case 12:
               r = _context3.sent;

package/bin/utils/utils.js

@@ -18,7 +18,7 @@ exports.isEmpty = isEmpty;
 exports.isPackageDir = isPackageDir;
 exports.kebabToCamelCase = kebabToCamelCase;
 exports.mapURL = mapURL;
-exports.queryWrapperTemplate = exports.queryExtension = exports.propertyTypes = exports.paramRegex = exports.namespaceTemplate = exports.nameRegex = void 0;
+exports.queryWrapperTemplate = exports.queryExtension = exports.propertyTypes = exports.paramRegex = exports.namespaceTemplate = exports.nameRegex = exports.nameAnnRegex = void 0;
 exports.removeScope = removeScope;
 exports.scriptWrapperTemplate = exports.scriptLangExtMap = exports.scriptExtensions = exports.replacers = void 0;
 exports.spaceToCamelCase = spaceToCamelCase;
@@ -225,12 +225,14 @@ var dgToTsTypeMap = {
   file: 'DG.FileInfo'
 };
 exports.dgToTsTypeMap = dgToTsTypeMap;
-var propertyTypes = ['bool', 'int', 'float', 'string', 'datetime', 'object', 'column', 'dataframe', 'bitset', 'cell', 'string_list', 'map'];
+var propertyTypes = ['int', 'bigint', 'double', 'num', 'bool', 'string'];
 exports.propertyTypes = propertyTypes;
-var headerTags = ['name', 'description', 'help-url', 'input', 'output', 'tags', 'sample', 'language', 'returns', 'test', 'sidebar', 'condition', 'top-menu', 'environment', 'require', 'editor-for', 'schedule', 'reference', 'editor'];
+var headerTags = ['name', 'description', 'help-url', 'input', 'output', 'tags', 'sample', 'language', 'returns', 'test', 'sidebar', 'condition', 'top-menu', 'environment', 'require', 'editor-for', 'schedule', 'reference', 'editor', 'meta'];
 exports.headerTags = headerTags;
-var paramRegex = new RegExp("//\\s*(".concat(headerTags.join('|'), "|meta\\.[^:]*): *(\\S+) ?(\\S+)?"));
+var paramRegex = new RegExp("//\\s*(".concat(headerTags.join('|'), "\\.[^:]*): *([^\\s\\[\\{]+) ?([^\\s\\[\\{]+)?"));
 exports.paramRegex = paramRegex;
+var nameAnnRegex = /\/\/\s*(name[^:]*): ([^\n\r\[\{]+)/;
+exports.nameAnnRegex = nameAnnRegex;
 var nameRegex = /(?:|static|export\s+function|export\s+async\s+function)\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?)\).*/;
 exports.nameRegex = nameRegex;
 var absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');

package/package-template/ts.webpack.config.js

@@ -9,7 +9,7 @@ module.exports = {
     package: './src/package.ts'
   },
   resolve: {
-    extensions: ['.wasm', '.mjs', '.js', '.json', '.ts', '.tsx'],
+    extensions: ['.wasm', '.mjs', '.ts', '.json', '.js', '.tsx'],
   },
   module: {
     rules: [

package/package.json

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