npm - datagrok-tools - Versions diffs - 6.2.0 → 6.2.2 - Mend

datagrok-tools 6.2.0 → 6.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/CHANGELOG.md +9 -1
package/bin/commands/report.js +61 -0
package/bin/commands/test.js +22 -3
package/bin/utils/playwright-runner.js +15 -2
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,8 +1,16 @@
 # Datagrok-tools changelog
+## 6.2.2 (2026-05-05)
+* `grok test` — Playwright runner now writes `test-report-playwright.csv` next to the existing merged `test-report.csv`, so CI can ship Playwright rows to a dedicated Datlas reporting bucket without disturbing the legacy `package` flow.
+## 6.2.1 (2026-05-05)
+* Reports: `grok report attach <ticket> <file>` — upload a file as a JIRA issue attachment via REST v2 multipart POST.
 ## 6.2.0 (2026-05-04)
-* `grok test` — Playwright support: when a package's `package.json` declares `"playwrightTests": "<path>"`, `grok test` runs `npx playwright test` against that directory in addition to the existing Puppeteer pass and merges results into a single `test-report.csv`. Auth is unified with the Puppeteer pass (dev key from `~/.grok/config.yaml` → session token → cookie + `localStorage` injection — no login form). Optional `DATAGROK_DEV_KEY_2` env var enables a second-user identity for specs that need it (`DATAGROK_AUTH_TOKEN_2` exposed to specs). New `--no-playwright` flag opts out of the Playwright pass for a single run.
+* `grok test` — Playwright support: when a package's `package.json` declares `"playwrightTests": "<path>"`, `grok test` runs `npx playwright test` against that directory in addition to the existing Puppeteer pass and merges results into a single `test-report.csv`. Auth is unified with the Puppeteer pass (dev key from `~/.grok/config.yaml` → session token → cookie + `localStorage` injection — no login form). Optional `DATAGROK_DEV_KEY_2` env var enables a second-user identity for specs that need it (`DATAGROK_AUTH_TOKEN_2` exposed to specs). New `--skip-playwright` flag opts out of the Playwright pass for a single run.
 ## 6.1.14 (2026-05-01)

package/bin/commands/report.js CHANGED Viewed

@@ -29,6 +29,8 @@ async function report(args) {
       return await handleComment(args);
     case 'label':
       return await handleLabel(args);
+    case 'attach':
+      return await handleAttach(args);
     default:
       return false;
   }
@@ -590,6 +592,65 @@ async function handleComment(args) {
     return false;
   }
 }
+async function handleAttach(args) {
+  const ticket = args._[2];
+  const filePath = args._[3];
+  if (!ticket || !filePath) {
+    color.error('Usage: grok report attach <ticket-key> <file> [--jira-url <url>]');
+    return false;
+  }
+  if (!_fs.default.existsSync(filePath)) {
+    color.error(`File not found: ${filePath}`);
+    return false;
+  }
+  const user = process.env.JIRA_USER;
+  const token = process.env.JIRA_TOKEN;
+  if (!user || !token) {
+    color.error('JIRA_USER and JIRA_TOKEN env vars are required for `grok report attach`.');
+    return false;
+  }
+  const base = resolveJiraBase(args);
+  const url = `${base}/rest/api/2/issue/${encodeURIComponent(ticket)}/attachments`;
+  // node-fetch v2 has no built-in FormData and the codebase doesn't depend on
+  // form-data. curl is universally available in deploy targets and handles
+  // multipart upload natively. JIRA REST v2 needs the X-Atlassian-Token
+  // anti-CSRF header; the field name must be `file`.
+  const {
+    spawnSync
+  } = require('child_process');
+  const r = spawnSync('curl', ['-sS', '-X', 'POST', '-u', `${user}:${token}`, '-H', 'X-Atlassian-Token: no-check', '-F', `file=@${filePath}`, '-w', '\n%{http_code}\n', url], {
+    encoding: 'utf8',
+    timeout: 120_000,
+    maxBuffer: 4 * 1024 * 1024
+  });
+  if (r.error) {
+    color.error(`curl spawn failed: ${r.error.message}`);
+    return false;
+  }
+  if (r.status !== 0) {
+    color.error(`curl exit ${r.status}: ${(r.stderr || '').slice(0, 400)}`);
+    return false;
+  }
+  // Stdout layout from curl `-w`: <body>\n<http_code>\n
+  const out = (r.stdout || '').trim();
+  const lastNl = out.lastIndexOf('\n');
+  const httpCode = lastNl >= 0 ? out.slice(lastNl + 1).trim() : '';
+  const body = lastNl >= 0 ? out.slice(0, lastNl) : out;
+  if (httpCode !== '200' && httpCode !== '201') {
+    color.error(`JIRA attachment POST failed (HTTP ${httpCode}): ${body.slice(0, 400)}`);
+    return false;
+  }
+  let id = null;
+  try {
+    const parsed = JSON.parse(body);
+    if (Array.isArray(parsed) && parsed[0] && (parsed[0].id || parsed[0].Id)) id = String(parsed[0].id || parsed[0].Id);
+  } catch (_) {/* ignored — JIRA usually returns JSON, but tolerate */}
+  const fileName = _path.default.basename(filePath);
+  color.success(`Attached ${fileName} to ${ticket}` + (id ? ` (id ${id})` : ''));
+  if (id) console.log(id);
+  return true;
+}
 async function handleLabel(args) {
   const ticket = args._[2];
   const labels = args._.slice(3).filter(s => s.length > 0);

package/bin/commands/test.js CHANGED Viewed

@@ -26,7 +26,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 const execAsync = (0, _util.promisify)(_child_process.exec);
 const execFileAsync = (0, _util.promisify)(_child_process.execFile);
 const testInvocationTimeout = 3600000;
-const availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag', 'ci-cd', 'debug', 'no-retry', 'dartium', 'f', 'params', 'logfailed', 'no-playwright'];
+const availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag', 'ci-cd', 'debug', 'no-retry', 'dartium', 'f', 'params', 'logfailed', 'skip-playwright'];
 const curDir = process.cwd();
 /** Expands camelCase to space-separated lowercase: "dataManipulation" → "data manipulation" */
@@ -225,8 +225,27 @@ async function test(args) {
     }
   }
   process.env.TARGET_PACKAGE = packageName;
