datagrok-tools 4.14.62 → 4.14.64

package/bin/utils/test-utils.js

@@ -184,10 +184,10 @@ const recorderConfig = exports.recorderConfig = {
 async function loadPackages(packagesDir, packagesToLoad, host, skipPublish, skipBuild, linkPackage, release) {
   const packagesToRun = new Map();
   const hostString = host === undefined ? `` : `${host}`;
-  if (packagesToLoad !== 'all') {
-    for (const pacakgeName of (packagesToLoad ?? '').split(' ')) {
-      if ((pacakgeName ?? '').length !== 0) packagesToRun.set((0, _utils.spaceToCamelCase)(pacakgeName).toLocaleLowerCase(), false);
-    }
+  if (packagesToLoad && packagesToLoad !== 'all') {
+    const packageNames = packagesToLoad.split(' ').map(p => p.trim()).filter(p => p.length > 0);
+    if (skipPublish && skipBuild && !linkPackage) return packageNames;
+    for (const name of packageNames) packagesToRun.set((0, _utils.spaceToCamelCase)(name).toLowerCase(), false);
   }
   for (const dirName of _fs.default.readdirSync(packagesDir)) {
     const packageDir = _path.default.join(packagesDir, dirName);
@@ -218,8 +218,7 @@ async function loadPackages(packagesDir, packagesToLoad, host, skipPublish, skip
     }
   }
   console.log();
-  return Array.from(packagesToRun).filter(([key, value]) => value === true).map(([key]) => key);
-  ;
+  return Array.from(packagesToRun).filter(([_, value]) => value).map(([key, _]) => key);
 }
 async function loadTestsList(packages, core = false) {
   const packageTestsData = await timeout(async () => {
@@ -329,16 +328,18 @@ 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);
+      if (!df.getCol('flaking')) {
+        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);
@@ -347,7 +348,7 @@ async function runTests(testsParams, stopOnFail) {
       //   df.columns.add(flakingCol);
       // }
       // if (!df.getCol('package')) {
-      //   const packageNameCol = 
+      //   const packageNameCol =
       //     (<any>window).DG.Column.fromList((<any>window).DG.COLUMN_TYPE.STRING, 'package', Array(df.rowCount).fill(testParam.package));
       //   df.columns.add(packageNameCol);
       // }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.14.62",
+  "version": "4.14.64",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {
@@ -31,7 +31,8 @@
     "link": "npm link",
     "prepublishOnly": "babel bin --extensions .ts -d bin",
     "babel": "babel bin --extensions .ts -d bin",
-    "build": "babel bin --extensions .ts -d bin"
+    "build": "babel bin --extensions .ts -d bin",
+    "debug-source-map": "babel bin --extensions .ts -d bin --source-maps true"
   },
   "bin": {
     "datagrok-upload": "./bin/_deprecated/upload.js",