datagrok-tools 4.14.49 → 4.14.50

package/bin/utils/func-generation.js

@@ -129,7 +129,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   const isFileViewer = data.tags?.includes(FUNC_TYPES.FILE_VIEWER) ?? false;
   const isFileImporter = data.tags?.includes(FUNC_TYPES.FILE_HANDLER) ?? false;
   let s = '';
-  if (data.name && (!data.tags?.includes('init') || data.name !== 'init' && data.name !== '_init')) s += `${comment}name: ${data.name}${sep}`;
+  if (data.name) s += `${comment}name: ${data.name}${sep}`;
   if (pseudoParams.EXTENSION in data && data.tags != null && data.tags.includes(FUNC_TYPES.FILE_EXPORTER)) s += `${comment}description: Save as ${data[pseudoParams.EXTENSION]}${sep}`;else if (data.description) s += `${comment}description: ${data.description}${sep}`;
   if (data.tags && data.tags?.length > 0) {
     s += `${comment}tags: ${isFileViewer && data[pseudoParams.EXTENSIONS] ? data.tags.concat(data[pseudoParams.EXTENSIONS].map(ext => 'fileViewer-' + ext)).join(', ') : data.tags.join(', ')}${sep}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.49",
+  "version": "4.14.50",
   "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

@@ -173,11 +173,13 @@ class FuncGeneratorPlugin {
       node?.type === 'MethodDefinition' ? className : identifierName,
       modifyImportPath(path.dirname(this.options.outputPath), file),
     );
+    
     imports.add(importString);
     const funcName = `${
       node?.type === 'MethodDefinition' ? '' : '_'
     }${identifierName}`;
     const funcAnnotaionOptions = {
+      ...{name: funcName},
       ...reservedDecorators[name]['metadata'],
       ...(annotationByReturnObj ?
         {outputs: annotationByReturnObj ?? []} :
@@ -196,10 +198,20 @@ class FuncGeneratorPlugin {
       actualType = 'void';
 
     // if (!funcAnnotaionOptions.name) funcAnnotaionOptions.name = identifierName;
-    
-    if (funcAnnotaionOptions.name === funcName)
-      funcAnnotaionOptions.name = undefined;
-    
+    function containsAnything(funcAnnotaionOptions) {
+      let hasValues = false;
+      const arrays = ['tags', 'inputs', 'outputs'];
+      for (const option of Object.keys(funcAnnotaionOptions)) {
+        if (arrays.includes(option)) {
+          if (funcAnnotaionOptions[option].length > 0)
+            hasValues = true;
+        } else if (option != 'isAsync' && option != 'name')
+          hasValues = true;
+      }
+      return hasValues;
+    }
+    if (funcAnnotaionOptions.name === funcName && containsAnything(funcAnnotaionOptions))
+      delete funcAnnotaionOptions.name;
     functions.push(
       reservedDecorators[name]['genFunc'](
         getFuncAnnotation(funcAnnotaionOptions),