datagrok-tools 4.14.23 → 4.14.25

package/bin/commands/api.js

@@ -103,13 +103,7 @@ function generateFunctionWrappers() {
       const annotationInputs = utils.getScriptInputs(annotation[0], utils.commentMap[utils.jsExtention]);
       const annotationOutputDir = utils.getScriptOutputType(annotation[0], utils.commentMap[utils.jsExtention]);
       let outputType = '';
-      for (let outputAnnotation of annotationOutputDir) {
-        if (outputType != '') {
-          outputType = 'any';
-          break;
-        }
-        outputType = utils.dgToTsTypeMap[outputAnnotation[1]] ?? 'any';
-      }
+      outputType = annotationOutputDir ?? 'any';
       checkNameColision(name);
       const tb = new utils.TemplateBuilder(utils.scriptWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package?.friendlyName ?? '').replace('PARAMS_OBJECT', annotationInputs).replace('FUNC_DESCRIPTION', description).replace('TYPED_PARAMS', annotationInputs).replace('OUTPUT_TYPE', outputType);
       wrappers.push(tb.build(1));

package/bin/commands/check.js

@@ -40,7 +40,7 @@ function runChecks(packagePath, soft = false) {
     path: packagePath,
     ignoreFiles: ['.npmignore', '.gitignore']
   }).filter(e => !e.includes('node_modules'));
-  const jsTsFiles = files.filter(f => !f.startsWith('dist/') && (f.endsWith('.js') || f.endsWith('.ts') || f.endsWith('.sql') || f.endsWith('.py')));
+  const jsTsFiles = files.filter(f => (f.startsWith('src' + _path.default.sep) || f.startsWith('queries' + _path.default.sep) || f.startsWith('scripts' + _path.default.sep)) && (f.endsWith('.js') || f.endsWith('.ts') || f.endsWith('.sql') || f.endsWith('.py')));
   const packageFiles = ['src/package.ts', 'src/detectors.ts', 'src/package.js', 'src/detectors.js', 'src/package-test.ts', 'src/package-test.js', 'package.js', 'detectors.js'];
   // const funcFiles = jsTsFiles.filter((f) => packageFiles.includes(f)); 
   const errors = [];
@@ -305,6 +305,7 @@ function checkFuncSignatures(packagePath, files) {
   };
   const functionRoles = Object.keys(checkFunctions);
   for (const file of files) {
+    if (file.includes('.min.')) continue;
     const content = _fs.default.readFileSync(_path.default.join(packagePath, file), {
       encoding: 'utf-8'
     });
@@ -557,6 +558,15 @@ function getFuncMetadata(script, fileExtention) {
     }
     if (isHeader) {
       const nm = line.match(utils.nameRegex);
+      if (data.name === '') {
+        data = {
+          name: '',
+          inputs: [],
+          outputs: []
+        };
+        isHeader = false;
+        continue;
+      }
       if (nm) data.name = nm[1]?.toLocaleLowerCase();
       if (data.name && !match) {
         funcData.push(data);

package/bin/utils/utils.js

@@ -180,7 +180,8 @@ const dgToTsTypeMap = exports.dgToTsTypeMap = {
   column: 'DG.Column',
   column_list: 'string[]',
   file: 'DG.FileInfo',
-  view: 'DG.View'
+  view: 'DG.View',
+  void: 'void'
 };
 const propertyTypes = exports.propertyTypes = ['bool', 'int', 'double', 'string', 'datetime', 'object', 'column', 'dataframe', 'bitset', 'cell', 'string_list', 'map'];
 const headerTags = exports.headerTags = ['name', 'description', 'help-url', 'input', 'output', 'tags', 'sample', 'language', 'returns', 'test', 'sidebar', 'condition', 'top-menu', 'environment', 'require', 'editor-for', 'schedule', 'reference', 'editor', 'meta', 'connection', 'friendlyName'];
@@ -202,14 +203,14 @@ function getScriptOutputType(script, comment = '#') {
   let wasSecond = false;
   for (let match of matches) {
     if (resType === 'void') {
-      resType = dgToTsTypeMap[match[1]];
+      resType = dgToTsTypeMap[match[1]] ?? 'any';
       firstItemName = match[2];
     } else {
       if (!wasSecond) {
         resType = `${firstItemName}: ${resType}`;
         wasSecond = true;
       }
-      resType = [resType, `${match[2]}: ${dgToTsTypeMap[match[1]]}`].join(', ');
+      resType = [resType, `${match[2]}: ${dgToTsTypeMap[match[1]] ?? 'any'}`].join(', ');
     }
   }
   return wasSecond ? `{${resType}}` : resType;

package/package.json

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