npm - datagrok-tools - Versions diffs - 6.1.14 → 6.2.1 - Mend

datagrok-tools 6.1.14 → 6.2.1

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 +8 -0
package/bin/commands/report.js +61 -0
package/bin/commands/test.js +43 -2
package/bin/utils/playwright-runner.js +259 -0
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,13 @@
 # Datagrok-tools changelog
+## 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 `--skip-playwright` flag opts out of the Playwright pass for a single run.
 ## 6.1.14 (2026-05-01)
 * Reports: `grok report comment` now converts Markdown body to JIRA wiki markup before POSTing, fixing rendered headings/list/HTML-entity mismatches in JIRA UI.

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

@@ -19,13 +19,14 @@ var _build = require("./build");
 var Papa = _interopRequireWildcard(require("papaparse"));
 var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
 var testUtils = _testUtils;
+var playwrightRunner = _interopRequireWildcard(require("../utils/playwright-runner"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /* eslint-disable max-len */
 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'];
+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" */
@@ -224,7 +225,47 @@ async function test(args) {
     }
   }
   process.env.TARGET_PACKAGE = packageName;
-  const res = await runTesting(args);
+  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 ?? '');
+      // mergeBrowsersResults assumes both inputs have a header row; an empty
+      // Puppeteer CSV (filter matched zero tests) breaks the merge. Take the
+      // Playwright CSV verbatim in that case, otherwise merge.
+      if (!res.csv || res.csv.trim().split('\n').length < 2) {
+        res.csv = ptRes.csv;
+        res.passedAmount += ptRes.passedAmount;
+        res.failedAmount += ptRes.failedAmount;
+        res.skippedAmount += ptRes.skippedAmount;
+        res.failed = res.failed || ptRes.failed;
+        res.verbosePassed = (res.verbosePassed || '') + ptRes.verbosePassed;
+        res.verboseFailed = (res.verboseFailed || '') + ptRes.verboseFailed;
+        res.verboseSkipped = (res.verboseSkipped || '') + ptRes.verboseSkipped;
+      } else if (ptRes.csv && ptRes.csv.trim().split('\n').length >= 2) {
+        res = await (0, _testUtils.mergeBrowsersResults)([res, ptRes]);
+      }
+    }
+  }
   if (args.csv) {
     res.csv = (0, _testUtils.addColumnToCsv)(res.csv, 'stress_test', args['stress-test'] ?? false);
     res.csv = (0, _testUtils.addColumnToCsv)(res.csv, 'benchmark', args.benchmark ?? false);

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

@@ -0,0 +1,259 @@
+"use strict";
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasPlaywrightTests = hasPlaywrightTests;
+exports.runPlaywrightTests = runPlaywrightTests;
+var _child_process = require("child_process");
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _papaparse = _interopRequireDefault(require("papaparse"));
+var color = _interopRequireWildcard(require("./color-utils"));
+var testUtils = _interopRequireWildcard(require("./test-utils"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function hasPlaywrightTests(pkgDir) {
+  const pkgJsonPath = _path.default.join(pkgDir, 'package.json');
+  if (!_fs.default.existsSync(pkgJsonPath)) return null;
+  let pkgJson;
+  try {
+    pkgJson = JSON.parse(_fs.default.readFileSync(pkgJsonPath, 'utf-8'));
+  } catch {
+    return null;
+  }
+  const rel = pkgJson.playwrightTests;
+  if (typeof rel !== 'string' || rel.length === 0) return null;
+  const abs = _path.default.resolve(pkgDir, rel);
+  if (!_fs.default.existsSync(abs)) return null;
+  return abs;
+}
+function flattenSuites(suites, testDir, pkgName, owner, verbose, rows) {
+  if (!suites) return;
+  const isoDate = new Date().toISOString();
+  for (var suite of suites) {
+    if (suite.specs) {
+      for (var spec of suite.specs) {
+        const specFile = spec.file || suite.file || '';
+        const absSpec = _path.default.isAbsolute(specFile) ? specFile : _path.default.resolve(testDir, specFile);
+        const category = _path.default.relative(testDir, _path.default.dirname(absSpec)).replace(/\\/g, '/');
+        for (var t of spec.tests || []) {
+          const result = t.results && t.results[t.results.length - 1] || undefined;
+          if (!result) continue;
+          const status = result.status;
+          const skipped = status === 'skipped';
+          const success = status === 'passed';
+          var errMsg = '';
+          if (!success && !skipped && result.errors && result.errors.length > 0) errMsg = result.errors.map(e => e.message || e.stack || '').filter(s => s.length > 0).join('\n');
+          var logs = '';
+          if (verbose) {
+            const out = (result.stdout || []).map(s => s.text || '').join('');
+            const err = (result.stderr || []).map(s => s.text || '').join('');
+            logs = [out, err].filter(s => s.length > 0).join('\n');
+          }
+          rows.push({
+            date: isoDate,
+            category: category,
+            name: spec.title,
+            success: success,
+            result: errMsg,
+            ms: Math.round(result.duration || 0),
+            skipped: skipped,
+            logs: logs,
+            owner: owner,
+            package: pkgName,
+            widgetsDifference: '',
+            flaking: false
+          });
+        }
+      }
+    }
+    if (suite.suites) flattenSuites(suite.suites, testDir, pkgName, owner, verbose, rows);
+  }
+}
+function rowsToCsv(rows) {
+  // 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]))
+  });
+}
+async function runPlaywrightTests(pkgDir, testDir, args, hostKey) {
+  const empty = {
+    failed: false,
+    verbosePassed: '',
+    verboseSkipped: '',
+    verboseFailed: '',
+    passedAmount: 0,
+    skippedAmount: 0,
+    failedAmount: 0,
+    csv: ''
+  };
+  let url;
+  let key;
+  try {
+    ({
+      url,
+      key
+    } = testUtils.getDevKey(hostKey));
+  } catch (e) {
+    color.error(`Playwright: cannot resolve host '${hostKey}': ${e.message || e}`);
+    return {
+      ...empty,
+      failed: true,
+      failedAmount: 1,
+      verboseFailed: `Playwright: ${e.message || e}\n`
+    };
+  }
+  let token;
+  try {
+    token = await testUtils.getToken(url, key);
+  } catch (e) {
+    color.error(`Playwright: cannot exchange dev key for token: ${e.message || e}`);
+    return {
+      ...empty,
+      failed: true,
+      failedAmount: 1,
+      verboseFailed: `Playwright: ${e.message || e}\n`
+    };
+  }
+  let webUrl;
+  try {
+    webUrl = await testUtils.getWebUrl(url, token);
+    if (webUrl.endsWith('/')) webUrl = webUrl.slice(0, -1);
+  } catch {
+    webUrl = url.replace(/\/api\/?$/, '');
+  }
+  let token2 = '';
+  if (process.env.DATAGROK_DEV_KEY_2 && process.env.DATAGROK_DEV_KEY_2.length > 0) {
+    try {
+      token2 = await testUtils.getToken(url, process.env.DATAGROK_DEV_KEY_2);
+    } catch (e) {
+      color.warn(`Playwright: DATAGROK_DEV_KEY_2 set but failed to exchange for token: ${e.message || e}`);
+    }
+  }
+  const configPath = _path.default.join(testDir, 'playwright.config.ts');
+  if (!_fs.default.existsSync(configPath)) {
+    color.error(`Playwright: ${configPath} not found.`);
+    return {
+      ...empty,
+      failed: true,
+      failedAmount: 1,
+      verboseFailed: 'Playwright: missing playwright.config.ts\n'
+    };
+  }
+  const reportFile = _path.default.join(pkgDir, 'test-playwright-report.json');
+  if (_fs.default.existsSync(reportFile)) _fs.default.unlinkSync(reportFile);
+  const cliArgs = ['--no-install', 'playwright', 'test', `--config=${configPath}`];
+  if (!args.gui) cliArgs.push(`--reporter=json`);else cliArgs.push('--headed');
+  if (args.test) cliArgs.push(`--grep=${args.test}`);
+  if (args['no-retry']) cliArgs.push('--retries=0');
+  let testDirFinal = testDir;
+  if (args.category) {
+    const candidate = _path.default.join(testDir, args.category);
+    if (_fs.default.existsSync(candidate)) testDirFinal = candidate;
+  }
+  if (testDirFinal !== testDir) cliArgs.push(testDirFinal);
+  const env = {
+    ...process.env,
+    DATAGROK_URL: webUrl,
+    DATAGROK_AUTH_TOKEN: token,
+    PLAYWRIGHT_JSON_OUTPUT_NAME: reportFile
+  };
+  if (token2) env.DATAGROK_AUTH_TOKEN_2 = token2;
+  color.info(`Playwright: running ${_path.default.relative(pkgDir, testDir) || '.'} against ${webUrl}`);
+  const stdoutChunks = [];
+  const stderrChunks = [];
+  const exitCode = await new Promise(resolve => {
+    const isWin = process.platform === 'win32';
+    const child = (0, _child_process.spawn)(isWin ? 'npx.cmd' : 'npx', cliArgs, {
+      cwd: pkgDir,
+      env: env,
+      shell: isWin
+    });
+    child.stdout.on('data', d => {
+      stdoutChunks.push(d);
+      if (args.gui || args.verbose) process.stdout.write(d);
+    });
+    child.stderr.on('data', d => {
+      stderrChunks.push(d);
+      process.stderr.write(d);
+    });
+    child.on('error', e => {
+      color.error(`Playwright: failed to spawn npx: ${e.message}`);
+      resolve(1);
+    });
+    child.on('close', code => resolve(code ?? 1));
+  });
+  if (args.gui) {
+    return {
+      ...empty,
+      failed: exitCode !== 0,
+      failedAmount: exitCode !== 0 ? 1 : 0,
+      passedAmount: exitCode === 0 ? 1 : 0,
+      verboseFailed: exitCode !== 0 ? 'Playwright (gui mode) exited non-zero\n' : ''
+    };
+  }
+  let report;
+  if (_fs.default.existsSync(reportFile)) {
+    try {
+      report = JSON.parse(_fs.default.readFileSync(reportFile, 'utf-8'));
+    } catch (e) {
+      color.warn(`Playwright: cannot parse JSON report: ${e.message || e}`);
+    }
+  }
+  if (!report) {
+    const stdoutText = Buffer.concat(stdoutChunks).toString('utf-8');
+    try {
+      report = JSON.parse(stdoutText);
+    } catch {/* ignore */}
+  }
+  if (!report) {
+    color.error('Playwright: no JSON report produced.');
+    const tail = Buffer.concat(stderrChunks).toString('utf-8').slice(-2000);
+    return {
+      ...empty,
+      failed: true,
+      failedAmount: 1,
+      verboseFailed: `Playwright: no JSON report. stderr tail:\n${tail}\n`
+    };
+  }
+  const pkgJson = JSON.parse(_fs.default.readFileSync(_path.default.join(pkgDir, 'package.json'), 'utf-8'));
+  const owner = pkgJson.author && (pkgJson.author.email || pkgJson.author) || '';
+  const pkgName = process.env.TARGET_PACKAGE || args.package || pkgJson.name || '';
+  const rows = [];
+  flattenSuites(report.suites, testDir, pkgName, typeof owner === 'string' ? owner : '', args.verbose === true, rows);
+  let passedAmount = 0;
+  let failedAmount = 0;
+  let skippedAmount = 0;
+  let verbosePassed = '';
+  let verboseFailed = '';
+  let verboseSkipped = '';
+  for (var r of rows) {
+    const line = `${r.category}: ${r.name} (${r.ms} ms)\n`;
+    if (r.skipped) {
+      skippedAmount++;
+      verboseSkipped += line;
+    } else if (r.success) {
+      passedAmount++;
+      verbosePassed += line;
+    } else {
+      failedAmount++;
+      verboseFailed += `${r.category}: ${r.name} (${r.ms} ms) :  ${r.result}\n`;
+    }
+  }
+  return {
+    failed: failedAmount > 0,
+    passedAmount: passedAmount,
+    failedAmount: failedAmount,
+    skippedAmount: skippedAmount,
+    verbosePassed: verbosePassed,
+    verboseFailed: verboseFailed,
+    verboseSkipped: verboseSkipped,
+    csv: rowsToCsv(rows)
+  };
+}

package/package.json CHANGED Viewed

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