datagrok-tools 4.14.37 → 4.14.39

package/bin/utils/func-generation.js

@@ -20,7 +20,7 @@ let pseudoParams = exports.pseudoParams = /*#__PURE__*/function (pseudoParams) {
   pseudoParams["INPUT_TYPE"] = "inputType";
   return pseudoParams;
 }({});
-const nonMetaData = ['sidebar', 'editor', 'friendlyName', 'helpUrl', 'condition', 'top-menu', 'cache', 'cache.invalidateOn'];
+const nonMetaData = ['sidebar', 'editor', 'friendlyName', 'helpUrl', 'help-url', 'condition', 'top-menu', 'cache', 'cache.invalidateOn', 'test'];
 const decoratorOptionToAnnotation = new Map([['initialValue', 'default']]);
 const dgAnnotationTypes = exports.dgAnnotationTypes = {
   INT: 'int',
@@ -126,7 +126,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) s += `${comment}name: ${data.name}${sep}`;
+  if (data.name && (!data.tags?.includes('init') || data.name !== 'init' && data.name !== '_init')) 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}`;
@@ -170,11 +170,13 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     }
   }
   if (data.test) {
-    for (const entry of Object.entries(data.test)) {
-      if (entry[0] === 'test' || entry[0] === 'wait') s += `${comment}`;else s += `, `;
-      s += `${entry[0]}: ${entry[1]} `;
+    if (typeof data.test === 'string') s += `${comment}test: ${data.test}${sep}`;else {
+      for (const entry of Object.entries(data.test)) {
+        if (entry[0] === 'test' || entry[0] === 'wait') s += `${comment}`;else s += `, `;
+        s += `${entry[0]}: ${entry[1]} `;
+      }
+      s += `${sep}`;
     }
-    s += `${sep}`;
   }
   return s;
 }
@@ -438,7 +440,7 @@ const primitives = new Set(['string', 'string[]', 'number', 'number[]', 'boolean
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], isAsync = false) {
   // eslint-disable-next-line max-len
-  const funcSigNature = inputs.map(e => `${e.name}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
+  const funcSigNature = inputs.map(e => `${e.name}${e.optional ? '?' : ''}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
   const funcArguments = inputs.map(e => e.name).join(', ');
 
   // eslint-disable-next-line max-len

package/package-template/package.json

@@ -10,7 +10,7 @@
     "@datagrok-libraries/utils": "^4.6.0"
   },
   "devDependencies": {
-    "datagrok-tools": "^4.14.34",
+    "datagrok-tools": "^4.14.38",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },

package/package.json

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

@@ -237,6 +237,7 @@ class FuncGeneratorPlugin {
         //   defaultValue = baseParam?.right?.raw;
         baseParam = baseParam?.left;
       }
+      const optional = param.optional;
 
       if (baseParam.type === 'RestElement' || baseParam.type === 'Identifier') {
         let name =
@@ -258,8 +259,7 @@ class FuncGeneratorPlugin {
           baseParam.typeAnnotation.typeAnnotation.typeArguments?.params;
         if (type !== 'any' && params && params.length > 0)
           type += `<${params.map((e) => e.typeName?.name ?? 'any').join(',')}>`;
-
-        return {name: name, type: type, options: options};
+        return {name: name, type: type, options: options, optional: optional};
       }
       // Commented code belove sets more strong types for ObjectPatterns and ArrayPatterns
       // else if (baseParam.type === 'ObjectPattern' || baseParam.type === 'ArrayPattern') {
@@ -294,7 +294,7 @@ class FuncGeneratorPlugin {
 
       //   return { name: name, type: type, options: options };
       // }
-      return {name: 'value', type: 'any', options: undefined};
+      return {name: 'value', type: 'any', options: undefined, optional: optional};
     });
     return params;
   }
@@ -346,7 +346,7 @@ class FuncGeneratorPlugin {
   }
 
   _readReturnType(annotation) {
-    let resultType = 'dynamic';
+    let resultType = 'void';
     let nodeAnnotation = annotation;
     let isArray = false; 
     if (nodeAnnotation?.type === 'TSUnionType' && 
@@ -376,7 +376,7 @@ class FuncGeneratorPlugin {
       } 
     }
     resultType = typesToAnnotation[resultType];
-    if (isArray && resultType) resultType = `list`;
+    if (isArray && resultType) resultType = `list<${resultType}>`;
     return resultType ?? 'dynamic';
   }
 
@@ -398,9 +398,8 @@ class FuncGeneratorPlugin {
       results = this._readOutputsFromReturnTypeObject(annotation);
     else {
       const resultType = this._readReturnType(annotation);
-      results.push({name: 'result', type: resultType});
-      if (resultType === 'void')
-        results = [];
+      if (resultType !== 'void')
+        results.push({name: 'result', type: resultType});
     }
     return results;
   }