@allurereport/ci 3.16.0 → 3.17.0

package/dist/ciEnv.d.ts

@@ -0,0 +1 @@
+export declare const applyAllureCiEnv: () => void;

package/dist/ciEnv.js

@@ -0,0 +1,18 @@
+import { env } from "node:process";
+export const applyAllureCiEnv = () => {
+    const encodedAllureCiEnv = env.ALLURE_CI_ENV;
+    if (!encodedAllureCiEnv) {
+        return;
+    }
+    try {
+        const decodedAllureCiEnv = JSON.parse(Buffer.from(encodedAllureCiEnv, "base64").toString("utf8"));
+        for (const [variableName, variableValue] of Object.entries(decodedAllureCiEnv)) {
+            if (variableName.startsWith("ALLURE_")) {
+                env[variableName] = variableValue;
+            }
+        }
+    }
+    catch {
+        return;
+    }
+};

package/dist/detectors/azure.js

@@ -4,7 +4,7 @@ import { getEnv } from "../utils.js";
 const REF_PREFIX = "refs/";
 const BRANCH_REF_PREFIX = "refs/heads/";
 const TAG_REF_PREFIX = "refs/tags/";
-export const getRootURL = () => getEnv("SYSTEM_COLLECTIONURI");
+export const getRootURL = () => getEnv("SYSTEM_COLLECTIONURI").replace(/\/+$/, "");
 export const getBuildID = () => getEnv("BUILD_BUILDID");
 export const getDefinitionID = () => getEnv("SYSTEM_DEFINITIONID");
 export const getProjectID = () => getEnv("SYSTEM_TEAMPROJECTID");

package/dist/detectors/github.js

@@ -1,6 +1,6 @@
 import { join } from "node:path/posix";
 import { CiType, GitProvider } from "@allurereport/core-api";
-import { resolveGithubPullRequestNumber } from "../helpers/github.js";
+import { resolveGithubPullRequestContext, resolveGithubPullRequestNumber } from "../helpers/github.js";
 import { stripRefsHeads } from "../helpers/gitProvider.js";
 import { getEnv } from "../utils.js";
 const getBaseURL = () => getEnv("GITHUB_SERVER_URL");
@@ -23,8 +23,19 @@ const getSourceBranch = () => {
     if (headRef) {
         return headRef;
     }
+    const pullRequestHeadRef = resolveGithubPullRequestContext()?.headRef;
+    if (pullRequestHeadRef) {
+        return pullRequestHeadRef;
+    }
     return isTagRef() ? "" : getBranchFromRef();
 };
