@allurereport/plugin-classic 3.14.3 → 3.16.0

package/dist/generators.d.ts

@@ -1,5 +1,5 @@
 import { type AttachmentLink, type EnvironmentItem, type Statistic } from "@allurereport/core-api";
-import { type AllureStore, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
+import { type AllureStore, type PluginContext, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
 import type { ClassicTestResult } from "@allurereport/web-classic";
 import type { ClassicOptions, TemplateManifest } from "./model.js";
 import type { ClassicDataWriter, ReportFile } from "./writer.js";
@@ -9,6 +9,7 @@ export declare const generateTree: (writer: ClassicDataWriter, treeName: string,
 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 & {

package/dist/generators.js

@@ -1,9 +1,11 @@
+import { randomUUID } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { basename, join } from "node:path";
+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 { generateCharts, getPieChartValues } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
 import { matchCategories } from "./categories.js";
 import { convertFixtureResult, convertTestResult } from "./converters.js";
@@ -85,7 +87,9 @@ export const generateTestResults = async (writer, store) => {
     let convertedTrs = [];
     for (const tr of allTr) {
         const trFixtures = related.fixturesByTrId.get(tr.id) ?? [];
-        const convertedTrFixtures = trFixtures.map(convertFixtureResult);
+        const convertedTrFixtures = [...trFixtures]
+            .sort(nullsLast(compareBy("start", ordinal())))
+            .map(convertFixtureResult);
         const convertedTr = convertTestResult(tr);
         const { error, status, flaky } = convertedTr;
         const matchedCategories = matchCategories(categories, {
@@ -150,6 +154,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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.14.3",
+  "version": "3.16.0",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -30,11 +30,12 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.14.3",
-    "@allurereport/plugin-api": "3.14.3",
-    "@allurereport/web-awesome": "3.14.3",
-    "@allurereport/web-classic": "3.14.3",
-    "@allurereport/web-commons": "3.14.3",
+    "@allurereport/charts-api": "3.16.0",
+    "@allurereport/core-api": "3.16.0",
+    "@allurereport/plugin-api": "3.16.0",
+    "@allurereport/web-awesome": "3.16.0",
+    "@allurereport/web-classic": "3.16.0",
+    "@allurereport/web-commons": "3.16.0",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.9",
     "markdown-it": "^14.2.0"