datagrok-tools 4.14.36 → 4.14.38

package/bin/commands/test.js

@@ -36,8 +36,8 @@ async function test(args) {
   if (!args.package) packageJsonData = JSON.parse(_fs.default.readFileSync(_path.default.join(curDir, 'package.json'), {
     encoding: 'utf-8'
   }));
-  let packageName = args.package ? utils.kebabToCamelCase(args.package) : utils.kebabToCamelCase(utils.removeScope(packageJsonData.name));
-  let packagesDir = _path.default.basename(curDir) === "packages" ? curDir : _path.default.dirname(curDir);
+  const packageName = args.package ? utils.kebabToCamelCase(args.package) : utils.kebabToCamelCase(utils.removeScope(packageJsonData.name));
+  const packagesDir = _path.default.basename(curDir) === 'packages' ? curDir : _path.default.dirname(curDir);
   console.log('Environment variable `TARGET_PACKAGE` is set to', packageName);
   if (args.platform && packageName !== 'ApiTests') color.warn('--platform flag can only be used in the ApiTests package');
   // if (args.core && packageName !== 'DevTools')
@@ -47,7 +47,7 @@ async function test(args) {
     await testUtils.loadPackages(packagesDir, packageName, args.host, args['skip-publish'], args['skip-build'], args.link);
   }
   process.env.TARGET_PACKAGE = packageName;
-  let res = await runTesting(args);
+  const res = await runTesting(args);
   if (args.csv) (0, _testUtils.saveCsvResults)([res.csv], csvReportDir);
   (0, _testUtils.printBrowsersResult)(res, args.verbose);
   if (res.failed) {
@@ -66,23 +66,25 @@ async function runTesting(args) {
   const loadedTests = await (0, _testUtils.loadTestsList)([process.env.TARGET_PACKAGE ?? ''], args.core);
   let testsObj = [];
   if (args['stress-test'] || args.benchmark) {
-    for (let element of loadedTests) {
+    for (const element of loadedTests) {
       if (args.benchmark && !element.options.benchmark || args['stress-test'] && !element.options.stressTest) continue;
       testsObj.push(element);
     }
   } else testsObj = loadedTests;
   const parsed = (0, _orderFunctions.setAlphabeticalOrder)(testsObj, 1, 1);
-  if (parsed.length == 0) return {
-    failed: true,
-    error: '',
-    verbosePassed: 'Package not found',
-    verboseSkipped: 'Package not found',
-    verboseFailed: 'Package not found',
-    passedAmount: 0,
-    skippedAmount: 0,
-    failedAmount: 0,
-    csv: ''
-  };
+  if (parsed.length == 0) {
+    return {
+      failed: true,
+      error: '',
+      verbosePassed: 'Package not found',
+      verboseSkipped: 'Package not found',
+      verboseFailed: 'Package not found',
+      passedAmount: 0,
+      skippedAmount: 0,
+      failedAmount: 0,
+      csv: ''
+    };
+  }
   let organized = parsed[0].map(testObj => ({
     package: testObj.packageName,
     params: {
@@ -94,10 +96,10 @@ async function runTesting(args) {
       }
     }
   }));
-  let filtered = [];
-  let categoryRegex = new RegExp(`${args.category?.replaceAll(' ', '')}.*`);
+  const filtered = [];
+  const categoryRegex = new RegExp(`${args.category?.replaceAll(' ', '')}.*`);
   if (args.category) {
-    for (let element of organized) {
+    for (const element of organized) {
       if (categoryRegex.test(element.params.category.replaceAll(' ', ''))) {
         if (element.params.test === args.test || !args.test) filtered.push(element);
       }
@@ -109,7 +111,7 @@ async function runTesting(args) {
     console.log(`Tests total: ${organized.length}`);
   }
   color.info('Starting tests...');
-  let testsResults = [];
+  const testsResults = [];
   let r;
   let browserId = 1;
   await (0, _testUtils.timeout)(async () => {
@@ -126,23 +128,21 @@ async function runTesting(args) {
         stopOnTimeout: true,
         debug: args['debug'] ?? false
       }, browserId, testInvocationTimeout);
-      let testsLeft = [];
-      let testsToReproduce = [];
-      for (let testData of organized) {
+      const testsLeft = [];
+      const testsToReproduce = [];
+      for (const testData of organized) {
         if (!r.verbosePassed.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseSkipped.includes(`${testData.params.category}: ${testData.params.test}`) && !r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test}`) && !new RegExp(`${testUtils.escapeRegex(testData.params.category.trim())}[^\n]*: *?(before|after)(\\(\\))?`).test(r.verboseFailed)) testsLeft.push(testData);
-        if (r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test} :  Error:`)) {
-          testsToReproduce.push(testData);
-        }
+        if (r.verboseFailed.includes(`${testData.params.category}: ${testData.params.test} :  Error:`)) testsToReproduce.push(testData);
       }
       if (testsToReproduce.length > 0) {
-        let reproduced = await reproducedTest(args, testsToReproduce);
-        for (let test of testsToReproduce) {
-          let reproducedTest = reproduced.get(test);
+        const reproduced = await reproducedTest(args, testsToReproduce);
+        for (const test of testsToReproduce) {
+          const reproducedTest = reproduced.get(test);
           if (reproducedTest && !reproducedTest.failed) r = await updateResultsByReproduced(r, reproducedTest, test);
         }
       }
-      r.csv = await (0, _testUtils.addColumnToCsv)(r.csv, "stress_test", args['stress-test'] ?? false);
-      r.csv = await (0, _testUtils.addColumnToCsv)(r.csv, "benchmark", args.benchmark ?? false);
+      r.csv = await (0, _testUtils.addColumnToCsv)(r.csv, 'stress_test', args['stress-test'] ?? false);
+      r.csv = await (0, _testUtils.addColumnToCsv)(r.csv, 'benchmark', args.benchmark ?? false);
       testsResults.push(r);
       organized = testsLeft;
       browserId++;
@@ -157,8 +157,8 @@ async function runTesting(args) {
 }
 async function reproducedTest(args, testsToReproduce) {
   const res = new Map();
-  for (let test of testsToReproduce) {
-    let r = await (0, _testUtils.runBrowser)([test], {
+  for (const test of testsToReproduce) {
+    const r = await (0, _testUtils.runBrowser)([test], {
       benchmark: args.benchmark ?? false,
       catchUnhandled: false,
       gui: false,
@@ -175,8 +175,8 @@ async function reproducedTest(args, testsToReproduce) {
 }
 async function updateResultsByReproduced(curentResult, reproducedResult, testsParams) {
   const table2Dict = {};
-  let table1 = readCSVResultData(curentResult.csv);
-  let table2 = readCSVResultData(reproducedResult.csv);
+  const table1 = readCSVResultData(curentResult.csv);
+  const table2 = readCSVResultData(reproducedResult.csv);
   const flakingMap = {};
   table2.rows.forEach(row => {
     const key = `${row['category']},${row['name']}`;
@@ -184,9 +184,7 @@ async function updateResultsByReproduced(curentResult, reproducedResult, testsPa
   });
   table1.rows.forEach(row => {
     const key = `${row['category']},${row['name']}`;
-    if (key in flakingMap) {
-      row['flaking'] = flakingMap[key];
-    }
+    if (key in flakingMap) row['flaking'] = flakingMap[key];
   });
   curentResult.csv = Papa.unparse(table1.rows, {
     columns: table1.headers
@@ -200,9 +198,7 @@ function readCSVResultData(data) {
     header: true,
     skipEmptyLines: true
   });
-  if (parsed.errors.length > 0) {
-    throw new Error(`Error parsing CSV file: ${parsed.errors[0].message}`);
-  }
+  if (parsed.errors.length > 0) throw new Error(`Error parsing CSV file: ${parsed.errors[0].message}`);
   return {
     headers: parsed.meta.fields || [],
     rows: parsed.data

package/bin/utils/func-generation.js

@@ -20,7 +20,7 @@ let pseudoParams = exports.pseudoParams = /*#__PURE__*/function (pseudoParams) {
   pseudoParams["INPUT_TYPE"] = "inputType";
   return pseudoParams;
 }({});
-const nonMetaData = ['sidebar', 'editor', 'friendlyName', 'helpUrl', 'condition', 'top-menu', 'cache', 'cache.invalidateOn'];
+const nonMetaData = ['sidebar', 'editor', 'friendlyName', 'helpUrl', 'help-url', 'condition', 'top-menu', 'cache', 'cache.invalidateOn', 'test'];
 const decoratorOptionToAnnotation = new Map([['initialValue', 'default']]);
 const dgAnnotationTypes = exports.dgAnnotationTypes = {
   INT: 'int',
@@ -126,7 +126,7 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
   const isFileViewer = data.tags?.includes(FUNC_TYPES.FILE_VIEWER) ?? false;
   const isFileImporter = data.tags?.includes(FUNC_TYPES.FILE_HANDLER) ?? false;
   let s = '';
-  if (data.name) s += `${comment}name: ${data.name}${sep}`;
+  if (data.name && (!data.tags?.includes('init') || data.name !== 'init' && data.name !== '_init')) s += `${comment}name: ${data.name}${sep}`;
   if (pseudoParams.EXTENSION in data && data.tags != null && data.tags.includes(FUNC_TYPES.FILE_EXPORTER)) s += `${comment}description: Save as ${data[pseudoParams.EXTENSION]}${sep}`;else if (data.description) s += `${comment}description: ${data.description}${sep}`;
   if (data.tags && data.tags?.length > 0) {
     s += `${comment}tags: ${isFileViewer && data[pseudoParams.EXTENSIONS] ? data.tags.concat(data[pseudoParams.EXTENSIONS].map(ext => 'fileViewer-' + ext)).join(', ') : data.tags.join(', ')}${sep}`;
@@ -170,11 +170,13 @@ function getFuncAnnotation(data, comment = '//', sep = '\n') {
     }
   }
   if (data.test) {
-    for (const entry of Object.entries(data.test)) {
-      if (entry[0] === 'test' || entry[0] === 'wait') s += `${comment}`;else s += `, `;
-      s += `${entry[0]}: ${entry[1]} `;
+    if (typeof data.test === 'string') s += `${comment}test: ${data.test}${sep}`;else {
+      for (const entry of Object.entries(data.test)) {
+        if (entry[0] === 'test' || entry[0] === 'wait') s += `${comment}`;else s += `, `;
+        s += `${entry[0]}: ${entry[1]} `;
+      }
+      s += `${sep}`;
     }
-    s += `${sep}`;
   }
   return s;
 }
@@ -438,7 +440,7 @@ const primitives = new Set(['string', 'string[]', 'number', 'number[]', 'boolean
 /** Generates a DG function. */
 function generateFunc(annotation, funcName, sep = '\n', className = '', inputs = [], isAsync = false) {
   // eslint-disable-next-line max-len
-  const funcSigNature = inputs.map(e => `${e.name}: ${primitives.has(e.type ?? '') && !typesToAny.includes(e.type ?? '') ? e.type : typesToAnnotation[e.type?.replace('[]', '') ?? ''] && !typesToAny.includes(e.type ?? '') ? e.type : 'any'}`).join(', ');
+  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(', ');
   const funcArguments = inputs.map(e => e.name).join(', ');
 
   // eslint-disable-next-line max-len

package/bin/utils/test-utils.js

@@ -329,16 +329,28 @@ async function runTests(testsParams, stopOnFail) {
   let resultDF = undefined;
   let lastTest = null;
   let res = '';
+
+  // function addColumn(columnName: string, column: any, df : any) {
+  //   if (!df.getCol(columnName)) 
+  //     df.columns.add(column);
+  // }
+
   try {
     for (const testParam of testsParams) {
       lastTest = testParam;
       const df = await window.grok.functions.call(testParam.package + ':test', testParam.params);
-      const flakingCol = window.DG.Column.fromType(window.DG.COLUMN_TYPE.BOOL, 'flaking', df.rowCount);
-      df.columns.add(flakingCol);
-      if (!df.getCol('package')) {
-        const packageNameCol = window.DG.Column.fromList(window.DG.COLUMN_TYPE.STRING, 'package', Array(df.rowCount).fill(testParam.package));
-        df.columns.add(packageNameCol);
-      }
+      df.columns.setOrder(['date', 'category', 'name', 'success', 'result', 'ms', 'skipped', 'logs', 'owner', 'package', 'widgetsDifference', 'flaking']);
+      // addColumn('flaking', (<any>window).DG.Column.fromType((<any>window).DG.COLUMN_TYPE.BOOL, 'flaking', df.rowCount), df);
+      // addColumn('package', (<any>window).DG.Column.fromType((<any>window).DG.COLUMN_TYPE.BOOL, 'flaking', df.rowCount), df);
+      // if (!df.getCol('flaking')) {
+      //   const flakingCol = (<any>window).DG.Column.fromType((<any>window).DG.COLUMN_TYPE.BOOL, 'flaking', df.rowCount);
+      //   df.columns.add(flakingCol);
+      // }
+      // if (!df.getCol('package')) {
+      //   const packageNameCol = 
+      //     (<any>window).DG.Column.fromList((<any>window).DG.COLUMN_TYPE.STRING, 'package', Array(df.rowCount).fill(testParam.package));
+      //   df.columns.add(packageNameCol);
+      // }
       if (df.rowCount === 0) {
         verboseFailed += `Test result : Invocation Fail : ${testParam.params.category}: ${testParam.params.test}\n`;
         countFailed += 1;

package/package-template/package.json

@@ -10,7 +10,7 @@
     "@datagrok-libraries/utils": "^4.6.0"
   },
   "devDependencies": {
-    "datagrok-tools": "^4.14.34",
+    "datagrok-tools": "^4.14.38",
     "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },

package/package.json

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

@@ -237,6 +237,7 @@ class FuncGeneratorPlugin {
         //   defaultValue = baseParam?.right?.raw;
         baseParam = baseParam?.left;
       }
+      const optional = param.optional;
 
       if (baseParam.type === 'RestElement' || baseParam.type === 'Identifier') {
         let name =
@@ -258,8 +259,7 @@ class FuncGeneratorPlugin {
           baseParam.typeAnnotation.typeAnnotation.typeArguments?.params;
         if (type !== 'any' && params && params.length > 0)
           type += `<${params.map((e) => e.typeName?.name ?? 'any').join(',')}>`;
-
-        return {name: name, type: type, options: options};
+        return {name: name, type: type, options: options, optional: optional};
       }
       // Commented code belove sets more strong types for ObjectPatterns and ArrayPatterns
       // else if (baseParam.type === 'ObjectPattern' || baseParam.type === 'ArrayPattern') {
@@ -294,7 +294,7 @@ class FuncGeneratorPlugin {
 
       //   return { name: name, type: type, options: options };
       // }
-      return {name: 'value', type: 'any', options: undefined};
+      return {name: 'value', type: 'any', options: undefined, optional: optional};
     });
     return params;
   }
@@ -346,13 +346,13 @@ class FuncGeneratorPlugin {
   }
 
   _readReturnType(annotation) {
-    let resultType = 'dynamic';
+    let resultType = 'void';
     let nodeAnnotation = annotation;
     let isArray = false; 
     if (nodeAnnotation?.type === 'TSUnionType' && 
       nodeAnnotation?.types?.length === 2 && 
-      nodeAnnotation?.types?.some((e)=> e?.type === 'TSNullKeyword')) 
-      nodeAnnotation = nodeAnnotation.types.filter((e)=> e.type !== 'TSNullKeyword')[0];
+      nodeAnnotation?.types?.some((e)=> e?.type === 'TSNullKeyword' || e?.type === 'TSVoidKeyword')) 
+      nodeAnnotation = nodeAnnotation.types.filter((e)=> e.type !== 'TSNullKeyword' || e?.type === 'TSVoidKeyword')[0];
     
 
     if (
@@ -398,9 +398,8 @@ class FuncGeneratorPlugin {
       results = this._readOutputsFromReturnTypeObject(annotation);
     else {
       const resultType = this._readReturnType(annotation);
-      results.push({name: 'result', type: resultType});
-      if (resultType === 'void')
-        results = [];
+      if (resultType !== 'void')
+        results.push({name: 'result', type: resultType});
     }
     return results;
   }