+const getTargetBranch = () => {
+    const baseRef = getEnv("GITHUB_BASE_REF");
+    if (baseRef) {
+        return baseRef;
+    }
+    return resolveGithubPullRequestContext()?.baseRef ?? "";
+};
 export const github = {
     type: CiType.Github,
     get detected() {
@@ -92,7 +103,7 @@ export const github = {
         return getSourceBranch() || undefined;
     },
     get targetBranch() {
-        return getEnv("GITHUB_BASE_REF") || undefined;
+        return getTargetBranch() || undefined;
     },
     get pullRequest() {
         const pullRequestId = resolveGithubPullRequestNumber();

package/dist/helpers/github.d.ts

@@ -1,2 +1,9 @@
+export type GithubPullRequestContext = {
+    number: string;
+    headRef?: string;
+    baseRef?: string;
+};
+export declare const parsePullRequestContextFromEventJson: (content: string) => GithubPullRequestContext | undefined;
 export declare const parsePullRequestNumberFromEventJson: (content: string) => string;
+export declare const resolveGithubPullRequestContext: () => GithubPullRequestContext | undefined;
 export declare const resolveGithubPullRequestNumber: () => string;

package/dist/helpers/github.js

@@ -8,43 +8,75 @@ const normalizePullRequestNumber = (value) => {
     }
     return String(value);
 };
-export const parsePullRequestNumberFromEventJson = (content) => {
+const nonBlank = (value) => {
+    const trimmed = value?.trim();
+    return trimmed ? trimmed : undefined;
+};
+const contextFromPullRequestFields = (pullRequest, fallbackNumber) => {
+    const number = normalizePullRequestNumber(pullRequest?.number ?? fallbackNumber);
+    if (!number) {
+        return undefined;
+    }
+    return {
+        number,
+        headRef: nonBlank(pullRequest?.head?.ref),
+        baseRef: nonBlank(pullRequest?.base?.ref),
+    };
+};
+export const parsePullRequestContextFromEventJson = (content) => {
     try {
         const event = JSON.parse(content);
-        return normalizePullRequestNumber(event?.number ?? event?.pull_request?.number);
+        const fromPullRequest = contextFromPullRequestFields(event.pull_request, event.number);
+        if (fromPullRequest) {
+            return fromPullRequest;
+        }
+        const workflowPullRequests = event.workflow_run?.pull_requests;
+        if (!Array.isArray(workflowPullRequests) || workflowPullRequests.length === 0) {
+            return undefined;
+        }
+        return contextFromPullRequestFields(workflowPullRequests[0]);
     }
     catch {
-        return "";
+        return undefined;
     }
 };
-const readPullRequestNumberFromEventPath = () => {
+export const parsePullRequestNumberFromEventJson = (content) => {
+    return parsePullRequestContextFromEventJson(content)?.number ?? "";
+};
+const readPullRequestContextFromEventPath = () => {
     const eventPath = getEnv("GITHUB_EVENT_PATH");
     if (!eventPath) {
-        return "";
+        return undefined;
     }
     try {
         const content = readFileSync(eventPath, "utf-8");
-        return parsePullRequestNumberFromEventJson(content);
+        return parsePullRequestContextFromEventJson(content);
     }
     catch {
-        return "";
+        return undefined;
     }
 };
-export const resolveGithubPullRequestNumber = () => {
+export const resolveGithubPullRequestContext = () => {
     const refName = getEnv("GITHUB_REF_NAME") || "";
     const refNameMatch = refName.match(PULL_REQUEST_REF_NAME_RE);
     if (refNameMatch) {
-        return refNameMatch[1];
+        return {
+            number: refNameMatch[1],
+            headRef: nonBlank(getEnv("GITHUB_HEAD_REF")),
+            baseRef: nonBlank(getEnv("GITHUB_BASE_REF")),
+        };
     }
     const githubRef = getEnv("GITHUB_REF") || "";
     const mergeRefMatch = githubRef.match(PULL_REQUEST_MERGE_REF_RE);
     if (mergeRefMatch) {
-        return mergeRefMatch[1];
+        return {
+            number: mergeRefMatch[1],
+            headRef: nonBlank(getEnv("GITHUB_HEAD_REF")),
+            baseRef: nonBlank(getEnv("GITHUB_BASE_REF")),
+        };
     }
-    const headRef = getEnv("GITHUB_HEAD_REF");
-    const baseRef = getEnv("GITHUB_BASE_REF");
-    if (headRef && baseRef) {
-        return readPullRequestNumberFromEventPath();
-    }
-    return "";
+    return readPullRequestContextFromEventPath();
+};
+export const resolveGithubPullRequestNumber = () => {
+    return resolveGithubPullRequestContext()?.number ?? "";
 };

package/dist/index.d.ts

@@ -1,2 +1,3 @@
+export { applyAllureCiEnv } from "./ciEnv.js";
 export { detect } from "./detect.js";
 export { isLocalCiDescriptor } from "./detectors/local.js";

package/dist/index.js

@@ -1,2 +1,3 @@
+export { applyAllureCiEnv } from "./ciEnv.js";
 export { detect } from "./detect.js";
 export { isLocalCiDescriptor } from "./detectors/local.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/ci",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "description": "Utilities set to get useful report data from different CI",
   "keywords": [
     "allure",
@@ -30,7 +30,7 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.16.0"
+    "@allurereport/core-api": "3.17.0"
   },
   "devDependencies": {
     "@types/node": "^20",