allure 3.0.0-beta.18 → 3.0.0-beta.19

package/dist/commands/generate.d.ts

@@ -7,5 +7,6 @@ export declare class GenerateCommand extends Command {
     output: string | undefined;
     cwd: string | undefined;
     reportName: string | undefined;
+    stage: string[] | undefined;
     execute(): Promise<void>;
 }

package/dist/commands/generate.js

@@ -1,10 +1,10 @@
 import { AllureReport, readConfig } from "@allurereport/core";
-import { findMatching } from "@allurereport/directory-watcher";
 import { KnownError } from "@allurereport/service";
 import { Command, Option } from "clipanion";
-import { join } from "node:path";
-import process from "node:process";
-import pm from "picomatch";
+import { glob } from "glob";
+import * as console from "node:console";
+import { sep } from "node:path";
+import { exit, cwd as processCwd } from "node:process";
 import { red } from "yoctocolors";
 import { logError } from "../utils/logs.js";
 export class GenerateCommand extends Command {
@@ -24,34 +24,51 @@ export class GenerateCommand extends Command {
             description: "The working directory for the command to run (default: current working directory)",
         });
         this.reportName = Option.String("--report-name,--name", {
-            description: "The report name",
+            description: "The report name (default: Allure Report)",
+        });
+        this.stage = Option.Array("--stage", {
+            description: "Stages archives to restore state from (default: empty string)",
         });
     }
     async execute() {
-        const cwd = this.cwd ?? process.cwd();
+        const cwd = this.cwd ?? processCwd();
         const resultsDir = (this.resultsDir ?? "./**/allure-results").replace(/[\\/]$/, "");
         const config = await readConfig(cwd, this.config, {
             name: this.reportName,
             output: this.output ?? "allure-report",
         });
-        const matcher = pm(resultsDir, {
-            dot: true,
-            contains: true,
-        });
-        const resultsDirectories = new Set();
-        await findMatching(cwd, resultsDirectories, (dirent) => {
-            if (dirent.isDirectory()) {
-                const fullPath = join(dirent?.parentPath ?? dirent?.path, dirent.name);
-                return matcher(fullPath);
+        const stageDumpFiles = [];
+        const resultsDirectories = [];
+        if (this.stage?.length) {
+            for (const stage of this.stage) {
+                const matchedFiles = await glob(stage, {
+                    nodir: true,
+                    dot: true,
+                    absolute: true,
+                    windowsPathsNoEscape: true,
+                    cwd,
+                });
+                stageDumpFiles.push(...matchedFiles);
             }
-            return false;
-        });
-        if (resultsDirectories.size === 0) {
+        }
+        if (!!this.resultsDir || stageDumpFiles.length === 0) {
+            const matchedDirs = (await glob(resultsDir, {
+                mark: true,
+                nodir: false,
+                absolute: true,
+                dot: true,
+                windowsPathsNoEscape: true,
+                cwd,
+            })).filter((p) => p.endsWith(sep));
+            resultsDirectories.push(...matchedDirs);
+        }
+        if (resultsDirectories.length === 0 && stageDumpFiles.length === 0) {
             console.log(red(`No test results directories found matching pattern: ${resultsDir}`));
             return;
         }
         try {
             const allureReport = new AllureReport(config);
+            await allureReport.restoreState(Array.from(stageDumpFiles));
             await allureReport.start();
             for (const dir of resultsDirectories) {
                 await allureReport.readDirectory(dir);
@@ -61,11 +78,11 @@ export class GenerateCommand extends Command {
         catch (error) {
             if (error instanceof KnownError) {
                 console.error(red(error.message));
-                process.exit(1);
+                exit(1);
                 return;
             }
             await logError("Failed to generate report due to unexpected error", error);
-            process.exit(1);
+            exit(1);
         }
     }
 }
@@ -79,5 +96,13 @@ GenerateCommand.usage = Command.Usage({
             "generate ./allure-results --output custom-report",
             "Generate a report from the ./allure-results directory to the custom-report directory",
         ],
+        [
+            "generate --stage=windows.zip --stage=macos.zip ./allure-results",
+            "Generate a report using data from windows.zip and macos.zip archives and using results from the ./allure-results directory",
+        ],
+        [
+            "generate --stage=allure-*.zip",
+            "Generate a report using data from any stage archive that matches the given pattern only (ignoring results directories)",
+        ],
     ],
 });

package/dist/commands/qualityGate.js

@@ -1,11 +1,10 @@
 import { AllureReport, QualityGateState, readConfig, stringifyQualityGateResults } from "@allurereport/core";
-import { findMatching } from "@allurereport/directory-watcher";
 import { Command, Option } from "clipanion";
+import { glob } from "glob";
 import * as console from "node:console";
 import { realpath } from "node:fs/promises";
-import { join } from "node:path";
+import { sep } from "node:path";
 import { exit, cwd as processCwd } from "node:process";
-import pm from "picomatch";
 import * as typanion from "typanion";
 import { red } from "yoctocolors";
 export class QualityGateCommand extends Command {
@@ -48,11 +47,6 @@ export class QualityGateCommand extends Command {
             knownIssuesPath,
         });
         const rules = {};
-        const resultsDirectories = new Set();
-        const matcher = pm(resultsDir, {
-            dot: true,
-            contains: true,
-        });
         if (maxFailures !== undefined) {
             rules.maxFailures = maxFailures;
         }
@@ -78,14 +72,15 @@ export class QualityGateCommand extends Command {
             exit(-1);
             return;
         }
-        await findMatching(cwd, resultsDirectories, (dirent) => {
-            if (dirent.isDirectory()) {
-                const fullPath = join(dirent?.parentPath ?? dirent?.path, dirent.name);
-                return matcher(fullPath);
-            }
-            return false;
-        });
-        if (resultsDirectories.size === 0) {
+        const resultsDirectories = (await glob(resultsDir, {
+            mark: true,
+            nodir: false,
+            absolute: true,
+            dot: true,
+            windowsPathsNoEscape: true,
+            cwd,
+        })).filter((p) => p.endsWith(sep));
+        if (resultsDirectories.length === 0) {
             console.error("No Allure results directories found");
             exit(0);
             return;

package/dist/commands/results/pack.js

@@ -4,14 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _ResultsPackCommand_instances, _ResultsPackCommand_formatSize;
-import { findMatching } from "@allurereport/directory-watcher";
 import AdmZip from "adm-zip";
 import { Command, Option } from "clipanion";
+import { glob } from "glob";
 import * as console from "node:console";
 import * as fs from "node:fs/promises";
 import { realpath } from "node:fs/promises";
-import { basename, join, resolve } from "node:path";
-import pm from "picomatch";
+import { basename, join, resolve, sep } from "node:path";
 import { green, red } from "yoctocolors";
 export class ResultsPackCommand extends Command {
     constructor() {
@@ -32,20 +31,16 @@ export class ResultsPackCommand extends Command {
         const cwd = await realpath(this.cwd ?? process.cwd());
         const resultsDir = (this.resultsDir ?? "./**/allure-results").replace(/[\\/]$/, "");
         const archiveName = this.name ?? "allure-results.zip";
-        const resultsDirectories = new Set();
-        const resultsFiles = new Set();
-        const matcher = pm(resultsDir, {
+        const resultsDirectories = (await glob(resultsDir, {
+            mark: true,
+            nodir: false,
             dot: true,
-            contains: true,
-        });
-        await findMatching(cwd, resultsDirectories, (dirent) => {
-            if (dirent.isDirectory()) {
-                const fullPath = join(dirent?.parentPath ?? dirent?.path, dirent.name);
-                return matcher(fullPath);
-            }
-            return false;
-        });
-        if (resultsDirectories.size === 0) {
+            absolute: true,
+            windowsPathsNoEscape: true,
+            cwd,
+        })).filter((p) => p.endsWith(sep));
+        const resultsFiles = new Set();
+        if (resultsDirectories.length === 0) {
             console.log(red(`No test results directories found matching pattern: ${resultsDir}`));
             return;
         }

package/dist/commands/run.d.ts

@@ -16,7 +16,9 @@ export declare class RunCommand extends Command {
     rerun: string | undefined;
     silent: boolean | undefined;
     ignoreLogs: boolean | undefined;
+    stage: string | undefined;
+    environment: string | undefined;
     commandToRun: string[];
-    get logs(): "pipe" | "ignore" | "inherit";
+    get logs(): "pipe" | "inherit" | "ignore";
     execute(): Promise<void>;
 }

package/dist/commands/run.js

@@ -151,6 +151,12 @@ export class RunCommand extends Command {
         this.ignoreLogs = Option.Boolean("--ignore-logs", {
             description: "Prevent logs attaching to the report (default: false)",
         });
+        this.stage = Option.String("--stage", {
+            description: "Runs tests in stage mode to collect results to a stage archive with the provided name (default: empty string)",
+        });
+        this.environment = Option.String("--environment", {
+            description: "Force specific environment to all tests in the run. Given environment has higher priority than the one defined in the config file (default: empty string)",
+        });
         this.commandToRun = Option.Rest();
     }
     get logs() {
@@ -192,6 +198,8 @@ export class RunCommand extends Command {
         }
         const allureReport = new AllureReport({
             ...config,
+            environment: this.environment,
+            stage: this.stage,
             realTime: false,
             plugins: [
                 ...(config.plugins?.length
@@ -321,5 +329,9 @@ RunCommand.usage = Command.Usage({
     examples: [
         ["run -- npm run test", "Run npm run test and collect Allure results"],
         ["run --rerun 3 -- npm run test", "Run npm run test and rerun failed tests up to 3 times"],
+        [
+            "run --stage=my-stage -- npm run test",
+            "Run npm run test and pack inner report state into my-stage.zip archive to restore the state in the next run",
+        ],
     ],
 });

package/dist/index.d.ts

@@ -1 +1 @@
-export { defineConfig } from "@allurereport/plugin-api";
+export { defineConfig, defaultChartsConfig } from "@allurereport/plugin-api";

package/dist/index.js

@@ -36,4 +36,4 @@ cli.register(ResultsUnpackCommand);
 cli.register(Builtins.HelpCommand);
 cli.runExit(args);
 console.log(cwd());
-export { defineConfig } from "@allurereport/plugin-api";
+export { defineConfig, defaultChartsConfig } from "@allurereport/plugin-api";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allure",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "description": "Allure Commandline Tool",
   "keywords": [
     "allure",
@@ -31,26 +31,26 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/core": "3.0.0-beta.18",
-    "@allurereport/core-api": "3.0.0-beta.18",
-    "@allurereport/directory-watcher": "3.0.0-beta.18",
-    "@allurereport/plugin-allure2": "3.0.0-beta.18",
-    "@allurereport/plugin-api": "3.0.0-beta.18",
-    "@allurereport/plugin-awesome": "3.0.0-beta.18",
-    "@allurereport/plugin-classic": "3.0.0-beta.18",
-    "@allurereport/plugin-csv": "3.0.0-beta.18",
-    "@allurereport/plugin-dashboard": "3.0.0-beta.18",
-    "@allurereport/plugin-log": "3.0.0-beta.18",
-    "@allurereport/plugin-progress": "3.0.0-beta.18",
-    "@allurereport/plugin-server-reload": "3.0.0-beta.18",
-    "@allurereport/plugin-slack": "3.0.0-beta.18",
-    "@allurereport/reader-api": "3.0.0-beta.18",
-    "@allurereport/service": "3.0.0-beta.18",
-    "@allurereport/static-server": "3.0.0-beta.18",
+    "@allurereport/core": "3.0.0-beta.19",
+    "@allurereport/core-api": "3.0.0-beta.19",
+    "@allurereport/directory-watcher": "3.0.0-beta.19",
+    "@allurereport/plugin-allure2": "3.0.0-beta.19",
+    "@allurereport/plugin-api": "3.0.0-beta.19",
+    "@allurereport/plugin-awesome": "3.0.0-beta.19",
+    "@allurereport/plugin-classic": "3.0.0-beta.19",
+    "@allurereport/plugin-csv": "3.0.0-beta.19",
+    "@allurereport/plugin-dashboard": "3.0.0-beta.19",
+    "@allurereport/plugin-log": "3.0.0-beta.19",
+    "@allurereport/plugin-progress": "3.0.0-beta.19",
+    "@allurereport/plugin-server-reload": "3.0.0-beta.19",
+    "@allurereport/plugin-slack": "3.0.0-beta.19",
+    "@allurereport/reader-api": "3.0.0-beta.19",
+    "@allurereport/service": "3.0.0-beta.19",
+    "@allurereport/static-server": "3.0.0-beta.19",
     "adm-zip": "^0.5.16",
     "clipanion": "^4.0.0-rc.4",
+    "glob": "^11.0.3",
     "lodash.omit": "^4.5.0",
-    "picomatch": "^4.0.3",
     "prompts": "^2.4.2",
     "terminate": "^2.8.0",
     "typanion": "^3.14.0",
@@ -62,7 +62,6 @@
     "@types/eslint": "^8.56.11",
     "@types/lodash.omit": "^4.5.9",
     "@types/node": "^20.17.9",
-    "@types/picomatch": "^4",
     "@types/prompts": "^2",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",