datagrok-tools 4.14.50 → 4.14.52

package/bin/utils/func-generation.js

@@ -150,7 +150,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     const functionName = (input.options?.name ? input?.options?.name : ` ${input.name?.replaceAll('.', '')}`)?.trim();
 
     // eslint-disable-next-line max-len
-    s += comment + 'input: ' + type + ' ' + functionName + (input.defaultValue !== undefined ? `= ${input.defaultValue}` : '') + ' ' + options.replaceAll('"', '\'') + sep;
+    s += comment + 'input: ' + type + ' ' + functionName + (input.defaultValue !== undefined ? `= ${input.defaultValue}` : '') + ' ' + options + sep;
   }
   if (data.outputs) {
     for (const output of data.outputs) {
@@ -188,7 +188,7 @@ function buildStringOfOptions(input) {
   const optionsInString = [];
   const opt = input.options ?? {};
   let defaultValue = '';
-  if (opt['initialValue']) defaultValue = ` = ${opt['initialValue']}`;
+  if (opt['initialValue']) defaultValue = `= ${opt['initialValue']}`;
   for (const [key, value] of Object.entries(opt)) {
     if (key === 'initialValue') continue;
     let val = value;

package/package.json

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

@@ -12,6 +12,7 @@ const {
   typesToAnnotation,
   dgAnnotationTypes,
   decoratorOptionToAnnotation,
+  inputOptionsNames,
 } = require('../bin/utils/func-generation');
 
 const {api} = require('../bin/commands/api');
@@ -20,30 +21,6 @@ const baseImport = 'import * as DG from \'datagrok-api/dg\';\n';
 // eslint-disable-next-line max-len
 const annotationForGeneratedFile = `/**\nThis file is auto-generated by the webpack command.\nIf you notice any changes, please push them to the repository.\nDo not edit this file manually.\n*/\n`;
 
-
-const inputOptionsNames = [
-  'semType',
-  'category',
-  'optional',
-  'editor',
-  'nullable',
-  'separators',
-  'choices',
-  'format',
-  'min',
-  'max',
-  'caption',
-  'description',
-  'initialValue',
-  'viewer',
-  'units',
-  'optionsType',
-  'step',
-  'meta.url',
-  'metaUrl',
-];
-
-
 class FuncGeneratorPlugin {
   constructor(options = {outputPath: './src/package.g.ts'}) {
     this.options = options;