@allurereport/core 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/api.d.ts

@@ -7,9 +7,10 @@ export interface FullConfig {
     reportFiles: ReportFiles;
     readers?: ResultsReader[];
     plugins?: PluginInstance[];
-    history?: HistoryDataPoint[];
-    historyPath?: string;
+    history: HistoryDataPoint[];
+    historyPath: string;
     appendHistory?: boolean;
+    knownIssuesPath: string;
     known?: KnownTestFailure[];
     qualityGate?: QualityGateConfig;
     realTime?: any;

package/dist/config.d.ts

@@ -1,22 +1,14 @@
 import type { Config } from "@allurereport/plugin-api";
-import type { QualityGateConfig } from "@allurereport/plugin-api";
-import type { FullConfig, PluginInstance } from "./api.js";
-export { defineConfig } from "@allurereport/plugin-api";
-export declare const createConfig: (opts: {
-    reportName?: string;
+import type { FullConfig } from "./api.js";
+export declare const getPluginId: (key: string) => string;
+export declare const findConfig: (cwd: string, configPath?: string) => Promise<string | undefined>;
+export interface ConfigOverride {
+    name?: string;
     output?: string;
     historyPath?: string;
     knownIssuesPath?: string;
-    plugins?: PluginInstance[];
-    qualityGate?: QualityGateConfig;
-    cwd?: string;
-}) => Promise<FullConfig>;
-export declare const getPluginId: (key: string) => string;
-export declare const findRuntimeConfigPath: (cwd?: string) => Promise<string | undefined>;
-export declare const readRuntimeConfig: (configPath?: string, cwd?: string, output?: string, name?: string) => Promise<FullConfig>;
+}
+export declare const readConfig: (cwd?: string, configPath?: string, override?: ConfigOverride) => Promise<FullConfig>;
 export declare const loadConfig: (configPath: string) => Promise<Config>;
-export declare const resolveConfig: (config: Config, override?: {
-    name?: string;
-    output?: string;
-}) => Promise<FullConfig>;
+export declare const resolveConfig: (config: Config, override?: ConfigOverride) => Promise<FullConfig>;
 export declare const resolvePlugin: (path: string) => Promise<any>;

package/dist/config.js

@@ -1,63 +1,69 @@
-import { readdir } from "node:fs/promises";
-import { join, resolve } from "node:path";
+import * as console from "node:console";
+import { stat } from "node:fs/promises";
+import { resolve } from "node:path";
 import * as process from "node:process";
 import { readHistory } from "./history.js";
 import { readKnownIssues } from "./known.js";
 import { FileSystemReportFiles } from "./plugin.js";
 import { importWrapper } from "./utils/module.js";
-export { defineConfig } from "@allurereport/plugin-api";
-export const createConfig = async (opts) => {
-    const { reportName = "Allure Report", output = "allure-report", historyPath, knownIssuesPath, qualityGate, cwd, } = opts;
-    const workingDirectory = cwd ?? process.cwd();
-    const target = resolve(workingDirectory, output);
-    const history = historyPath ? await readHistory(resolve(workingDirectory, historyPath)) : [];
-    const known = knownIssuesPath ? await readKnownIssues(resolve(workingDirectory, knownIssuesPath)) : [];
-    return {
-        name: reportName,
-        history,
-        historyPath,
-        known,
-        qualityGate,
-        plugins: opts.plugins ?? [],
-        reportFiles: new FileSystemReportFiles(target),
-        output: target,
-    };
-};
-const defaultRuntimeConfig = {};
+import { normalizeImportPath } from "./utils/path.js";
 export const getPluginId = (key) => {
     return key.replace(/^@.*\//, "").replace(/[/\\]/g, "-");
 };
-export const findRuntimeConfigPath = async (cwd = process.cwd()) => {
-    const files = await readdir(cwd);
-    if (files.includes("allurerc.js")) {
-        return join(cwd, "allurerc.js");
+const configNames = ["allurerc.js", "allurerc.mjs"];
+const defaultConfig = {};
+export const findConfig = async (cwd, configPath) => {
+    if (configPath) {
+        const resolved = resolve(cwd, configPath);
+        try {
+            const stats = await stat(resolved);
+            if (stats.isFile()) {
+                return resolved;
+            }
+        }
+        catch (e) {
+            console.error(e);
+        }
+        throw new Error(`invalid config path ${resolved}: not a regular file`);
     }
-    if (files.includes("allurerc.mjs")) {
-        return join(cwd, "allurerc.mjs");
+    for (const configName of configNames) {
+        const resolved = resolve(cwd, configName);
+        try {
+            const stats = await stat(resolved);
+            if (stats.isFile()) {
+                return resolved;
+            }
+        }
+        catch (ignored) {
+        }
     }
-    return undefined;
 };
-export const readRuntimeConfig = async (configPath, cwd, output, name) => {
-    const runtimeConfigPath = !configPath ? await findRuntimeConfigPath(cwd) : resolve(cwd ?? process.cwd(), configPath);
-    const runtimeConfig = runtimeConfigPath ? await loadConfig(runtimeConfigPath) : defaultRuntimeConfig;
-    return await resolveConfig(runtimeConfig, { output, name });
+export const readConfig = async (cwd = process.cwd(), configPath, override) => {
+    const cfg = await findConfig(cwd, configPath);
+    const config = cfg ? await loadConfig(cfg) : { ...defaultConfig };
+    return await resolveConfig(config, override);
 };
 export const loadConfig = async (configPath) => {
-    return (await import(configPath)).default;
+    return (await import(normalizeImportPath(configPath))).default;
 };
 export const resolveConfig = async (config, override = {}) => {
-    const { plugins = {}, name, output, historyPath, ...rest } = config;
-    const pluginInstances = await resolvePlugins(plugins);
-    const out = resolve(override.output ?? output ?? "./allure-report");
-    const history = historyPath ? await readHistory(historyPath) : [];
+    const name = override.name ?? config.name ?? "Allure Report";
+    const historyPath = resolve(override.historyPath ?? config.historyPath ?? "./.allure/history.jsonl");
+    const knownIssuesPath = resolve(override.knownIssuesPath ?? config.knownIssuesPath ?? "./allure/known.json");
+    const output = resolve(override.output ?? config.output ?? "./allure-report");
+    const history = await readHistory(historyPath);
+    const known = await readKnownIssues(knownIssuesPath);
+    const pluginInstances = await resolvePlugins(config.plugins ?? {});
     return {
-        ...rest,
-        name: override.name ?? name ?? "Allure Report",
-        reportFiles: new FileSystemReportFiles(out),
+        name,
+        reportFiles: new FileSystemReportFiles(output),
         plugins: pluginInstances,
-        output: out,
+        output,
         history,
         historyPath,
+        knownIssuesPath,
+        known,
+        qualityGate: config.qualityGate,
     };
 };
 export const resolvePlugin = async (path) => {

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 export type * from "./api.js";
 export * from "./utils/misc.js";
 export * from "./utils/crypto.js";
+export * from "./utils/path.js";
 export * from "./history.js";
 export * from "./known.js";
-export * from "./config.js";
+export { resolveConfig, readConfig } from "./config.js";
 export * from "./report.js";
 export * from "./plugin.js";
 export * from "./qualityGate.js";

package/dist/index.js

@@ -1,8 +1,9 @@
 export * from "./utils/misc.js";
 export * from "./utils/crypto.js";
+export * from "./utils/path.js";
 export * from "./history.js";
 export * from "./known.js";
-export * from "./config.js";
+export { resolveConfig, readConfig } from "./config.js";
 export * from "./report.js";
 export * from "./plugin.js";
 export * from "./qualityGate.js";

package/dist/report.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AllureReport_instances, _AllureReport_reportUuid, _AllureReport_reportName, _AllureReport_store, _AllureReport_readers, _AllureReport_plugins, _AllureReport_reportFiles, _AllureReport_eventEmitter, _AllureReport_events, _AllureReport_qualityGate, _AllureReport_appendHistory, _AllureReport_historyPath, _AllureReport_realTime, _AllureReport_state, _AllureReport_stage, _AllureReport_update, _AllureReport_eachPlugin, _AllureReport_getPluginState;
-import { allure1, allure2, attachments, junitXml } from "@allurereport/reader";
+import { allure1, allure2, attachments, cucumberjson, junitXml } from "@allurereport/reader";
 import { PathResultFile } from "@allurereport/reader-api";
 import console from "node:console";
 import { randomUUID } from "node:crypto";
@@ -159,14 +159,14 @@ export class AllureReport {
         this.validate = async () => {
             await __classPrivateFieldGet(this, _AllureReport_qualityGate, "f").validate(__classPrivateFieldGet(this, _AllureReport_store, "f"));
         };
-        const { name, readers = [allure1, allure2, junitXml, attachments], plugins = [], history, known, reportFiles, qualityGate, realTime, appendHistory, historyPath, } = opts;
+        const { name, readers = [allure1, allure2, cucumberjson, junitXml, attachments], plugins = [], history, known, reportFiles, qualityGate, realTime, appendHistory, historyPath, } = opts;
         __classPrivateFieldSet(this, _AllureReport_reportUuid, randomUUID(), "f");
         __classPrivateFieldSet(this, _AllureReport_reportName, name, "f");
         __classPrivateFieldSet(this, _AllureReport_eventEmitter, new EventEmitter(), "f");
         __classPrivateFieldSet(this, _AllureReport_events, new Events(__classPrivateFieldGet(this, _AllureReport_eventEmitter, "f")), "f");
         __classPrivateFieldSet(this, _AllureReport_realTime, realTime, "f");
         __classPrivateFieldSet(this, _AllureReport_appendHistory, appendHistory ?? true, "f");
-        __classPrivateFieldSet(this, _AllureReport_historyPath, historyPath ?? "./.allure/history.jsonl", "f");
+        __classPrivateFieldSet(this, _AllureReport_historyPath, historyPath, "f");
         __classPrivateFieldSet(this, _AllureReport_store, new DefaultAllureStore(history, known, __classPrivateFieldGet(this, _AllureReport_eventEmitter, "f")), "f");
         __classPrivateFieldSet(this, _AllureReport_readers, [...readers], "f");
         __classPrivateFieldSet(this, _AllureReport_plugins, [...plugins], "f");

package/dist/store/convert.js

@@ -1,9 +1,9 @@
 import { notNull } from "@allurereport/core-api";
 import { findByLabelName } from "@allurereport/core-api";
 import { md5 } from "@allurereport/plugin-api";
+import { extension, lookupContentType } from "@allurereport/reader-api";
 import MarkdownIt from "markdown-it";
 import { randomUUID } from "node:crypto";
-import { extname } from "node:path";
 const defaultStatus = "unknown";
 export const __unknown = "#___unknown_value___#";
 export const testFixtureResultRawToState = (stateData, raw, context) => {
@@ -102,12 +102,14 @@ const processAttachmentLink = ({ attachments, visitAttachmentLink }, attach) =>
     const id = md5(attach.originalFileName);
     const previous = attachments.get(id);
     if (!previous) {
+        const contentType = attach.contentType ?? lookupContentType(attach.originalFileName);
+        const ext = extension(attach.originalFileName, contentType) ?? "";
         const linkExpected = {
             id,
             originalFileName: attach.originalFileName,
-            ext: extname(attach.originalFileName),
+            ext,
             name: attach.name ?? attach.originalFileName,
-            contentType: attach.contentType,
+            contentType,
             used: true,
             missed: true,
         };
@@ -131,6 +133,7 @@ const processAttachmentLink = ({ attachments, visitAttachmentLink }, attach) =>
         id,
         name: attach.name ?? previous.originalFileName,
         contentType: attach.contentType ?? previous.contentType,
+        ext: extension(previous.originalFileName, attach.contentType) ?? previous.ext ?? "",
         contentLength: previous.contentLength,
         used: true,
         missed: false,

package/dist/store/store.d.ts

@@ -15,7 +15,7 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     constructor(history?: HistoryDataPoint[], known?: KnownTestFailure[], eventEmitter?: EventEmitter<AllureStoreEvents>);
     visitTestResult(raw: RawTestResult, context: ReaderContext): Promise<void>;
     visitTestFixtureResult(result: RawFixtureResult, context: ReaderContext): Promise<void>;
-    visitAttachmentFile(resultFile: ResultFile): Promise<void>;
+    visitAttachmentFile(resultFile: ResultFile, context: ReaderContext): Promise<void>;
     visitMetadata(metadata: RawMetadata): Promise<void>;
     allTestCases(): Promise<TestCase[]>;
     allTestResults(options?: {

package/dist/store/store.js

@@ -12,7 +12,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _DefaultAllureStore_testResults, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_known, _DefaultAllureStore_fixtures, _DefaultAllureStore_eventEmitter;
 import { compareBy, nullsLast, ordinal, reverse } from "@allurereport/core-api";
 import { md5 } from "@allurereport/plugin-api";
-import { extname } from "node:path";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
 const index = (indexMap, key, ...items) => {
     if (key) {
@@ -93,7 +92,7 @@ export class DefaultAllureStore {
         index(this.indexAttachmentByFixture, testFixtureResult.id, ...attachmentLinks);
         __classPrivateFieldGet(this, _DefaultAllureStore_eventEmitter, "f")?.emit("testFixtureResult", testFixtureResult.id);
     }
-    async visitAttachmentFile(resultFile) {
+    async visitAttachmentFile(resultFile, context) {
         const originalFileName = resultFile.getOriginalFileName();
         const id = md5(originalFileName);
         __classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f").set(id, resultFile);
@@ -101,7 +100,7 @@ export class DefaultAllureStore {
         if (maybeLink) {
             const link = maybeLink;
             link.missed = false;
-            link.ext = link?.ext ?? extname(originalFileName);
+            link.ext = link.ext === undefined || link.ext === "" ? resultFile.getExtension() : link.ext;
             link.contentType = link.contentType ?? resultFile.getContentType();
             link.contentLength = resultFile.getContentLength();
         }
@@ -111,7 +110,7 @@ export class DefaultAllureStore {
                 missed: false,
                 id,
                 originalFileName,
-                ext: extname(originalFileName),
+                ext: resultFile.getExtension(),
                 contentType: resultFile.getContentType(),
                 contentLength: resultFile.getContentLength(),
             });

package/dist/utils/module.js

@@ -1,3 +1,6 @@
+import { createRequire } from "node:module";
+import { normalizeImportPath } from "./path.js";
+const require = createRequire(import.meta.url);
 export const importWrapper = async (path) => {
-    return import(path);
+    return import(normalizeImportPath(require.resolve(path)));
 };

package/dist/utils/path.d.ts

@@ -0,0 +1 @@
+export declare const normalizeImportPath: (path: string) => string;

package/dist/utils/path.js

@@ -0,0 +1,4 @@
+import { pathToFileURL } from "node:url";
+export const normalizeImportPath = (path) => {
+    return pathToFileURL(path).href;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -25,17 +25,17 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.4",
-    "@allurereport/plugin-api": "3.0.0-beta.4",
-    "@allurereport/plugin-awesome": "3.0.0-beta.4",
-    "@allurereport/plugin-classic": "3.0.0-beta.4",
-    "@allurereport/plugin-csv": "3.0.0-beta.4",
-    "@allurereport/plugin-log": "3.0.0-beta.4",
-    "@allurereport/plugin-progress": "3.0.0-beta.4",
-    "@allurereport/plugin-slack": "3.0.0-beta.4",
-    "@allurereport/plugin-testplan": "3.0.0-beta.4",
-    "@allurereport/reader": "3.0.0-beta.4",
-    "@allurereport/reader-api": "3.0.0-beta.4",
+    "@allurereport/core-api": "3.0.0-beta.6",
+    "@allurereport/plugin-api": "3.0.0-beta.6",
+    "@allurereport/plugin-awesome": "3.0.0-beta.6",
+    "@allurereport/plugin-classic": "3.0.0-beta.6",
+    "@allurereport/plugin-csv": "3.0.0-beta.6",
+    "@allurereport/plugin-log": "3.0.0-beta.6",
+    "@allurereport/plugin-progress": "3.0.0-beta.6",
+    "@allurereport/plugin-slack": "3.0.0-beta.6",
+    "@allurereport/plugin-testplan": "3.0.0-beta.6",
+    "@allurereport/reader": "3.0.0-beta.6",
+    "@allurereport/reader-api": "3.0.0-beta.6",
     "markdown-it": "^14.1.0"
   },
   "devDependencies": {