datagrok-tools 4.14.46 → 4.14.48

package/bin/utils/func-generation.js

@@ -156,7 +156,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     for (const output of data.outputs) {
       if (output.type !== 'void') {
         // eslint-disable-next-line max-len
-        s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output.options)}` : ''}` : '') + sep;
+        s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output)}` : ''}` : '') + sep;
       }
     }
   }
@@ -463,7 +463,7 @@ function generateFunc(annotation, funcName, sep = '\n', className = '', inputs =
   const funcArguments = inputs.map(e => e.name).join(', ');
   const returnType = output ? primitives.has(output) ? !isAsync ? `: ${output} ` : `: Promise<${output}> ` : !isAsync ? `: any ` : `: Promise<any> ` : '';
   // eslint-disable-next-line max-len
-  return sep + annotation + `export ${isAsync ? 'async ' : ''}function ${funcName}(${funcSigNature}) ${returnType}{${sep}  ${output !== 'void' ? 'return ' : ''}${className.length > 0 ? `${className}.` : ''}${funcName}(${funcArguments});${sep}}${sep}`;
+  return sep + annotation + `export ${isAsync ? 'async ' : ''}function ${funcName}(${funcSigNature}) ${returnType}{${sep}  ${output !== 'void' ? 'return ' : ''}${isAsync ? 'await ' : ''}${className.length > 0 ? `${className}.` : ''}${funcName}(${funcArguments});${sep}}${sep}`;
 }
 function generateImport(className, path, sep = '\n') {
   return `import {${className}} from '${path}';${sep}`;

package/package.json

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

package/plugins/func-gen-plugin.js

@@ -197,8 +197,6 @@ class FuncGeneratorPlugin {
 
     // if (!funcAnnotaionOptions.name) funcAnnotaionOptions.name = identifierName;
     
-    console.log(funcName);
-    console.log(funcAnnotaionOptions.name);
     if (funcAnnotaionOptions.name === funcName)
       funcAnnotaionOptions.name = undefined;
     
@@ -253,7 +251,6 @@ class FuncGeneratorPlugin {
         optionsToAdd.set(key, this._evalLiteral(prop.value));
       else
         resultMap.set(key, this._evalLiteral(prop.value));
-      
     }
     
     if (optionsToAdd.size > 0)