allure 3.0.0-beta.20 → 3.0.0-beta.21

package/dist/commands/generate.js

@@ -3,7 +3,6 @@ import { KnownError } from "@allurereport/service";
 import { Command, Option } from "clipanion";
 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";
@@ -59,7 +58,7 @@ export class GenerateCommand extends Command {
                 dot: true,
                 windowsPathsNoEscape: true,
                 cwd,
-            })).filter((p) => p.endsWith(sep));
+            })).filter((p) => /(\/|\\)$/.test(p));
             resultsDirectories.push(...matchedDirs);
         }
         if (resultsDirectories.length === 0 && stageDumpFiles.length === 0) {

package/dist/commands/index.d.ts

@@ -20,3 +20,4 @@ export * from "./logout.js";
 export * from "./whoami.js";
 export * from "./projects/index.js";
 export * from "./results/index.js";
+export * from "./jira/index.js";

package/dist/commands/index.js

@@ -20,3 +20,4 @@ export * from "./logout.js";
 export * from "./whoami.js";
 export * from "./projects/index.js";
 export * from "./results/index.js";
+export * from "./jira/index.js";

package/dist/commands/jira/clear.d.ts

@@ -0,0 +1,16 @@
+import { Command } from "clipanion";
+declare abstract class BaseJiraCommand extends Command {
+    config: string | undefined;
+    cwd: string | undefined;
+    token: string | undefined;
+    webhook: string | undefined;
+}
+export declare class JiraClearCommand extends BaseJiraCommand {
+    static paths: string[][];
+    static usage: import("clipanion").Usage;
+    issues: string[];
+    clearReports: boolean | undefined;
+    clearResults: boolean | undefined;
+    execute(): Promise<void>;
+}
+export {};

package/dist/commands/jira/clear.js

@@ -0,0 +1,113 @@
+import { getPluginInstance, readConfig } from "@allurereport/core";
+import JiraPlugin from "@allurereport/plugin-jira";
+import { Command, Option, UsageError } from "clipanion";
+import { realpath } from "node:fs/promises";
+import process, { exit } from "node:process";
+import { green, red } from "yoctocolors";
+class BaseJiraCommand extends Command {
+    constructor() {
+        super(...arguments);
+        this.config = Option.String("--config,-c", {
+            description: "The path Allure config file",
+        });
+        this.cwd = Option.String("--cwd", {
+            description: "The working directory for the command to run (default: current working directory)",
+        });
+        this.token = Option.String("--token,-t", {
+            description: "Atlassian User OAuth Token (default: ALLURE_JIRA_TOKEN environment variable)",
+            required: false,
+        });
+        this.webhook = Option.String("--webhook", {
+            description: "Allure Jira Integration Webhook URL (default: ALLURE_JIRA_WEBHOOK environment variable)",
+            required: false,
+        });
+    }
+}
+export class JiraClearCommand extends BaseJiraCommand {
+    constructor() {
+        super(...arguments);
+        this.issues = Option.Array("--issue", {
+            description: "Jira issue key(s)",
+            required: true,
+            arity: 1,
+        });
+        this.clearReports = Option.Boolean("--reports", {
+            description: "Unlink reports from the specified Jira issue",
+            required: false,
+        });
+        this.clearResults = Option.Boolean("--results", {
+            description: "Unlink results from the specified Jira issue",
+            required: false,
+        });
+    }
+    async execute() {
+        const cwd = await realpath(this.cwd ?? process.cwd());
+        const config = await readConfig(cwd, this.config);
+        const pluginFromConfig = getPluginInstance(config, ({ plugin }) => plugin instanceof JiraPlugin);
+        const jiraPlugin = new JiraPlugin({
+            token: this.token ?? pluginFromConfig?.options?.token,
+            webhook: this.webhook ?? pluginFromConfig?.options?.webhook,
+        });
+        if (!jiraPlugin.options.token) {
+            throw new UsageError("Token is not provided");
+        }
+        if (!jiraPlugin.options.webhook) {
+            throw new UsageError("Webhook url is not provided");
+        }
+        if (!this.clearReports && !this.clearResults) {
+            throw new UsageError("Either --reports or --results must be provided");
+        }
+        const operation = this.clearReports && this.clearResults ? "clearAll" : this.clearReports ? "clearReports" : "clearResults";
+        if (operation === "clearAll") {
+            try {
+                await jiraPlugin.clearAll(this.issues);
+                this.context.stdout.write(green("All reports and test results have been unlinked from the specified Jira issue"));
+            }
+            catch (error) {
+                this.context.stderr.write(red("Failed to unlink reports and test results from the specified Jira issue"));
+                exit(1);
+            }
+        }
+        if (operation === "clearReports") {
+            try {
+                await jiraPlugin.clearReports(this.issues);
+                this.context.stdout.write(green("All reports have been unlinked from the specified Jira issue"));
+            }
+            catch (error) {
+                this.context.stderr.write(red("Failed to unlink reports from the specified Jira issue"));
+                exit(1);
+            }
+        }
+        if (operation === "clearResults") {
+            try {
+                await jiraPlugin.clearResults(this.issues);
+                this.context.stdout.write(green("All test results have been unlinked from the specified Jira issue"));
+            }
+            catch (error) {
+                this.context.stderr.write(red("Failed to unlink test results from the specified Jira issue"));
+                exit(1);
+            }
+        }
+    }
+}
+JiraClearCommand.paths = [["jira", "clear"]];
+JiraClearCommand.usage = Command.Usage({
+    category: "Integrations",
+    description: "Unlink test results or reports in Jira",
+    details: "This command posts test results from the provided Allure Results directory to a Jira.",
+    examples: [
+        [
+            "Clear linked test results for the specified Jira issue",
+            "jira clear --token xoxb-token --webhook C12345 --issue JIRA-123 --results",
+        ],
+        [
+            "Clear linked reports for the specified Jira issue",
+            "jira clear --token xoxb-token --webhook C12345 --issue JIRA-123 --reports",
+        ],
+        [
+            "Clear linked test results and reports for the specified Jira issue",
+            "jira clear --token xoxb-token --webhook C12345 --issue JIRA-123 --results --reports",
+        ],
+        ["Clear from multiple Jira issues", "jira clear --issue JIRA-123 --issue JIRA-456 ..."],
+    ],
+});

package/dist/commands/jira/index.d.ts

@@ -0,0 +1 @@
+export * from "./clear.js";

package/dist/commands/jira/index.js

@@ -0,0 +1 @@
+export * from "./clear.js";

package/dist/commands/qualityGate.js

@@ -3,7 +3,6 @@ import { Command, Option } from "clipanion";
 import { glob } from "glob";
 import * as console from "node:console";
 import { realpath } from "node:fs/promises";
-import { sep } from "node:path";
 import { exit, cwd as processCwd } from "node:process";
 import * as typanion from "typanion";
 import { red } from "yoctocolors";
@@ -79,7 +78,7 @@ export class QualityGateCommand extends Command {
             dot: true,
             windowsPathsNoEscape: true,
             cwd,
-        })).filter((p) => p.endsWith(sep));
+        })).filter((p) => /(\/|\\)$/.test(p));
         if (resultsDirectories.length === 0) {
             console.error("No Allure results directories found");
             exit(0);

package/dist/commands/results/pack.js

@@ -10,7 +10,7 @@ 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, sep } from "node:path";
+import { basename, join, resolve } from "node:path";
 import { green, red } from "yoctocolors";
 export class ResultsPackCommand extends Command {
     constructor() {
@@ -38,7 +38,7 @@ export class ResultsPackCommand extends Command {
             absolute: true,
             windowsPathsNoEscape: true,
             cwd,
-        })).filter((p) => p.endsWith(sep));
+        })).filter((p) => /(\/|\\)$/.test(p));
         const resultsFiles = new Set();
         if (resultsDirectories.length === 0) {
             console.log(red(`No test results directories found matching pattern: ${resultsDir}`));

package/dist/index.d.ts

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

package/dist/index.js

@@ -2,7 +2,7 @@ import { Builtins, Cli } from "clipanion";
 import console from "node:console";
 import { readFileSync } from "node:fs";
 import { argv, cwd } from "node:process";
-import { Allure2Command, AwesomeCommand, ClassicCommand, CsvCommand, DashboardCommand, GenerateCommand, HistoryCommand, KnownIssueCommand, LogCommand, LoginCommand, LogoutCommand, OpenCommand, ProjectsCreateCommand, ProjectsDeleteCommand, ProjectsListCommand, QualityGateCommand, ResultsPackCommand, ResultsUnpackCommand, RunCommand, SlackCommand, TestPlanCommand, WatchCommand, WhoamiCommand, } from "./commands/index.js";
+import { Allure2Command, AwesomeCommand, ClassicCommand, CsvCommand, DashboardCommand, GenerateCommand, HistoryCommand, JiraClearCommand, KnownIssueCommand, LogCommand, LoginCommand, LogoutCommand, OpenCommand, ProjectsCreateCommand, ProjectsDeleteCommand, ProjectsListCommand, QualityGateCommand, ResultsPackCommand, ResultsUnpackCommand, RunCommand, SlackCommand, TestPlanCommand, WatchCommand, WhoamiCommand, } from "./commands/index.js";
 const [node, app, ...args] = argv;
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
 const cli = new Cli({
@@ -17,6 +17,7 @@ cli.register(CsvCommand);
 cli.register(DashboardCommand);
 cli.register(GenerateCommand);
 cli.register(HistoryCommand);
+cli.register(JiraClearCommand);
 cli.register(KnownIssueCommand);
 cli.register(LogCommand);
 cli.register(LoginCommand);
@@ -36,4 +37,5 @@ cli.register(ResultsUnpackCommand);
 cli.register(Builtins.HelpCommand);
 cli.runExit(args);
 console.log(cwd());
-export { defineConfig, defaultChartsConfig } from "@allurereport/plugin-api";
+export { defineConfig } from "@allurereport/plugin-api";
+export { defaultChartsConfig } from "@allurereport/charts-api";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allure",
-  "version": "3.0.0-beta.20",
+  "version": "3.0.0-beta.21",
   "description": "Allure Commandline Tool",
   "keywords": [
     "allure",
@@ -31,22 +31,24 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/core": "3.0.0-beta.20",
-    "@allurereport/core-api": "3.0.0-beta.20",
-    "@allurereport/directory-watcher": "3.0.0-beta.20",
-    "@allurereport/plugin-allure2": "3.0.0-beta.20",
-    "@allurereport/plugin-api": "3.0.0-beta.20",
-    "@allurereport/plugin-awesome": "3.0.0-beta.20",
-    "@allurereport/plugin-classic": "3.0.0-beta.20",
-    "@allurereport/plugin-csv": "3.0.0-beta.20",
-    "@allurereport/plugin-dashboard": "3.0.0-beta.20",
-    "@allurereport/plugin-log": "3.0.0-beta.20",
-    "@allurereport/plugin-progress": "3.0.0-beta.20",
-    "@allurereport/plugin-server-reload": "3.0.0-beta.20",
-    "@allurereport/plugin-slack": "3.0.0-beta.20",
-    "@allurereport/reader-api": "3.0.0-beta.20",
-    "@allurereport/service": "3.0.0-beta.20",
-    "@allurereport/static-server": "3.0.0-beta.20",
+    "@allurereport/charts-api": "3.0.0-beta.21",
+    "@allurereport/core": "3.0.0-beta.21",
+    "@allurereport/core-api": "3.0.0-beta.21",
+    "@allurereport/directory-watcher": "3.0.0-beta.21",
+    "@allurereport/plugin-allure2": "3.0.0-beta.21",
+    "@allurereport/plugin-api": "3.0.0-beta.21",
+    "@allurereport/plugin-awesome": "3.0.0-beta.21",
+    "@allurereport/plugin-classic": "3.0.0-beta.21",
+    "@allurereport/plugin-csv": "3.0.0-beta.21",
+    "@allurereport/plugin-dashboard": "3.0.0-beta.21",
+    "@allurereport/plugin-jira": "3.0.0-beta.21",
+    "@allurereport/plugin-log": "3.0.0-beta.21",
+    "@allurereport/plugin-progress": "3.0.0-beta.21",
+    "@allurereport/plugin-server-reload": "3.0.0-beta.21",
+    "@allurereport/plugin-slack": "3.0.0-beta.21",
+    "@allurereport/reader-api": "3.0.0-beta.21",
+    "@allurereport/service": "3.0.0-beta.21",
+    "@allurereport/static-server": "3.0.0-beta.21",
     "adm-zip": "^0.5.16",
     "clipanion": "^4.0.0-rc.4",
     "glob": "^11.0.3",