@allurereport/plugin-classic 3.21.0 → 3.22.1

package/dist/categories.js

@@ -35,7 +35,7 @@ const match = (regex, value) => {
         const b = new RegExp(regex, "s").test(value);
         return b;
     }
-    catch (ignored) {
+    catch {
         return false;
     }
 };

package/dist/converters.d.ts

@@ -1,5 +1,3 @@
-import { type TestFixtureResult, type TestResult, type TestStepResult } from "@allurereport/core-api";
-import type { ReportFixtureResult, ReportTestResult, ReportTestStepResult } from "@allurereport/plugin-api";
+import { type TestResult } from "@allurereport/core-api";
+import type { ReportTestResult } 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

@@ -1,4 +1,5 @@
-import { isStep, redactParameters, } from "@allurereport/core-api";
+import { redactParameters } from "@allurereport/core-api";
+import { convertTestStepResult } from "@allurereport/plugin-api/internal/report";
 import MarkdownIt from "markdown-it";
 const md = new MarkdownIt();
 const markdownToHtml = (value) => (value ? md.render(value) : undefined);
@@ -46,23 +47,3 @@ export const convertTestResult = (tr) => {
         transition: tr.transition,
     };
 };
-export const convertTestStepResult = (tsr) => {
-    if (isStep(tsr)) {
-        return {
-            ...tsr,
-            parameters: redactParameters(tsr.parameters),
-            steps: (tsr.steps ?? []).map(convertTestStepResult),
-        };
-    }
-    return tsr;
-};
-export const convertFixtureResult = (fr) => {
-    return {
-        id: fr.id,
-        type: fr.type,
-        name: fr.name,
-        status: fr.status,
-        steps: fr.steps.map(convertTestStepResult),
-        duration: fr.duration,
-    };
-};

package/dist/generators.d.ts

@@ -1,8 +1,7 @@
 import { type AttachmentLink, type EnvironmentItem, type Statistic } from "@allurereport/core-api";
 import { type AllureStore, type ReportTestResult, type PluginContext, type ReportFiles, type ResultFile } from "@allurereport/plugin-api";
