@argos-ci/playwright 6.2.0 → 6.3.0

package/dist/reporter.js

@@ -1,58 +1,13 @@
+import "./chunk-2ESYSVXG.js";
+
 // src/reporter.ts
 import chalk from "chalk";
 import { readConfig, upload } from "@argos-ci/core";
 import { copyFile, readdir, writeFile } from "fs/promises";
-import { dirname, join } from "path";
+import { dirname as dirname2, join } from "path";
 
 // src/util.ts
-import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var PNG_EXTENSION = `.png`;
-var METADATA_EXTENSION = `.argos.json`;
-var MAX_NAME_LENGTH = 255 - PNG_EXTENSION.length - METADATA_EXTENSION.length;
-function truncate(text, length) {
-  if (text.length <= length) {
-    return text;
-  }
-  return text.slice(0, length - 1) + "\u2026";
-}
-function getAutomaticScreenshotName(test, result) {
-  const name = test.titlePath().join(" ");
-  let suffix = "";
-  suffix += result.retry > 0 ? ` #${result.retry + 1}` : "";
-  suffix += result.status === "failed" || result.status === "timedOut" ? " (failed)" : "";
-  const maxNameLength = MAX_NAME_LENGTH - suffix.length;
-  if (name.length > maxNameLength) {
-    return `${truncate(`${test.id} - ${test.title}`, maxNameLength)}${suffix}`;
-  }
-  return `${name}${suffix}`;
-}
-
-// src/attachment.ts
-function getOriginalAttachmentName(name) {
-  return name.replace(/^argos\/[^/]+___/, "");
-}
-function getAttachmentFilename(name) {
-  if (name.startsWith("argos/screenshot")) {
-    return `${getOriginalAttachmentName(name)}${PNG_EXTENSION}`;
-  }
-  if (name.startsWith("argos/metadata")) {
-    return `${getOriginalAttachmentName(name)}${PNG_EXTENSION}${METADATA_EXTENSION}`;
-  }
-  throw new Error(`Unknown attachment name: ${name}`);
-}
-function checkIsTrace(attachment) {
-  return attachment.name === "trace" && attachment.contentType === "application/zip" && Boolean(attachment.path);
-}
-function checkIsArgosScreenshot(attachment) {
-  return attachment.name.startsWith("argos/") && attachment.contentType === "image/png" && Boolean(attachment.path);
-}
-function checkIsArgosScreenshotMetadata(attachment) {
-  return attachment.name.startsWith("argos/") && attachment.contentType === "application/json" && Boolean(attachment.path);
-}
-function checkIsAutomaticScreenshot(attachment) {
-  return attachment.name === "screenshot" && attachment.contentType === "image/png" && Boolean(attachment.path);
-}
+import { createRequire as createRequire2 } from "module";
 
 // src/metadata.ts
 import {
@@ -60,12 +15,12 @@ import {
   readVersionFromPackage
 } from "@argos-ci/util";
 import { relative } from "path";
-import { createRequire as createRequire2 } from "module";
+import { createRequire } from "module";
 import { AsyncLocalStorage } from "async_hooks";
-var require3 = createRequire2(import.meta.url);
+var require2 = createRequire(import.meta.url);
 function tryResolve(pkg) {
   try {
-    return require3.resolve(pkg);
+    return require2.resolve(pkg);
   } catch {
     return null;
   }
@@ -91,7 +46,7 @@ async function getAutomationLibraryMetadata() {
   );
 }
 async function getArgosPlaywrightVersion() {
-  const pkgPath = require3.resolve("@argos-ci/playwright/package.json");
+  const pkgPath = require2.resolve("@argos-ci/playwright/package.json");
   return readVersionFromPackage(pkgPath);
 }
 async function getSdkMetadata() {
@@ -144,6 +99,83 @@ async function getMetadataFromTestCase(testCase, testResult) {
   return metadata;
 }
 
+// src/util.ts
+import {
+  getGlobalScript
+} from "@argos-ci/browser";
+import { dirname, resolve } from "path";
+import { mkdir } from "fs/promises";
+var require3 = createRequire2(import.meta.url);
+var PNG_EXTENSION = `.png`;
+var ARIA_EXTENSION = `.aria.yml`;
+var METADATA_EXTENSION = `.argos.json`;
+var MAX_NAME_LENGTH = 255 - PNG_EXTENSION.length - METADATA_EXTENSION.length;
+function truncate(text, length) {
+  if (text.length <= length) {
+    return text;
+  }
+  return text.slice(0, length - 1) + "\u2026";
+}
+function getAutomaticScreenshotName(test, result) {
+  const name = test.titlePath().join(" ");
+  let suffix = "";
+  suffix += result.retry > 0 ? ` #${result.retry + 1}` : "";
+  suffix += result.status === "failed" || result.status === "timedOut" ? " (failed)" : "";
+  const maxNameLength = MAX_NAME_LENGTH - suffix.length;
+  if (name.length > maxNameLength) {
+    return `${truncate(`${test.id} - ${test.title}`, maxNameLength)}${suffix}`;
+  }
+  return `${name}${suffix}`;
+}
+
+// src/attachment.ts
+function parseAttachmentName(name) {
+  const match = name.match(/^argos\/(screenshot|aria)(\/metadata)?___(.*)$/);
+  if (!match) {
+    return null;
+  }
+  const [, mainType, metadataPart, originalName] = match;
+  if (!originalName) {
+    throw new Error(`Invalid attachment name: ${name}`);
+  }
+  const type = metadataPart ? `${mainType}/metadata` : mainType;
+  return { type, originalName };
+}
+function getAttachmentFilename(attachment) {
+  const parsed = parseAttachmentName(attachment.name);
+  if (!parsed) {
+    throw new Error(`Invalid attachment name: ${attachment.name}`);
+  }
+  const { type, originalName } = parsed;
+  const extension = {
+    screenshot: PNG_EXTENSION,
+    aria: ARIA_EXTENSION,
+    "screenshot/metadata": `${PNG_EXTENSION}${METADATA_EXTENSION}`,
+    "aria/metadata": `${ARIA_EXTENSION}${METADATA_EXTENSION}`
+  }[type];
+  return `${originalName}${extension}`;
+}
+function checkIsTrace(attachment) {
+  return attachment.name === "trace" && attachment.contentType === "application/zip" && Boolean(attachment.path);
+}
+function checkIsArgosSnapshot(attachment) {
+  const parsed = parseAttachmentName(attachment.name);
+  if (!parsed) {
+    return false;
+  }
+  return parsed.type === "aria" || parsed.type === "screenshot";
+}
+function checkIsArgosMetadata(attachment) {
+  const parsed = parseAttachmentName(attachment.name);
+  if (!parsed) {
+    return false;
+  }
+  return parsed.type === "aria/metadata" || parsed.type === "screenshot/metadata";
+}
+function checkIsAutomaticScreenshot(attachment) {
+  return attachment.name === "screenshot" && attachment.contentType === "image/png" && Boolean(attachment.path);
+}
+
 // src/debug.ts
 import createDebug from "debug";
 var KEY = "@argos-ci/playwright";
@@ -192,7 +224,7 @@ var ArgosReporter = class {
    * Write a file to the temporary directory.
    */
   async writeFile(path, body) {
-    await createDirectory(dirname(path));
+    await createDirectory(dirname2(path));
     debug(`Writing file to ${path}`);
     await writeFile(path, body);
     debug(`File written to ${path}`);
@@ -201,7 +233,7 @@ var ArgosReporter = class {
    * Copy a file to the temporary directory.
    */
   async copyFile(from, to) {
-    await createDirectory(dirname(to));
+    await createDirectory(dirname2(to));
     debug(`Copying file from ${from} to ${to}`);
     await copyFile(from, to);
     debug(`File copied from ${from} to ${to}`);
@@ -238,8 +270,8 @@ var ArgosReporter = class {
     debug("ArgosReporter:onTestEnd");
     await Promise.all(
       result.attachments.map(async (attachment) => {
-        if (checkIsArgosScreenshot(attachment) || checkIsArgosScreenshotMetadata(attachment)) {
-          const path = join(uploadDir, getAttachmentFilename(attachment.name));
+        if (checkIsArgosSnapshot(attachment) || checkIsArgosMetadata(attachment)) {
+          const path = join(uploadDir, getAttachmentFilename(attachment));
           await Promise.all([
             this.copyFile(attachment.path, path),
             this.copyTraceIfFound(result, path)
@@ -279,7 +311,7 @@ var ArgosReporter = class {
     }
     const buildNameConfig = this.config.buildName;
     const uploadOptions = {
-      files: ["**/*.png"],
+      files: ["**/*.png", "**/*.aria.yml"],
       parallel: parallel ?? void 0,
       ...this.config,
       buildName: void 0,