datagrok-tools 4.14.66 → 4.14.67

package/bin/utils/func-generation.js

@@ -136,7 +136,13 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   }
   for (const input of data.inputs ?? []) {
     if (!input) continue;
-    let type = input?.type;
+    let type = input?.type?.replaceAll(" ", "");
+    if (type?.includes(`|undefined`)) {
+      type = type.replaceAll(`|undefined`, '');
+      // modify original payload
+      input.optional = true;
+      input.type = type;
+    }
     let isArray = false;
     if (type?.includes(`[]`)) {
       type = type.replace(/\[\]$/, '');
@@ -470,8 +476,19 @@ const primitives = exports.primitives = new Set(['string', 'string[]', 'number',
 
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], output, isAsync = false) {
-  // eslint-disable-next-line max-len
-  const funcSigNature = inputs.map(e => `${e.name}${e.optional ? '?' : ''}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
+  // FuncCall can have an optional followed by mandatory args for ui reasons, typescript cannot
+  let firstTsValidOptionalIdx = inputs.length - 1;
+  for (; firstTsValidOptionalIdx >= 0; firstTsValidOptionalIdx--) {
+    const e = inputs[firstTsValidOptionalIdx];
+    if (!e.optional) break;
+  }
+  const funcSigNature = inputs.map((e, idx) => {
+    const namePart = `${e.name}${e.optional && idx >= firstTsValidOptionalIdx ? '?' : ''}`;
+    // eslint-disable-next-line max-len
+    let typePart = `${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`;
+    if (e.optional && idx < firstTsValidOptionalIdx) typePart += ' | undefined';
+    return `${namePart}: ${typePart}`;
+  }).join(', ');
   const funcArguments = inputs.map(e => e.name).join(', ');
   const returnType = output ? primitives.has(output) ? !isAsync ? `: ${output} ` : `: Promise<${output}> ` : !isAsync ? `: any ` : `: Promise<any> ` : '';
   // eslint-disable-next-line max-len

package/bin/utils/utils.js

@@ -110,7 +110,7 @@ const replacers = exports.replacers = {
   FUNC_NAME_LOWERCASE: (s, name) => s.replace(/#{FUNC_NAME_LOWERCASE}/g, friendlyNameToName(name, false)),
   PARAMS_OBJECT: (s, params) => s.replace(/#{PARAMS_OBJECT}/g, params.length ? `{ ${params.map(p => p.name).join(', ')} }` : `{}`),
   OUTPUT_TYPE: (s, type) => s.replace(/#{OUTPUT_TYPE}/g, type),
-  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type} ${p.nullable ? '| null' : ''}`).join(', '))
+  TYPED_PARAMS: (s, params) => s.replace(/#{TYPED_PARAMS}/g, params.map(p => `${p.name}${p.isOptional ? '?' : ''}: ${p.type} ${p.undefinable ? '| undefined' : ''}${p.nullable ? '| null' : ''}`).join(', '))
 };
 class TemplateBuilder {
   static sep = '\n';
@@ -219,9 +219,18 @@ function getScriptOutputType(script, comment = '#') {
 ;
 function getScriptInputs(script, comment = '#') {
   const regex = new RegExp(`${comment}\\s*input:\\s?([a-z_]+)(?:<[^>]*>)?\\s+(\\w+)(?:[^{\\n]*{[^}\\n]*})?`, 'g');
+  const testOptional = inputAnnotation => /isOptional\s*:\s*true/.test(inputAnnotation) || /optional\s*:\s*true/.test(inputAnnotation);
+  const inputAnnotations = [...script.matchAll(regex)];
+  let firstTsValidOptionalIdx = inputAnnotations.length - 1;
+  for (; firstTsValidOptionalIdx >= 0; firstTsValidOptionalIdx--) {
+    const annotation = inputAnnotations[firstTsValidOptionalIdx][0];
+    if (!testOptional(annotation)) break;
+  }
   const inputs = [];
-  for (const match of script.matchAll(regex)) {
-    const isOptional = /isOptional\s*:\s*true/.test(match[0]) || /optional\s*:\s*true/.test(match[0]);
+  for (const [idx, match] of inputAnnotations.entries()) {
+    const hasOptionalAnnotation = testOptional(match[0]);
+    const isOptional = hasOptionalAnnotation && idx >= firstTsValidOptionalIdx;
+    const undefinable = hasOptionalAnnotation && idx < firstTsValidOptionalIdx;
     const nullable = /nullable\s*:\s*true/.test(match[0]);
     const type = dgToTsTypeMap[match[1]] || 'any';
     const name = match[2];
@@ -229,6 +238,7 @@ function getScriptInputs(script, comment = '#') {
       type,
       name,
       isOptional,
+      undefinable,
       nullable
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.66",
+  "version": "4.14.67",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {