datagrok-tools 4.14.54 → 4.14.56

package/bin/utils/func-generation.js

@@ -146,6 +146,11 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     if (input?.options?.type || input?.options?.options?.type) type = input?.options?.type ?? input?.options?.options?.type;else if (annotationType) {
       if (isArray) type = `list<${annotationType}>`;else type = annotationType;
     } else type = 'dynamic';
+
+    // if ((input as any)?.options?.type === 'categorical' || (input as any)?.options?.options?.type === 'categorical')
+    //   console.log(input);
+    // console.log(input);
+
     const options = input?.options?.options ? buildStringOfOptions(input.options ?? {}) : '';
     const functionName = (input.options?.name ? input?.options?.name : ` ${input.name?.replaceAll('.', '')}`)?.trim();
 
@@ -192,7 +197,7 @@ function buildStringOfOptions(input) {
   if (opt['initialValue'] && /[A-Za-z]/.test(opt['initialValue']) && !opt['initialValue'].includes('\'') && !opt['initialValue'].includes('"') && !nonquotedValues.includes(opt['initialValue'])) opt['initialValue'] = `'${opt['initialValue']}'`;
   if (opt['initialValue']) defaultValue = `= ${opt['initialValue']}`;
   for (const [key, value] of Object.entries(opt)) {
-    if (key === 'initialValue' || key === 'name' || key === 'type' && !input?.options?.key) continue;
+    if (key === 'initialValue') continue;
     let val = value;
     let option = key;
     option = decoratorOptionToAnnotation.get(option) ?? option;

package/bin/utils/test-utils.js

@@ -275,7 +275,7 @@ async function loadTestsList(packages, core = false) {
   for (const testPackage of packageTestsData) {
     for (const key in testPackage.tests) {
       if (testPackage.tests.hasOwnProperty(key)) {
-        for (const testValue of testPackage.tests[key].tests) {
+        for (const testValue of testPackage.tests[key]?.tests ?? []) {
           testValue.packageName = testPackage.packageName;
           testsList.push(testValue);
         }

package/package.json

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

@@ -242,11 +242,11 @@ class FuncGeneratorPlugin {
         resultMap.set(key, this._evalLiteral(prop.value));
     }
     
-    if (optionsToAdd.size > 0)
-      resultMap.set('options', {...(resultMap.get('options') ?? {}), ...Object.fromEntries(optionsToAdd)});
+    for (const [key, value] of optionsToAdd)
+      resultMap.set(key, value);
     if (resultObj)
       resultMap.set('outputs', [resultObj]);
-      
+    
     return resultMap;
   }