datagrok-tools 4.14.0 → 4.14.1

package/bin/utils/func-generation.js

@@ -375,10 +375,11 @@ const reservedDecorators = exports.reservedDecorators = {
 function generateClassFunc(annotation, className, sep = '\n') {
   return annotation + `export function _${className}() {${sep}  return new ${className}();${sep}}${sep.repeat(2)}`;
 }
+const primitives = new Set(['string', 'string[]', 'number', 'number[]', 'boolean', 'boolean[]']);
 
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], isAsync = false) {
-  let funcSigNature = inputs.map(e => `${e.name}: ${e.type}`).join(', ');
+  let funcSigNature = inputs.map(e => `${e.name}: ${primitives.has(e.type ?? '') ? e.type : 'any'}`).join(', ');
   let funcArguments = inputs.map(e => e.name).join(', ');
   return annotation + `export ${isAsync ? 'async ' : ''}function ${funcName}(${funcSigNature}) {${sep}  return ${className.length > 0 ? `${className}.` : ''}${funcName}(${funcArguments});${sep}}${sep.repeat(2)}`;
 }

package/package.json

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

@@ -179,10 +179,11 @@ class FuncGeneratorPlugin {
           name += ': ' + generate(baseParam.argument.typeAnnotation.typeAnnotation).code;
     
         let type = '';
-        if (baseParam?.typeAnnotation?.typeAnnotation?.typeName || baseParam?.typeAnnotation?.typeAnnotation?.elementType?.typeName)
-          type = 'any';
-        else if (baseParam?.typeAnnotation?.typeAnnotation)
+        if (baseParam?.typeAnnotation?.typeAnnotation)
           type = generate(baseParam.typeAnnotation.typeAnnotation).code;
+        else 
+          type = 'any';
+        
         let params = baseParam.typeAnnotation.typeAnnotation.typeArguments?.params;
         if(type !== 'any' && params && params.length > 0)
           type += `<${params.map((e)=>e.typeName.name).join(',')}>`;