datagrok-tools 4.14.44 → 4.14.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.44",
+  "version": "4.14.46",
   "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),
@@ -413,11 +419,13 @@ class FuncGeneratorPlugin {
     let resultType = 'void';
     let nodeAnnotation = annotation;
     let isArray = false; 
+    let isNullable = false; 
     if (nodeAnnotation?.type === 'TSUnionType' && 
       nodeAnnotation?.types?.length === 2 && 
       nodeAnnotation?.types?.some((e)=> e?.type === 'TSNullKeyword' || e?.type === 'TSVoidKeyword'|| e?.type === 'TSUndefinedKeyword')) {
       nodeAnnotation = 
         nodeAnnotation.types.filter((e)=> e.type !== 'TSNullKeyword' || e?.type === 'TSVoidKeyword' || e?.type === 'TSUndefinedKeyword')[0];
+      isNullable = true;
     }
     
 
@@ -442,6 +450,7 @@ class FuncGeneratorPlugin {
       } 
     }
     let anotationType = typesToAnnotation[resultType];
+    resultType = isNullable? 'any' : resultType;
     if (isArray && anotationType) anotationType = `list<${anotationType}>`;
     return [anotationType ?? 'dynamic', `${resultType}${isArray? '[]': ''}` ?? 'any'];
   }