datagrok-tools 4.14.35 → 4.14.37

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/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;
@@ -363,7 +375,7 @@ async function runTests(testsParams, stopOnFail) {
       row['flaking'] = success && window.DG.Test.isReproducing;
       df.changeColumnType('result', window.DG.COLUMN_TYPE.STRING);
       df.changeColumnType('logs', window.DG.COLUMN_TYPE.STRING);
-      df.changeColumnType('widgetsDifference', window.DG.COLUMN_TYPE.STRING);
+      if (df.col('widgetsDifference')) df.changeColumnType('widgetsDifference', window.DG.COLUMN_TYPE.STRING);
       // df.changeColumnType('memoryDelta', (<any>window).DG.COLUMN_TYPE.BIG_INT);
 
       if (resultDF === undefined) resultDF = df;else resultDF = resultDF.append(df);

package/package.json

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

@@ -351,8 +351,8 @@ class FuncGeneratorPlugin {
     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 (