datagrok-tools 4.14.47 → 4.14.49

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',
@@ -156,7 +156,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     for (const output of data.outputs) {
       if (output.type !== 'void') {
         // eslint-disable-next-line max-len
-        s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output.options)}` : ''}` : '') + sep;
+        s += comment + 'output: ' + output.type + (output.name ? ` ${output.name}${output.options ? ` ${buildStringOfOptions(output)}` : ''}` : '') + 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.47",
+  "version": "4.14.49",
   "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

@@ -197,8 +197,6 @@ class FuncGeneratorPlugin {
 
     // if (!funcAnnotaionOptions.name) funcAnnotaionOptions.name = identifierName;
     
-    console.log(funcName);
-    console.log(funcAnnotaionOptions.name);
     if (funcAnnotaionOptions.name === funcName)
       funcAnnotaionOptions.name = undefined;
     
@@ -253,7 +251,6 @@ class FuncGeneratorPlugin {
         optionsToAdd.set(key, this._evalLiteral(prop.value));
       else
         resultMap.set(key, this._evalLiteral(prop.value));
-      
     }
     
     if (optionsToAdd.size > 0)