-  let res = await runTesting(args);
-  if (!args['no-playwright']) {
+  let res;
+  try {
+    res = await runTesting(args);
+  } catch (e) {
+    // Don't let Puppeteer-side failures (login error, browser crash) skip the
+    // Playwright pass — the two suites have independent auth and runtime paths,
+    // and we want at least one half of the run reported.
+    color.error(`Puppeteer pass failed: ${e?.message || e}`);
+    res = {
+      failed: true,
+      verbosePassed: '',
+      verboseSkipped: '',
+      verboseFailed: `Puppeteer pass failed: ${e?.message || e}\n`,
+      passedAmount: 0,
+      skippedAmount: 0,
+      failedAmount: 1,
+      csv: '',
+      error: String(e?.message || e)
+    };
+  }
+  if (!args['skip-playwright']) {
     const ptDir = playwrightRunner.hasPlaywrightTests(curDir);
     if (ptDir) {
       const ptRes = await playwrightRunner.runPlaywrightTests(curDir, ptDir, args, args.host ?? '');

package/bin/utils/playwright-runner.js CHANGED Viewed

@@ -72,7 +72,11 @@ function flattenSuites(suites, testDir, pkgName, owner, verbose, rows) {
   }
 }
 function rowsToCsv(rows) {
-  const header = ['date', 'category', 'name', 'success', 'result', 'ms', 'skipped', 'logs', 'owner', 'package', 'widgetsDifference', 'flaking'];
+  // Column order must match what runTesting() actually serializes (see
+  // test-utils.ts:485 — `setOrder` is a no-op for the CSV writer, so the order
+  // is the natural order Dart's package-test emits). mergeBrowsersResults uses
+  // the first CSV's header, so any drift here misaligns Playwright rows.
+  const header = ['date', 'category', 'name', 'success', 'ms', 'skipped', 'owner', 'package', 'flaking', 'result', 'logs', 'widgetsDifference'];
   return _papaparse.default.unparse({
     fields: header,
     data: rows.map(r => header.map(h => r[h]))
@@ -242,6 +246,15 @@ async function runPlaywrightTests(pkgDir, testDir, args, hostKey) {
       verboseFailed += `${r.category}: ${r.name} (${r.ms} ms) :  ${r.result}\n`;
     }
   }
+  const csv = rowsToCsv(rows);
+  // Persist a Playwright-only CSV so the pipeline can ship it to the Datlas
+  // 'playwright' bucket, separate from the merged Puppeteer+Playwright
+  // test-report.csv that feeds the legacy 'package' bucket and JUnit.
+  try {
+    _fs.default.writeFileSync(_path.default.join(pkgDir, 'test-report-playwright.csv'), csv, 'utf-8');
+  } catch (e) {
+    color.warn(`Playwright: failed to write test-report-playwright.csv: ${e.message || e}`);
+  }
   return {
     failed: failedAmount > 0,
     passedAmount: passedAmount,
@@ -250,6 +263,6 @@ async function runPlaywrightTests(pkgDir, testDir, args, hostKey) {
     verbosePassed: verbosePassed,
     verboseFailed: verboseFailed,
     verboseSkipped: verboseSkipped,
-    csv: rowsToCsv(rows)
+    csv: csv
   };
 }

package/package.json CHANGED Viewed

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