@flakiness/sdk 0.130.0 → 0.132.0

package/lib/localReportServer.js

@@ -29,8 +29,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -39,13 +41,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });

package/lib/playwright-test.js

@@ -139,6 +139,29 @@ var ansiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:
 function stripAnsi(str) {
   return str.replace(ansiRegex, "");
 }
+async function saveReportAndAttachments(report, attachments, outputFolder) {
+  const reportPath = path.join(outputFolder, "report.json");
+  const attachmentsFolder = path.join(outputFolder, "attachments");
+  await fs.promises.rm(outputFolder, { recursive: true, force: true });
+  await fs.promises.mkdir(outputFolder, { recursive: true });
+  await fs.promises.writeFile(reportPath, JSON.stringify(report), "utf-8");
+  if (attachments.length)
+    await fs.promises.mkdir(attachmentsFolder);
+  const movedAttachments = [];
+  for (const attachment of attachments) {
+    const attachmentPath = path.join(attachmentsFolder, attachment.id);
+    if (attachment.path)
+      await fs.promises.cp(attachment.path, attachmentPath);
+    else if (attachment.body)
+      await fs.promises.writeFile(attachmentPath, attachment.body);
+    movedAttachments.push({
+      contentType: attachment.contentType,
+      id: attachment.id,
+      path: attachmentPath
+    });
+  }
+  return movedAttachments;
+}
 function shell(command, args, options) {
   try {
     const result = spawnSync(command, args, { encoding: "utf-8", ...options });
@@ -451,8 +474,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -461,13 +486,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });
@@ -1072,25 +1098,7 @@ var FlakinessReporter = class {
     for (const unaccessibleAttachment of context.unaccessibleAttachmentPaths)
       warn(`cannot access attachment ${unaccessibleAttachment}`);
     this._report = report;
-    const reportPath = path6.join(this._outputFolder, "report.json");
-    const attachmentsFolder = path6.join(this._outputFolder, "attachments");
-    await fs7.promises.rm(this._outputFolder, { recursive: true, force: true });
-    await fs7.promises.mkdir(this._outputFolder, { recursive: true });
-    await fs7.promises.writeFile(reportPath, JSON.stringify(report), "utf-8");
-    if (context.attachments.size)
-      await fs7.promises.mkdir(attachmentsFolder);
-    for (const attachment of context.attachments.values()) {
-      const attachmentPath = path6.join(attachmentsFolder, attachment.id);
-      if (attachment.path)
-        await fs7.promises.cp(attachment.path, attachmentPath);
-      else if (attachment.body)
-        await fs7.promises.writeFile(attachmentPath, attachment.body);
-      this._attachments.push({
-        contentType: attachment.contentType,
-        id: attachment.id,
-        path: attachmentPath
-      });
-    }
+    this._attachments = await saveReportAndAttachments(report, Array.from(context.attachments.values()), this._outputFolder);
     this._result = result;
   }
   async onExit() {
@@ -1111,9 +1119,9 @@ var FlakinessReporter = class {
       const defaultOutputFolder = path6.join(process.cwd(), "flakiness-report");
       const folder = defaultOutputFolder === this._outputFolder ? "" : path6.relative(process.cwd(), this._outputFolder);
       console.log(`
-To open last Flakiness report run:
+To open last Flakiness report, install Flakiness CLI tool and run:
 
-  ${chalk2.cyan(`npx flakiness show-report ${folder}`)}
+  ${chalk2.cyan(`flakiness show ${folder}`)}
       `);
     }
   }

package/lib/utils.js

@@ -123,6 +123,29 @@ var ansiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:
 function stripAnsi(str) {
   return str.replace(ansiRegex, "");
 }
+async function saveReportAndAttachments(report, attachments, outputFolder) {
+  const reportPath = path.join(outputFolder, "report.json");
+  const attachmentsFolder = path.join(outputFolder, "attachments");
+  await fs.promises.rm(outputFolder, { recursive: true, force: true });
+  await fs.promises.mkdir(outputFolder, { recursive: true });
+  await fs.promises.writeFile(reportPath, JSON.stringify(report), "utf-8");
+  if (attachments.length)
+    await fs.promises.mkdir(attachmentsFolder);
+  const movedAttachments = [];
+  for (const attachment of attachments) {
+    const attachmentPath = path.join(attachmentsFolder, attachment.id);
+    if (attachment.path)
+      await fs.promises.cp(attachment.path, attachmentPath);
+    else if (attachment.body)
+      await fs.promises.writeFile(attachmentPath, attachment.body);
+    movedAttachments.push({
+      contentType: attachment.contentType,
+      id: attachment.id,
+      path: attachmentPath
+    });
+  }
+  return movedAttachments;
+}
 function shell(command, args, options) {
   try {
     const result = spawnSync(command, args, { encoding: "utf-8", ...options });
@@ -342,6 +365,7 @@ export {
   parseStringDate,
   resolveAttachmentPaths,
   retryWithBackoff,
+  saveReportAndAttachments,
   sha1Buffer,
   sha1File,
   shell,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flakiness/sdk",
-  "version": "0.130.0",
+  "version": "0.132.0",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -50,7 +50,7 @@
   "author": "Degu Labs, Inc",
   "license": "Fair Source 100",
   "devDependencies": {
-    "@flakiness/server": "0.130.0",
+    "@flakiness/server": "0.132.0",
     "@playwright/test": "^1.54.0",
     "@types/babel__code-frame": "^7.0.6",
     "@types/compression": "^1.8.1",
@@ -58,8 +58,8 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@flakiness/report": "0.130.0",
-    "@flakiness/shared": "0.130.0",
+    "@flakiness/report": "0.132.0",
+    "@flakiness/shared": "0.132.0",
     "@rgrove/parse-xml": "^4.2.0",
     "body-parser": "^1.20.3",
     "chalk": "^5.6.2",