datagrok-tools 4.14.45 → 4.14.47

package/bin/utils/func-generation.js

@@ -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.45",
+  "version": "4.14.47",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -31,8 +31,7 @@
     "link": "npm link",
     "prepublishOnly": "babel bin --extensions .ts -d bin",
     "babel": "babel bin --extensions .ts -d bin",
-    "build": "babel bin --extensions .ts -d bin",
-    "debug-source-map": "babel bin --extensions .ts -d bin --source-maps true"
+    "build": "babel bin --extensions .ts -d bin"
   },
   "bin": {
     "datagrok-upload": "./bin/_deprecated/upload.js",

package/plugins/func-gen-plugin.js

@@ -195,7 +195,13 @@ class FuncGeneratorPlugin {
     else if (funcAnnotaionOptions.outputs?.length === 0)
       actualType = 'void';
 
-    if (!funcAnnotaionOptions.name) funcAnnotaionOptions.name = identifierName;
+    // if (!funcAnnotaionOptions.name) funcAnnotaionOptions.name = identifierName;
+    
+    console.log(funcName);
+    console.log(funcAnnotaionOptions.name);
+    if (funcAnnotaionOptions.name === funcName)
+      funcAnnotaionOptions.name = undefined;
+    
     functions.push(
       reservedDecorators[name]['genFunc'](
         getFuncAnnotation(funcAnnotaionOptions),