ortoni-report 4.0.2-beta.0 → 4.0.2-beta.1

package/dist/cli/cli.js

@@ -88,6 +88,10 @@ function openBrowser(url) {
 }
 
 // src/cli/cli.ts
+var fs3 = __toESM(require("fs"));
+var path4 = __toESM(require("path"));
+
+// src/cli/mergeData.ts
 var fs2 = __toESM(require("fs"));
 var path3 = __toESM(require("path"));
 
@@ -383,6 +387,75 @@ var DatabaseManager = class {
   }
 };
 
+// src/helpers/fileManager.ts
+var import_fs = __toESM(require("fs"));
+var import_path2 = __toESM(require("path"));
+var FileManager = class {
+  constructor(folderPath) {
+    this.folderPath = folderPath;
+  }
+  ensureReportDirectory() {
+    const ortoniDataFolder = import_path2.default.join(this.folderPath, "ortoni-data");
+    if (!import_fs.default.existsSync(this.folderPath)) {
+      import_fs.default.mkdirSync(this.folderPath, { recursive: true });
+    } else {
+      if (import_fs.default.existsSync(ortoniDataFolder)) {
+        import_fs.default.rmSync(ortoniDataFolder, { recursive: true, force: true });
+      }
+    }
+  }
+  writeReportFile(filename, data) {
+    const templatePath = import_path2.default.join(__dirname, "..", "index.html");
+    console.log("temp path - " + templatePath);
+    let html = import_fs.default.readFileSync(templatePath, "utf-8");
+    const reportJSON = JSON.stringify({
+      data
+    });
+    html = html.replace("__ORTONI_TEST_REPORTDATA__", reportJSON);
+    import_fs.default.writeFileSync(filename, html);
+    return filename;
+  }
+  writeRawFile(filename, data) {
+    const outputPath = import_path2.default.join(process.cwd(), this.folderPath, filename);
+    import_fs.default.mkdirSync(import_path2.default.dirname(outputPath), { recursive: true });
+    const content = typeof data === "string" ? data : JSON.stringify(data, null, 2);
+    import_fs.default.writeFileSync(outputPath, content, "utf-8");
+    return outputPath;
+  }
+  copyTraceViewerAssets(skip) {
+    if (skip) return;
+    const traceViewerFolder = import_path2.default.join(
+      require.resolve("playwright-core"),
+      "..",
+      "lib",
+      "vite",
+      "traceViewer"
+    );
+    const traceViewerTargetFolder = import_path2.default.join(this.folderPath, "trace");
+    const traceViewerAssetsTargetFolder = import_path2.default.join(
+      traceViewerTargetFolder,
+      "assets"
+    );
+    import_fs.default.mkdirSync(traceViewerAssetsTargetFolder, { recursive: true });
+    for (const file of import_fs.default.readdirSync(traceViewerFolder)) {
+      if (file.endsWith(".map") || file.includes("watch") || file.includes("assets"))
+        continue;
+      import_fs.default.copyFileSync(
+        import_path2.default.join(traceViewerFolder, file),
+        import_path2.default.join(traceViewerTargetFolder, file)
+      );
+    }
+    const assetsFolder = import_path2.default.join(traceViewerFolder, "assets");
+    for (const file of import_fs.default.readdirSync(assetsFolder)) {
+      if (file.endsWith(".map") || file.includes("xtermModule")) continue;
+      import_fs.default.copyFileSync(
+        import_path2.default.join(assetsFolder, file),
+        import_path2.default.join(traceViewerAssetsTargetFolder, file)
+      );
+    }
+  }
+};
+
 // src/utils/groupProjects.ts
 function groupResults(config, results) {
   if (config.showProject) {
@@ -535,116 +608,21 @@ var HTMLGenerator = class {
   }
 };
 
-// src/helpers/fileManager.ts
-var import_fs = __toESM(require("fs"));
-var import_path2 = __toESM(require("path"));
-var FileManager = class {
-  constructor(folderPath) {
-    this.folderPath = folderPath;
-  }
-  ensureReportDirectory() {
-    const ortoniDataFolder = import_path2.default.join(this.folderPath, "ortoni-data");
-    if (!import_fs.default.existsSync(this.folderPath)) {
-      import_fs.default.mkdirSync(this.folderPath, { recursive: true });
-    } else {
-      if (import_fs.default.existsSync(ortoniDataFolder)) {
-        import_fs.default.rmSync(ortoniDataFolder, { recursive: true, force: true });
-      }
-    }
-  }
-  writeReportFile(filename, data) {
-    const templatePath = import_path2.default.join(__dirname, "..", "index.html");
-    console.log("temp path - " + templatePath);
-    let html = import_fs.default.readFileSync(templatePath, "utf-8");
-    const reportJSON = JSON.stringify({
-      data
-    });
-    html = html.replace("__ORTONI_TEST_REPORTDATA__", reportJSON);
-    import_fs.default.writeFileSync(filename, html);
-    return filename;
-  }
-  writeRawFile(filename, data) {
-    const outputPath = import_path2.default.join(process.cwd(), this.folderPath, filename);
-    import_fs.default.mkdirSync(import_path2.default.dirname(outputPath), { recursive: true });
-    const content = typeof data === "string" ? data : JSON.stringify(data, null, 2);
-    import_fs.default.writeFileSync(outputPath, content, "utf-8");
-    return outputPath;
-  }
-  copyTraceViewerAssets(skip) {
-    if (skip) return;
-    const traceViewerFolder = import_path2.default.join(
-      require.resolve("playwright-core"),
-      "..",
-      "lib",
-      "vite",
-      "traceViewer"
-    );
-    const traceViewerTargetFolder = import_path2.default.join(this.folderPath, "trace");
-    const traceViewerAssetsTargetFolder = import_path2.default.join(
-      traceViewerTargetFolder,
-      "assets"
-    );
-    import_fs.default.mkdirSync(traceViewerAssetsTargetFolder, { recursive: true });
-    for (const file of import_fs.default.readdirSync(traceViewerFolder)) {
-      if (file.endsWith(".map") || file.includes("watch") || file.includes("assets"))
-        continue;
-      import_fs.default.copyFileSync(
-        import_path2.default.join(traceViewerFolder, file),
-        import_path2.default.join(traceViewerTargetFolder, file)
-      );
-    }
-    const assetsFolder = import_path2.default.join(traceViewerFolder, "assets");
-    for (const file of import_fs.default.readdirSync(assetsFolder)) {
-      if (file.endsWith(".map") || file.includes("xtermModule")) continue;
-      import_fs.default.copyFileSync(
-        import_path2.default.join(assetsFolder, file),
-        import_path2.default.join(traceViewerAssetsTargetFolder, file)
-      );
-    }
-  }
-};
-
-// src/cli/cli.ts
-import_commander.program.version("2.0.9").description("Ortoni Playwright Test Report CLI");
-import_commander.program.command("show-report").description("Open the generated Ortoni report").option(
-  "-d, --dir <path>",
-  "Path to the folder containing the report",
-  "ortoni-report"
-).option(
-  "-f, --file <filename>",
-  "Name of the report file",
-  "ortoni-report.html"
-).option("-p, --port <port>", "Port to run the server", "2004").action((options) => {
+// src/cli/mergeData.ts
+async function mergerData(options) {
   const projectRoot = process.cwd();
   const folderPath = path3.resolve(projectRoot, options.dir);
-  const filePath = path3.resolve(folderPath, options.file);
-  const port = parseInt(options.port) || 2004;
-  if (!fs2.existsSync(filePath)) {
-    console.error(
-      `\u274C Error: The file "${filePath}" does not exist in "${folderPath}".`
-    );
-    process.exit(1);
-  }
-  startReportServer(folderPath, path3.basename(filePath), port, "always");
-});
-import_commander.program.command("merge-shards").description("Merge sharded reports into one final report").option(
-  "-d, --dir <path>",
-  "Path to the folder containing shard files",
-  "ortoni-report"
-).option("-f, --file <filename>", "Output report file", "ortoni-report.html").action(async (options) => {
-  const projectRoot = process.cwd();
-  const folderPath = path3.resolve(projectRoot, options.dir);
-  console.log("folder - " + folderPath);
-  console.log(`Merging shard files in folder: ${folderPath}`);
-  const filePath = path3.resolve(folderPath, options.file);
+  console.info(`Ortoni Report: Merging shard files in folder: ${folderPath}`);
   const shardFiles = fs2.readdirSync(folderPath).filter((f) => f.startsWith("ortoni-shard-") && f.endsWith(".json"));
   if (shardFiles.length === 0) {
-    console.error("\u274C No shard files found to merge.");
+    console.error("Ortoni Report: \u274C No shard files found to merge.");
     process.exit(1);
   }
   let allResults = [];
   let projectSet = /* @__PURE__ */ new Set();
   let totalDuration = 0;
+  let mergedUserConfig = null;
+  let mergedUserMeta = null;
   for (const file of shardFiles) {
     const shardData = JSON.parse(
       fs2.readFileSync(path3.join(folderPath, file), "utf-8")
@@ -652,6 +630,10 @@ import_commander.program.command("merge-shards").description("Merge sharded repo
     allResults.push(...shardData.results);
     shardData.projectSet.forEach((p) => projectSet.add(p));
     totalDuration += shardData.duration;
+    if (!mergedUserConfig && shardData.userConfig)
+      mergedUserConfig = shardData.userConfig;
+    if (!mergedUserMeta && shardData.userMeta)
+      mergedUserMeta = shardData.userMeta;
   }
   const dbManager = new DatabaseManager();
   await dbManager.initialize(
@@ -660,8 +642,13 @@ import_commander.program.command("merge-shards").description("Merge sharded repo
   const runId = await dbManager.saveTestRun();
   if (typeof runId === "number") {
     await dbManager.saveTestResults(runId, allResults);
+  } else {
+    console.error("Ortoni Report: \u274C Failed to save test run to database.");
   }
-  const htmlGenerator = new HTMLGenerator({}, dbManager);
+  const htmlGenerator = new HTMLGenerator(
+    { ...mergedUserConfig, meta: mergedUserMeta?.meta },
+    dbManager
+  );
   const finalReportData = await htmlGenerator.generateFinalReport(
     allResults.filter((r) => r.status !== "skipped"),
     totalDuration,
@@ -669,7 +656,43 @@ import_commander.program.command("merge-shards").description("Merge sharded repo
     projectSet
   );
   const fileManager = new FileManager(folderPath);
-  const outputPath = fileManager.writeReportFile(filePath, finalReportData);
+  const outputFileName = options.file || "ortoni-report.html";
+  const outputFilenamePath = path3.join(folderPath, outputFileName);
+  const outputPath = fileManager.writeReportFile(
+    outputFilenamePath,
+    finalReportData
+  );
   console.log(`\u2705 Final merged report generated at ${outputPath}`);
+}
+
+// src/cli/cli.ts
+import_commander.program.version("4.0.1").description("Ortoni Report - CLI");
+import_commander.program.command("show-report").description("Open Ortoni Report").option(
+  "-d, --dir <path>",
+  "Path to the folder containing the report",
+  "ortoni-report"
+).option(
+  "-f, --file <filename>",
+  "Name of the report file",
+  "ortoni-report.html"
+).option("-p, --port <port>", "Port to run the server", "2004").action((options) => {
+  const projectRoot = process.cwd();
+  const folderPath = path4.resolve(projectRoot, options.dir);
+  const filePath = path4.resolve(folderPath, options.file);
+  const port = parseInt(options.port) || 2004;
+  if (!fs3.existsSync(filePath)) {
+    console.error(
+      `\u274C Error: The file "${filePath}" does not exist in "${folderPath}".`
+    );
+    process.exit(1);
+  }
+  startReportServer(folderPath, path4.basename(filePath), port, "always");
+});
+import_commander.program.command("merge-report").description("Merge sharded reports into one final report").option(
+  "-d, --dir <path>",
+  "Path to the folder containing shard files",
+  "ortoni-report"
+).option("-f, --file <filename>", "Output report file", "ortoni-report.html").action(async (options) => {
+  await mergerData(options);
 });
 import_commander.program.parse(process.argv);

package/dist/cli/cli.mjs

@@ -8,48 +8,26 @@ import {
 
 // src/cli/cli.ts
 import { program } from "commander";
+import * as fs2 from "fs";
+import * as path2 from "path";
+
+// src/cli/mergeData.ts
 import * as fs from "fs";
 import * as path from "path";
-program.version("2.0.9").description("Ortoni Playwright Test Report CLI");
-program.command("show-report").description("Open the generated Ortoni report").option(
-  "-d, --dir <path>",
-  "Path to the folder containing the report",
-  "ortoni-report"
-).option(
-  "-f, --file <filename>",
-  "Name of the report file",
-  "ortoni-report.html"
-).option("-p, --port <port>", "Port to run the server", "2004").action((options) => {
+async function mergerData(options) {
   const projectRoot = process.cwd();
   const folderPath = path.resolve(projectRoot, options.dir);
-  const filePath = path.resolve(folderPath, options.file);
-  const port = parseInt(options.port) || 2004;
-  if (!fs.existsSync(filePath)) {
-    console.error(
-      `\u274C Error: The file "${filePath}" does not exist in "${folderPath}".`
-    );
-    process.exit(1);
-  }
-  startReportServer(folderPath, path.basename(filePath), port, "always");
-});
-program.command("merge-shards").description("Merge sharded reports into one final report").option(
-  "-d, --dir <path>",
-  "Path to the folder containing shard files",
-  "ortoni-report"
-).option("-f, --file <filename>", "Output report file", "ortoni-report.html").action(async (options) => {
-  const projectRoot = process.cwd();
-  const folderPath = path.resolve(projectRoot, options.dir);
-  console.log("folder - " + folderPath);
-  console.log(`Merging shard files in folder: ${folderPath}`);
-  const filePath = path.resolve(folderPath, options.file);
+  console.info(`Ortoni Report: Merging shard files in folder: ${folderPath}`);
   const shardFiles = fs.readdirSync(folderPath).filter((f) => f.startsWith("ortoni-shard-") && f.endsWith(".json"));
   if (shardFiles.length === 0) {
-    console.error("\u274C No shard files found to merge.");
+    console.error("Ortoni Report: \u274C No shard files found to merge.");
     process.exit(1);
   }
   let allResults = [];
   let projectSet = /* @__PURE__ */ new Set();
   let totalDuration = 0;
+  let mergedUserConfig = null;
+  let mergedUserMeta = null;
   for (const file of shardFiles) {
     const shardData = JSON.parse(
       fs.readFileSync(path.join(folderPath, file), "utf-8")
@@ -57,6 +35,10 @@ program.command("merge-shards").description("Merge sharded reports into one fina
     allResults.push(...shardData.results);
     shardData.projectSet.forEach((p) => projectSet.add(p));
     totalDuration += shardData.duration;
+    if (!mergedUserConfig && shardData.userConfig)
+      mergedUserConfig = shardData.userConfig;
+    if (!mergedUserMeta && shardData.userMeta)
+      mergedUserMeta = shardData.userMeta;
   }
   const dbManager = new DatabaseManager();
   await dbManager.initialize(
@@ -65,8 +47,13 @@ program.command("merge-shards").description("Merge sharded reports into one fina
   const runId = await dbManager.saveTestRun();
   if (typeof runId === "number") {
     await dbManager.saveTestResults(runId, allResults);
+  } else {
+    console.error("Ortoni Report: \u274C Failed to save test run to database.");
   }
-  const htmlGenerator = new HTMLGenerator({}, dbManager);
+  const htmlGenerator = new HTMLGenerator(
+    { ...mergedUserConfig, meta: mergedUserMeta?.meta },
+    dbManager
+  );
   const finalReportData = await htmlGenerator.generateFinalReport(
     allResults.filter((r) => r.status !== "skipped"),
     totalDuration,
@@ -74,7 +61,43 @@ program.command("merge-shards").description("Merge sharded reports into one fina
     projectSet
   );
   const fileManager = new FileManager(folderPath);
-  const outputPath = fileManager.writeReportFile(filePath, finalReportData);
+  const outputFileName = options.file || "ortoni-report.html";
+  const outputFilenamePath = path.join(folderPath, outputFileName);
+  const outputPath = fileManager.writeReportFile(
+    outputFilenamePath,
+    finalReportData
+  );
   console.log(`\u2705 Final merged report generated at ${outputPath}`);
+}
+
+// src/cli/cli.ts
+program.version("4.0.1").description("Ortoni Report - CLI");
+program.command("show-report").description("Open Ortoni Report").option(
+  "-d, --dir <path>",
+  "Path to the folder containing the report",
+  "ortoni-report"
+).option(
+  "-f, --file <filename>",
+  "Name of the report file",
+  "ortoni-report.html"
+).option("-p, --port <port>", "Port to run the server", "2004").action((options) => {
+  const projectRoot = process.cwd();
+  const folderPath = path2.resolve(projectRoot, options.dir);
+  const filePath = path2.resolve(folderPath, options.file);
+  const port = parseInt(options.port) || 2004;
+  if (!fs2.existsSync(filePath)) {
+    console.error(
+      `\u274C Error: The file "${filePath}" does not exist in "${folderPath}".`
+    );
+    process.exit(1);
+  }
+  startReportServer(folderPath, path2.basename(filePath), port, "always");
+});
+program.command("merge-report").description("Merge sharded reports into one final report").option(
+  "-d, --dir <path>",
+  "Path to the folder containing shard files",
+  "ortoni-report"
+).option("-f, --file <filename>", "Output report file", "ortoni-report.html").action(async (options) => {
+  await mergerData(options);
 });
 program.parse(process.argv);

package/dist/ortoni-report.js

@@ -2072,7 +2072,16 @@ var OrtoniReport = class {
             status: result.status,
             duration: totalDuration,
             results: this.results,
-            projectSet: Array.from(this.projectSet)
+            projectSet: Array.from(this.projectSet),
+            userConfig: {
+              projectName: this.ortoniConfig.projectName,
+              authorName: this.ortoniConfig.authorName,
+              type: this.ortoniConfig.testType,
+              title: this.ortoniConfig.title
+            },
+            userMeta: {
+              meta: this.ortoniConfig.meta
+            }
           };
           this.fileManager.writeRawFile(shardFile, shardData);
           console.log(`\u{1F4E6} OrtoniReport wrote shard file: ${shardFile}`);

package/dist/ortoni-report.mjs

@@ -1434,7 +1434,16 @@ var OrtoniReport = class {
             status: result.status,
             duration: totalDuration,
             results: this.results,
-            projectSet: Array.from(this.projectSet)
+            projectSet: Array.from(this.projectSet),
+            userConfig: {
+              projectName: this.ortoniConfig.projectName,
+              authorName: this.ortoniConfig.authorName,
+              type: this.ortoniConfig.testType,
+              title: this.ortoniConfig.title
+            },
+            userMeta: {
+              meta: this.ortoniConfig.meta
+            }
           };
           this.fileManager.writeRawFile(shardFile, shardData);
           console.log(`\u{1F4E6} OrtoniReport wrote shard file: ${shardFile}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ortoni-report",
-  "version": "4.0.2-beta.0",
+  "version": "4.0.2-beta.1",
   "description": "Playwright Report By LetCode with Koushik",
   "scripts": {
     "tsc": "tsc",