@allurereport/plugin-classic 3.15.0 → 3.16.1

package/dist/converters.d.ts

@@ -1,5 +1,5 @@
 import { type TestFixtureResult, type TestResult, type TestStepResult } from "@allurereport/core-api";
-import type { ClassicFixtureResult, ClassicTestResult, ClassicTestStepResult } from "@allurereport/web-classic";
-export declare const convertTestResult: (tr: TestResult) => ClassicTestResult;
-export declare const convertTestStepResult: (tsr: TestStepResult) => ClassicTestStepResult;
-export declare const convertFixtureResult: (fr: TestFixtureResult) => ClassicFixtureResult;
+import type { ReportFixtureResult, ReportTestResult, ReportTestStepResult } from "@allurereport/plugin-api";
+export declare const convertTestResult: (tr: TestResult) => ReportTestResult;
+export declare const convertTestStepResult: (tsr: TestStepResult) => ReportTestStepResult;
+export declare const convertFixtureResult: (fr: TestFixtureResult) => ReportFixtureResult;

package/dist/converters.js

@@ -23,7 +23,6 @@ export const convertTestResult = (tr) => {
         historyId: tr.historyId,
         flaky: tr.flaky,
         muted: tr.muted,
-        known: tr.known,
         isRetry: tr.isRetry,
         labels: tr.labels,
         groupedLabels: mapLabelsByName(tr.labels),

package/dist/generators.d.ts

@@ -1,14 +1,14 @@
 import { type AttachmentLink, type EnvironmentItem, type Statistic } from "@allurereport/core-api";
-import { type AllureStore, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
-import type { ClassicTestResult } from "@allurereport/web-classic";
+import { type AllureStore, type ReportTestResult, type PluginContext, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
 import type { ClassicOptions, TemplateManifest } from "./model.js";
 import type { ClassicDataWriter, ReportFile } from "./writer.js";
-export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
-export declare const generateTestResults: (writer: ClassicDataWriter, store: AllureStore) => Promise<ClassicTestResult[]>;
-export declare const generateTree: (writer: ClassicDataWriter, treeName: string, labels: string[], tests: ClassicTestResult[]) => Promise<void>;
+export declare const readTemplateManifest: (_singleFileMode?: boolean) => Promise<TemplateManifest>;
+export declare const generateTestResults: (writer: ClassicDataWriter, store: AllureStore) => Promise<ReportTestResult[]>;
+export declare const generateTree: (writer: ClassicDataWriter, treeName: string, labels: string[], tests: ReportTestResult[]) => Promise<void>;
 export declare const generateEnvironmentJson: (writer: ClassicDataWriter, env: EnvironmentItem[]) => Promise<void>;
 export declare const generateStatistic: (writer: ClassicDataWriter, statistic: Statistic) => Promise<void>;
 export declare const generatePieChart: (writer: ClassicDataWriter, statistic: Statistic) => Promise<void>;
+export declare const generateAllCharts: (writer: ClassicDataWriter, store: AllureStore, options: ClassicOptions, context: PluginContext) => Promise<void>;
 export declare const generateAttachmentsFiles: (writer: ClassicDataWriter, attachmentLinks: AttachmentLink[], contentFunction: (id: string) => Promise<ResultFile | undefined>) => Promise<Map<string, string>>;
 export declare const generateHistoryDataPoints: (writer: ClassicDataWriter, store: AllureStore) => Promise<Map<string, string>>;
 export declare const generateStaticFiles: (payload: ClassicOptions & {
@@ -18,4 +18,4 @@ export declare const generateStaticFiles: (payload: ClassicOptions & {
     reportUuid: string;
     reportName: string;
 }) => Promise<void>;
-export declare const generateTreeByCategories: (writer: ClassicDataWriter, treeName: string, tests: ClassicTestResult[]) => Promise<void>;
+export declare const generateTreeByCategories: (writer: ClassicDataWriter, treeName: string, tests: ReportTestResult[]) => Promise<void>;

package/dist/generators.js

@@ -1,13 +1,13 @@
-import { readFile } from "node:fs/promises";
-import { createRequire } from "node:module";
-import { basename, join } from "node:path";
+import { randomUUID } from "node:crypto";
+import { defaultChartsConfig } from "@allurereport/charts-api";
 import { compareBy, createBaseUrlScript, createFontLinkTag, createReportDataScript, stringifyForInlineScript, createScriptTag, createStylesLinkTag, incrementStatistic, nullsLast, ordinal, } from "@allurereport/core-api";
 import { createTreeByCategories, createTreeByLabels, processTree, } from "@allurereport/plugin-api";
-import { getPieChartValues } from "@allurereport/web-commons";
+import { copyReportStaticAssets, getReportStaticAsset, readReportStaticAssets, } from "@allurereport/plugin-api/static-assets";
+import { generateCharts, getPieChartValues } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
 import { matchCategories } from "./categories.js";
 import { convertFixtureResult, convertTestResult } from "./converters.js";
-const require = createRequire(import.meta.url);
+const reportStaticArchive = new URL("../dist/static/report.tar", import.meta.url);
 const template = `<!DOCTYPE html>
 <html dir="ltr" lang="en">
 <head>
@@ -50,10 +50,9 @@ const writeConcurrently = async (items, write, concurrency = 64) => {
         await Promise.all(items.slice(i, i + concurrency).map(write));
     }
 };
-export const readTemplateManifest = async (singleFileMode) => {
-    const templateManifestSource = require.resolve(`@allurereport/web-classic/dist/${singleFileMode ? "single" : "multi"}/manifest.json`);
-    const templateManifest = await readFile(templateManifestSource, { encoding: "utf-8" });
-    return JSON.parse(templateManifest);
+export const readTemplateManifest = async (_singleFileMode) => {
+    const { manifest } = await readReportStaticAssets(reportStaticArchive);
+    return manifest;
 };
 const createBreadcrumbs = (convertedTr) => {
     const labelsByType = convertedTr.labels.reduce((acc, label) => {
@@ -152,6 +151,13 @@ export const generatePieChart = async (writer, statistic) => {
     const chartData = getPieChartValues(statistic);
     await writer.writeWidget("allure_pie_chart.json", chartData);
 };
+export const generateAllCharts = async (writer, store, options, context) => {
+    const { filter } = options;
+    const generatedChartsData = await generateCharts(defaultChartsConfig, store, context.reportName, randomUUID, filter);
+    if (Object.keys(generatedChartsData.general).length > 0) {
+        await writer.writeWidget("charts.json", generatedChartsData);
+    }
+};
 export const generateAttachmentsFiles = async (writer, attachmentLinks, contentFunction) => {
     const result = new Map();
     for (const { id, ext, ...link } of attachmentLinks) {
@@ -178,14 +184,14 @@ export const generateHistoryDataPoints = async (writer, store) => {
     return result;
 };
 export const generateStaticFiles = async (payload) => {
-    const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "auto", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
-    const manifest = await readTemplateManifest(payload.singleFile);
+    const { reportName = "Allure Report", reportLanguage = "en", logo = "", theme = "auto", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
+    const staticAssets = await readReportStaticAssets(reportStaticArchive);
+    const { manifest } = staticAssets;
     const headTags = [];
     const bodyTags = [];
     if (!payload.singleFile) {
         for (const key in manifest) {
             const fileName = manifest[key];
-            const filePath = require.resolve(join("@allurereport/web-classic/dist", singleFile ? "single" : "multi", fileName));
             if (key.includes(".woff")) {
                 headTags.push(createFontLinkTag(fileName));
             }
@@ -195,17 +201,17 @@ export const generateStaticFiles = async (payload) => {
             if (key === "main.js") {
                 bodyTags.push(createScriptTag(fileName));
             }
-            if (singleFile) {
-                continue;
-            }
-            const fileContent = await readFile(filePath);
-            await reportFiles.addFile(basename(filePath), fileContent);
         }
+        await copyReportStaticAssets(staticAssets, reportFiles);
     }
     else {
         const mainJs = manifest["main.js"];
-        const mainJsSource = require.resolve(`@allurereport/web-classic/dist/single/${mainJs}`);
-        const mainJsContentBuffer = await readFile(mainJsSource);
+        const mainCss = manifest["main.css"];
+        if (mainCss) {
+            const mainCssContent = getReportStaticAsset(staticAssets, mainCss);
+            headTags.push(createStylesLinkTag(`data:text/css;base64,${mainCssContent.toString("base64")}`));
+        }
+        const mainJsContentBuffer = getReportStaticAsset(staticAssets, mainJs);
         bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
     }
     const now = Date.now();

package/dist/plugin.js

@@ -12,7 +12,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _ClassicPlugin_writer, _ClassicPlugin_generate;
 import { createPluginSummary, } from "@allurereport/plugin-api";
 import { preciseTreeLabels } from "@allurereport/plugin-api";
-import { generateAttachmentsFiles, generateEnvironmentJson, generateHistoryDataPoints, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, generateTreeByCategories, } from "./generators.js";
+import { generateAllCharts, generateAttachmentsFiles, generateEnvironmentJson, generateHistoryDataPoints, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, generateTreeByCategories, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
 export class ClassicPlugin {
     constructor(options = {}) {
@@ -25,6 +25,7 @@ export class ClassicPlugin {
             const attachments = await store.allAttachments();
             await generateStatistic(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), statistic);
             await generatePieChart(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), statistic);
+            await generateAllCharts(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), store, this.options, context);
             const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _ClassicPlugin_writer, "f"), store);
             const treeLabels = preciseTreeLabels(!groupBy.length ? ["parentSuite", "suite", "subSuite"] : groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name));
             const behaviorLabels = preciseTreeLabels(!groupBy.length ? ["epic", "feature", "story"] : groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name));

package/dist/writer.d.ts

@@ -1,5 +1,4 @@
-import type { ReportFiles, ResultFile } from "@allurereport/plugin-api";
-import type { AwesomeTestResult } from "@allurereport/web-awesome";
+import type { ReportTestResult, ReportFiles, ResultFile } from "@allurereport/plugin-api";
 export interface ReportFile {
     name: string;
     value: string;
@@ -7,7 +6,7 @@ export interface ReportFile {
 export interface ClassicDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
 export declare class FileSystemReportDataWriter implements ClassicDataWriter {
@@ -16,14 +15,14 @@ export declare class FileSystemReportDataWriter implements ClassicDataWriter {
     constructor(output: string);
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
 export declare class InMemoryReportDataWriter implements ClassicDataWriter {
     #private;
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(fileName: string, file: ResultFile): Promise<void>;
     reportFiles(): ReportFile[];
 }
@@ -33,5 +32,5 @@ export declare class ReportFileDataWriter implements ClassicDataWriter {
     writeData(fileName: string, data: any): Promise<void>;
     writeWidget(fileName: string, data: any): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
-    writeTestCase(test: AwesomeTestResult): Promise<void>;
+    writeTestCase(test: ReportTestResult): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.15.0",
+  "version": "3.16.1",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -23,23 +23,23 @@
     ".": "./dist/index.js"
   },
   "scripts": {
-    "build": "run clean && tsc --project ./tsconfig.json",
+    "build": "run clean && tsc --project ./tsconfig.json && node ../../scripts/pack-report-static.mjs ../web-classic/dist/multi ./dist/static/report.tar",
     "clean": "rimraf ./dist",
     "test": "rimraf ./out && vitest run",
     "lint": "oxlint --import-plugin src test features stories",
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.15.0",
-    "@allurereport/plugin-api": "3.15.0",
-    "@allurereport/web-awesome": "3.15.0",
-    "@allurereport/web-classic": "3.15.0",
-    "@allurereport/web-commons": "3.15.0",
+    "@allurereport/charts-api": "3.16.1",
+    "@allurereport/core-api": "3.16.1",
+    "@allurereport/plugin-api": "3.16.1",
+    "@allurereport/web-commons": "3.16.1",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.9",
     "markdown-it": "^14.2.0"
   },
   "devDependencies": {
+    "@allurereport/web-classic": "3.16.1",
     "@types/d3-shape": "^3.1.8",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^20",