datagrok-tools 4.14.48 → 4.14.50

package/bin/utils/func-generation.js

@@ -21,7 +21,7 @@ let pseudoParams = exports.pseudoParams = /*#__PURE__*/function (pseudoParams) {
   return pseudoParams;
 }({});
 const nonMetaData = ['sidebar', 'editor', 'friendlyName', 'helpUrl', 'help-url', 'condition', 'connection', 'top-menu', 'cache', 'cache.invalidateOn', 'test'];
-const decoratorOptionToAnnotation = exports.decoratorOptionToAnnotation = new Map([['initialValue', 'default'], ['helpUrl', 'help-url'], ['topMenu', 'top-menu'], ['metaUrl', 'meta.url'], ['optionsType', 'type'], ['cacheInvalidateOn', 'cache.invalidateOn'], ['scriptHandlerLanguage', 'scriptHandler.language'], ['scriptHandlerExtensions', 'scriptHandler.extensions'], ['scriptHandlerCommentStart', 'scriptHandler.commentStart'], ['scriptHandlerTemplateScript', 'scriptHandler.templateScript'], ['scriptHandlerCodeEditorMode', 'scriptHandler.codeEditorMode'], ['scriptHandlerVectorizationFunction', 'scriptHandler.vectorizationFunction']]);
+const decoratorOptionToAnnotation = exports.decoratorOptionToAnnotation = new Map([['helpUrl', 'help-url'], ['topMenu', 'top-menu'], ['metaUrl', 'meta.url'], ['optionsType', 'type'], ['cacheInvalidateOn', 'cache.invalidateOn'], ['scriptHandlerLanguage', 'scriptHandler.language'], ['scriptHandlerExtensions', 'scriptHandler.extensions'], ['scriptHandlerCommentStart', 'scriptHandler.commentStart'], ['scriptHandlerTemplateScript', 'scriptHandler.templateScript'], ['scriptHandlerCodeEditorMode', 'scriptHandler.codeEditorMode'], ['scriptHandlerVectorizationFunction', 'scriptHandler.vectorizationFunction']]);
 const dgAnnotationTypes = exports.dgAnnotationTypes = {
   INT: 'int',
   BIG_INT: 'bigint',
@@ -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}`;
@@ -186,14 +186,19 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
 const inputOptionsNames = exports.inputOptionsNames = ['semType', 'category', 'optional', 'editor', 'nullable', 'separators', 'choices', 'format', 'min', 'max', 'caption', 'description', 'initialValue', 'viewer', 'units', 'type', 'optionsType', 'step', 'meta.url', 'metaUrl'];
 function buildStringOfOptions(input) {
   const optionsInString = [];
-  for (const [key, value] of Object.entries(input.options ?? {})) {
+  const opt = input.options ?? {};
+  let defaultValue = '';
+  if (opt['initialValue']) defaultValue = ` = ${opt['initialValue']}`;
+  for (const [key, value] of Object.entries(opt)) {
+    if (key === 'initialValue') continue;
     let val = value;
     let option = key;
     option = decoratorOptionToAnnotation.get(option) ?? option;
     if (Array.isArray(value)) val = JSON.stringify(value);
     optionsInString.push(`${option}: ${val}`);
   }
-  return `{ ${optionsInString.join('; ')} }`;
+  const optString = optionsInString.length > 0 ? `{ ${optionsInString.join('; ')} }` : '';
+  return `${defaultValue} ${optString}`;
 }
 const reservedDecorators = exports.reservedDecorators = {
   viewer: {

package/package-template/package.json

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

package/package.json

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