datagrok-tools 4.14.4 → 4.14.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Datagrok-tools changelog
 
+## 4.14.6 (2025-05-29)
+
+### Features
+
+* Decorators added ability to set hardcoded values
+* Decorators added ability to get outputs from multiple parameters 
+
+
 ## 4.14.2 (2025-05-16)
 
 ### Features

package/bin/commands/api.js

@@ -20,9 +20,7 @@ const srcDir = _path.default.join(curDir, 'src');
 const funcFilePath = _path.default.join(_fs.default.existsSync(srcDir) ? srcDir : curDir, apiFile);
 const packagePath = _path.default.join(curDir, 'package.json');
 const names = new Set();
-const _package = JSON.parse(_fs.default.readFileSync(packagePath, {
-  encoding: 'utf-8'
-}));
+let _package = {};
 function generateQueryWrappers() {
   const queriesDir = _path.default.join(curDir, 'queries');
   if (!_fs.default.existsSync(queriesDir)) {
@@ -45,7 +43,7 @@ function generateQueryWrappers() {
       const name = utils.getScriptName(q, utils.commentMap[utils.queryExtension]);
       if (!name) continue;
       checkNameColision(name);
-      const tb = new utils.TemplateBuilder(utils.queryWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package.name);
+      const tb = new utils.TemplateBuilder(utils.queryWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package?.name ?? '');
       const description = utils.getScriptDescription(q, utils.commentMap[utils.queryExtension]);
       const inputs = utils.getScriptInputs(q, utils.commentMap[utils.queryExtension]);
       const outputType = utils.getScriptOutputType(q, utils.commentMap[utils.queryExtension]);
@@ -109,7 +107,7 @@ function generateFunctionWrappers() {
         outputType = utils.dgToTsTypeMap[outputAnnotation[1]] ?? 'any';
       }
       checkNameColision(name);
-      const tb = new utils.TemplateBuilder(utils.scriptWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package.name).replace('PARAMS_OBJECT', annotationInputs).replace('FUNC_DESCRIPTION', description).replace('TYPED_PARAMS', annotationInputs).replace('OUTPUT_TYPE', outputType);
+      const tb = new utils.TemplateBuilder(utils.scriptWrapperTemplate).replace('FUNC_NAME', name).replace('FUNC_NAME_LOWERCASE', name).replace('PACKAGE_NAMESPACE', _package?.name ?? '').replace('PARAMS_OBJECT', annotationInputs).replace('FUNC_DESCRIPTION', description).replace('TYPED_PARAMS', annotationInputs).replace('OUTPUT_TYPE', outputType);
       wrappers.push(tb.build(1));
     }
   }
@@ -133,6 +131,9 @@ function checkNameColision(name) {
   names.add(name);
 }
 function api(args) {
+  _package = JSON.parse(_fs.default.readFileSync(packagePath, {
+    encoding: 'utf-8'
+  }));
   const nOptions = Object.keys(args).length - 1;
   if (args['_'].length !== 1 || nOptions > 0) return false;
   if (!utils.isPackageDir(process.cwd())) {

package/package.json

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

@@ -125,12 +125,7 @@ class FuncGeneratorPlugin {
     ]);
     const functionParams =
       node?.type === "MethodDefinition" ? this._readMethodParamas(node) : [];
-    const annotationByReturnType = node?.type === "MethodDefinition" ? this._readReturnType(node) : "";
-
-    const annotationByReturnTypeObj = {
-      name: "result",
-      type: annotationByReturnType,
-    };
+    const annotationByReturnObj = node?.type === "MethodDefinition" ? this._readOutputsFromReturnType(node) : undefined;
     const isMethodAsync = this._isMethodAsync(node);
     let importString = generateImport(
       node?.type === "MethodDefinition" ? className : identifierName,
@@ -142,8 +137,8 @@ class FuncGeneratorPlugin {
     }${identifierName}`;
     const funcAnnotaionOptions = {
       ...reservedDecorators[name]["metadata"],
-      ...(annotationByReturnType
-        ? { outputs: [annotationByReturnTypeObj ?? {}] }
+      ...(annotationByReturnObj
+        ? { outputs: annotationByReturnObj ?? [] }
         : {}),
       ...Object.fromEntries(decoratorOptions),
       ...{ inputs: functionParams },
@@ -345,21 +340,14 @@ class FuncGeneratorPlugin {
     }
   }
 
-  _readReturnType(node) {
+  _readReturnType(annotation) {
     let resultType = "dynamic";
-    let isArray = false;
-    let annotation = node.value?.returnType?.typeAnnotation;
+    let isArray = false; 
     if (
       annotation &&
       annotation.type !== "TSUnionType" &&
       annotation.type !== "TSIntersectionType"
     ) {
-      // if (annotation?.typeName?.name === "Promise") {
-      //   const argumnets = annotation.typeArguments?.params;
-      //   if (argumnets && argumnets.length === 1) {
-      //     annotation = argumnets[0];
-      //   } else annotation = {};
-      // }
       
       if (annotation.typeName || annotation.type === "TSTypeReference")
         resultType =
@@ -377,12 +365,49 @@ class FuncGeneratorPlugin {
           annotation?.elementType?.typeName?.right?.name;
       } 
     }
-
     resultType = typesToAnnotation[resultType];
     if (isArray && resultType) resultType = `list`;
     return resultType ?? 'dynamic';
   }
 
+  _readOutputsFromReturnType(node) {
+    let results = [];
+    let annotation = node.value?.returnType?.typeAnnotation;
+
+    if (node?.type === 'ClassDeclaration')
+      return [];
+    
+    if (annotation?.typeName?.name === "Promise") {
+      const argumnets = annotation.typeArguments?.params;
+      if (argumnets && argumnets.length === 1) {
+        annotation = argumnets[0];
+      } else annotation = {};
+    }
+
+    if (annotation?.type === "TSTypeLiteral"){
+      results = this._readOutputsFromReturnTypeObject(annotation);
+    }
+    else{
+      let resultType = this._readReturnType(annotation);
+      results.push({name: 'result', type: resultType});
+      if (resultType === 'void')
+        results = [];
+    }
+    return results;
+  }
+
+  _readOutputsFromReturnTypeObject(node) {
+    let i = 0;
+    let results = [];
+    for (let member of node.members) {
+      results.push({
+        name: member?.key?.name ?? `result${i}`,
+        type: this._readReturnType(member.typeAnnotation.typeAnnotation),
+      });
+      i++;
+    }
+    return results;
+  }
 
   _getTypeNameFromNode(typeNode) {
     if (typeNode.type === "TSTypeReference") {