-import type { ClassicOptions, TemplateManifest } from "./model.js";
+import type { ClassicOptions } 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<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>;
@@ -10,7 +9,6 @@ export declare const generateStatistic: (writer: ClassicDataWriter, statistic: S
 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 & {
     allureVersion: string;
     reportFiles: ReportFiles;

package/dist/generators.js

@@ -2,11 +2,12 @@ import { randomUUID } from "node:crypto";
 import { defaultChartsConfig } from "@allurereport/charts-api";
 import { compareBy, createBaseUrlScript, createFontLinkTag, injectReportDataScript, reportDataScriptPlaceholder, stringifyForInlineScript, createScriptTag, createStylesLinkTag, incrementStatistic, nullsLast, ordinal, } from "@allurereport/core-api";
 import { createTreeByCategories, createTreeByLabels, processTree, } from "@allurereport/plugin-api";
+import { convertFixtureResult, writeConcurrently } from "@allurereport/plugin-api/internal/report";
 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";
+import { convertTestResult } from "./converters.js";
 const reportStaticArchive = new URL("../dist/static/report.tar", import.meta.url);
 const template = `<!DOCTYPE html>
 <html dir="ltr" lang="en">
@@ -45,15 +46,6 @@ const template = `<!DOCTYPE html>
 </html>
 `;
 const compiledTemplate = Handlebars.compile(template);
-const writeConcurrently = async (items, write, concurrency = 64) => {
-    for (let i = 0; i < items.length; i += concurrency) {
-        await Promise.all(items.slice(i, i + concurrency).map(write));
-    }
-};
-export const readTemplateManifest = async (_singleFileMode) => {
-    const { manifest } = await readReportStaticAssets(reportStaticArchive);
-    return manifest;
-};
 const createBreadcrumbs = (convertedTr) => {
     const labelsByType = convertedTr.labels.reduce((acc, label) => {
         if (!acc[label.name]) {
@@ -174,15 +166,6 @@ export const generateAttachmentsFiles = async (writer, attachmentLinks, contentF
     }
     return result;
 };
-export const generateHistoryDataPoints = async (writer, store) => {
-    const result = new Map();
-    const allHistoryPoints = await store.allHistoryDataPoints();
-    for (const historyPoint of allHistoryPoints.slice(0, 6)) {
-        const src = `history/${historyPoint.uuid}.json`;
-        await writer.writeData(src, historyPoint);
-    }
-    return result;
-};
 export const generateStaticFiles = async (payload) => {
     const { reportName = "Allure Report", reportLanguage = "en", logo = "", theme = "auto", groupBy, reportFiles, reportDataFiles, reportUuid, allureVersion, overviewHref, } = payload;
     const staticAssets = await readReportStaticAssets(reportStaticArchive);

package/dist/model.d.ts

@@ -13,7 +13,6 @@ export type ClassicOptions = {
     };
     filter?: (tr: TestResult) => boolean;
 };
-export type TemplateManifest = Record<string, string>;
 export type ClassicPluginOptions = ClassicOptions;
 export interface ClassicCategory {
     name: string;

package/dist/plugin.js

@@ -12,7 +12,8 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _ClassicPlugin_writer, _ClassicPlugin_generate;
 import { createPluginSummary, } from "@allurereport/plugin-api";
 import { preciseTreeLabels } from "@allurereport/plugin-api";
-import { generateAllCharts, generateAttachmentsFiles, generateEnvironmentJson, generateHistoryDataPoints, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, generateTreeByCategories, } from "./generators.js";
+import { generateHistoryDataPoints } from "@allurereport/plugin-api/internal/report";
+import { generateAllCharts, generateAttachmentsFiles, generateEnvironmentJson, generatePieChart, generateStaticFiles, generateStatistic, generateTestResults, generateTree, generateTreeByCategories, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
 export class ClassicPlugin {
     constructor(options = {}) {

package/dist/writer.d.ts

@@ -9,15 +9,6 @@ export interface ClassicDataWriter {
     writeTestCase(test: ReportTestResult): Promise<void>;
     writeAttachment(source: string, file: ResultFile): Promise<void>;
 }
-export declare class FileSystemReportDataWriter implements ClassicDataWriter {
-    #private;
-    private readonly output;
-    constructor(output: string);
-    writeData(fileName: string, data: any): Promise<void>;
-    writeWidget(fileName: string, data: any): 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>;

package/dist/writer.js

@@ -1,56 +1,10 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _FileSystemReportDataWriter_dataDir, _FileSystemReportDataWriter_widgetsDir, _FileSystemReportDataWriter_testResultsDir, _FileSystemReportDataWriter_attachmentsDir, _FileSystemReportDataWriter_dataDirReady, _FileSystemReportDataWriter_widgetsDirReady, _FileSystemReportDataWriter_testResultsDirReady, _FileSystemReportDataWriter_attachmentsDirReady, _InMemoryReportDataWriter_data;
-import { mkdir, writeFile } from "node:fs/promises";
-import { resolve } from "node:path";
+var _InMemoryReportDataWriter_data;
 import { joinPosixPath } from "@allurereport/core-api";
-export class FileSystemReportDataWriter {
-    constructor(output) {
-        this.output = output;
-        _FileSystemReportDataWriter_dataDir.set(this, void 0);
-        _FileSystemReportDataWriter_widgetsDir.set(this, void 0);
-        _FileSystemReportDataWriter_testResultsDir.set(this, void 0);
-        _FileSystemReportDataWriter_attachmentsDir.set(this, void 0);
-        _FileSystemReportDataWriter_dataDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_widgetsDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_testResultsDirReady.set(this, void 0);
-        _FileSystemReportDataWriter_attachmentsDirReady.set(this, void 0);
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_dataDir, resolve(this.output, "data"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_widgetsDir, resolve(this.output, "widgets"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_testResultsDir, resolve(this.output, "data", "test-results"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_attachmentsDir, resolve(this.output, "data", "attachments"), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_dataDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_widgetsDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_testResultsDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_testResultsDir, "f"), { recursive: true }), "f");
-        __classPrivateFieldSet(this, _FileSystemReportDataWriter_attachmentsDirReady, mkdir(__classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDir, "f"), { recursive: true }), "f");
-    }
-    async writeData(fileName, data) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_dataDir, "f"), fileName), JSON.stringify(data), { encoding: "utf-8" });
-    }
-    async writeWidget(fileName, data) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_widgetsDir, "f"), fileName), JSON.stringify(data), { encoding: "utf-8" });
-    }
-    async writeTestCase(test) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_testResultsDirReady, "f");
-        await writeFile(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_testResultsDir, "f"), `${test.id}.json`), JSON.stringify(test), { encoding: "utf-8" });
-    }
-    async writeAttachment(source, file) {
-        await __classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDirReady, "f");
-        await file.writeTo(resolve(__classPrivateFieldGet(this, _FileSystemReportDataWriter_attachmentsDir, "f"), source));
-    }
-}
-_FileSystemReportDataWriter_dataDir = new WeakMap(), _FileSystemReportDataWriter_widgetsDir = new WeakMap(), _FileSystemReportDataWriter_testResultsDir = new WeakMap(), _FileSystemReportDataWriter_attachmentsDir = new WeakMap(), _FileSystemReportDataWriter_dataDirReady = new WeakMap(), _FileSystemReportDataWriter_widgetsDirReady = new WeakMap(), _FileSystemReportDataWriter_testResultsDirReady = new WeakMap(), _FileSystemReportDataWriter_attachmentsDirReady = new WeakMap();
 export class InMemoryReportDataWriter {
     constructor() {
         _InMemoryReportDataWriter_data.set(this, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.21.0",
+  "version": "3.22.1",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -25,32 +25,34 @@
   "scripts": {
     "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",
+    "test": "rimraf out && vp test run",
     "test:unit": "yarn test",
-    "lint": "oxlint --import-plugin src test features stories",
-    "lint:fix": "oxlint --import-plugin --fix src test features stories"
+    "lint": "vp lint --import-plugin src test features stories",
+    "lint:fix": "vp lint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/charts-api": "3.21.0",
-    "@allurereport/core-api": "3.21.0",
-    "@allurereport/plugin-api": "3.21.0",
-    "@allurereport/web-commons": "3.21.0",
+    "@allurereport/charts-api": "3.22.1",
+    "@allurereport/core-api": "3.22.1",
+    "@allurereport/plugin-api": "3.22.1",
+    "@allurereport/web-commons": "3.22.1",
     "d3-shape": "^3.2.0",
     "handlebars": "4.7.10",
-    "markdown-it": "^15.0.2"
+    "markdown-it": "^15.0.3"
   },
   "devDependencies": {
-    "@allurereport/test-config": "3.21.0",
-    "@allurereport/web-classic": "3.21.0",
+    "@allurereport/common-config": "3.22.1",
+    "@allurereport/web-classic": "3.22.1",
     "@types/d3-shape": "^3.1.8",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^20",
-    "@vitest/coverage-istanbul": "^4.1.0",
+    "@vitest/coverage-istanbul": "5.0.4",
     "@vitest/runner": "^2",
     "allure-js-commons": "^3",
     "allure-vitest": "^3",
     "rimraf": "^6",
     "typescript": "^5",
-    "vitest": "^4.1.0"
+    "vite": "@voidzero-dev/vite-plus-core@1.2.0",
+    "vite-plus": "1.2.0",
+    "vitest": "5.0.4"
   }
 }