datagrok-tools 4.14.22 → 4.14.24

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

@@ -35,6 +35,7 @@ function check(args) {
   }
 }
 function runChecks(packagePath, soft = false) {
+  if (packagePath.includes(`${_path.default.sep}node_modules${_path.default.sep}`)) return true;
   const files = _ignoreWalk.default.sync({
     path: packagePath,
     ignoreFiles: ['.npmignore', '.gitignore']

package/bin/utils/utils.js

@@ -194,10 +194,25 @@ const nameAnnRegex = exports.nameAnnRegex = /\s*(name[^:]*): ([^\n\r\[\{]+)/;
 const nameRegex = exports.nameRegex = /(?:|(?:static)(?:export )(?:async ))\s+function\s+([a-zA-Z_][a-zA-Z0-9_$]*)\s*\((.*?).*/;
 const absUrlRegex = exports.absUrlRegex = new RegExp('^(?:[a-z+]+:)?//', 'i');
 function getScriptOutputType(script, comment = '#') {
-  const regex = new RegExp(`${comment}\\s*output:\\s?([a-z_]+)\\s*`);
-  const match = script.match(regex);
-  if (!match) return 'void';
-  return dgToTsTypeMap[match[1]] || 'any';
+  const regex = /\s*output:\s?([a-z_]+)\s*([^\s]*)/g;
+  const matches = script.matchAll(regex);
+  if (!matches) return 'void';
+  let resType = 'void';
+  let firstItemName = '';
+  let wasSecond = false;
+  for (let match of matches) {
+    if (resType === 'void') {
+      resType = dgToTsTypeMap[match[1]] ?? 'any';
+      firstItemName = match[2];
+    } else {
+      if (!wasSecond) {
+        resType = `${firstItemName}: ${resType}`;
+        wasSecond = true;
+      }
+      resType = [resType, `${match[2]}: ${dgToTsTypeMap[match[1]] ?? 'any'}`].join(', ');
+    }
+  }
+  return wasSecond ? `{${resType}}` : resType;
 }
 ;
 function getScriptInputs(script, comment = '#') {

package/package.json

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